X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/15387df0fd5daee2ec35d4ab2b8a29fbdc3800f7..02176688eaa23a31ff5b71c317cb5ee685483aa4:/eu.etaxonomy.taxeditor.editor/plugin.xml?ds=sidebyside

diff --git a/eu.etaxonomy.taxeditor.editor/plugin.xml b/eu.etaxonomy.taxeditor.editor/plugin.xml
index bcd7eb865..d06b782aa 100644
--- a/eu.etaxonomy.taxeditor.editor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.editor/plugin.xml
@@ -26,50 +26,62 @@
            class="eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor"
            icon="icons/edit_16x16.gif"
            id="eu.etaxonomy.taxeditor.editor.taxon"
-           name="Multipage Taxon Editor">
+           name="%editor.name">
  	  </editor>
       <editor
             class="eu.etaxonomy.taxeditor.editor.name.TaxonNameEditor"
             default="true"
             id="eu.etaxonomy.taxeditor.editor.taxon.name"
-            name="Taxon Name Editor">
+            name="%editor.name.0">
       </editor>
       <editor
             class="eu.etaxonomy.taxeditor.editor.key.KeyEditor"
             default="false"
             id="eu.etaxonomy.taxeditor.editor.key"
-            name="Key">
+            name="%editor.name.1">
       </editor>
       <editor
             class="eu.etaxonomy.taxeditor.editor.key.polytomous.PolytomousKeyGraphEditor"
             default="false"
             id="eu.etaxonomy.taxeditor.editor.key.polytomous.graph"
-            name="Polytomous Key Graph Editor">
+            name="%editor.name.2">
       </editor>
       <editor
             class="eu.etaxonomy.taxeditor.editor.key.polytomous.PolytomousKeyListEditor"
             default="false"
             id="eu.etaxonomy.taxeditor.editor.key.polytomous.list"
-            name="Polytomous Key List Editor">
+            name="%editor.name.3">
       </editor>
       <editor
             class="eu.etaxonomy.taxeditor.editor.group.authority.CdmAuthorityEditor"
             default="false"
             id="eu.etaxonomy.taxeditor.editor.group.authority"
-            name="Cdm Authority Editor">
+            name="%editor.name.4">
       </editor>
       <editor
             class="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView"
             default="false"
             icon="icons/derivate_view-16x16-32.png"
             id="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView"
-            name="Derivate View">
+            name="%editor.name.5">
       </editor>
       <editor
             class="eu.etaxonomy.taxeditor.editor.view.dataimport.SpecimenImportEditor"
             default="false"
             id="eu.etaxonomy.taxeditor.editor.view.dataimport.SpecimenImportEditor"
-            name="Specimen Import Editor">
+            name="%editor.name.6">
+      </editor>
+      <editor
+            class="eu.etaxonomy.taxeditor.editor.view.dataimport.GbifImportEditor"
+            default="false"
+            id="eu.etaxonomy.taxeditor.editor.view.dataimport.GbifImportEditor"
+            name="%editor.name.7">
+      </editor>
+         <editor
+            class="eu.etaxonomy.taxeditor.editor.view.checklist.ChecklistEditor"
+            icon="icons/check.png"
+            id="eu.etaxonomy.taxeditor.editor.view.checklist.ChecklistEditor"
+            name="%editor.name.8">
       </editor>
    </extension>
       <extension
@@ -80,7 +92,7 @@
                class="eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptiveViewPart"
                icon="icons/address-book-new.png"
                id="eu.etaxonomy.taxeditor.editor.view.descriptive"
-               name="Factual Data"
+               name="%view.name"
                restorable="true">
          </view>
           <view
@@ -89,7 +101,7 @@
                 class="eu.etaxonomy.taxeditor.editor.view.uses.UsesViewPart"
                 icon="icons/leaf.png"
                 id="eu.etaxonomy.taxeditor.editor.view.uses"
-                name="Uses"
+                name="%view.name.0"
                 restorable="true">
          </view>
          <view
@@ -98,14 +110,14 @@
                class="eu.etaxonomy.taxeditor.editor.view.media.MediaViewPart"
                icon="icons/camera-photo.png"
                id="eu.etaxonomy.taxeditor.editor.view.media"
-               name="Media"
+               name="%view.name.1"
                restorable="true">
          </view>
          <view
                category="eu.etaxonomy.taxeditor.editor.category"
                class="eu.etaxonomy.taxeditor.editor.view.concept.ConceptViewPart"
                id="eu.etaxonomy.taxeditor.editor.view.concept"
-               name="Concept Relations"
+               name="%view.name.2"
                restorable="true">
          </view>
          <view
@@ -113,15 +125,109 @@
                class="eu.etaxonomy.taxeditor.editor.view.concept.graph.ConceptGraphView"
                icon="icons/address-book-new.png"
                id="eu.etaxonomy.taxeditor.editor.view.concept.graph"
-               name="Concept Graph"
+               name="%view.name.3"
                restorable="true">
          </view>
          <category
                id="eu.etaxonomy.taxeditor.editor.category"
-               name="Taxonomic Editor">
+               name="%category.name">
          </category>
+         <view
+               allowMultiple="true"
+               class="eu.etaxonomy.taxeditor.editor.view.dataimport.SpecimenImportView"
+               id="eu.etaxonomy.taxeditor.editor.view.dataimport.SpecimenImportView"
+               name="%view.name.4">
+         </view>
+         <view
+               allowMultiple="true"
+               class="eu.etaxonomy.taxeditor.editor.view.dataimport.GbifResponseImportView"
+               id="eu.etaxonomy.taxeditor.editor.view.dataimport.GbifResponseImportView"
+               name="%view.name.5">
+         </view>
+         <view
+               allowMultiple="false"
+               category="eu.etaxonomy.taxeditor.editor.category"
+               class="eu.etaxonomy.taxeditor.editor.view.validation.ValidationProblemsView"
+               icon="icons/edit_16x16.gif"
+               id="eu.etaxonomy.taxeditor.editor.view.validation.problems"
+               name="%view.name.6">
+         </view>
       </extension>
-   <extension
+      
+	<!-- VALIDATION RELATED STUFF -->
+	<extension point="org.eclipse.core.resources.markers" name="%extension.name.0" id="eu.etaxonomy.taxeditor.markers.validationerror">
+		<super type="org.eclipse.core.resources.problemmarker"/>
+		<attribute name="databaseId"/>
+		<attribute name="userFriendlyTypeName"/>
+		<attribute name="userFriendlyDescription"/>
+		<attribute name="userFriendlyFieldName"/>
+		<attribute name="validatorMessage"/>
+		<attribute name="invalidValue"/>
+		<attribute name="validatorClass"/>
+		<attribute name="entityClass"/>
+		<attribute name="entityId"/>
+   		<persistent value="false"/>
+   	</extension>
+
+	<extension point="org.eclipse.ui.ide.markerSupport">
+	    <markerContentGenerator
+		    id="eu.etaxonomy.taxeditor.editor.validation.ValidationProblemsMarkerGenerator" 
+		    name="%markerContentGenerator.name">  
+	    	<markerTypeReference id="eu.etaxonomy.taxeditor.markers.validationerror" />
+	    	
+	    	<markerFieldReference id="eu.etaxonomy.taxeditor.markers.validation.userFriendlyTypeName" visible="true" />
+	    	<markerFieldReference id="eu.etaxonomy.taxeditor.markers.validation.userFriendlyDescription" visible="true" />
+	    	<markerFieldReference id="eu.etaxonomy.taxeditor.markers.validation.userFriendlyFieldName" visible="true" />
+	    	<markerFieldReference id="eu.etaxonomy.taxeditor.markers.validation.validatorMessage" visible="true" />
+	    	<markerFieldReference id="eu.etaxonomy.taxeditor.markers.validation.invalidValue" visible="true" />
+	    	<markerFieldReference id="eu.etaxonomy.taxeditor.markers.validation.validatorClass" visible="false" />
+	    	<markerFieldReference id="eu.etaxonomy.taxeditor.markers.validation.entityClass" visible="false" />
+	    	<markerFieldReference id="eu.etaxonomy.taxeditor.markers.validation.entityId" visible="false" />
+	    </markerContentGenerator>
+	    
+		<markerField
+			class="eu.etaxonomy.taxeditor.editor.view.validation.UserFriendlyTypeNameMarkerField"
+			id="eu.etaxonomy.taxeditor.markers.validation.userFriendlyTypeName"
+			name="%marker.field.0">
+		</markerField>
+		<markerField
+			class="eu.etaxonomy.taxeditor.editor.view.validation.UserFriendlyDescriptionMarkerField"
+			id="eu.etaxonomy.taxeditor.markers.validation.userFriendlyDescription"
+			name="%marker.field.1">
+		</markerField>
+		<markerField
+			class="eu.etaxonomy.taxeditor.editor.view.validation.UserFriendlyFieldNameMarkerField"
+			id="eu.etaxonomy.taxeditor.markers.validation.userFriendlyFieldName"
+			name="%marker.field.2 = Attribute">
+		</markerField>
+		<markerField
+			class="eu.etaxonomy.taxeditor.editor.view.validation.InvalidValueMarkerField"
+			id="eu.etaxonomy.taxeditor.markers.validation.invalidValue"
+			name="%marker.field.3 = Problematic Value">
+		</markerField>
+		<markerField
+			class="eu.etaxonomy.taxeditor.editor.view.validation.ValidatorMessageMarkerField"
+			id="eu.etaxonomy.taxeditor.markers.validation.validatorMessage"
+			name="%marker.field.4 = Problem description">
+		</markerField>
+		<markerField
+			class="eu.etaxonomy.taxeditor.editor.view.validation.ValidatorClassMarkerField"
+			id="eu.etaxonomy.taxeditor.markers.validation.validatorClass"
+			name="%marker.field.5">
+		</markerField>
+		<markerField
+			class="eu.etaxonomy.taxeditor.editor.view.validation.EntityClassMarkerField"
+			id="eu.etaxonomy.taxeditor.markers.validation.entityClass"
+			name="%marker.field.6">
+		</markerField>
+		<markerField
+			class="eu.etaxonomy.taxeditor.editor.view.validation.EntityIdMarkerField"
+			id="eu.etaxonomy.taxeditor.markers.validation.entityId"
+			name="%marker.field.7">
+		</markerField>
+	</extension>
+	
+  <extension
          point="org.eclipse.ui.elementFactories">
       <factory
             class="eu.etaxonomy.taxeditor.editor.TaxonEditorInputFactory"
@@ -133,28 +239,41 @@
       <menuContribution
             locationURI="menu:eu.etaxonomy.navigation.menu.new?after=eu.etaxonomy.navigation.menu.new.separator1">
          <command
-               commandId="eu.etaxonomy.taxeditor.editor.command.new.reference"
-               label="Reference"
+               commandId="eu.etaxonomy.taxeditor.editor.command.new.name"
+               label="%command.label.46"
                style="push">
          </command>
          <command
-               commandId="eu.etaxonomy.taxeditor.editor.command.new.name"
-               label="Name"
+               commandId="eu.etaxonomy.taxeditor.editor.command.new.reference"
+               label="%command.label.47"
                style="push">
          </command>
          <command
                commandId="eu.etaxonomy.taxeditor.editor.command.new.team"
-               label="Team"
+               label="%command.label.1"
                style="push">
          </command>
          <command
                commandId="eu.etaxonomy.taxeditor.editor.command.new.person"
-               label="Person"
+               label="%command.label.2"
                style="push">
          </command>
+         <separator
+               name="eu.etaxonomy.navigation.menu.new.separator2"
+               visible="true">
+         </separator>
          <command
                commandId="eu.etaxonomy.taxeditor.editor.command.new.specimen"
-               label="Specimen"
+               label="%command.label.3"
+               style="push">
+         </command>
+         <separator
+               name="eu.etaxonomy.navigation.menu.new.separator3"
+               visible="true">
+         </separator>
+         <command
+               commandId="eu.etaxonomy.taxeditor.editor.command.new.datasource"
+               label="%command.label.48"
                style="push">
          </command>
       </menuContribution>
@@ -166,7 +285,7 @@
          </separator>
          <command
                commandId="org.eclipse.ui.views.showView"
-               label="Factual Data"
+               label="%command.label.4"
                style="push">
             <parameter
                   name="org.eclipse.ui.views.showView.viewId"
@@ -175,7 +294,7 @@
          </command>
          <command
                commandId="org.eclipse.ui.views.showView"
-               label="Media"
+               label="%command.label.5"
                style="push">
             <parameter
                   name="org.eclipse.ui.views.showView.viewId"
@@ -184,7 +303,7 @@
          </command>
          <command
                commandId="org.eclipse.ui.views.showView"
-               label="Concept"
+               label="%command.label.6"
                style="push">
             <parameter
                   name="org.eclipse.ui.views.showView.viewId"
@@ -193,7 +312,7 @@
          </command>
          <command
                commandId="org.eclipse.ui.views.showView"
-               label="Concept Graph"
+               label="%command.label.7"
                style="push">
             <parameter
                   name="org.eclipse.ui.views.showView.viewId"
@@ -211,17 +330,17 @@
             locationURI="menu:org.eclipse.ui.main.menu.navigate">
          <command
                commandId="eu.etaxonomy.taxeditor.editor.command.openParent"
-               label="Open Parent"
+               label="%command.label.8"
                style="push">
          </command>
       </menuContribution>
       <menuContribution
             locationURI="popup:eu.etaxonomy.taxeditor.editor.taxon.name">
          <menu
-               label="New">
+               label="%menu.label">
             <command
                   commandId="eu.etaxonomy.taxeditor.editor.name.createHeterotypicSynoym"
-                  label="Heterotypic Synonym"
+                  label="%command.label.9"
                   style="push">
                <visibleWhen>
                   <reference
@@ -231,7 +350,7 @@
             </command>
             <command
                   commandId="eu.etaxonomy.taxeditor.editor.name.createHomotypicSynoym"
-                  label="Homotypic Synonym"
+                  label="%command.label.10"
                   style="push">
                <visibleWhen>
                   <reference
@@ -241,7 +360,7 @@
             </command>
             <command
                   commandId="eu.etaxonomy.taxeditor.editor.name.createSynonymInHomotypicalGroup"
-                  label="Synonym In Homotypical Group"
+                  label="%command.label.11"
                   style="push">
                <visibleWhen>
                   <reference
@@ -253,9 +372,9 @@
                   name="separator1"
                   visible="true">
             </separator>
-           <!-- <command
+           <command
                   commandId="eu.etaxonomy.taxeditor.editor.name.createMisapplication"
-                  label="Misapplication"
+                  label="%command.label.49"
                   style="push">
                <visibleWhen>
                   <or>
@@ -267,7 +386,7 @@
                      </reference>
                   </or>
                </visibleWhen>
-            </command>-->
+            </command>
          </menu>
         <!--<command
                commandId="eu.etaxonomy.taxeditor.editor.name.changeAcceptedToSynonym"
@@ -291,10 +410,10 @@
                </visibleWhen>
          </command>-->
          <menu
-               label="Change To">
+               label="%menu.label.0">
             <command
                   commandId="eu.etaxonomy.taxeditor.editor.name.changeToAcceptedTaxon"
-                  label="Accepted Taxon"
+                  label="%command.label.12"
                   style="push">
                <visibleWhen>
                   <not>
@@ -311,7 +430,7 @@
             </command>
             <command
                   commandId="eu.etaxonomy.taxeditor.editor.name.changeToSynonym"
-                  label="Synonym"
+                  label="%command.label.13"
                   style="push">
                <visibleWhen>
                   <not>
@@ -328,7 +447,7 @@
             </command>
             <command
                   commandId="eu.etaxonomy.taxeditor.editor.name.changeToMisapplication"
-                  label="Misapplication"
+                  label="%command.label.14"
                   style="push">
                <visibleWhen>
                   <not>
@@ -349,8 +468,8 @@
                visible="true">
          </separator>
          <command
-               commandId="org.eclipse.ui.edit.delete"
-               label="Delete"
+               commandId="eu.etaxonomy.taxeditor.editor.name.delete"
+               label="%command.label.15"
                style="push">
             <visibleWhen>
                <or>
@@ -368,7 +487,7 @@
          </command>
          <command
                commandId="eu.etaxonomy.taxeditor.editor.name.deleteAllEmptyNames"
-               label="Delete All Empty Names"
+               label="%command.label.16"
                style="push">
             <visibleWhen>
                <reference
@@ -396,7 +515,7 @@
          </dynamic>
          <command
                commandId="eu.etaxonomy.taxeditor.editor.name.swapSynonymAndAccepted"
-               label="Swap Synonym With Accepted"
+               label="%command.label.17"
                style="push">
             <visibleWhen>
                <reference
@@ -404,13 +523,23 @@
                </reference>
             </visibleWhen>
          </command>
+         <command
+                  commandId="eu.etaxonomy.taxeditor.editor.name.moveSynonymToAnotherAcceptedTaxon"
+                  label="%command.label.56"
+                  style="push">
+               <visibleWhen>
+                   <reference
+                         definitionId="isSynonym">
+                   </reference>
+                </visibleWhen>
+          </command>
          <separator
                name="taxeditor-editor.separator3"
                visible="true">
          </separator>
          <command
                commandId="org.eclipse.ui.views.showView"
-               label="Show Details"
+               label="%command.label.18"
                style="push">
             <parameter
                   name="org.eclipse.ui.views.showView.viewId"
@@ -423,7 +552,7 @@
          </separator>
          <command
                commandId="org.eclipse.ui.file.save"
-               label="Save"
+               label="%command.label.19"
                style="push">
          </command>
       </menuContribution>
@@ -431,7 +560,7 @@
             locationURI="popup:eu.etaxonomy.taxeditor.editor.key.polytomous">
          <command
                commandId="eu.etaxonomy.taxeditor.key.polytomous.command.new"
-               label="New Node"
+               label="%command.label.20"
                style="push">
          </command>
          <separator
@@ -439,8 +568,8 @@
                visible="true">
          </separator>
          <command
-               commandId="org.eclipse.ui.edit.delete"
-               label="Delete"
+               commandId="eu.etaxonomy.taxeditor.key.polytomous.delete"
+               label="%command.label.21"
                style="push">
          </command>
          <separator
@@ -449,7 +578,7 @@
          </separator>
          <command
                commandId="eu.etaxonomy.taxeditor.key.command.applyLayout"
-               label="Apply Layout"
+               label="%command.label.22"
                style="push">
          </command>
          <separator
@@ -461,30 +590,30 @@
             locationURI="popup:eu.etaxonomy.taxeditor.editor.key.polytomous.list">
          <command
                commandId="eu.etaxonomy.taxeditor.key.polytomous.command.new.child"
-               label="New Key Number"
+               label="%command.label.23"
                style="push">
          </command>
          <command
                commandId="eu.etaxonomy.taxeditor.key.polytomous.command.new.sibling"
-               label="New Alternative"
+               label="%command.label.24"
                style="push">
          </command>
          <command
                commandId="eu.etaxonomy.taxeditor.key.polytomous.command.refresh"
-               label="Refresh Nodes"
+               label="%command.label.25"
                style="push">
          </command>
          <command
-               commandId="org.eclipse.ui.edit.delete"
-               label="Delete"
+               commandId="eu.etaxonomy.taxeditor.key.polytomous.command.delete"
+               label="%command.label.26"
                style="push">
          </command>
       </menuContribution>
       <menuContribution
             locationURI="popup:eu.etaxonomy.taxeditor.editor.view.descriptive">
          <command
-               commandId="eu.etaxonomy.taxeditor.description.commands.adddescription"
-               label="New Factual Data"
+               commandId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.adddescription"
+               label="%command.label.27"
                style="push">
          </command>
          <separator
@@ -492,7 +621,7 @@
                visible="true">
          </separator>
          <menu
-               label="New">
+               label="%menu.label.1">
             <dynamic
                   class="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.DynamicFeatureMenu"
                   id="eu.etaxonomy.taxeditor.dynamicFeatureMenu">
@@ -517,8 +646,27 @@
                visible="true">
          </separator>
          <command
-               commandId="eu.etaxonomy.taxeditor.editor.commands.description.moveDescriptionToTaxon"
-               label="Move Description to Taxon"
+               commandId="eu.etaxonomy.taxeditor.editor.handler.openDerivateView"
+               label="%command.label.51"
+               style="push">
+            <visibleWhen
+                  checkEnabled="true">
+               <and>
+                  <with
+                        variable="selection">
+                     <count
+                           value="+">
+                     </count>
+                  </with>
+                  <reference
+                        definitionId="isIndividualsAssociation">
+                  </reference>
+               </and>
+            </visibleWhen>
+         </command>
+         <command
+               commandId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.moveDescriptionToTaxon"
+               label="%command.label.28"
                style="push">
             <visibleWhen
                   checkEnabled="true">
@@ -528,8 +676,8 @@
             </visibleWhen>
          </command>
          <command
-               commandId="eu.etaxonomy.taxeditor.description.commands.moveDescriptionElements"
-               label="Move Elements to Taxon"
+               commandId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.moveDescriptionElements"
+               label="%command.label.29"
                style="push">
             <visibleWhen
                   checkEnabled="true">
@@ -547,9 +695,9 @@
                name="eu.etaxonomy.taxeditor.taxonDescriptionEditor.separator.afterNew"
                visible="true">
          </separator>
-         <command
-               commandId="org.eclipse.ui.edit.delete"
-               label="Delete"
+                  <command
+               commandId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.delete"
+               label="%command.label.30"
                style="push">
          </command>
          <separator
@@ -558,33 +706,49 @@
          </separator>
          <command
                commandId="org.eclipse.ui.file.save"
-               label="Save"
+               label="%command.label.31"
                style="push">
          </command>
+         <separator
+               name="eu.etaxonomy.taxeditor.editor.separator1">
+         </separator>
       </menuContribution>
       <menuContribution
             locationURI="popup:eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView">
-         <menu
-               label="New Derivate">
-            <dynamic
-                  class="eu.etaxonomy.taxeditor.editor.view.derivate.CreateDerivateContextMenu"
-                  id="eu.etaxonomy.taxeditor.editor.view.derivate.CreateDerivateContextMenu">
-            </dynamic>
-            <visibleWhen
-                  checkEnabled="true">
-               <reference
-                     definitionId="isSpecimenOrObservation">
-               </reference>
-            </visibleWhen>
-         </menu>
-      </menuContribution>
-      <menuContribution
-            locationURI="popup:eu.etaxonomy.taxeditor.editor.view.dataimport.SpecimenImportEditor">
          <command
-               commandId="eu.etaxonomy.taxeditor.editor.view.dataimport.SaveSpecimenCommand"
-               label="Save Specimen"
+               commandId="eu.etaxonomy.taxeditor.editor.derivate.delete"
+               label="%command.label.52"
                style="push">
          </command>
+         <command
+               commandId="eu.etaxonomy.taxeditor.editor.derivate.createFieldUnit"
+               label="%command.label.53"
+               style="push">
+         </command>
+         <command
+               commandId="eu.etaxonomy.taxeditor.editor.derivate.deepDelete"
+               icon="icons/deep-delete-16x16-32.png"
+               label="%command.label.54"
+               style="push">
+         </command>
+         <dynamic
+               class="eu.etaxonomy.taxeditor.editor.view.derivate.contextMenu.DerivateViewContextMenu"
+               id="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateContextMenu">
+         </dynamic>
+      </menuContribution>
+      <menuContribution
+            locationURI="popup:eu.etaxonomy.taxeditor.editor.view.dataimport.SpecimenImportEditor">
+         <dynamic
+               class="eu.etaxonomy.taxeditor.editor.view.dataimport.DataImportEditorContextMenu"
+               id="eu.etaxonomy.taxeditor.editor.view.dataimport.DataImportEditorContextMenu">
+         </dynamic>
+      </menuContribution>
+      <menuContribution
+            locationURI="popup:eu.etaxonomy.taxeditor.editor.view.dataimport.GbifImportEditor">
+         <dynamic
+               class="eu.etaxonomy.taxeditor.editor.view.dataimport.DataImportEditorContextMenu"
+               id="eu.etaxonomy.taxeditor.editor.view.dataimport.DataImportEditorContextMenu">
+         </dynamic>
       </menuContribution>
       
       
@@ -594,12 +758,12 @@
             locationURI="popup:eu.etaxonomy.taxeditor.editor.view.uses">
          <command
                commandId="eu.etaxonomy.taxeditor.use.commands.adduse"
-               label="New Use"
+               label="%command.label.32"
                style="push">
          </command>
          <command
                commandId="eu.etaxonomy.taxeditor.editor.use.createUseSummary"
-               label="New Use Summary"
+               label="%command.label.33"
                style="push">
             <visibleWhen
                   checkEnabled="true">
@@ -618,7 +782,7 @@
          </command>
          <command
                commandId="eu.etaxonomy.taxeditor.editor.use.createUseRecord"
-               label="New Use Record"
+               label="%command.label.34"
                style="push">
             <visibleWhen
                   checkEnabled="true">
@@ -648,8 +812,8 @@
                visible="true">
          </separator>
          <command
-               commandId="org.eclipse.ui.edit.delete"
-               label="Delete"
+               commandId="eu.etaxonomy.taxeditor.editor.use.command.delete"
+               label="%command.label.35"
                style="push">
          </command>
          <separator
@@ -658,7 +822,7 @@
          </separator>
          <command
                commandId="org.eclipse.ui.file.save"
-               label="Save"
+               label="%command.label.36"
                style="push">
          </command>
       </menuContribution>
@@ -670,17 +834,40 @@
       <menuContribution
             locationURI="popup:eu.etaxonomy.taxeditor.editor.view.media">
          <command
-               commandId="taxeditor-editor.command.newimagegallery"
-               label="New Image Gallery"
+               commandId="eu.etaxonomy.taxeditor.editor.media.command.newimagegallery"
+               label="%command.label.37"
                style="push">
+            <visibleWhen>
+               <or>
+                  <reference
+                        definitionId="isBulkEditor">
+                  </reference>
+                  <reference
+                        definitionId="isTaxonEditor">
+                  </reference>
+                  <reference
+                        definitionId="isDerivateEditor">
+                  </reference>
+               </or>
+            </visibleWhen>
          </command>
          <separator
                name="taxeditor-editor.separator1"
                visible="true">
          </separator>
          <command
-               commandId="taxeditor-editor.newimage"
-               label="New Image"
+               commandId="eu.etaxonomy.taxeditor.editor.media.command.newimage"
+               label="%command.label.38"
+               style="push">
+            <visibleWhen>
+               <reference
+                     definitionId="isImageGallery">
+               </reference>
+            </visibleWhen>
+         </command>
+         <command
+               commandId="eu.etaxonomy.taxeditor.editor.media.command.useExistingImage"
+               label="%command.label.50"
                style="push">
             <visibleWhen>
                <reference
@@ -689,8 +876,8 @@
             </visibleWhen>
          </command>
          <command
-               commandId="taxeditor-editor.command.moveimgdown"
-               label="Move Image Up In List"
+               commandId="eu.etaxonomy.taxeditor.editor.media.command.moveimgdown"
+               label="%command.label.39"
                style="push">
             <visibleWhen>
                <reference
@@ -699,8 +886,8 @@
             </visibleWhen>
          </command>
          <command
-               commandId="taxeditor-editor.command.moveimgup"
-               label="Move Image Down In List"
+               commandId="eu.etaxonomy.taxeditor.editor.media.command.moveimgup"
+               label="%command.label.40"
                style="push">
             <visibleWhen>
                <reference
@@ -713,20 +900,20 @@
                visible="true">
          </separator>
          <command
-               commandId="org.eclipse.ui.edit.delete"
-               label="Delete"
+               commandId="eu.etaxonomy.taxeditor.editor.media.command.delete"
+               label="%command.label.41"
                style="push">
          </command>
          <command
                commandId="org.eclipse.ui.file.save"
-               label="Save"
+               label="%command.label.42"
                style="push">
          </command>
       </menuContribution>
       <menuContribution
             locationURI="popup:eu.etaxonomy.taxeditor.editor.view.concept">
          <menu
-               label="New">
+               label="%menu.label.3">
             <dynamic
                   class="eu.etaxonomy.taxeditor.editor.view.concept.handler.CreateConceptRelationMenu"
                   id="eu.etaxonomy.taxeditor.editor.view.concept.menus.new">
@@ -734,7 +921,7 @@
          </menu>
          <command
                commandId="eu.etaxonomy.taxeditor.editor.view.concept.command.open"
-               label="Open Related Concept"
+               label="%command.label.43"
                style="push">
          </command>
          <separator
@@ -742,8 +929,8 @@
                visible="true">
          </separator>
          <command
-               commandId="org.eclipse.ui.edit.delete"
-               label="Delete"
+               commandId="eu.etaxonomy.taxeditor.editor.view.concept.command.delete"
+               label="%command.label.44"
                style="push">
          </command>
       </menuContribution>
@@ -752,15 +939,65 @@
             locationURI="popup:#BulkEditorContext?before=taxeditor-bulkeditor.separator1">
          <command
                commandId="eu.etaxonomy.taxeditor.group.cdmauthorities.edit"
-               label="Edit Authorities"
+               label="%command.label.45"
                style="push">
             <visibleWhen>
                <reference
-                     definitionId="isGroup">
+                     definitionId="isGroupEditor">
                </reference>
             </visibleWhen>
          </command>
       </menuContribution>
+      <menuContribution
+            allPopups="false"
+            locationURI="toolbar:eu.etaxonomy.taxeditor.editor.view.descriptive">
+         <command
+               commandId="eu.etaxonomy.taxeditor.editor.handler.showOnlyIndividualAssociations"
+               icon="icons/link_obj.gif"
+               style="toggle"
+               tooltip="%command.tooltip">
+         </command>
+      </menuContribution>
+      <menuContribution
+            allPopups="false"
+            locationURI="popup:eu.etaxonomy.taxeditor.navigation.navigatorpopup?after=taxeditor-navigation.separator2">
+         <command
+               commandId="eu.etaxonomy.taxeditor.editor.handler.openDerivateView"
+               label="%command.label.55"
+               style="push">
+            <visibleWhen
+                  checkEnabled="false">
+               <and>
+                  <reference
+                        definitionId="isCdmStoreConnected">
+                  </reference>
+                  <reference
+                        definitionId="isTaxonNode">
+                  </reference>
+               </and>
+            </visibleWhen>
+         </command>
+         <separator
+               name="eu.etaxonomy.taxeditor.editor.separator1"
+               visible="true">
+         </separator>
+      </menuContribution>
+      <menuContribution
+            locationURI="menu:eu.etaxonomy.taxeditor.menu.showView?after=org.eclipse.ui.views.showView.supplemental">
+         <separator
+               name="eu.etaxonomy.taxeditor.store.showViewMenu.validation.separator"
+               visible="true">
+         </separator>
+         <command
+               commandId="org.eclipse.ui.views.showView"
+               label="%command.name.40"
+               style="push">
+            <parameter
+                  name="org.eclipse.ui.views.showView.viewId"
+                  value="eu.etaxonomy.taxeditor.editor.view.validation.problems">
+            </parameter>
+         </command>
+      </menuContribution>
    </extension>
    <extension
          point="org.eclipse.ui.handlers">
@@ -782,7 +1019,7 @@
       </handler>
       <handler
             class="eu.etaxonomy.taxeditor.editor.name.handler.DeleteTaxonBaseHandler"
-            commandId="org.eclipse.ui.edit.delete">
+            commandId="eu.etaxonomy.taxeditor.editor.name.command.delete">
          <activeWhen>
             <and>
                <reference
@@ -798,7 +1035,7 @@
       </handler>
       <handler
             class="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.DeleteHandler"
-            commandId="org.eclipse.ui.edit.delete">
+            commandId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.delete">
           <activeWhen>
              <with
                    variable="activePartId">
@@ -809,13 +1046,16 @@
                    <equals
                          value="eu.etaxonomy.taxeditor.editor.view.media">
                    </equals>
+                   <equals
+                     	value="eu.etaxonomy.taxeditor.editor.view.uses">
+               		</equals>
                 </or>
-             </with>
-          </activeWhen>
+           	 </with>
+         </activeWhen>
       </handler>
       <handler
             class="eu.etaxonomy.taxeditor.editor.key.polytomous.handler.DeleteNodeHandler"
-            commandId="org.eclipse.ui.edit.delete">
+            commandId="eu.etaxonomy.taxeditor.editor.key.polytomous.command.delete">
          <activeWhen>
             <with
                   variable="activePartId">
@@ -827,7 +1067,7 @@
       </handler>
       <handler
             class="eu.etaxonomy.taxeditor.editor.view.concept.handler.DeleteConceptRelationHandler"
-            commandId="org.eclipse.ui.edit.delete">
+            commandId="eu.etaxonomy.taxeditor.editor.view.concept.command.delete">
          <activeWhen>
             <with
                   variable="activePartId">
@@ -838,55 +1078,75 @@
          </activeWhen>
       </handler>
       <handler
-            class="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.DeleteHandler"
-            commandId="org.eclipse.ui.edit.delete">
+            class="eu.etaxonomy.taxeditor.editor.handler.OpenChecklistEditorHandler"
+            commandId="eu.etaxonomy.taxeditor.editor.handler.OpenChecklistEditorHandler">
+      </handler>
+      <handler
+            class="eu.etaxonomy.taxeditor.editor.view.derivate.handler.DeleteDerivateHandler"
+            commandId="eu.etaxonomy.taxeditor.editor.view.derivate.command.delete">
+         <activeWhen>
+            <with
+                  variable="activePartId">
+               <equals
+                     value="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView">
+               </equals>
+            </with>
+         </activeWhen>
+      </handler>
+      <handler
+            class="eu.etaxonomy.taxeditor.editor.view.derivate.handler.OpenDerivateEditorForTaxonHandler"
+            commandId="eu.etaxonomy.taxeditor.editor.handler.openDerivateView">
          <activeWhen>
             <with
                   variable="activePartId">
                <equals
-                     value="eu.etaxonomy.taxeditor.editor.view.uses">
+                     value="eu.etaxonomy.taxeditor.navigation.navigator">
                </equals>
             </with>
          </activeWhen>
       </handler>
+      <handler
+            class="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.ToggleShowOnlyIndividualAssociationsHandler"
+            commandId="eu.etaxonomy.taxeditor.editor.handler.showOnlyIndividualAssociations">
+      </handler>
    </extension>
    <extension
-         name="Name Commands"
+         name="%extension.name"
          point="org.eclipse.ui.commands">
       <category
             id="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
-            name="-- Name Editor">
+            name="%category.name.0">
       </category>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.handler.OpenParentHandler"
             id="eu.etaxonomy.taxeditor.editor.command.openParent"
-            name="Open Parent">
+            name="%command.name">
       </command>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.CreateHomotypicSynonymHandler"
             id="eu.etaxonomy.taxeditor.editor.name.createHomotypicSynoym"
-            name="Create Homotypic Synonym">
+            name="%command.name.0">
       </command>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.CreateHeterotypicSynonymHandler"
             id="eu.etaxonomy.taxeditor.editor.name.createHeterotypicSynoym"
-            name="Create Heterotypic Synonym">
+            name="%command.name.1">
       </command>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.CreateSynonymInHomotypicalGroupHandler"
             id="eu.etaxonomy.taxeditor.editor.name.createSynonymInHomotypicalGroup"
-            name="Create Synonym In Homotypical Group">
+            name="%command.name.2">
       </command>
-     <!-- <command
+     <command
             categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.CreateMisapplicationHandler"
             id="eu.etaxonomy.taxeditor.editor.name.createMisapplication"
-            name="Create Misapplication">
-      </command>-->
+            name="%command.name.36">
+      </command>
       <!--command
             defaultHandler="eu.etaxonomy.taxeditor.editor.handler.MoveTaxonHandler"
             id="eu.etaxonomy.taxeditor.editor.name.moveTaxon"
@@ -896,37 +1156,43 @@
             categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.ChangeToSynonymHandler"
             id="eu.etaxonomy.taxeditor.editor.name.changeToSynonym"
-            name="Change To Synonym">
+            name="%command.name.3">
       </command>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.ChangeSynonymToAcceptedTaxonHandler"
             id="eu.etaxonomy.taxeditor.editor.name.changeToAcceptedTaxon"
-            name="Change To Accepted Taxon">
+            name="%command.name.4">
       </command>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.ChangeToMisapplicationHandler"
             id="eu.etaxonomy.taxeditor.editor.name.changeToMisapplication"
-            name="Change To Misapplication">
+            name="%command.name.5">
       </command>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.SwapSynonymAndAcceptedHandler"
             id="eu.etaxonomy.taxeditor.editor.name.swapSynonymAndAccepted"
-            name="Swap Synonym With Accepted">
+            name="%command.name.6">
+      </command>
+      <command
+            categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
+            defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.MoveSynonymToAnotherAcceptedTaxonHandler"
+            id="eu.etaxonomy.taxeditor.editor.name.moveSynonymToAnotherAcceptedTaxon"
+            name="%command.name.46">
       </command>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.SetBasionymHandler"
             id="eu.etaxonomy.taxeditor.editor.name.setBasionym"
-            name="Set Basionym / Original Combination">
+            name="%command.name.7">
       </command>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.RemoveBasionymHandler"
             id="eu.etaxonomy.taxeditor.editor.name.removeBasionym"
-            name="Remove Basionym / Original Combination">
+            name="%command.name.8">
       </command>
      <!-- <command
             categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
@@ -934,188 +1200,258 @@
             id="eu.etaxonomy.taxeditor.editor.name.changeAcceptedToSynonym"
             name="Change Accepted Taxon to Synonym">
       </command>-->
+      <command
+            categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
+            defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.DeleteTaxonBaseHandler"
+            id="eu.etaxonomy.taxeditor.editor.name.delete"
+            name="%command.name.45">
+      </command>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.DeleteAllEmptyNamesHandler"
             id="eu.etaxonomy.taxeditor.editor.name.deleteAllEmptyNames"
-            name="Delete All Empty Names">
+            name="%command.name.9">
       </command>
       <category
             id="eu.etaxonomy.taxeditor.editor.view.descriptive.command.category"
-            name="-- Factual">
+            name="%category.name.1">
       </category>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.CreateDescriptionElementHandler"
-            id="eu.etaxonomy.taxeditor.editor.description.createDescriptionElement"
-            name="Create Description Element">
+            id="eu.etaxonomy.taxeditor.editor.view.descriptive.command.createDescriptionElement"
+            name="%command.name.10">
       </command>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.CreateDescriptionHandler"
-            id="eu.etaxonomy.taxeditor.description.commands.adddescription"
-            name="New Description">
+            id="eu.etaxonomy.taxeditor.editor.view.descriptive.command.adddescription"
+            name="%command.name.11">
       </command>
-      <command
-            categoryId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.category"
-            defaultHandler="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.MoveDescriptionElementsHandler"
-            id="eu.etaxonomy.taxeditor.description.commands.moveDescriptionElements"
-            name="Move Description Elements to Taxon">
-      </command>
-      <command
-            categoryId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.category"
-            defaultHandler="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.MoveDescriptionToOtherTaxonHandler"
-            id="eu.etaxonomy.taxeditor.editor.commands.description.moveDescriptionToTaxon"
-            name="Move Description to Taxon">
+       <command
+             categoryId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.category"
+             defaultHandler="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.DeleteHandler"
+             id="eu.etaxonomy.taxeditor.editor.view.descriptive.command.delete"
+             name="%command.name.48">
       </command>
       <category
             id="eu.etaxonomy.taxeditor.editor.view.uses.command.category"
-            name="-- New Uses">
+            name="%category.name.2">
       </category>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.view.uses.command.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.view.uses.handler.CreateUseHandler"
             id="eu.etaxonomy.taxeditor.use.commands.adduse"
-            name="New Use">
+            name="%command.name.14">
+      </command>
+      <command
+            categoryId="eu.etaxonomy.taxeditor.editor.view.uses.command.category"
+            defaultHandler="eu.etaxonomy.taxeditor.editor.view.uses.handler.CreateUseRecordHandler"
+            id="eu.etaxonomy.taxeditor.editor.use.createUseRecord"
+            name="%command.name.16">
       </command>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.view.uses.command.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.view.uses.handler.CreateUseSummaryHandler"
             id="eu.etaxonomy.taxeditor.editor.use.createUseSummary"
-            name="New Use Summary">
+            name="%command.name.15">
       </command>
       <command
-            categoryId="eu.etaxonomy.taxeditor.editor.view.uses.command.category"
-            defaultHandler="eu.etaxonomy.taxeditor.editor.view.uses.handler.CreateUseRecordHandler"
-            id="eu.etaxonomy.taxeditor.editor.use.createUseRecord"
-            name="New Use Record">
+            id="eu.etaxonomy.taxeditor.editor.use.command.delete"
+            name="%command.name.47">
       </command>
       <category
             id="eu.etaxonomy.taxeditor.editor.media.category"
-            name="-- Media">
+            name="%category.name.3">
       </category>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.media.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.view.media.handler.MoveImageDownInListHandler"
-            id="taxeditor-editor.command.moveimgdown"
-            name="Move Image Down In List">
+            id="eu.etaxonomy.taxeditor.editor.media.command.moveimgdown"
+            name="%command.name.19">
       </command>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.media.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.view.media.handler.AddImageGalleryHandler"
-            id="taxeditor-editor.command.newimagegallery"
-            name="New Image Gallery">
+            id="eu.etaxonomy.taxeditor.editor.media.command.newimagegallery"
+            name="%command.name.20">
       </command>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.media.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.view.media.handler.CreateMediaHandler"
-            id="taxeditor-editor.newimage"
-            name="New Image">
+            id="eu.etaxonomy.taxeditor.editor.media.command.newimage"
+            name="%command.name.21">
+      </command>
+      <command
+            categoryId="eu.etaxonomy.taxeditor.editor.media.category"
+            defaultHandler="eu.etaxonomy.taxeditor.editor.view.media.handler.AddExistingMediaHandler"
+            id="eu.etaxonomy.taxeditor.editor.media.command.useExistingImage"
+            name="%command.name.37">
       </command>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.media.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.view.media.handler.MoveImageUpInListHandler"
-            id="taxeditor-editor.command.moveimgup"
-            name="Move Image Up In List">
+            id="eu.etaxonomy.taxeditor.editor.media.command.moveimgup"
+            name="%command.name.22">
+      </command>
+       <command
+            categoryId="eu.etaxonomy.taxeditor.editor.media.category"
+            defaultHandler="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.DeleteHandler"
+            id="eu.etaxonomy.taxeditor.editor.media.command.delete"
+            name="%command.name.49">
       </command>
       <category
             id="eu.etaxonomy.taxeditor.editor.new.category"
-            name="-- New Entity">
+            name="%category.name.4">
       </category>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.new.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.handler.create.NewReferenceHandler"
             id="eu.etaxonomy.taxeditor.editor.command.new.reference"
-            name="New Reference">
+            name="%command.name.23">
       </command>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.new.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.handler.create.NewNameHandler"
             id="eu.etaxonomy.taxeditor.editor.command.new.name"
-            name="New Name">
+            name="%command.name.24">
       </command>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.new.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.handler.create.NewTeamHandler"
             id="eu.etaxonomy.taxeditor.editor.command.new.team"
-            name="New Team">
+            name="%command.name.25">
       </command>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.new.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.handler.create.NewPersonHandler"
             id="eu.etaxonomy.taxeditor.editor.command.new.person"
-            name="New Person">
+            name="%command.name.26">
       </command>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.new.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.handler.create.NewSpecimenHandler"
             id="eu.etaxonomy.taxeditor.editor.command.new.specimen"
-            name="New Specimen">
+            name="%command.name.27">
       </command>
       <category
             id="eu.etaxonomy.taxeditor.editor.key.category"
-            name="-- Polytomous Keys">
+            name="%category.name.5">
       </category>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.key.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.key.polytomous.handler.CreateChildNodeHandler"
             id="eu.etaxonomy.taxeditor.key.polytomous.command.new.child"
-            name="New Child Node">
+            name="%command.name.28">
       </command>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.key.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.key.polytomous.handler.CreateSiblingNodeHandler"
             id="eu.etaxonomy.taxeditor.key.polytomous.command.new.sibling"
-            name="New Sibling Node">
+            name="%command.name.29">
       </command>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.key.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.key.polytomous.handler.RefreshNodeNumberingHandler"
             id="eu.etaxonomy.taxeditor.key.polytomous.command.refresh"
-            name="Refresh Node Numbering">
+            name="%command.name.30">
       </command>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.key.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.key.handler.ApplyLayoutHandler"
             id="eu.etaxonomy.taxeditor.key.command.applyLayout"
-            name="Apply Layout">
+            name="%command.name.31">
+      </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.editor.key.polytomous.handler.DeleteNodeHandler"
+            id="eu.etaxonomy.taxeditor.key.polytomous.command.delete"
+            name="%command.name.50">
       </command>
       <category
             id="eu.etaxonomy.taxeditor.editor.view.concept.category"
-            name="-- Concept Relations">
+            name="%category.name.6">
       </category>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.view.concept.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.view.concept.handler.CreateConceptRelationHandler"
             id="eu.etaxonomy.taxeditor.editor.name.createConceptRelation"
-            name="Create Concept Relation">
+            name="%command.name.32">
       </command>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.view.concept.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.view.concept.handler.OpenRelatedConceptHandler"
             id="eu.etaxonomy.taxeditor.editor.view.concept.command.open"
-            name="Open Related Concept">
+            name="%command.name.33">
       </command>
       <category
             id="eu.etaxonomy.taxeditor.bulkeditor.group.category"
-            name="-- Group">
+            name="%category.name.7">
       </category>
       <command
             categoryId="eu.etaxonomy.taxeditor.bulkeditor.group.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.group.authority.handler.EditCdmAuthoritiesHandler"
             id="eu.etaxonomy.taxeditor.group.cdmauthorities.edit"
-            name="Edit CDM Authorities">
+            name="%command.name.34">
       </command>
       <command
             defaultHandler="eu.etaxonomy.taxeditor.editor.handler.OpenDerivateViewHandler"
             id="eu.etaxonomy.taxeditor.editor.handler.openDerivateView"
-            name="Open Derivate View">
+            name="%command.name.35">
       </command>
        <command
-            defaultHandler="eu.etaxonomy.taxeditor.editor.view.dataimport.SaveSpecimenCommand"
-            id="eu.etaxonomy.taxeditor.editor.view.dataimport.SaveSpecimenCommand"
-            name="Save Specimen">
+             defaultHandler="eu.etaxonomy.taxeditor.editor.handler.OpenChecklistEditorHandler"
+             id="eu.etaxonomy.taxeditor.editor.handler.OpenChecklistViewHandler"
+             name="%command.name.38">
+       </command>
+      <command
+            categoryId="eu.etaxonomy.taxeditor.editor.new.category"
+            defaultHandler="eu.etaxonomy.taxeditor.view.datasource.handler.CreateDataSourceHandler"
+            id="eu.etaxonomy.taxeditor.editor.command.new.datasource"
+            name="%command.name.39">
+      </command>
+      <command
+            id="eu.etaxonomy.taxeditor.editor.handler.showOnlyIndividualAssociations"
+            name="%command.name.41">
+      </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.OpenTaxonEditorHandler"
+            id="eu.etaxonomy.taxeditor.editor.openTaxonEditor"
+            name="%command.name.42">
+         <commandParameter
+               id="eu.etaxonomy.taxeditor.editor.taxonParameter"
+               name="%commandParameter.name"
+               optional="false"
+               typeId="eu.etaxonomy.taxeditor.editor.taxonParameterType">
+         </commandParameter>
+      </command>
+      <commandParameterType
+            converter="eu.etaxonomy.taxeditor.editor.handler.TaxonParameterConverter"
+            id="eu.etaxonomy.taxeditor.editor.taxonParameterType"
+            type="eu.etaxonomy.cdm.model.taxon.TaxonBase">
+      </commandParameterType>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.editor.view.derivate.handler.CreateFieldUnitHandler"
+            id="eu.etaxonomy.taxeditor.editor.derivate.createFieldUnit"
+            name="%command.name.43">
+      </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.editor.view.derivate.handler.DeleteDerivateHandler"
+            id="eu.etaxonomy.taxeditor.editor.derivate.deepDelete"
+            name="%command.name.44">
+      </command>
+      <command
+            categoryId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.category"
+            defaultHandler="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.MoveDescriptionToOtherTaxonHandler"
+            id="eu.etaxonomy.taxeditor.editor.commands.description.moveDescriptionToTaxon"
+            name="%command.name.13">
+      </command>
+      <command
+            categoryId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.category"
+            defaultHandler="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.MoveDescriptionElementsHandler"
+            id="eu.etaxonomy.taxeditor.description.commands.moveDescriptionElements"
+            name="%command.name.12">
       </command>
+        
    </extension>
    <extension
          point="org.eclipse.core.expressions.definitions">
@@ -1191,6 +1527,33 @@
             </test>
          </with>
       </definition>
+      <definition
+            id="isTaxonEditor">
+         <with
+               variable="selection">
+            <test
+                  property="eu.etaxonomy.taxeditor.descriptions.propertyTester.isTaxonEditor">
+            </test>
+         </with>
+      </definition>
+      <definition
+            id="isBulkEditor">
+         <with
+               variable="selection">
+            <test
+                  property="eu.etaxonomy.taxeditor.descriptions.propertyTester.isBulkEditor">
+            </test>
+         </with>
+      </definition>
+      <definition
+            id="isDerivateEditor">
+         <with
+               variable="selection">
+            <test
+                  property="eu.etaxonomy.taxeditor.descriptions.propertyTester.isDerivateEditor">
+            </test>
+         </with>
+      </definition>
       <definition
             id="isDescription">
          <with
@@ -1237,20 +1600,20 @@
          </with>
       </definition>
       <definition
-            id="isGroup">
+            id="isGroupEditor">
          <with
                variable="activeEditor">
             <test
-                  property="taxeditor-bulkeditor.propertyTester.isGroup">
+                  property="taxeditor-bulkeditor.propertyTester.isGroupEditor">
             </test>
          </with>
       </definition>
       <definition
-            id="isSpecimenOrObservation">
+            id="isIndividualsAssociation">
          <with
                variable="selection">
             <test
-                  property="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateMenuPropertyTester.isSpecimenOrObservation">
+                  property="eu.etaxonomy.taxeditor.descriptions.propertyTester.isIndividualsAssociation">
             </test>
          </with>
       </definition>
@@ -1268,30 +1631,23 @@
             class="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.DescriptionsMenuPropertyTester"
             id="eu.etaxonomy.taxeditor.descriptions.PropertyTester"
             namespace="eu.etaxonomy.taxeditor.descriptions.propertyTester"
-            properties="isMedia,isDescription,isDescriptionElement,isDeletable,isFeatureNodeContainer,isImageGallery"
+            properties="isMedia,isDescription,isDescriptionElement,isDeletable,isFeatureNodeContainer,isImageGallery,isTaxonEditor,isBulkEditor,isDerivateEditor, isIndividualsAssociation"
             type="org.eclipse.jface.viewers.TreeSelection">
       </propertyTester>
       <propertyTester
             class="eu.etaxonomy.taxeditor.bulkeditor.command.BulkEditorPropertyTester"
             id="taxeditor-bulkeditor.PropertyTester"
             namespace="taxeditor-bulkeditor.propertyTester"
-            properties="isGroup"
+            properties="isGroupEditor"
             type="eu.etaxonomy.taxeditor.bulkeditor.BulkEditor">
       </propertyTester>
-      <propertyTester
-            class="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateMenuPropertyTester"
-            id="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateMenuPropertyTester"
-            namespace="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateMenuPropertyTester"
-            properties="isSpecimenOrObservation"
-            type="org.eclipse.jface.viewers.TreeSelection">
-      </propertyTester>
    </extension>
    <extension
          point="org.eclipse.ui.bindings">   
       <scheme
-            description="The default key binding scheme for the Taxonomic Editor"
+            description="%scheme.description"
             id="eu.etaxonomy.taxeditor.bindings.scheme.default"
-            name="Taxonomic Editor Default Key Bindings">
+            name="%scheme.name">
       </scheme>
    </extension>
     <extension
@@ -1300,10 +1656,16 @@
             category="eu.etaxonomy.taxeditor.import.category.cdm"
             class="eu.etaxonomy.taxeditor.editor.view.dataimport.SpecimenSearchWizard"
             id="eu.etaxonomy.taxeditor.editor.view.dataimport.SpecimenSearchWizard"
-            name="Query BioCASE">
+            name="%wizard.name">
          <description>
-            Query BioCaseProvider
+            %wizard.description
          </description>
       </wizard>
    </extension>
+    <extension
+          point="eu.etaxonomy.taxeditor.store.cdmViewer">
+       <cdmViewer
+             class="eu.etaxonomy.taxeditor.editor.EditorCdmViewer">
+       </cdmViewer>
+    </extension>
 </plugin>