BGBM BDI Projects / taxeditor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7ccb730)
merge fragment.e4.xmi
authorKatja Luther <k.luther@bgbm.org>
Mon, 24 Sep 2018 12:50:42 +0000 (14:50 +0200)
committerKatja Luther <k.luther@bgbm.org>
Mon, 24 Sep 2018 12:50:42 +0000 (14:50 +0200)
eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties patch | blob | history
eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_de.properties patch | blob | history
eu.etaxonomy.taxeditor.editor/fragment.e4xmi patch | blob | history

diff --git a/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties b/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties
index a58f6f5333f3e5373050d6c9d78318663cdbee9c..0cb8a5b0c4b91cb20fcf5edd2e3fddc1fe63a9ff 100755 (executable)
--- a/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties
+++ b/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties
@@ -248,7 +248,14 @@ handledmenuitem.label.16 = Character Editor
 handledmenuitem.tooltip.4 = Character Editor
 handledmenuitem.label.17 = Remove Taxon
 command.commandname.21 = Remove taxon
+<<<<<<< Updated upstream
 
 handledmenuitem.label.18 = New Factual Data Set with source
 handledmenuitem.label.19 = Create default description
 handledmenuitem.label.20 = Create literature description
+=======
+handledmenuitem.label.18 = Invalid Designation\r
+command.commandname.22 = Create Invalid Designation\r
+handledmenuitem.label.19 = Invalid Designation\r
+command.commandname.23 = Change To Invalid Designation
+>>>>>>> Stashed changes
diff --git a/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_de.properties b/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_de.properties
index 3eb64d551565d0a3a8bc98e23ea6a0958ec35ea2..2cceea9a382466f7df18c8bdaf9dc1f04f19e873 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_de.properties
+++ b/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_de.properties
@@ -248,7 +248,11 @@ handledmenuitem.label.16 = Character-Editor
 handledmenuitem.tooltip.4 = Character-Editor
 handledmenuitem.label.17 = Taxon entfernen
 command.commandname.21 = Taxon entfernen
-
 handledmenuitem.label.18 = Neues FaktendatenSet mit Quelle
 handledmenuitem.label.19 = Standard-Beschreibung erstellen
-handledmenuitem.label.20 = Literatur-Beschreibung erstellen
\ No newline at end of file
+handledmenuitem.label.20 = Literatur-Beschreibung erstellen
+handledmenuitem.label.21 = Invalid Designation
+command.commandname.22 = Erstelle Invalid Designation
+handledmenuitem.label.22 = Invalid Designation
+command.commandname.23 = Ändere zu Invalid Designation
+
diff --git a/eu.etaxonomy.taxeditor.editor/fragment.e4xmi b/eu.etaxonomy.taxeditor.editor/fragment.e4xmi
index 91066740fda2da3de2ee4a26523cbd0429d2fdbc..19f4d93e71eae3b03d8e846323f6537eae8f5a92 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/fragment.e4xmi
+++ b/eu.etaxonomy.taxeditor.editor/fragment.e4xmi
@@ -157,6 +157,8 @@
       <handlers xmi:id="_lv9GYIvQEee7R4eqeQiXZg" elementId="eu.etaxonomy.taxeditor.editor.name.e4.handler.MoveSynonymToAnotherAcceptedTaxonHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.name.e4.handler.MoveSynonymToAnotherAcceptedTaxonHandlerE4" command="_jNvBQIvQEee7R4eqeQiXZg"/>
       <handlers xmi:id="_g8QScFgWEeiQk_eTMvMviQ" elementId="eu.etaxonomy.taxeditor.editor.name.e4.handler.CreateProParteSynonymHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.name.e4.handler.CreateProParteSynonymHandlerE4" command="_HSKdYFgXEeiQk_eTMvMviQ"/>
       <handlers xmi:id="_442rEFj-EeiQk_eTMvMviQ" elementId="eu.etaxonomy.taxeditor.editor.name.e4.handler.ChangeToMisapplicationHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.name.e4.handler.ChangeToProParteSynonymHandlerE5" command="_BgX6gFj_EeiQk_eTMvMviQ"/>
+      <handlers xmi:id="_a4ggsLzGEeiaf9p39XS3qw" elementId="eu.etaxonomy.taxeditor.editor.handler.createInvalidDesignationHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.name.e4.handler.CreateInvalidDesignationHandlerE4" command="_DlSuULzFEeiaf9p39XS3qw"/>
+      <handlers xmi:id="_g52YELzGEeiaf9p39XS3qw" elementId="eu.etaxonomy.taxeditor.editor.handler.changeToInvalidDesignationHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.name.e4.handler.ChangeToInvalidDesignationHandlerE4" command="_UQb18LzFEeiaf9p39XS3qw"/>
       <menus xsi:type="menu:PopupMenu" xmi:id="_tLceQYl4Eeeox7omhvOBWg" elementId="eu.etaxonomy.taxeditor.editor.popupmenu.nameeditor">
         <children xsi:type="menu:Menu" xmi:id="_R6buoIl5Eeeox7omhvOBWg" elementId="eu.etaxonomy.taxeditor.editor.nameEditor.menu.new" label="%menu.label">
           <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_X1lWsEoREeiEhr9v9h_MoA" coreExpressionId="isNotMisapplication"/>
@@ -176,6 +178,9 @@
           <children xsi:type="menu:HandledMenuItem" xmi:id="_MCsX0Il8Eeeox7omhvOBWg" elementId="eu.etaxonomy.taxeditor.editor.nameEditor.menuItem.newMisapplication" label="%command.label.49" command="_c0byUIvPEee7R4eqeQiXZg">
             <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_G1zjMEoOEeiEhr9v9h_MoA" coreExpressionId="isAcceptedTaxon"/>
           </children>
+          <children xsi:type="menu:HandledMenuItem" xmi:id="_7mgS0LzEEeiaf9p39XS3qw" elementId="eu.etaxonomy.taxeditor.editor.nameEditor.menuItem.newInvalidDesignation" label="%handledmenuitem.label.21" command="_DlSuULzFEeiaf9p39XS3qw">
+            <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_7mg54LzEEeiaf9p39XS3qw" coreExpressionId="isAcceptedTaxon"/>
+          </children>
         </children>
         <children xsi:type="menu:MenuSeparator" xmi:id="_bxjbgE3LEeiplYSgvvNXRQ" elementId="eu.etaxonomy.taxeditor.editor.menuseparator.23"/>
         <children xsi:type="menu:DynamicMenuContribution" xmi:id="_drYq8E3LEeiplYSgvvNXRQ" elementId="eu.etaxonomy.taxeditor.editor.dynamicmenucontribution.nameEditor.openInCdmViewer" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.view.CdmViewerContextMenuE4"/>
@@ -193,9 +198,12 @@
           <children xsi:type="menu:HandledMenuItem" xmi:id="_QbC4IIl8Eeeox7omhvOBWg" elementId="eu.etaxonomy.taxeditor.editor.nameEditor.menuItem.changeToMisapplication" label="%command.label.14" command="_56AaUIvPEee7R4eqeQiXZg">
             <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_fYbSgEoQEeiEhr9v9h_MoA" coreExpressionId="isNotMisapplication"/>
           </children>
-          <children xsi:type="menu:HandledMenuItem" xmi:id="_F0EH0FkAEeiQk_eTMvMviQ" elementId="eu.etaxonomy.taxeditor.editor.handledmenuitem.changeToProparteSynonym" label="%command.label.61" command="_BgX6gFj_EeiQk_eTMvMviQ">
+          <children xsi:type="menu:HandledMenuItem" xmi:id="_F0EH0FkAEeiQk_eTMvMviQ" elementId="eu.etaxonomy.taxeditor.editor.handledmenuitem.changeToProparteSynonym" label="%command.label.60" command="_BgX6gFj_EeiQk_eTMvMviQ">
             <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_Lc4KcFkAEeiQk_eTMvMviQ" coreExpressionId="isNotProparteSynonym"/>
           </children>
+          <children xsi:type="menu:HandledMenuItem" xmi:id="_p_1hoLzFEeiaf9p39XS3qw" elementId="eu.etaxonomy.taxeditor.editor.handledmenuitem.changeToInvalidDesignation" label="%handledmenuitem.label.22" command="_UQb18LzFEeiaf9p39XS3qw">
+            <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_LbnU4LzGEeiaf9p39XS3qw" coreExpressionId="isNotInvalidDesignation"/>
+          </children>
         </children>
         <children xsi:type="menu:MenuSeparator" xmi:id="_a0anEIl5Eeeox7omhvOBWg" elementId="eu.etaxonomy.taxeditor.editor.menuseparator.13"/>
         <children xsi:type="menu:HandledMenuItem" xmi:id="_bu3dIIl5Eeeox7omhvOBWg" elementId="eu.etaxonomy.taxeditor.editor.nameEditor.menuItem.delete" label="%command.label.15" command="_CoVcYIvQEee7R4eqeQiXZg"/>
@@ -380,6 +388,8 @@
     <elements xsi:type="commands:Command" xmi:id="_ZHC3oLKVEeikjKoOnLFm2w" elementId="eu.etaxonomy.taxeditor.editor.charactermatrix.command.createDefaultTaxonDescription" commandName="handledmenuitem.label.19"/>
     <elements xsi:type="commands:Command" xmi:id="_fkPkkLKVEeikjKoOnLFm2w" elementId="eu.etaxonomy.taxeditor.editor.charactermatrix.command.createLiteratureTaxonDescription" commandName="handledmenuitem.label.20"/>
     <elements xsi:type="commands:Command" xmi:id="_Z51sQLy2EeioE565ihOF2g" elementId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.adddescriptionWithSource" commandName="handledmenuitem.label.18"/>
+    <elements xsi:type="commands:Command" xmi:id="_DlSuULzFEeiaf9p39XS3qw" elementId="eu.etaxonomy.taxeditor.editor.command.createinvaliddesignation" commandName="%command.commandname.22"/>
+    <elements xsi:type="commands:Command" xmi:id="_UQb18LzFEeiaf9p39XS3qw" elementId="eu.etaxonomy.taxeditor.editor.command.changeToInvalidDesignation" commandName="%command.commandname.23"/>
   </fragments>
   <fragments xsi:type="fragment:StringModelFragment" xmi:id="_pZmusEalEeeXMc6kSYO7Xg" featurename="children" parentElementId="eu.etaxonomy.taxeditor.menu.showView" positionInList="after:eu.etaxonomy.taxeditor.workbench.menuseparator.navigation">
     <elements xsi:type="menu:HandledMenuItem" xmi:id="_FPIHQKNwEeebGZ23ERGMGw" elementId="eu.etaxonomy.taxeditor.editor.showViewMenu.conceptGraph" label="%view.name.3" iconURI="" tooltip="%view.name.3" command="_WPjpoDSnEeek0dKsFNy--Q">