Merge branch 'release/5.11.0'

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / l10n / messages.properties

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
index e4cf6eddd75a79649a4eb823278dcbd994dde7dd..731b7d2f78e2f2ce8e43ab1e0175e2e74752a9bc 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
@@ -63,6 +63,7 @@ UriWithLabelElement_INVALID_URL=Invalid URI
 UriWithLabelElement_OPEN_EXTERNAL_BROWSER=Open in external browser
 
 DoiWithLabelElement_DOI_NOT_SAVED=DOI won't be saved\!
+OrcidWithLabelElement_ORCID_NOT_SAVED=ORCID won't be saved\!
 
 ChangeConnectionHandler_ALREADY_CONNECTING=Already creating data model
 ChangeConnectionHandler_CURRENTLY_CONNECTING_ALREADY=You are currently creating a data model for a datasource already.
@@ -105,7 +106,7 @@ RemotingLoginDialog_CONNECTION_FAILED_TITLE=Connection to CDM server failed
 RemotingLoginDialog_DEFAULT_LOGIN=Default: %s (login), %s (password)
 RemotingLoginDialog_CHOOSE_COMPATIBLE_CDM_SERVER=Please choose a compatible cdm-server or update the chosen cdm-server
 RemotingLoginDialog_LABEL_ADVANCED=advanced
-RemotingLoginDialog_LABEL_CDM_INSTANCE=CDM Instance : 
+RemotingLoginDialog_LABEL_CDM_INSTANCE=Database : 
 RemotingLoginDialog_LABEL_CDM_SERVER=CDM Server : 
 RemotingLoginDialog_LABEL_CONNECT=Connect
 RemotingLoginDialog_LABEL_EDITOR_CDM_VERSION=Editor CDM Version :
@@ -310,6 +311,11 @@ NameDetailsViewComposite_Show_Protologue=Protologue section
 NameDetailsViewConfiguration_activateSimpleDetailsView=Show simplified name details view with the following elements:
 NameDetailsViewConfiguration_useLocalSettings=Use local settings for display of name details
 
+NameDetailsViewComposite_Show_NomenclaturalStatus_RuleConsidered=Rule Considered
+NameDetailsViewComposite_Show_NomenclaturalStatus_RuleConsideredCodeEdition=Code edition of rule considered
+NameDetailsViewComposite_Show_Namerelationships_RuleConsidered=Rule considered
+NameDetailsViewComposite_Show_Namerelationships_RuleConsideredCodeEdition=Code edition of rule considered
+
 SetPublishConfiguration_Publish=Set Publish Flag
 SetPublishConfiguration_Publish_tooltip=With set publish flag, the taxa are published in data portal and print publications
 SetPublishConfiguration_Description_Configurator=Configure where the publish flag should be set
@@ -440,7 +446,7 @@ NomenclaturalCodePreferences_localChangesNotAllowed=The CDM settings don't allow
 NomenclaturalCodePreferences_useLocalCode=Use local nomenclatural code
 NomenclaturalStatusTypeMenuPreferences_1=Configure nomenclatural status types
 
-NameDetailsViewConfiguration_description=Configure the simple name details view. The selected parts are displayed, others are not visible in a simple name details view.
+NameDetailsViewConfiguration_description=Configure the name details view. The selected parts are displayed, others are not visible.
 NameDetailsViewConfiguration_description_not_available=The configuration of the name details view is not possible in local preferences. \nIf you want to change the configuration, please contact an administrator.
 NameRelationshipTypeMenuPreferences_relationshipTypes=Configure name relationship types
 NameRelationshipWizardPage_description=Choose namerelationship type and related name
@@ -520,4 +526,7 @@ SupplementalDataSourcePreferences_SHOW_NAMESPACE=Show ID Namespace
 
 OrderPreferencePage_NotAllowed=The DB preference does not allow to edit this preference locally
 Delete=Delete
-Preference_update=Update
\ No newline at end of file
+Preference_update=Update
+FactualData_showModifier=Show modifier
+FactualData_showModifier_FreeText=Show modifier freetext
+FactualData_description=If a preference is not selectable, there is a serverside preference not allowed to override.
\ No newline at end of file