adapt master to develop

[taxeditor.git] / eu.etaxonomy.taxeditor.editor / plugin.xml

diff --git a/eu.etaxonomy.taxeditor.editor/plugin.xml b/eu.etaxonomy.taxeditor.editor/plugin.xml
index 99c9c375f4367519053a8850a3134a8e9492c3dd..4c9c3904a99db7999f7637c018fb09c4938e823b 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.editor/plugin.xml
@@ -266,15 +266,6 @@
             </test>
          </with>
       </definition>
-      <definition
-            id="isNotInvalidDesignation">
-         <with
-               variable="selection">
-            <test
-                  property="eu.etaxonomy.taxeditor.editor.name.propertyTester.isNotInvalidDesignation">
-            </test>
-         </with>
-      </definition>
       <definition
             id="isTaxonBase">
          <with
@@ -478,7 +469,7 @@
             class="eu.etaxonomy.taxeditor.editor.name.handler.NameEditorMenuPropertyTester"
             id="eu.etaxonomy.taxeditor.editor.name.propertyTester"
             namespace="eu.etaxonomy.taxeditor.editor.name.propertyTester"
-            properties="isAcceptedTaxon,isSynonym,isNotSynonym,isMisapplication,isProparteSynonym,isNotProparteSynonym,isNotMisapplication,isNotInvalidDesignation,isTaxonBase,hasEmptyNames,isAcceptedAndHasNoHomotypicSynonyms,isNotHomotypicSynonymOfAcceptedTaxon,isNotAcceptedTaxon,isSynonymInHomotypicalGroupWithMoreSynonyms,isOrphaned"
+            properties="isAcceptedTaxon,isSynonym,isNotSynonym,isMisapplication,isProparteSynonym,isNotProparteSynonym,isNotMisapplication,isTaxonBase,hasEmptyNames,isAcceptedAndHasNoHomotypicSynonyms,isNotHomotypicSynonymOfAcceptedTaxon,isNotAcceptedTaxon,isSynonymInHomotypicalGroupWithMoreSynonyms,isOrphaned"
             type="java.lang.Object">
       </propertyTester>
       <propertyTester
@@ -565,7 +556,7 @@
       <viewCommandMapping
             commandId="eu.etaxonomy.taxeditor.editor.view.concept.command.open"
             selection="eu.etaxonomy.cdm.model.taxon.TaxonRelationship"
-            viewerName="Name Editor">
+            viewerName="Taxon Editor">
       </viewCommandMapping>
       <viewCommandMapping
             commandId="eu.etaxonomy.taxeditor.editor.openBulkEditorForTaxonRelationship"
@@ -580,7 +571,7 @@
       <viewCommandMapping
             commandId="eu.etaxonomy.taxeditor.editor.command.descriptiveDataSet.openDescriptiveDataSetEditor"
             selection="eu.etaxonomy.cdm.model.description.DescriptiveDataSet"
-            viewerName="Descriptive Data Set Editor">
+            viewerName="Descriptive Dataset Editor">
       </viewCommandMapping>
       <viewCommandMapping
             commandId="eu.etaxonomy.taxeditor.editor.command.descriptiveDataSet.openCharacterMatrix"
@@ -590,7 +581,7 @@
       <viewCommandMapping
             commandId="eu.etaxonomy.taxeditor.editor.command.descriptiveDataSet.openDescriptiveDataSetEditor"
             selection="eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache"
-            viewerName="Descriptive Data Set Editor">
+            viewerName="Descriptive Dataset Editor">
       </viewCommandMapping>
       <viewCommandMapping
             commandId="eu.etaxonomy.taxeditor.openSpecimenEditorForGatheringEvent"