From b0e037f666795355adfbf8cf2959361afc8031e1 Mon Sep 17 00:00:00 2001
From: Patric Plitzner
Date: Wed, 6 May 2015 12:49:41 +0000
Subject: [PATCH] - changed "derivate" to "derivatives"
---
.../OSGI-INF/l10n/plugin.properties | 2 +-
.../OSGI-INF/l10n/plugin.properties | 6 +++---
.../taxeditor/editor/handler/OpenDerivateViewHandler.java | 4 ++--
.../taxeditor/editor/view/derivate/DerivateView.java | 2 +-
.../derivate/handler/OpenDerivateEditorForTaxonHandler.java | 6 +++---
.../view/derivate/operation/MoveDerivateOperation.java | 4 ++--
.../editor/view/descriptive/DescriptiveViewPart.java | 2 +-
.../OSGI-INF/l10n/bundle.properties | 4 ++--
.../view/derivateSearch/DerivateSearchComposite.java | 2 +-
9 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/eu.etaxonomy.taxeditor.application/OSGI-INF/l10n/plugin.properties b/eu.etaxonomy.taxeditor.application/OSGI-INF/l10n/plugin.properties
index 8db829129..37beb7b7d 100644
--- a/eu.etaxonomy.taxeditor.application/OSGI-INF/l10n/plugin.properties
+++ b/eu.etaxonomy.taxeditor.application/OSGI-INF/l10n/plugin.properties
@@ -13,7 +13,7 @@ extension.name = Taxonomic Editor
perspective.name = Taxonomic
perspective.name.0 = Polytomous Key
perspective.name.1 = Uses
-perspective.name.2 = Derivates
+perspective.name.2 = Derivatives
menu.label = General
menu.label.0 = Edit
menu.label.1 = Window
diff --git a/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties b/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties
index 7e5c3e342..e28dcac16 100644
--- a/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties
+++ b/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties
@@ -9,7 +9,7 @@ editor.name.1 = Key
editor.name.2 = Polytomous Key Graph Editor
editor.name.3 = Polytomous Key List Editor
editor.name.4 = Cdm Authority Editor
-editor.name.5 = Derivate View
+editor.name.5 = Derivative View
view.name = Factual Data
view.name.0 = Uses
view.name.1 = Media
@@ -52,7 +52,7 @@ command.label.28 = Move Description to Taxon
command.label.29 = Move Elements to Taxon
command.label.30 = Delete
command.label.31 = Save
-menu.label.2 = New Derivate
+menu.label.2 = New Derivative
command.label.32 = New Use
command.label.33 = New Use Summary
command.label.34 = New Use Record
@@ -112,7 +112,7 @@ command.name.32 = Create Concept Relation
command.name.33 = Open Related Concept
category.name.7 = -- Group
command.name.34 = Edit CDM Authorities
-command.name.35 = Open Derivate View
+command.name.35 = Open Derivative View
scheme.description = The default key binding scheme for the Taxonomic Editor
scheme.name = Taxonomic Editor Default Key Bindings
editor.name.6 = Specimen Import Editor
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenDerivateViewHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenDerivateViewHandler.java
index 412cabedd..318191f82 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenDerivateViewHandler.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenDerivateViewHandler.java
@@ -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{
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
index 8dc0e35a4..7548960d9 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
@@ -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)
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/OpenDerivateEditorForTaxonHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/OpenDerivateEditorForTaxonHandler.java
index ab74d55aa..5f2922765 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/OpenDerivateEditorForTaxonHandler.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/OpenDerivateEditorForTaxonHandler.java
@@ -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;
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/MoveDerivateOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/MoveDerivateOperation.java
index 960548975..b863dcbe2 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/MoveDerivateOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/MoveDerivateOperation.java
@@ -63,7 +63,7 @@ public class MoveDerivateOperation extends AbstractPostOperation {
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 {
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;
}
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveViewPart.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveViewPart.java
index f9541aa3e..7556a73d2 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveViewPart.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveViewPart.java
@@ -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);
}
diff --git a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties
index d2e8b5c5c..e4f265421 100644
--- a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties
+++ b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties
@@ -33,10 +33,10 @@ view.name.2 = Reporting
view.name.3 = Supplemental Data
view.name.4 = Details
view.name.5 = Use Records
-view.name.6 = Derivate Search
+view.name.6 = Derivative Search
editor.name = Defined Term Editor
menu.label = Show View
-command.label = Derivate Search
+command.label = Derivative Search
command.label.0 = Details
command.label.1 = Supplemental
command.label.2 = Datasource
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchComposite.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchComposite.java
index 0db71df83..b101a2298 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchComposite.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchComposite.java
@@ -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));
--
2.34.1