You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2008/08/27 09:03:50 UTC
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...
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 @@
<entry>off</entry>
</row>
<row>
- <entry>Update if entry already exists</entry>
+ <entry>Update existing entries</entry>
<entry>
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 @@
<entry>on</entry>
</row>
<row>
- <entry>Update if entry already exists</entry>
+ <entry>Update existing entries</entry>
<entry>
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." );