- changed "derivate" to "derivatives"
authorPatric Plitzner <p.plitzner@bgbm.org>
Wed, 6 May 2015 12:49:41 +0000 (12:49 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Wed, 6 May 2015 12:49:41 +0000 (12:49 +0000)
eu.etaxonomy.taxeditor.application/OSGI-INF/l10n/plugin.properties
eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenDerivateViewHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/OpenDerivateEditorForTaxonHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/MoveDerivateOperation.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveViewPart.java
eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchComposite.java

index 8db829129667b94fe710bd503643e4d25bcbc03a..37beb7b7d6080d8b6d566bcc38749314b3cfe1d2 100644 (file)
@@ -13,7 +13,7 @@ extension.name = Taxonomic Editor
 perspective.name = Taxonomic\r
 perspective.name.0 = Polytomous Key\r
 perspective.name.1 = Uses\r
-perspective.name.2 = Derivates\r
+perspective.name.2 = Derivatives\r
 menu.label = General\r
 menu.label.0 = Edit\r
 menu.label.1 = Window\r
index 7e5c3e34245e6a391124fb18dfd90ef0895a903c..e28dcac16ba53883a458369429f57fec488fbdf0 100644 (file)
@@ -9,7 +9,7 @@ editor.name.1 = Key
 editor.name.2 = Polytomous Key Graph Editor\r
 editor.name.3 = Polytomous Key List Editor\r
 editor.name.4 = Cdm Authority Editor\r
-editor.name.5 = Derivate View\r
+editor.name.5 = Derivative View\r
 view.name = Factual Data\r
 view.name.0 = Uses\r
 view.name.1 = Media\r
@@ -52,7 +52,7 @@ command.label.28 = Move Description to Taxon
 command.label.29 = Move Elements to Taxon\r
 command.label.30 = Delete\r
 command.label.31 = Save\r
-menu.label.2 = New Derivate\r
+menu.label.2 = New Derivative\r
 command.label.32 = New Use\r
 command.label.33 = New Use Summary\r
 command.label.34 = New Use Record\r
@@ -112,7 +112,7 @@ command.name.32 = Create Concept Relation
 command.name.33 = Open Related Concept\r
 category.name.7 = -- Group\r
 command.name.34 = Edit CDM Authorities\r
-command.name.35 = Open Derivate View\r
+command.name.35 = Open Derivative View\r
 scheme.description = The default key binding scheme for the Taxonomic Editor\r
 scheme.name = Taxonomic Editor Default Key Bindings\r
 editor.name.6 = Specimen Import Editor\r
index 412cabedd6d2856c44bc4ff79b8d2a5a089f1b51..318191f82fa760fed8d2b965fd9bf183f57cb0a0 100644 (file)
@@ -47,9 +47,9 @@ public class OpenDerivateViewHandler extends AbstractHandler {
                 try {
                     EditorUtil.open(input);
                 } catch (PartInitException e) {
-                    MessagingUtils.error(OpenDerivateViewHandler.class, "Could not open Derivate Editor", e);
+                    MessagingUtils.error(OpenDerivateViewHandler.class, "Could not open Derivative Editor", e);
                 } catch (NullPointerException npe){
-                    MessagingUtils.messageDialog("Failed to open Editor", OpenDerivateViewHandler.class, "Could not open Derivate Editor. The derivate hierarchy is corrupted!", npe);
+                    MessagingUtils.messageDialog("Failed to open Editor", OpenDerivateViewHandler.class, "Could not open Derivative Editor. The derivate hierarchy is corrupted!", npe);
                 }
             }
             else{
index 8dc0e35a4d194e0638e7354ff64d19437d6ae50b..7548960d901fee8e5cf57967c11d847e1f60866a 100644 (file)
@@ -166,7 +166,7 @@ public class DerivateView extends EditorPart implements IPartContentHasFactualDa
             DerivateViewEditorInput derivateViewEditorInput = (DerivateViewEditorInput) getEditorInput();
             return derivateViewEditorInput.getName();
         }
-        return "Derivate View";
+        return "Derivative View";
     }
 
     /* (non-Javadoc)
index ab74d55aa71945cc35d8b087279c8a4d84958ebe..5f29227659bd535f89c4bc3708723831b6f2f646 100644 (file)
@@ -61,16 +61,16 @@ public class OpenDerivateEditorForTaxonHandler extends AbstractHandler {
                 }
             }
             if(derivateUuids.isEmpty()){
-                MessagingUtils.warningDialog("Could not open Derivate Editor", this, "No Derivates found");
+                MessagingUtils.warningDialog("Could not open Derivative Editor", this, "No Derivatives found");
                 return null;
             }
             DerivateViewEditorInput input = new DerivateViewEditorInput(derivateUuids);
             try {
                 EditorUtil.open(input);
             } catch (PartInitException e) {
-                MessagingUtils.error(OpenDerivateViewHandler.class, "Could not open Derivate Editor", e);
+                MessagingUtils.error(OpenDerivateViewHandler.class, "Could not open Derivative Editor", e);
             } catch (NullPointerException npe){
-                MessagingUtils.messageDialog("Failed to open Editor", OpenDerivateViewHandler.class, "Could not open Derivate Editor. The derivate hierarchy is corrupted!", npe);
+                MessagingUtils.messageDialog("Failed to open Editor", OpenDerivateViewHandler.class, "Could not open Derivative Editor. The derivative hierarchy is corrupted!", npe);
             }
         }
         return null;
index 960548975c864b53f0af55eab51c3ffe555c0a34..b863dcbe28a14aa047007dccf5189f11df1cd582 100644 (file)
@@ -63,7 +63,7 @@ public class MoveDerivateOperation extends AbstractPostOperation<CdmBase>  {
             derivateView = (DerivateView) getPostOperationEnabled();
         }
         if(derivateView==null){
-            MessagingUtils.operationDialog(this, new NullPointerException("DerivateView was null"), TaxeditorEditorPlugin.PLUGIN_ID, this.getLabel(), getLabel());
+            MessagingUtils.operationDialog(this, new NullPointerException("DerivativeView was null"), TaxeditorEditorPlugin.PLUGIN_ID, this.getLabel(), getLabel());
             return Status.CANCEL_STATUS;
         }
         if(derivateView.isDirty()){
@@ -79,7 +79,7 @@ public class MoveDerivateOperation extends AbstractPostOperation<CdmBase>  {
             return postExecute(null);
         }
         else{
-            MessagingUtils.warningDialog("Moving derivate not possible!", derivateView, "Moving \""+derivateView.getLabelProvider().getDerivateText(draggedNode)+"\" to \""+derivateView.getLabelProvider().getDerivateText(targetNode)+"\" is not possible!");
+            MessagingUtils.warningDialog("Moving derivatives not possible!", derivateView, "Moving \""+derivateView.getLabelProvider().getDerivateText(draggedNode)+"\" to \""+derivateView.getLabelProvider().getDerivateText(targetNode)+"\" is not possible!");
         }
         return Status.CANCEL_STATUS;
     }
index f9541aa3ec5580324687e36ce093820a98c5ab85..7556a73d2612f9b93ca11525614197de02a0c09a 100644 (file)
@@ -150,7 +150,7 @@ public class DescriptiveViewPart extends AbstractCdmEditorViewPart implements IP
                         EditorUtil.open(new DerivateViewEditorInput(specimenUuids));
                     }
                 } catch (PartInitException e) {
-                    MessagingUtils.error(DescriptiveViewPart.class, "Could not open Derivate Editor", e);
+                    MessagingUtils.error(DescriptiveViewPart.class, "Could not open Derivative Editor", e);
                 }
 
 
index d2e8b5c5c00ef9ca9fec645c2a98b3275f1de76e..e4f26542136f3b75ec2881a16223dfa57ed57beb 100644 (file)
@@ -33,10 +33,10 @@ view.name.2 = Reporting
 view.name.3 = Supplemental Data\r
 view.name.4 = Details\r
 view.name.5 = Use Records\r
-view.name.6 = Derivate Search\r
+view.name.6 = Derivative Search\r
 editor.name = Defined Term Editor\r
 menu.label = Show View\r
-command.label = Derivate Search\r
+command.label = Derivative Search\r
 command.label.0 = Details\r
 command.label.1 = Supplemental\r
 command.label.2 = Datasource\r
index 0db71df83aec3b4933db863b847953dc7a368e7b..b101a2298f984495584e9f00a7dad9267fd8ea15 100644 (file)
@@ -68,7 +68,7 @@ public class DerivateSearchComposite extends Composite {
         btnClearTaxon.setImage(ResourceManager.getPluginImage("eu.etaxonomy.taxeditor.store", "icons/trash.gif"));
 
         lblDerivateType = new Label(this, SWT.NULL);
-        lblDerivateType.setText("Derivate Type");
+        lblDerivateType.setText("Derivative Type");
 
         comboDerivateType = new Combo(this, SWT.READ_ONLY);
         comboDerivateType.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));