diff --git a/openwebstart/src/main/java/com/openwebstart/update/UpdatePanel.java b/openwebstart/src/main/java/com/openwebstart/update/UpdatePanel.java index aee6b519..c9c4a2e9 100644 --- a/openwebstart/src/main/java/com/openwebstart/update/UpdatePanel.java +++ b/openwebstart/src/main/java/com/openwebstart/update/UpdatePanel.java @@ -87,12 +87,15 @@ public UpdatePanel(final DeploymentConfiguration configuration) { }); }); + final JLabel updatesPanelLabel = new JLabel(translator.translate("updatesPanel.info")); + setBorder(BorderFactory.createEmptyBorder(12, 12, 12, 12)); - addEditorRow(0, checkForUpdatesCheckbox); - addRow(1, updateStrategyForSettingsLabel, updateStrategyForSettingsComboBox); - addRow(2, updateStrategyForLaunchLabel, updateStrategyForLaunchComboBox); - addEditorRow(3, checkForUpdateButton); - addFlexibleRow(4); + addRow(0, checkForUpdatesCheckbox); + addRow(1, updatesPanelLabel); + addRow(2, updateStrategyForSettingsLabel, updateStrategyForSettingsComboBox); + addRow(3, updateStrategyForLaunchLabel, updateStrategyForLaunchComboBox); + addEditorRow(4, checkForUpdateButton); + addFlexibleRow(5); } private void save() { diff --git a/openwebstart/src/main/resources/i18n.properties b/openwebstart/src/main/resources/i18n.properties index ed19453e..05aaeb01 100644 --- a/openwebstart/src/main/resources/i18n.properties +++ b/openwebstart/src/main/resources/i18n.properties @@ -33,8 +33,8 @@ jvmManager.unknownLocation=unknown location jvmManager.updateStrategy.noRemote=Do not download any version jvmManager.updateStrategy.doNothing=Use local if available -jvmManager.updateStrategy.askForUpdate=Ask if newer version should be downloaded -jvmManager.updateStrategy.download=Always download newer version +jvmManager.updateStrategy.askForUpdate=Ask if a newer version should be downloaded +jvmManager.updateStrategy.download=Always download a newer version appManager.name=Application Manager appManager.action.refresh.text=Refresh @@ -62,7 +62,7 @@ jvmManager.error.deleteFolder=Cannot delete local folder jvmManager.error.invalidServerUri=The URL for the default update server is invalid jvmManager.error.updateVendorNames=Error while getting vendor names jvmManager.error.versionOutOfRange=One of the found JVMs does not fit the supported version range of OpenWebStart -jvmManager.error.jvmNotAdded=One of the JVMs found was not be added due to insufficient data. See logs for details. +jvmManager.error.jvmNotAdded=One of the JVMs found has not been added due to insufficient data. See logs for details. jvmManager.info.noJvmAdded=No JVM was added to the JVM Manager jvmManager.info.jvmsAdded={0} JVMs were added to the JVM Manager @@ -74,11 +74,12 @@ desktop.integration.shortcutUpdateStrategy.preserve=Preserve existing shortcuts desktop.integration.shortcutUpdateStrategy.uniqueName=Create unique shortcut names updatesPanel.title=Updates -updatesPanel.checkForUpdates.text=Check automatically for updates -updatesPanel.checkForUpdates.description=By activating this feature OpenWebStart will automatically search for new updates based on the configured schedule -updatesPanel.updateStrategyForSettings.text=Update strategy for settings: +updatesPanel.info=Choose when OpenWebStart should check for updates: +updatesPanel.checkForUpdates.text=Automatically check for OpenWebStart updates +updatesPanel.checkForUpdates.description=By activating this feature, OpenWebStart will automatically search for new updates based on the configured schedule +updatesPanel.updateStrategyForSettings.text=When opening OpenWebStart Settings: updatesPanel.updateStrategyForSettings.description=Defines how often OpenWebStart should search for updates when opening the settings dialog -updatesPanel.updateStrategyForLaunch.text=Update strategy for app launches: +updatesPanel.updateStrategyForLaunch.text=When launching an application with OpenWebStart: updatesPanel.updateStrategyForLaunch.description=Defines how often OpenWebStart should search for updates when starting an application updatesPanel.checkNowForUpdates.text=Check for update now updatesPanel.checkNowForUpdates.description=Checks if an update for OpenWebStart is available @@ -95,18 +96,18 @@ updatesPanel.dialog.noUpdate.message=No update for OpenWebStart can be found. aboutPanel.title=About OpenWebStart loggingPanel.title=Logging -loggingPanel.activateDebug.text=Increase verbosity of the log (loglevel = debug) -loggingPanel.activateDebug.description=By activating debug logging the log will contain much more information that can help to analyze errors +loggingPanel.activateDebug.text=Increase the verbosity of the log (loglevel = debug) +loggingPanel.activateDebug.description=By activating debug logging, the log will contain much more information that can help to analyze errors loggingPanel.logJnlpContent.text=Log content of JNLP files loggingPanel.logJnlpContent.description=By activating this the content of all JNLP files is dumped to the log. loggingPanel.logInFile.text=Log to file -loggingPanel.logInFile.description=When activated the logging will be written to a file +loggingPanel.logInFile.description=When activated, the logging will be written to a file loggingPanel.logAppToConsole.text=Log output from application to console -loggingPanel.logAppToConsole.description=When activated the output from application will be written to the console +loggingPanel.logAppToConsole.description=When activated, the output from the application will be written to the console loggingPanel.logToStandardOut.text=Log to standard out -loggingPanel.logToStandardOut.description=When activated the logging will be streamed to the standard out of the process +loggingPanel.logToStandardOut.description=When activated, the logging will be streamed to the standard out of the process loggingPanel.showLogWindow.text=Log Console -loggingPanel.showLogWindow.description=When activated a log window will be created for each application +loggingPanel.showLogWindow.description=When activated, a log window will be created for each application loggingPanel.logFolder.text=Log Folder loggingPanel.logFolder.description=The folder that will contain all log files if logging to file is activated loggingPanel.selectLogFolder.text=Select... @@ -123,13 +124,13 @@ debugPanel.host.description=The host for remote debugging debugPanel.specificPort.text=Fixed port debugPanel.specificPort.description=The port for remote debugging debugPanel.activateDebug.text=Activate remote debugging -debugPanel.activateDebug.description=By setting this flag the remote debugging will be activated +debugPanel.activateDebug.description=By setting this flag, the remote debugging will be activated debugPanel.description.success=Applications will be started with:\n''{0}''. debugPanel.description.fail=Please define a valid port. At the moment the last valid port will be used and applications will be started with:\n''{0}''. debugPanel.randomPort.text=Use a random port debugPanel.randomPort.description=The port will be chosen randomly to allow launching multiple application with remote debugging debugPanel.startSuspended.text=Start suspended -debugPanel.startSuspended.description=Starts the JVM in suspended state so that you can easily debug the startup phase of the application +debugPanel.startSuspended.description=Starts the JVM in a suspended state so that you can easily debug the startup phase of the application debugPanel.oneInstanceWarning=Only one application can be started when a fixed port is used! proxyPanel.title=Proxy Settings diff --git a/openwebstart/src/main/resources/i18n_de.properties b/openwebstart/src/main/resources/i18n_de.properties index 2e7eba3a..530b31a8 100644 --- a/openwebstart/src/main/resources/i18n_de.properties +++ b/openwebstart/src/main/resources/i18n_de.properties @@ -74,11 +74,12 @@ desktop.integration.shortcutUpdateStrategy.preserve=Vorhandene Verkn\u00FCpfunge desktop.integration.shortcutUpdateStrategy.uniqueName=Eindeutigen Verkn\u00FCpfungsnamen erstellen updatesPanel.title=Updates -updatesPanel.checkForUpdates.text=Automatische Updates aktivieren +updatesPanel.info=W\u00E4hlen Sie aus, wann OpenWebStart nach Aktualisierungen suchen soll: +updatesPanel.checkForUpdates.text=Automatische Suche nach OpenWebStart-Updates updatesPanel.checkForUpdates.description=Wenn automatische Updates aktiviert sind wird OpenWebStart basierend auf den konfigurierten Update Perioden versuchen neue Updates zu laden -updatesPanel.updateStrategyForSettings.text=Aktualisierungsh\u00E4ufigkeit des Einstellungsdialogs: +updatesPanel.updateStrategyForSettings.text=Beim \u00D6ffnen der OpenWebStart-Einstellungen: updatesPanel.updateStrategyForSettings.description=Definiert wann OpenWebStart beim \u00D6ffnen des Einstellungsdialogs nach neuen Updates suchen soll -updatesPanel.updateStrategyForLaunch.text=Aktualisierungsh\u00E4ufigkeit f\u00FCr Anwendungsstarts: +updatesPanel.updateStrategyForLaunch.text=Beim Starten einer Anwendung mit OpenWebStart: updatesPanel.updateStrategyForLaunch.description=Definiert wann OpenWebStart beim Start von Anwendungen nach neuen Updates suchen soll updatesPanel.checkNowForUpdates.text=Jetzt nach einem Update suchen updatesPanel.checkNowForUpdates.description=\u00DCberpr\u00FCft ob ein Update f\u00FCr OpenWebStart vorhanden ist diff --git a/openwebstart/src/main/resources/i18n_es.properties b/openwebstart/src/main/resources/i18n_es.properties index 7a32e75c..6e2485db 100644 --- a/openwebstart/src/main/resources/i18n_es.properties +++ b/openwebstart/src/main/resources/i18n_es.properties @@ -74,11 +74,12 @@ desktop.integration.shortcutUpdateStrategy.preserve=Preservar accesos directos e desktop.integration.shortcutUpdateStrategy.uniqueName=Crear nombres \u00fanicos para accesos directos updatesPanel.title=Actualizaciones -updatesPanel.checkForUpdates.text=Buscar autom\u00e1ticamente actualizaciones +updatesPanel.info=Elige cu\u00e1ndo OpenWebStart debe buscar actualizaciones: +updatesPanel.checkForUpdates.text=Buscar actualizaciones de OpenWebStart autom\u00e1ticamente updatesPanel.checkForUpdates.description=Al activar esta opci\u00f3n OpenWebStart buscar\u00e1 nuevas actualizaciones autom\u00e1ticamente seg\u00fan la programaci\u00f3n configurada -updatesPanel.updateStrategyForSettings.text=Estrategia de actualizaci\u00f3n para la configuraci\u00f3n: +updatesPanel.updateStrategyForSettings.text=Al abrir la configuraci\u00f3n de OpenWebStart: updatesPanel.updateStrategyForSettings.description=Define con qu\u00e9 frecuencia OpenWebStart debe buscar actualizaciones al abrir el di\u00e1logo de configuraci\u00f3n -updatesPanel.updateStrategyForLaunch.text=Estrategia de actualizaci\u00f3n para lanzamientos: +updatesPanel.updateStrategyForLaunch.text=Al iniciar una aplicaci\u00f3n con OpenWebStart: updatesPanel.updateStrategyForLaunch.description=Define con qu\u00e9 frecuencia OpenWebStart debe buscar actualizaciones al iniciar una aplicaci\u00f3n updatesPanel.checkNowForUpdates.text=Buscar actualizaci\u00f3n ahora updatesPanel.checkNowForUpdates.description=Verifica si hay una actualizaci\u00f3n disponible para OpenWebStart diff --git a/openwebstart/src/main/resources/i18n_fr.properties b/openwebstart/src/main/resources/i18n_fr.properties index 9852941e..10ed6c96 100644 --- a/openwebstart/src/main/resources/i18n_fr.properties +++ b/openwebstart/src/main/resources/i18n_fr.properties @@ -69,11 +69,12 @@ jvmManager.info.jvmsAdded={0} JVM ont \u00E9t\u00E9 ajout\u00E9es au gestionnair desktop.integration.userInteractionType.name=Traitement des raccourcis : updatesPanel.title=Mises \u00E0 jour -updatesPanel.checkForUpdates.text=V\u00E9rifier automatiquement les mises \u00E0 jour +updatesPanel.info=Choisissez quand OpenWebStart doit rechercher les mises \u00E0 jour: +updatesPanel.checkForUpdates.text=Rechercher automatiquement les mises \u00E0 jour d\u2019OpenWebStart updatesPanel.checkForUpdates.description=En activant cette fonction, OpenWebStart recherchera automatiquement les nouvelles mises \u00E0 jour en fonction de la plannification -updatesPanel.updateStrategyForSettings.text=Strat\u00E9gie de mise \u00E0 jour des param\u00E8tres : +updatesPanel.updateStrategyForSettings.text=\u00C0 l\u2019ouverture des des param\u00E8tres d\u2019OpenWebStart: updatesPanel.updateStrategyForSettings.description=D\u00E9finit la fr\u00E9quence \u00E0 laquelle OpenWebStart doit rechercher les mises \u00E0 jour lors de l''ouverture de la bo\u00EEte de dialogue des param\u00E8tres -updatesPanel.updateStrategyForLaunch.text=Strat\u00E9gie de mise \u00E0 jour pour le lancement d''applications : +updatesPanel.updateStrategyForLaunch.text=Au lancement d\u2019une application avec OpenWebStart: updatesPanel.updateStrategyForLaunch.description=D\u00E9finit la fr\u00E9quence \u00E0 laquelle OpenWebStart doit rechercher les mises \u00E0 jour lors du lancement d''une application updatesPanel.checkNowForUpdates.text=V\u00E9rifier la mise \u00E0 jour maintenant updatesPanel.checkNowForUpdates.description=V\u00E9rifie si une mise \u00E0 jour pour OpenWebStart est disponible