ref #7849 String externalization and label adjustment

diff --git a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties
index 4bcff1844cf123911a532e1e3ea8e3439ee1ef24..23f85bf34dd7e37e2452032b82786b5471ce3e43 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties
+++ b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties
@@ -29,7 +29,7 @@ page.name.36 = Name Details View
 page.name.37 = Cdm Preferences\r
 page.name.38 = General Preferences\r
 page.name.39 = Nomenclatural Code\r
-page.name.100 = Distribution Data Configuration\r
+page.name.100 = Distribution\r
 view.name = Datasource\r
 view.name.0 = Progress\r
 view.name.1 = Message\r
@@ -184,19 +184,18 @@ command.label.25 = Import Preferences
 partdescriptor.label.featureTreeEditor = Feature Tree Editor\r
 command.name.OPEN_REFERENCING_OBJECTS_VIEW = Open Referencing Objects View\r
 extension.name.1 = Store Workbench Model\r
-page.name.21 = Distribution Editor Configuration\r
-page.name.21 = Distribution Data Configuration\r
-page.name.40 = ABCD Import Configuration\r
+page.name.21 = Distribution Editor\r
+page.name.40 = ABCD Import\r
 page.name.41 = ABCD Import Provider\r
 page.name.42 = Database Preferences\r
-page.name.43 = Nomenclatural Code Admin\r
-page.name.44 = Name Details\r
+page.name.43 = Nomenclatural Code\r
+page.name.44 = Name Details View\r
 extension-point.name = Cdm Viewer\r
 extension-point.name.0 = Preference Page\r
 extension-point.name.1 = Admin Preference Page\r
 page.name.45 = Specimen\r
 page.name.46 = Publish Flag\r
-page.name.47 = Vocabulary Selection\r
+page.name.47 = Common Names\r
 page.name.48 = Identifier Search\r
 command.name.111 = Open Admin Distributionstatus-Wizard\r
 command.name.112 = Open Admin CommonNameArea-Wizard
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties
index 0178ade15f2e7f3329614b16ec4e1802d5dfc677..ea1999a77c32e1e502c8c48ec0446078dfc12efc 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties
+++ b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties
@@ -195,7 +195,7 @@ extension-point.name.0 = Pr
 extension-point.name.1 = Admin Präferenzen
 page.name.45 = Specimen
 page.name.46 = Publish Flag
-page.name.47 = Vokabular Auswahl
+page.name.47 = Trivialnamen
 page.name.48 = Identifier Suche
 command.name.111 = \u00d6ffne Admin Verbreitungsstatus-Wizard
 command.name.112 = \u00d6ffne Admin Common Name Areal-Wizard
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/VokabularyAdminPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/VokabularyAdminPreferences.java
old mode 100755 (executable)
new mode 100644 (file)
index 6b38f3f..a23f8fb
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/VokabularyAdminPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/VokabularyAdminPreferences.java
@@ -50,10 +50,10 @@ public class VokabularyAdminPreferences extends CdmPreferencePage implements IE4
         }
 
         final CLabel commonNameAreaLabel = new CLabel(composite, SWT.NULL);
-        commonNameAreaLabel.setText("Select the area vocabularies which should be available for common names.");
+        commonNameAreaLabel.setText(Messages.VokabularyAdminPreferences_SELECT_VOCABULARY_TEXT);
 
         final CommandHandlerButton button_opencommonNameAreaWizard = new CommandHandlerButton(composite, SWT.PUSH,
-                "eu.etaxonomy.taxeditor.store.open.OpenCommonNameAreaWizardAdminHandler");
+                "eu.etaxonomy.taxeditor.store.open.OpenCommonNameAreaWizardAdminHandler"); //$NON-NLS-1$
 
         button_opencommonNameAreaWizard.setText(Messages.GeneralPreference_open_common_name_area_selection);
         final Button allowOverrideCommonNameAreaCheckButton = new Button(composite, SWT.CHECK);
@@ -82,7 +82,7 @@ public class VokabularyAdminPreferences extends CdmPreferencePage implements IE4
 
             CdmPreference pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.CommonNameAreaVocabularies);
             if(pref==null){
-                pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.CommonNameAreaVocabularies, "");
+                pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.CommonNameAreaVocabularies, ""); //$NON-NLS-1$
             }
             pref.setAllowOverride(allowOverride);
             service.set(pref);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
index caec734e0d74a1a846790662e5c5efa70cfc8315..50ffcfc4f3479fe04ebab771fb76e9e33ecea28f 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
@@ -518,6 +518,8 @@ public class Messages extends NLS {
 
     public static String ChecklistEditorGeneralPreference_3;
     public static String ChecklistEditorGeneralPreference_enable;
+
+
     public static String ChecklistEditorGeneralPreference_allowOverride;
     public static String ChecklistEditorGeneralPreference_open_distribution_selection;
     public static String ChecklistEditorGeneralPreference_open_wizard;
@@ -547,6 +549,8 @@ public class Messages extends NLS {
     public static String DateDetail_parseText_tooltip;
 
 
+
+
     public static String GeneralPreference_open_common_name_area_selection;
 
 
@@ -577,6 +581,16 @@ public class Messages extends NLS {
 
 
 
+    public static String VokabularyAdminPreferences_2;
+
+
+    public static String VokabularyAdminPreferences_SELECT_VOCABULARY_TEXT;
+
+
+
+
+
+
     static {
         // initialize resource bundle
         NLS.initializeMessages(BUNDLE_NAME, Messages.class);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
index a57af260e69793795d8a7b5f2fd5ffcf8e7fdb53..360c37dd693f45714367101f350eb9d14e13616c 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
@@ -349,8 +349,9 @@ NameRelationshipWizardPage_description=Choose namerelationship type and related
 
 DateDetail_parseText_tooltip=This field is for quick data entry. The content is parsed and the atomised fields will be filled, the content of this field will not be saved.
 
-GeneralPreference_open_common_name_area_selection=Selection of vocabularies for common name distributions
+GeneralPreference_open_common_name_area_selection=Select Areas
 
+VokabularyAdminPreferences_SELECT_VOCABULARY_TEXT=Select the area vocabularies which should be available for common names.
 DatabasePreferncesPage_Show_Specimen=Show specimen related views and menu entries
 SpecimenConfiguration_description=Select whether you want to edit specimen related data and how they should be displayed.
 DatabasePreferncesPage_Show_IOMenu=Show Import/Export menu entries

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
index ad8b64ff542b957e00a90d8f3fc56eb178d7a834..3f80634383e2f372dc4a818184ddc1abdd5240ad 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
@@ -349,8 +349,9 @@ NameDetailsViewConfiguration_description=Konfiguration eines vereinfachten Namen
 
 DateDetail_parseText_tooltip=Dieses Feld ist für die schnelle Dateneingabe. Der Inhalt des Feldes wird geparsed und in die atomisierten Felder geschrieben. Der Inhalt des Feldes selber wird nicht gespeichert.
 
-GeneralPreference_open_common_name_area_selection=Auswahl der Vokabulare für die Verbreitung der Common Names
+GeneralPreference_open_common_name_area_selection=Vokabulare auswählen
 
+VokabularyAdminPreferences_SELECT_VOCABULARY_TEXT=Wählen Sie die Gebietsvokabulare aus, die für Trivialnamen verfügbar seien sollen.
 DatabasePreferncesPage_Show_Specimen=Zeige Specimenbezogene Views und Menüeintrgäge
 SpecimenConfiguration_description=Wählen Sie aus, ob sie specimenbezogene Daten editieren wollen und wie diese angezeigt werden sollen.
 DatabasePreferncesPage_Show_IOMenu=Zeige Import/Export Menü Einträge an