From: Patrick Plitzner Date: Tue, 21 Jun 2016 09:47:11 +0000 (+0200) Subject: Fix i18n #5146 X-Git-Tag: 4.2.0^2~44 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/2016e6e8752c5dcbe008e58b2f68add33e16d677 Fix i18n #5146 --- diff --git a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages_de.properties b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages_de.properties index c9c75234c..16015fd62 100644 --- a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages_de.properties +++ b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages_de.properties @@ -88,9 +88,9 @@ RemotingLoginDialog_STATUS_STARTED=Gestartet RemotingLoginDialog_UPDATE_EDITOR=Bitte aktualisieren Sie den Taxonomic Editor (Hifle->Suche nach Updates) oder wählen Sie einen kompatiblen CDM-Server RemotingLoginDialog_COULD_NOT_STOP_SERVER=Konte den internen CDM-Server auf Port %s nicht beenden. Bitte beenden sie ihn manuell. RemotingLoginDialog_ERROR_GENERATING_CONFIG_FILE=Fehler beim Generieren der Config-Datei für den Server -RemotingLoginDialog_ERROR_STARTING_SERVER=Fehler beim Starten des internen Servers -RemotingLoginDialog_ERROR_STOPPING_SERVER=Fehler beim Beenden des internen Servers +RemotingLoginDialog_ERROR_STARTING_SERVER=Fehler beim Starten des internen CDM-Servers +RemotingLoginDialog_ERROR_STOPPING_SERVER=Fehler beim Beenden des internen CDM-Servers RemotingLoginDialog_GENERATING_CONFIG_FILE=Generiere Config-Datei für Datenquellen für %s -RemotingLoginDialog_JOB_SERVER_LAUNCH=Starte internen Server -RemotingLoginDialog_STARTING_MGD_SERVER=Starte internen Server. Dies kann eine Weile dauern. -RemotingLoginDialog_TASK_LAUNCHING_SERVER=Starte internen Server +RemotingLoginDialog_JOB_SERVER_LAUNCH=Starte internen CDM-Server +RemotingLoginDialog_STARTING_MGD_SERVER=Starte internen CDM-Server. Dies kann eine Weile dauern. +RemotingLoginDialog_TASK_LAUNCHING_SERVER=Starte internen CDM-Server diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/RemotingLoginDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/RemotingLoginDialog.java index 2a45f5f52..74d54d5a1 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/RemotingLoginDialog.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/RemotingLoginDialog.java @@ -93,19 +93,19 @@ public class RemotingLoginDialog extends Dialog implements ICDMServerError { private final Map csiiMap = new HashMap(); - private final static String STATUS_AVAILABLE = ""; //$NON-NLS-1$ - private final static String STATUS_NOT_AVAILABLE = ""; //$NON-NLS-1$ - private final static String STATUS_STARTED = ""; //$NON-NLS-1$ - private final static String STATUS_NOT_STARTED = ""; //$NON-NLS-1$ - private final static String STATUS_RETRIEVING = ""; //$NON-NLS-1$ - private final static String STATUS_CHECKING_AVAILABILITY = ""; //$NON-NLS-1$ - private final static String STATUS_NO_INSTANCES = ""; //$NON-NLS-1$ - private final static String STATUS_ERROR = ""; //$NON-NLS-1$ - private final static String STATUS_REMOTING_NOT_ACTIVATED = ""; //$NON-NLS-1$ - private final static String STATUS_NOT_COMPATIBLE = ""; //$NON-NLS-1$ - - private final static String MESG_COMPATIBLE_EDITOR_OLD = ""; //$NON-NLS-1$ - private final static String MESG_COMPATIBLE_SERVER_OLD = ""; //$NON-NLS-1$ + private final static String STATUS_AVAILABLE = Messages.RemotingLoginDialog_STATUS_AVAILABLE; + private final static String STATUS_NOT_AVAILABLE = Messages.RemotingLoginDialog_STATUS_NOT_AVAILABLE; + private final static String STATUS_STARTED = Messages.RemotingLoginDialog_STATUS_STARTED; + private final static String STATUS_NOT_STARTED = Messages.RemotingLoginDialog_STATUS_NOT_STARTED; + private final static String STATUS_RETRIEVING = Messages.RemotingLoginDialog_STATUS_RETRIEVING; + private final static String STATUS_CHECKING_AVAILABILITY = Messages.RemotingLoginDialog_STATUS_CHECKING; + private final static String STATUS_NO_INSTANCES = Messages.RemotingLoginDialog_STATUS_NO_INSTANCES_FOUND; + private final static String STATUS_ERROR = Messages.RemotingLoginDialog_STATUS_ERROR; + private final static String STATUS_REMOTING_NOT_ACTIVATED = Messages.RemotingLoginDialog_STATUS_REMOTING_NOT_ACTIVATED; + private final static String STATUS_NOT_COMPATIBLE = Messages.RemotingLoginDialog_STATUS_NOT_COMPATIBLE; + + private final static String MESG_COMPATIBLE_EDITOR_OLD = Messages.RemotingLoginDialog_UPDATE_EDITOR; + private final static String MESG_COMPATIBLE_SERVER_OLD = Messages.RemotingLoginDialog_CHOOSE_COMPATIBLE_CDM_SERVER; private final static String STORE_PREFERENCES_NODE = "eu.etaxonomy.taxeditor.store"; //$NON-NLS-1$ @@ -117,7 +117,7 @@ public class RemotingLoginDialog extends Dialog implements ICDMServerError { private final static String LAST_SERVER_KEY = "lastServerKey"; //$NON-NLS-1$ private final static String LAST_INSTANCE_KEY = "lastInstanceKey"; //$NON-NLS-1$ - private final static String REFRESH_LABEL = ""; //$NON-NLS-1$ + private final static String REFRESH_LABEL = Messages.RemotingLoginDialog_LABEL_REFRESH; private Composite remotingComposite; private CdmServerInfo selectedCsii; @@ -163,7 +163,7 @@ public class RemotingLoginDialog extends Dialog implements ICDMServerError { */ public RemotingLoginDialog(Shell parent, int style) { super(parent, style); - setText(""); //$NON-NLS-1$ + setText(Messages.RemotingLoginDialog_LABEL_LOGIN); } public Object open(CdmRemoteSource source, boolean loadLoginPrefs, boolean autoConnect) { @@ -219,7 +219,7 @@ public class RemotingLoginDialog extends Dialog implements ICDMServerError { shlConnect = new Shell(getParent(), SWT.DIALOG_TRIM); shlConnect.setMinimumSize(new Point(MIN_WIDTH, MIN_HEIGHT)); shlConnect.setSize(MIN_WIDTH, MIN_HEIGHT); - shlConnect.setText(""); //$NON-NLS-1$ + shlConnect.setText(Messages.RemotingLoginDialog_LABEL_CONNECT); shlConnect.setLayout(new FillLayout(SWT.HORIZONTAL)); remotingComposite = new Composite(shlConnect, SWT.NONE); @@ -232,7 +232,7 @@ public class RemotingLoginDialog extends Dialog implements ICDMServerError { cdmServerComposite.setLayout(new GridLayout(4, false)); Label lblCdmServer = new Label(cdmServerComposite, SWT.NONE); - lblCdmServer.setText(""); //$NON-NLS-1$ + lblCdmServer.setText(Messages.RemotingLoginDialog_LABEL_CDM_SERVER); lblCdmServer.setFont(SWTResourceManager.getFont(UBUNTU, 9, SWT.NORMAL)); lblCdmServer.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1)); @@ -264,13 +264,13 @@ public class RemotingLoginDialog extends Dialog implements ICDMServerError { } }); btnCdmServerRefresh.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1)); - btnCdmServerRefresh.setText(""); //$NON-NLS-1$ + btnCdmServerRefresh.setText(Messages.RemotingLoginDialog_LABEL_REFRESH); Label lblCdmInstance = new Label(cdmServerComposite, SWT.NONE); GridData gd_lblCdmInstance = new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1); gd_lblCdmInstance.heightHint = 30; lblCdmInstance.setLayoutData(gd_lblCdmInstance); - lblCdmInstance.setText(""); //$NON-NLS-1$ + lblCdmInstance.setText(Messages.RemotingLoginDialog_LABEL_CDM_INSTANCE); lblCdmInstance.setFont(SWTResourceManager.getFont(UBUNTU, 9, SWT.NORMAL)); comboCdmInstance = new Combo(cdmServerComposite, SWT.READ_ONLY); @@ -303,7 +303,7 @@ public class RemotingLoginDialog extends Dialog implements ICDMServerError { gd_btnCdmInstanceRefresh.widthHint = 110; gd_btnCdmInstanceRefresh.heightHint = 30; btnCdmInstanceRefresh.setLayoutData(gd_btnCdmInstanceRefresh); - btnCdmInstanceRefresh.setText(""); //$NON-NLS-1$ + btnCdmInstanceRefresh.setText(Messages.RemotingLoginDialog_LABEL_REFRESH); loginComposite = new Composite(remotingComposite, SWT.NONE); GridData gd_loginComposite = new GridData(SWT.LEFT, SWT.CENTER, false, false, 1, 1); @@ -318,7 +318,7 @@ public class RemotingLoginDialog extends Dialog implements ICDMServerError { GridData gd_lblLogin = new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1); gd_lblLogin.widthHint = 50; lblLogin.setLayoutData(gd_lblLogin); - lblLogin.setText(""); //$NON-NLS-1$ + lblLogin.setText(Messages.RemotingLoginDialog_LABEL_LOGIN_COLON); lblLogin.setFont(SWTResourceManager.getFont(UBUNTU, 9, SWT.NORMAL)); txtLogin = new Text(loginComposite, SWT.BORDER); @@ -330,7 +330,7 @@ public class RemotingLoginDialog extends Dialog implements ICDMServerError { lblPassword = new Label(loginComposite, SWT.CENTER); lblPassword.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1)); - lblPassword.setText(""); //$NON-NLS-1$ + lblPassword.setText(Messages.RemotingLoginDialog_LABEL_PASSWORD); lblPassword.setFont(SWTResourceManager.getFont(UBUNTU, 9, SWT.NORMAL)); txtPassword = new Text(loginComposite, SWT.BORDER | SWT.PASSWORD); @@ -353,14 +353,14 @@ public class RemotingLoginDialog extends Dialog implements ICDMServerError { } } }); - btnConnect.setText(""); //$NON-NLS-1$ + btnConnect.setText(Messages.RemotingLoginDialog_LABEL_CONNECT); btnRememberMe = new Button(loginComposite, SWT.CHECK); btnRememberMe.setSelection(true); GridData gd_btnRememberMe = new GridData(SWT.LEFT, SWT.CENTER, false, false, 2, 1); gd_btnRememberMe.widthHint = 107; btnRememberMe.setLayoutData(gd_btnRememberMe); - btnRememberMe.setText(""); //$NON-NLS-1$ + btnRememberMe.setText(Messages.RemotingLoginDialog_LABEL_REMEMBER_ME); new Label(loginComposite, SWT.NONE); new Label(loginComposite, SWT.NONE); new Label(loginComposite, SWT.NONE); @@ -399,7 +399,7 @@ public class RemotingLoginDialog extends Dialog implements ICDMServerError { public void expansionStateChanging(ExpansionEvent e) { } }); - xpndblcmpstAdvanced.setText(""); //$NON-NLS-1$ + xpndblcmpstAdvanced.setText(Messages.RemotingLoginDialog_LABEL_ADVANCED); xpndblcmpstAdvanced.setExpanded(true); compAdvanced = new Composite(xpndblcmpstAdvanced, SWT.NONE); @@ -409,7 +409,7 @@ public class RemotingLoginDialog extends Dialog implements ICDMServerError { lblPort = new Label(compAdvanced, SWT.CENTER); lblPort.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1)); lblPort.setSize(0, 0); - lblPort.setText(""); //$NON-NLS-1$ + lblPort.setText(Messages.RemotingLoginDialog_LABEL_PORT); lblPort.setFont(SWTResourceManager.getFont(UBUNTU, 9, SWT.NORMAL)); txtPort = new Text(compAdvanced, SWT.BORDER); @@ -420,7 +420,7 @@ public class RemotingLoginDialog extends Dialog implements ICDMServerError { lblServerVersion = new Label(compAdvanced, SWT.CENTER); lblServerVersion.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1)); - lblServerVersion.setText(""); //$NON-NLS-1$ + lblServerVersion.setText(Messages.RemotingLoginDialog_LABEL_SERVER_CDMLIB_VERSION); lblServerVersion.setFont(SWTResourceManager.getFont(UBUNTU, 9, SWT.NORMAL)); txtServerVersion = new Text(compAdvanced, SWT.BORDER); @@ -434,11 +434,11 @@ public class RemotingLoginDialog extends Dialog implements ICDMServerError { stopManagedServer(); } }); - btnStopServer.setText(""); //$NON-NLS-1$ + btnStopServer.setText(Messages.RemotingLoginDialog_LABEL_STOP_MANAGED_SERVER); lblEditorVersion = new Label(compAdvanced, SWT.CENTER); lblEditorVersion.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1)); - lblEditorVersion.setText(""); //$NON-NLS-1$ + lblEditorVersion.setText(Messages.RemotingLoginDialog_LABEL_EDITOR_CDMLIB_VERSION); lblEditorVersion.setFont(SWTResourceManager.getFont(UBUNTU, 9, SWT.NORMAL)); txtEditorVersion = new Text(compAdvanced, SWT.BORDER); @@ -449,7 +449,7 @@ public class RemotingLoginDialog extends Dialog implements ICDMServerError { lblServerCDMVersion = new Label(compAdvanced, SWT.CENTER); lblServerCDMVersion.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1)); - lblServerCDMVersion.setText(""); //$NON-NLS-1$ + lblServerCDMVersion.setText(Messages.RemotingLoginDialog_LABEL_SERVER_CDM_VERSION); lblServerCDMVersion.setFont(SWTResourceManager.getFont(UBUNTU, 9, SWT.NORMAL)); txtServerCDMVersion = new Text(compAdvanced, SWT.BORDER); @@ -460,7 +460,7 @@ public class RemotingLoginDialog extends Dialog implements ICDMServerError { lblEditorCDMVersion = new Label(compAdvanced, SWT.CENTER); lblEditorCDMVersion.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1)); - lblEditorCDMVersion.setText(""); //$NON-NLS-1$ + lblEditorCDMVersion.setText(Messages.RemotingLoginDialog_LABEL_EDITOR_CDM_VERSION); lblEditorCDMVersion.setFont(SWTResourceManager.getFont(UBUNTU, 9, SWT.NORMAL)); txtEditorCDMVersion = new Text(compAdvanced, SWT.BORDER); @@ -472,7 +472,7 @@ public class RemotingLoginDialog extends Dialog implements ICDMServerError { private void populateCdmServerCombo() { - Job job = new Job("") { //$NON-NLS-1$ + Job job = new Job(Messages.RemotingLoginDialog_RETRIEVE_SERVER_INSTANCES) { @Override protected IStatus run(IProgressMonitor monitor) { Display.getDefault().syncExec(new Runnable() { @@ -536,7 +536,7 @@ public class RemotingLoginDialog extends Dialog implements ICDMServerError { } private void updatePort() { - txtPort.setText(""); //$NON-NLS-1$ + txtPort.setText(""); if(selectedCsii != null) { int port = selectedCsii.getPort(); if(port == CdmServerInfo.NULL_PORT) { @@ -553,7 +553,7 @@ public class RemotingLoginDialog extends Dialog implements ICDMServerError { port = Integer.valueOf(txtPort.getText()); } catch (NumberFormatException nfe) { if(!CdmServerInfo.NULL_PORT_STRING.equals(txtPort.getText())) { - setMessage(""); //$NON-NLS-1$ + setMessage(Messages.RemotingLoginDialog_MESSAGE_PORT_SHOULD_BE_INTEGER); } } return port; @@ -573,7 +573,7 @@ public class RemotingLoginDialog extends Dialog implements ICDMServerError { } else { txtCdmServerStatus.setText(STATUS_NOT_AVAILABLE); comboCdmInstance.removeAll(); - disableCdmInstanceControls("", ""); //$NON-NLS-1$ //$NON-NLS-2$ + disableCdmInstanceControls("", ""); } } updatePort(); @@ -585,9 +585,9 @@ public class RemotingLoginDialog extends Dialog implements ICDMServerError { comboCdmInstance.setEnabled(false); btnConnect.setEnabled(false); txtCdmInstanceStatus.setText(STATUS_RETRIEVING); - txtCdmInstanceStatus.setToolTipText(""); //$NON-NLS-1$ + txtCdmInstanceStatus.setToolTipText(""); - serverJob = new Job("") { //$NON-NLS-1$ + serverJob = new Job(Messages.RemotingLoginDialog_RETRIEVE_SERVER_INSTANCES) { @Override protected IStatus run(IProgressMonitor monitor) { try { @@ -929,8 +929,8 @@ public class RemotingLoginDialog extends Dialog implements ICDMServerError { } private void emptyCredentials() { - txtLogin.setText(""); //$NON-NLS-1$ - txtPassword.setText(""); //$NON-NLS-1$ + txtLogin.setText(""); + txtPassword.setText(""); } private String getUsernamePrefKey() { @@ -943,11 +943,11 @@ public class RemotingLoginDialog extends Dialog implements ICDMServerError { private boolean validateLogin(ICdmRemoteSource remoteSource) { if(getUsername() == null || getUsername().isEmpty()) { - setMessage(""); //$NON-NLS-1$ + setMessage(Messages.RemotingLoginDialog_LOGIN_CANNOT_BE_EMPTY); return false; } if(getPassword() == null || getPassword().isEmpty()) { - setMessage(""); //$NON-NLS-1$ + setMessage(Messages.RemotingLoginDialog_PASSWORD_CANNOT_BE_EMPTY); return false; } @@ -1081,7 +1081,7 @@ public class RemotingLoginDialog extends Dialog implements ICDMServerError { public void run() { serverJob.cancel(); - String title = ""; //$NON-NLS-1$ + String title = Messages.RemotingLoginDialog_SERVER_LAUNCH_ERROR; String message = t.getMessage();