Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 98764 invoked from network); 27 Aug 2008 07:04:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 27 Aug 2008 07:04:42 -0000 Received: (qmail 46050 invoked by uid 500); 27 Aug 2008 07:04:40 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 46007 invoked by uid 500); 27 Aug 2008 07:04:40 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 45998 invoked by uid 99); 27 Aug 2008 07:04:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Aug 2008 00:04:40 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Aug 2008 07:03:51 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6E58323889FC; Wed, 27 Aug 2008 00:03:51 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r689390 - in /directory/studio/trunk: ldapbrowser-help/src/main/docbook/ ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ ldifeditor-help/src/main/docbook/ ldifeditor/src/main/java/org/apache/directory/studio... Date: Wed, 27 Aug 2008 07:03:50 -0000 To: commits@directory.apache.org From: seelmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080827070351.6E58323889FC@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: seelmann Date: Wed Aug 27 00:03:50 2008 New Revision: 689390 URL: http://svn.apache.org/viewvc?rev=689390&view=rev Log: Changed labels Modified: directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.45_tools_ldifimport_wizard.xml directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportLdifMainWizardPage.java directory/studio/trunk/ldifeditor-help/src/main/docbook/1_gettingstarted.xml directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorPreferencePage.java Modified: directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.45_tools_ldifimport_wizard.xml URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.45_tools_ldifimport_wizard.xml?rev=689390&r1=689389&r2=689390&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.45_tools_ldifimport_wizard.xml (original) +++ directory/studio/trunk/ldapbrowser-help/src/main/docbook/2.45_tools_ldifimport_wizard.xml Wed Aug 27 00:03:50 2008 @@ -212,7 +212,7 @@ off - Update if entry already exists + Update existing entries This options applies for LDIF content records and LDIF add records. If enabled and the entry Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportLdifMainWizardPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportLdifMainWizardPage.java?rev=689390&r1=689389&r2=689390&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportLdifMainWizardPage.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportLdifMainWizardPage.java Wed Aug 27 00:03:50 2008 @@ -302,7 +302,7 @@ Group optionsGroup = BaseWidgetUtils.createGroup( optionsOuterComposite, "Options", 1 ); Composite optionsContainer = BaseWidgetUtils.createColumnContainer( optionsGroup, 3, 1 ); - updateIfEntryExistsButton = BaseWidgetUtils.createCheckbox( optionsContainer, "Update if entry already exists", + updateIfEntryExistsButton = BaseWidgetUtils.createCheckbox( optionsContainer, "Update existing entries", 3 ); updateIfEntryExistsButton .setToolTipText( "This options applies for LDIF content records and LDIF add records. " Modified: directory/studio/trunk/ldifeditor-help/src/main/docbook/1_gettingstarted.xml URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor-help/src/main/docbook/1_gettingstarted.xml?rev=689390&r1=689389&r2=689390&view=diff ============================================================================== --- directory/studio/trunk/ldifeditor-help/src/main/docbook/1_gettingstarted.xml (original) +++ directory/studio/trunk/ldifeditor-help/src/main/docbook/1_gettingstarted.xml Wed Aug 27 00:03:50 2008 @@ -877,7 +877,7 @@ on - Update if entry already exists + Update existing entries This options applies for LDIF content records and LDIF add records. If enabled and the entry Modified: directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorPreferencePage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorPreferencePage.java?rev=689390&r1=689389&r2=689390&view=diff ============================================================================== --- directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorPreferencePage.java (original) +++ directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorPreferencePage.java Wed Aug 27 00:03:50 2008 @@ -176,9 +176,9 @@ // Options Group optionsGroup = BaseWidgetUtils.createGroup( BaseWidgetUtils.createColumnContainer( composite, 1, 1 ), - "Options", 1 ); + "Execute Options", 1 ); - updateIfEntryExistsButton = BaseWidgetUtils.createCheckbox( optionsGroup, "Update if entry already exists", 1 ); + updateIfEntryExistsButton = BaseWidgetUtils.createCheckbox( optionsGroup, "Update existing entries", 1 ); updateIfEntryExistsButton .setToolTipText( "This options applies for LDIF content records and LDIF add records. " + "If enabled and the entry to add already exists it will be updated with the attributes defined in the LDIF record." );