diff --git a/bundles/org.openhab.ui.basic/src/main/resources/OH-INF/i18n/basic.properties b/bundles/org.openhab.ui.basic/src/main/resources/OH-INF/i18n/basic.properties index 2141d66ee..ae8589b1e 100644 --- a/bundles/org.openhab.ui.basic/src/main/resources/OH-INF/i18n/basic.properties +++ b/bundles/org.openhab.ui.basic/src/main/resources/OH-INF/i18n/basic.properties @@ -1,7 +1,33 @@ +ui.config.basic.capitalizeValues.label = Capitalize Values +ui.config.basic.capitalizeValues.description = Displays all widget states in uppercase. +ui.config.basic.capitalizeValues.option.true = Enable +ui.config.basic.capitalizeValues.option.false = Disable +ui.config.basic.condensedLayout.label = Condensed Layout +ui.config.basic.condensedLayout.description = When enabled, changes the layout so that more widgets can fit on the screen. +ui.config.basic.condensedLayout.option.true = Enable +ui.config.basic.condensedLayout.option.false = Disable +ui.config.basic.defaultSitemap.label = Default Sitemap +ui.config.basic.defaultSitemap.description = The sitemap to show if no parameter is passed. +ui.config.basic.enableIcons.label = Enable Icons +ui.config.basic.enableIcons.description = Defines whether UI renders icons for the widgets or not. +ui.config.basic.enableIcons.option.true = Enable +ui.config.basic.enableIcons.option.false = Disable +ui.config.basic.theme.label = Theme +ui.config.basic.theme.description = Defines the UI theme. +ui.config.basic.theme.option.default = Default +ui.config.basic.theme.option.dark = Dark + +# service + +service.ui.basic.label = Basic UI + +# messages + main.offline-msg = Offline: waiting for connection to become available main.long-polling-mode-msg = SSE subscription failed ({error}): running in fallback mode -sitemaps-list.welcome = Welcome! -sitemaps-list.available-sitemaps = Available sitemaps +# sitemaps sitemaps-list-empty.info = It seems like you have not defined any sitemaps yet. To build one, please check the documentation for guidance. +sitemaps-list.welcome = Welcome! +sitemaps-list.available-sitemaps = Available sitemaps diff --git a/bundles/org.openhab.ui.basic/src/main/resources/OH-INF/i18n/basic_de.properties b/bundles/org.openhab.ui.basic/src/main/resources/OH-INF/i18n/basic_de.properties index 342c4fdfa..f921be9d6 100644 --- a/bundles/org.openhab.ui.basic/src/main/resources/OH-INF/i18n/basic_de.properties +++ b/bundles/org.openhab.ui.basic/src/main/resources/OH-INF/i18n/basic_de.properties @@ -1,6 +1,10 @@ -main.offline-msg = Offline: Warte auf Verbindung -main.long-polling-mode-msg = SSE-Abonnement fehlgeschlagen ({error}): Im Fallback-Modus ausgeführt +# messages + +main.offline-msg = Offline: Warte auf Verbindung +main.long-polling-mode-msg = SSE-Abonnement fehlgeschlagen ({error}): Im Fallback-Modus ausgeführt + +# sitemaps -sitemaps-list.welcome = Willkommen! -sitemaps-list.available-sitemaps = Verfügbare Sitemaps sitemaps-list-empty.info = Sie haben noch keine Sitemaps definiert. Hilfe zur Erstellung von Sitemaps finden Sie in der Dokumentation. +sitemaps-list.welcome = Willkommen! +sitemaps-list.available-sitemaps = Verfügbare Sitemaps diff --git a/bundles/org.openhab.ui.basic/src/main/resources/OH-INF/i18n/basic_fr.properties b/bundles/org.openhab.ui.basic/src/main/resources/OH-INF/i18n/basic_fr.properties index a8300a732..7d9c951a9 100644 --- a/bundles/org.openhab.ui.basic/src/main/resources/OH-INF/i18n/basic_fr.properties +++ b/bundles/org.openhab.ui.basic/src/main/resources/OH-INF/i18n/basic_fr.properties @@ -1,7 +1,10 @@ -main.offline-msg = Non connecté: en attente d'une connexion disponible -main.long-polling-mode-msg = Échec de l'abonnement SSE ({error}): exécution en mode secours +# messages +main.offline-msg = Non connecté: en attente d'une connexion disponible +main.long-polling-mode-msg = Échec de l'abonnement SSE ({error}): exécution en mode secours + +# sitemaps + +sitemaps-list-empty.info = Il semble que vous n'ayez encore défini aucune sitemap. Pour en construire une, merci de vous aider de la documentation. sitemaps-list.welcome = Bienvenue! sitemaps-list.available-sitemaps = Sitemaps disponibles - -sitemaps-list-empty.info = Il semble que vous n'ayez encore défini aucune sitemap. Pour en construire une, merci de vous aider de la documentation. diff --git a/bundles/org.openhab.ui.cometvisu/src/main/resources/OH-INF/i18n/cometvisu.properties b/bundles/org.openhab.ui.cometvisu/src/main/resources/OH-INF/i18n/cometvisu.properties new file mode 100644 index 000000000..957a972ce --- /dev/null +++ b/bundles/org.openhab.ui.cometvisu/src/main/resources/OH-INF/i18n/cometvisu.properties @@ -0,0 +1,10 @@ +ui.config.cometvisu.autoDownload.label = Auto-Download +ui.config.cometvisu.autoDownload.description = If you enable this feature, the current release of CometVisu client (GNU General Public License v3.0) will be automatically downloaded to your openHAB server and extracted into the folder you defined in the Filesystem path, if it is not found there. +ui.config.cometvisu.webAlias.label = Browser path +ui.config.cometvisu.webAlias.description = The relative browser path where you can access the client e.g http://:8080// +ui.config.cometvisu.webFolder.label = Filesystem path +ui.config.cometvisu.webFolder.description = Defines the path to the CometVisu client directory. + +# service + +service.ui.cometvisu.label = CometVisu diff --git a/bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/nlp/internal/OpenNLPInterpreter.java b/bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/nlp/internal/OpenNLPInterpreter.java index da1ce7f28..352f95e5b 100644 --- a/bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/nlp/internal/OpenNLPInterpreter.java +++ b/bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/nlp/internal/OpenNLPInterpreter.java @@ -25,6 +25,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import org.openhab.core.common.registry.RegistryChangeListener; +import org.openhab.core.config.core.ConfigurableService; import org.openhab.core.events.EventPublisher; import org.openhab.core.items.Item; import org.openhab.core.items.ItemRegistry; @@ -52,11 +53,12 @@ import org.osgi.service.component.annotations.ReferencePolicy; * * @author Yannick Schaus - Initial contribution */ -@Component(service = HumanLanguageInterpreter.class, immediate = true, name = "org.openhab.opennlphli", property = { - "service.config.description.uri=voice:opennlphli", "service.config.label=OpenNLP Interpreter for HABot", - "service.config.category=voice" }) +@Component(service = HumanLanguageInterpreter.class, immediate = true, name = "org.openhab.opennlphli") +@ConfigurableService(category = "voice", label = "OpenNLP Interpreter for HABot", description_uri = OpenNLPInterpreter.CONFIG_URI) public class OpenNLPInterpreter implements HumanLanguageInterpreter { + protected static final String CONFIG_URI = "voice:opennlphli"; + public static final Set SUPPORTED_LOCALES = Set.of(Locale.ENGLISH, Locale.FRENCH, Locale.GERMAN); private IntentTrainer intentTrainer = null; diff --git a/bundles/org.openhab.ui.habot/src/main/resources/OH-INF/i18n/opennlphli.properties b/bundles/org.openhab.ui.habot/src/main/resources/OH-INF/i18n/opennlphli.properties new file mode 100644 index 000000000..81ee36e6c --- /dev/null +++ b/bundles/org.openhab.ui.habot/src/main/resources/OH-INF/i18n/opennlphli.properties @@ -0,0 +1,8 @@ +voice.config.opennlphli.theme.label = Tokenizer +voice.config.opennlphli.theme.description = The alphanumeric tokenizer removes punctuation and might help with languages where entities might not always be enclosed between whitespaces (French, Spanish, Italian... Example: "l'humidité", "l'alarme") +voice.config.opennlphli.theme.option.whitespace = Whitespace +voice.config.opennlphli.theme.option.alphanumeric = Alphanumeric + +# service + +service.voice.opennlphli.label = OpenNLP Interpreter for HABot diff --git a/bundles/org.openhab.ui.iconset.classic/src/main/resources/OH-INF/i18n/iconset.properties b/bundles/org.openhab.ui.iconset.classic/src/main/resources/OH-INF/i18n/iconset.properties new file mode 100644 index 000000000..df52db3ba --- /dev/null +++ b/bundles/org.openhab.ui.iconset.classic/src/main/resources/OH-INF/i18n/iconset.properties @@ -0,0 +1,2 @@ +iconset.label = Classic Icons +iconset.description = This is a modernized version of the original icon set of openHAB 1. diff --git a/bundles/org.openhab.ui.iconset.classic/src/main/resources/OH-INF/i18n/iconset_de_DE.properties b/bundles/org.openhab.ui.iconset.classic/src/main/resources/OH-INF/i18n/iconset_de.properties similarity index 74% rename from bundles/org.openhab.ui.iconset.classic/src/main/resources/OH-INF/i18n/iconset_de_DE.properties rename to bundles/org.openhab.ui.iconset.classic/src/main/resources/OH-INF/i18n/iconset_de.properties index 7667d8b31..01ce116d9 100644 --- a/bundles/org.openhab.ui.iconset.classic/src/main/resources/OH-INF/i18n/iconset_de_DE.properties +++ b/bundles/org.openhab.ui.iconset.classic/src/main/resources/OH-INF/i18n/iconset_de.properties @@ -1,2 +1,2 @@ iconset.label = Classic Icons -iconset.description = Dies ist eine modernisierte Variante der ursprünglichen openHAB 1 Icons. +iconset.description = Dies ist eine modernisierte Variante der ursprünglichen openHAB 1 Icons. diff --git a/crowdin.yml b/crowdin.yml index 7a8931cab..81734886d 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -1,3 +1,7 @@ files: - source: /bundles/org.openhab.ui/web/src/assets/i18n/**/en.json translation: /%original_path%/%two_letters_code%.json + - source: /bundles/**/i18n/**/*.properties + ignore: + - /bundles/**/i18n/**/*_*.properties + translation: /%original_path%/%file_name%_%two_letters_code%.properties diff --git a/pom.xml b/pom.xml index 6a01f3cfe..1047dc24e 100644 --- a/pom.xml +++ b/pom.xml @@ -70,6 +70,7 @@ 6.1.0 2.3.0 4.3.4 + 3.3.0-SNAPSHOT 0.12.0 2.0.3 @@ -422,6 +423,12 @@ Import-Package: \\ + + org.openhab.core.tools + i18n-maven-plugin + ${ohc.version} + + org.openhab.tools.sat sat-plugin