ref #7019 Fix menu sort order of navigation context menu

diff --git a/eu.etaxonomy.taxeditor.navigation/OSGI-INF/l10n/bundle.properties b/eu.etaxonomy.taxeditor.navigation/OSGI-INF/l10n/bundle.properties
index 385986723f9879918324330c8b3710f5640fb76f..f5b688785529c435acf67b314ae0720c66f0b7d1 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/OSGI-INF/l10n/bundle.properties
+++ b/eu.etaxonomy.taxeditor.navigation/OSGI-INF/l10n/bundle.properties
@@ -68,8 +68,8 @@ command.name.removeDoubtful = Remove Doubtful Flag
 command.label.removeDoubtful = Remove Doubtful Flag\r
 \r
 wizard.name = TCS\r
-wizard.name.2 = Excel Normal Explicit Taxa\r
-wizard.name.3 = ABCD\r
+wizard.name.2 = Excel Normal Explicit\r
+wizard.name.3 = ABCD file\r
 wizard.name.4 = SDD\r
 wizard.name.5 = Specimen CDM Excel\r
 wizard.name.6 = JAXB\r
@@ -82,11 +82,11 @@ wizard.name.20 = CSV_PRINT
 wizard.name.22 = CDM light (csv)\r
 wizard.name.14 = Specimen\r
 wizard.name.23 = Excel Distribution Data Update\r
-wizard.name.24 = RIS Reference\r
+wizard.name.24 = RIS\r
 \r
 handledmenuitem.label.1 = Clone Classification\r
 menu.label.1 = Import\r
-handledmenuitem.label.2 = Import Specimens\r
+handledmenuitem.label.2 = Specimen online\r
 menu.label.2 = Export\r
 handledtoolitem.label.1 = Collapse\r
 handledtoolitem.label.2 = Sync with taxon selectio\r

diff --git a/eu.etaxonomy.taxeditor.navigation/OSGI-INF/l10n/bundle_de.properties b/eu.etaxonomy.taxeditor.navigation/OSGI-INF/l10n/bundle_de.properties
index ff51efac5610cf35adb5ef3edd17c178c3e951f8..976ce378dbc9c56a20c5cef6b92c45865daaddd4 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/OSGI-INF/l10n/bundle_de.properties
+++ b/eu.etaxonomy.taxeditor.navigation/OSGI-INF/l10n/bundle_de.properties
@@ -11,7 +11,6 @@ command.label.3 = Klassifikation
 command.label.5 = Bearbeiten\r
 command.label.6 = Akzeptiertes Taxon zum Synonym umwandeln\r
 command.label.61 = Akzeptiertes Taxon zum Synonym umwandeln (Setze Name in Quelle automatisch)\r
-command.label.62 = Akzeptiertes Taxon zum Synonym umwandeln (Der Name wird automatisch gesetzt, wenn er leer ist)\r
 command.label.7 = Verschiebe Taxon (mit Kindern)\r
 command.label.8 = Importieren\r
 command.label.9 = Exportieren\r
@@ -67,9 +66,10 @@ command.name.setDoubtful = Setze Doubtful Flag
 command.label.setDoubtful = Setze Doubtful Flag\r
 command.name.removeDoubtful = Entferne Doubtful Flag\r
 command.label.removeDoubtful = Entferne Doubtful Flag\r
+\r
 wizard.name = TCS\r
-wizard.name.2 = Excel Normal Explicit Taxa\r
-wizard.name.3 = ABCD\r
+wizard.name.2 = Excel Normal Explicit\r
+wizard.name.3 = ABCD Datei\r
 wizard.name.4 = SDD\r
 wizard.name.5 = Beleg CDM Excel\r
 wizard.name.6 = JAXB\r
@@ -82,4 +82,15 @@ wizard.name.20 = CSV_PRINT
 wizard.name.22 = CDM light (csv)\r
 wizard.name.14 = Beleg\r
 wizard.name.23 = Excel Verbreitungsdaten Update\r
-wizard.name.24 = RIS Referenzen
\ No newline at end of file
+wizard.name.24 = RIS\r
+\r
+\r
+handledmenuitem.label.1 = Klassifikation duplizieren\r
+menu.label.1 = Import\r
+handledmenuitem.label.2 = Beleg online\r
+menu.label.2 = Export\r
+handledtoolitem.label.1 = Collapse\r
+handledtoolitem.label.2 = Sync with taxon selectio\r
+command.commandname.1 = Klassifikation duplizieren\r
+command.commandname.2 = Navigator aktualisieren\r
+command.commandname.3 = Mit Taxon verknüpfen
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.navigation/fragment.e4xmi b/eu.etaxonomy.taxeditor.navigation/fragment.e4xmi
index 03b8d4dbd68fbe98cb317beb7231e36ef24e8423..6383554ac4c3a5821a447d6ebad3a4c5bf79e479 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/fragment.e4xmi
+++ b/eu.etaxonomy.taxeditor.navigation/fragment.e4xmi
@@ -73,16 +73,26 @@
         <children xsi:type="menu:MenuSeparator" xmi:id="_rBdnsJIwEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.menuseparator.2"/>
         <children xsi:type="menu:Menu" xmi:id="_T8ey0KkeEeejedk4mZQIGw" elementId="eu.etaxonomy.taxeditor.navigation.menu.import" label="%menu.label.1">
           <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_7ZtcEMuuEeiGO4eKaXkw0w" coreExpressionId="isShowIOMenuEnabled"/>
-          <children xsi:type="menu:HandledMenuItem" xmi:id="_YMugAKkeEeejedk4mZQIGw" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.importSpecimens" label="%handledmenuitem.label.2" command="_yBC78KnJEeeTAPHmaMLwQQ"/>
-          <children xsi:type="menu:HandledMenuItem" xmi:id="_2NC0kKnEEeeTAPHmaMLwQQ" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.importAbcd" label="%wizard.name.3" command="_AOq4QKnKEeeTAPHmaMLwQQ"/>
-          <children xsi:type="menu:HandledMenuItem" xmi:id="_3rMNkKnEEeeTAPHmaMLwQQ" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.importExceldistribution" label="%wizard.name.23" command="_Anfn8KnKEeeTAPHmaMLwQQ">
-            <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_3rMNkanEEeeTAPHmaMLwQQ" coreExpressionId="isShowExperimentalFeatures"/>
+          <children xsi:type="menu:Menu" xmi:id="_2sWBQAUvEeqpi5fkbwgEHQ" elementId="eu.etaxonomy.taxeditor.navigation.menu.specimen" label="Specimen">
+            <children xsi:type="menu:HandledMenuItem" xmi:id="_YMugAKkeEeejedk4mZQIGw" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.importSpecimens" label="%handledmenuitem.label.2" command="_yBC78KnJEeeTAPHmaMLwQQ"/>
+            <children xsi:type="menu:HandledMenuItem" xmi:id="_2NC0kKnEEeeTAPHmaMLwQQ" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.importAbcd" label="%wizard.name.3" command="_AOq4QKnKEeeTAPHmaMLwQQ"/>
+            <children xsi:type="menu:HandledMenuItem" xmi:id="_6uLdcKnEEeeTAPHmaMLwQQ" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.importExcelSpecimen" label="%wizard.name.5" command="_Av4u8KnKEeeTAPHmaMLwQQ"/>
+          </children>
+          <children xsi:type="menu:Menu" xmi:id="_6UTmcAUvEeqpi5fkbwgEHQ" elementId="eu.etaxonomy.taxeditor.navigation.menu.taxa" label="Taxa">
+            <children xsi:type="menu:HandledMenuItem" xmi:id="_6YeTMKnEEeeTAPHmaMLwQQ" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.importExcelTaxa" label="%wizard.name.2" command="_AqZK8KnKEeeTAPHmaMLwQQ"/>
+            <children xsi:type="menu:HandledMenuItem" xmi:id="_7w_lUKnEEeeTAPHmaMLwQQ" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.importTcs" label="%wizard.name" command="_LCsbgKnKEeeTAPHmaMLwQQ"/>
+          </children>
+          <children xsi:type="menu:Menu" xmi:id="_7e6YYAUvEeqpi5fkbwgEHQ" elementId="eu.etaxonomy.taxeditor.navigation.menu.references" label="References">
+            <children xsi:type="menu:HandledMenuItem" xmi:id="_7B5qsKnEEeeTAPHmaMLwQQ" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.importRisReference" label="%wizard.name.24" command="_AsTPcKnKEeeTAPHmaMLwQQ"/>
+          </children>
+          <children xsi:type="menu:Menu" xmi:id="_8rL-QAUvEeqpi5fkbwgEHQ" elementId="eu.etaxonomy.taxeditor.navigation.menu.descriptivedata" label="Descriptive Data">
+            <children xsi:type="menu:HandledMenuItem" xmi:id="_7XgHQKnEEeeTAPHmaMLwQQ" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.importSdd" label="%wizard.name.4" command="_AuNT8KnKEeeTAPHmaMLwQQ"/>
+          </children>
+          <children xsi:type="menu:Menu" xmi:id="_-bKuIAUvEeqpi5fkbwgEHQ" elementId="eu.etaxonomy.taxeditor.navigation.menu.factualdata" label="Factual Data">
+            <children xsi:type="menu:HandledMenuItem" xmi:id="_3rMNkKnEEeeTAPHmaMLwQQ" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.importExceldistribution" label="%wizard.name.23" command="_Anfn8KnKEeeTAPHmaMLwQQ">
+              <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_3rMNkanEEeeTAPHmaMLwQQ" coreExpressionId="isShowExperimentalFeatures"/>
+            </children>
           </children>
-          <children xsi:type="menu:HandledMenuItem" xmi:id="_6YeTMKnEEeeTAPHmaMLwQQ" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.importExcelTaxa" label="%wizard.name.2" command="_AqZK8KnKEeeTAPHmaMLwQQ"/>
-          <children xsi:type="menu:HandledMenuItem" xmi:id="_6uLdcKnEEeeTAPHmaMLwQQ" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.importExcelSpecimen" label="%wizard.name.5" command="_Av4u8KnKEeeTAPHmaMLwQQ"/>
-          <children xsi:type="menu:HandledMenuItem" xmi:id="_7B5qsKnEEeeTAPHmaMLwQQ" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.importRisReference" label="%wizard.name.24" command="_AsTPcKnKEeeTAPHmaMLwQQ"/>
-          <children xsi:type="menu:HandledMenuItem" xmi:id="_7XgHQKnEEeeTAPHmaMLwQQ" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.importSdd" label="%wizard.name.4" command="_AuNT8KnKEeeTAPHmaMLwQQ"/>
-          <children xsi:type="menu:HandledMenuItem" xmi:id="_7w_lUKnEEeeTAPHmaMLwQQ" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.importTcs" label="%wizard.name" command="_LCsbgKnKEeeTAPHmaMLwQQ"/>
         </children>
         <children xsi:type="menu:Menu" xmi:id="_rbInwKqhEeeXcJGhyhlrKA" elementId="eu.etaxonomy.taxeditor.navigation.menu.export" label="%menu.label.2">
           <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_3qJaEMuuEeiGO4eKaXkw0w" coreExpressionId="isShowIOMenuEnabled"/>

diff --git a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties
index d8eb7ce2e855047686f4024612fe175738d0c650..c9ae5ff349b72e1aae9dbb0ac7b3ef6150d2de46 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties
+++ b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties
@@ -75,8 +75,8 @@ category.name = CDM
 wizard.name = TCS\r
 wizard.name.0 = Berlin Model\r
 wizard.name.1 = Endnote\r
-wizard.name.2 = Excel Normal Explicit Taxa\r
-wizard.name.3 = ABCD\r
+wizard.name.2 = Excel Normal Explicit\r
+wizard.name.3 = ABCD file\r
 wizard.name.4 = SDD\r
 wizard.name.5 = Specimen CDM Excel\r
 category.name.0 = CDM\r
@@ -182,7 +182,7 @@ viewCommandMapping.viewerName.TAXON_NODE_WIZARD = Taxon Node Dialogue
 command.label.CHANGE_PASSWORD = Change password\r
 wizard.name.22 = CDM light (csv)\r
 wizard.name.23 = Excel Distribution Data Update\r
-wizard.name.24 = RIS Reference\r
+wizard.name.24 = RIS\r
 command.label.25 = Import Preferences
 partdescriptor.label.featureTreeEditor = Feature Tree Editor\r
 command.name.OPEN_REFERENCING_OBJECTS_VIEW = Open Referencing Objects View\r

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 51cbe115604fc42b2d3ccd891f0058ad8ed9b487..abdc27a5c84822698362c0c9b518df9bc2c9188f 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties
+++ b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties
@@ -75,8 +75,8 @@ category.name = CDM
 wizard.name = TCS
 wizard.name.0 = Berlin Modell
 wizard.name.1 = Endnote
-wizard.name.2 = Excel Normal Explicit Taxa
-wizard.name.3 = ABCD
+wizard.name.2 = Excel Normal Explicit
+wizard.name.3 = ABCD Datei
 wizard.name.4 = SDD
 wizard.name.5 = Beleg CDM Excel
 category.name.0 = CDM
@@ -182,7 +182,7 @@ viewCommandMapping.viewerName.TAXON_NODE_WIZARD = Taxonknoten-Dialog
 command.label.CHANGE_PASSWORD = Kennwort ändern
 wizard.name.22 = CDM light (csv)
 wizard.name.23 = Excel Verbreitungsdaten Update
-wizard.name.24 = RIS Referenzen
+wizard.name.24 = RIS
 command.label.25 = Import Präferenzen
 partdescriptor.label.featureTreeEditor = Merkmal-Baumeditor
 command.name.OPEN_REFERENCING_OBJECTS_VIEW = Öffne Referenzierende Objekte