merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 23 Sep 2014 13:31:07 +0000 (13:31 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 23 Sep 2014 13:31:07 +0000 (13:31 +0000)
1  2 
.gitattributes
eu.etaxonomy.taxeditor.editor/.project
eu.etaxonomy.taxeditor.editor/plugin.xml

diff --cc .gitattributes
Simple merge
index ce8935ac2072251cf6f225298b65070a1a8fc91e,e25293c2fcd8c813e182d2540716f7b232713c7e..718c96cd31413a3c4295a68c263b98f3fcffffcf
@@@ -1,40 -1,28 +1,40 @@@
- <?xml version="1.0" encoding="UTF-8"?>\r
- <projectDescription>\r
-       <name>eu.etaxonomy.taxeditor.editor</name>\r
-       <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>\r
-       <projects>\r
-       </projects>\r
-       <buildSpec>\r
-               <buildCommand>\r
-                       <name>org.eclipse.jdt.core.javabuilder</name>\r
-                       <arguments>\r
-                       </arguments>\r
-               </buildCommand>\r
-               <buildCommand>\r
-                       <name>org.eclipse.pde.ManifestBuilder</name>\r
-                       <arguments>\r
-                       </arguments>\r
-               </buildCommand>\r
-               <buildCommand>\r
-                       <name>org.eclipse.pde.SchemaBuilder</name>\r
-                       <arguments>\r
-                       </arguments>\r
-               </buildCommand>\r
-       </buildSpec>\r
-       <natures>\r
-               <nature>org.eclipse.jdt.core.javanature</nature>\r
-               <nature>org.eclipse.pde.PluginNature</nature>\r
-       </natures>\r
-       <linkedResources>\r
-               <link>\r
-                       <name>lib/LibrAlign</name>\r
-                       <type>2</type>\r
-                       <locationURI>WORKSPACE_LOC/LibrAlign/bin</locationURI>\r
-               </link>\r
-               <link>\r
-                       <name>lib/bioinfweb.commons</name>\r
-                       <type>2</type>\r
-                       <locationURI>WORKSPACE_LOC/_Lib/bin</locationURI>\r
-               </link>\r
-       </linkedResources>\r
- </projectDescription>\r
+ <?xml version="1.0" encoding="UTF-8"?>
+ <projectDescription>
+       <name>eu.etaxonomy.taxeditor.editor</name>
+       <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.jdt.core.javabuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.jdt.core.javanature</nature>
+               <nature>org.eclipse.pde.PluginNature</nature>
+       </natures>
++      <linkedResources>
++              <link>
++                      <name>lib/LibrAlign</name>
++                      <type>2</type>
++                      <location>/home/pplitzner/svn/LibrAlign/LibrAlign/main/bin</location>
++              </link>
++              <link>
++                      <name>lib/bioinfweb.commons</name>
++                      <type>2</type>
++                      <location>/home/pplitzner/svn/LibrAlign/commons/main/bin</location>
++              </link>
++      </linkedResources>
+ </projectDescription>
index 3e9c53eb8f35c52b43e02964397d9b3e6f9fd4f0,85830b21f62e07e66cbf8712eac30375d6993efa..a31ca6d0b03d99c6aef772c16c7554c66204eb98
              class="eu.etaxonomy.taxeditor.editor.view.checklist.ChecklistEditor"
              icon="icons/address-book-new.png"
              id="eu.etaxonomy.taxeditor.editor.view.checklist.ChecklistEditor"
-             name="Checklist Editor">
+             name="%editor.name.8">
        </editor>
 +      <editor
 +            class="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor"
 +            default="false"
 +            id="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor"
 +            name="Alignment Editor">
 +      </editor>
     </extension>
        <extension
              point="org.eclipse.ui.views">
         <command
               defaultHandler="eu.etaxonomy.taxeditor.editor.handler.OpenChecklistEditorHandler"
               id="eu.etaxonomy.taxeditor.editor.handler.OpenChecklistViewHandler"
-              name="Open Checklist Editor">
+              name="%command.name.38">
 -       </command>
 +      </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="New Datasource">
+             name="%command.name.39">
        </command>
 +      <command
 +            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.OpenAlignmentEditor"
 +            id="eu.etaxonomy.taxeditor.editor.handler.OpenAlignmentEditor"
 +            name="Open Alignment Editor">
 +      </command>
 +
     </extension>
     <extension
           point="org.eclipse.core.expressions.definitions">