From: Patric Plitzner <p.plitzner@bgbm.org>
Date: Tue, 24 Mar 2015 13:26:52 +0000 (+0000)
Subject: merge-update from trunk
X-Git-Tag: 3.8.0^2~59^2~75
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/d400a8b186465463fe389f644f018871345308db

merge-update from trunk
---

d400a8b186465463fe389f644f018871345308db
diff --cc eu.etaxonomy.taxeditor.editor/plugin.xml
index 5775ab4f5,20254cc3e..3aca8a587
--- a/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">