merge-update from trunk

diff --cc .gitattributes
Simple merge

diff --cc eu.etaxonomy.taxeditor.editor/plugin.xml
index 5775ab4f5454f4e3388492e3e735ad6e8a2cb88c,20254cc3e0b0d1eda74a9dc932be46df55c82e56..3aca8a587514ecd4a6f57a1508dc37109f8cb02f
--- 1/eu.etaxonomy.taxeditor.editor/plugin.xml
--- 2/eu.etaxonomy.taxeditor.editor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.editor/plugin.xml
@@@ -159,16 -152,10 +159,16 @@@
                 id="eu.etaxonomy.taxeditor.editor.view.validation.problems"
                 name="%view.name.6">
           </view>
 +         <view
 +               allowMultiple="true"
 +               class="eu.etaxonomy.taxeditor.editor.molecular.PherogramViewPart"
 +               id="eu.etaxonomy.taxeditor.editor.molecular.PherogramView"
 +               name="PherogramView"
 +               restorable="true">
 +         </view>
        </extension>
 -      
 -      <!-- VALIDATION RELATED STUFF -->
 +      <!-- VALIDATION RELATED STUFF -->
-       <extension point="org.eclipse.core.resources.markers" name="Validation Error" id="eu.etaxonomy.taxeditor.markers.validationerror">
+       <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"/>
@@@ -730,31 -713,9 +730,31 @@@
           <command
                 commandId="eu.etaxonomy.taxeditor.editor.derivate.deepDelete"
                 icon="icons/deep-delete-16x16-32.png"
-                label="Delete (with children)"
+                label="%command.label.54"
                 style="push">
           </command>
 +         <command
 +               commandId="eu.etaxonomy.taxeditor.editor.editSequence"
 +               label="Edit Sequence"
 +               style="push">
 +            <visibleWhen
 +                  checkEnabled="true">
 +               <reference
 +                     definitionId="isSequence">
 +               </reference>
 +            </visibleWhen>
 +         </command>
 +         <command
 +               commandId="eu.etaxonomy.taxeditor.editor.showPherogram"
 +               label="Show Pherogram"
 +               style="push">
 +            <visibleWhen
 +                  checkEnabled="true">
 +               <reference
 +                     definitionId="isSingleRead">
 +               </reference>
 +            </visibleWhen>
 +         </command>
           <dynamic
                 class="eu.etaxonomy.taxeditor.editor.view.derivate.contextMenu.DerivateViewContextMenu"
                 id="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateContextMenu">
@@@ -1501,27 -1386,10 +1501,27 @@@
              id="eu.etaxonomy.taxeditor.editor.command.new.datasource"
              name="%command.name.39">
        </command>
 +      <command
 +            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.OpenAlignmentEditorHandler"
 +            id="eu.etaxonomy.taxeditor.editor.handler.OpenAlignmentEditor"
 +            name="Open Alignment Editor">
 +      </command>
 +      <command
 +            id="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor.loadPherogram"
 +            name="Load Pherogram">
 +      </command>
        <command
              id="eu.etaxonomy.taxeditor.editor.handler.showOnlyIndividualAssociations"
-             name="Show Only Individual Associations">
+             name="%command.name.41">
        </command>
 +      <command
 +            id="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor.toggleInsertOverwrite"
 +            name="Toggle insert/overwrite">
 +      </command>
 +      <command
 +            id="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor.toggleLeftRightInsertion"
 +            name="Toggle left/right insertion in base call sequence">
 +      </command>
        <command
              defaultHandler="eu.etaxonomy.taxeditor.editor.handler.OpenTaxonEditorHandler"
              id="eu.etaxonomy.taxeditor.editor.openTaxonEditor"
@@@ -1551,18 -1419,8 +1551,18 @@@
        <command
              defaultHandler="eu.etaxonomy.taxeditor.editor.handler.FixClassificationHierarchyHandler"
              id="eu.etaxonomy.taxeditor.editor.handler.OpenFixClassificationHierarchyHandler"
-             name="Fix Classification Hierarchy">
+             name="%command.name.45">
        </command>
 +      <command
 +            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.EditSequenceHandler"
 +            id="eu.etaxonomy.taxeditor.editor.editSequence"
 +            name="Edit Sequence">
 +      </command>
 +      <command
 +            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.ShowPherogramHandler"
 +            id="eu.etaxonomy.taxeditor.editor.showPherogram"
 +            name="Show Pherogram">
 +      </command>
     </extension>
     <extension
           point="org.eclipse.core.expressions.definitions">