From 15bd3eac6c1e278e763d52e3973ae46bac7dcf37 Mon Sep 17 00:00:00 2001 From: "gitlocalize-app[bot]" <55277160+gitlocalize-app[bot]@users.noreply.github.com> Date: Sat, 2 Nov 2024 23:52:05 +0000 Subject: [PATCH 1/7] da-dk/translate (#583) * Translate intents.json via GitLocalize * Translate intents.json via GitLocalize --------- Co-authored-by: mt-gitlocalize Co-authored-by: Andreas Lorensen --- translations/da-dk/intents.json | 54 +++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 translations/da-dk/intents.json diff --git a/translations/da-dk/intents.json b/translations/da-dk/intents.json new file mode 100644 index 00000000000..f85918a7853 --- /dev/null +++ b/translations/da-dk/intents.json @@ -0,0 +1,54 @@ +{ + "stop.intent": [ + "stop", + "stop med det", + "stop det", + "Stop hvad du laver", + "Venligst stop det", + "Kan du stoppe nu", + "Stop med at udføre den opgave", + "Stop venligst den aktuelle handling", + "Stop den igangværende proces", + "Stop den aktuelle aktivitet", + "Sæt venligst en stopper for det", + "Lad være med at arbejde på det", + "Stop med at udføre den aktuelle kommando", + "Afslut venligst den aktuelle opgave", + "Stop den aktuelle handling", + "Stop den aktuelle handling", + "Annuller venligst den aktuelle opgave" + ], + "global_stop.intent": [ + "stop alt", + "afslut alt", + "afslut alle", + "annuller alle", + "afslutte alle", + "stands alt", + "afbryd alt", + "ophør med alt", + "stop alt", + "afslutte alt", + "afslutte alt", + "annullere alt", + "afslutte alt", + "standse alt", + "afbryde alt", + "ophøre med alt", + "Stop alt nu", + "Afslut alle processer", + "Afslut alle operationer", + "Annuller alle opgaver", + "Afslut alle aktiviteter", + "Stop alle aktiviteter med det samme", + "Afbryd alle igangværende processer", + "Stop alle handlinger", + "Stop alle aktuelle opgaver", + "Afslut alle løbende aktiviteter", + "Annuller alle afventende operationer", + "Afslut alle åbne opgaver", + "Stop alle igangværende processer", + "Afbryd alle kørende handlinger", + "Stop alle aktive aktiviteter" + ] +} From 739ab426df24aa78ae8efd18ce489ab881cda8f3 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Sat, 2 Nov 2024 23:52:19 +0000 Subject: [PATCH 2/7] Increment Version to 0.2.7a1 --- ovos_core/version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ovos_core/version.py b/ovos_core/version.py index d0f30611d36..c5130099dad 100644 --- a/ovos_core/version.py +++ b/ovos_core/version.py @@ -1,8 +1,8 @@ # START_VERSION_BLOCK VERSION_MAJOR = 0 VERSION_MINOR = 2 -VERSION_BUILD = 6 -VERSION_ALPHA = 0 +VERSION_BUILD = 7 +VERSION_ALPHA = 1 # END_VERSION_BLOCK # for compat with old imports From 23b48643e3c8a9185886b22ed836321a7f2b5ac5 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Sat, 2 Nov 2024 23:52:57 +0000 Subject: [PATCH 3/7] Update Changelog --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81b08ae2759..03eb07ddbaa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,12 @@ # Changelog -## [0.2.6a1](https://github.com/OpenVoiceOS/ovos-core/tree/0.2.6a1) (2024-11-02) +## [0.2.7a1](https://github.com/OpenVoiceOS/ovos-core/tree/0.2.7a1) (2024-11-02) -[Full Changelog](https://github.com/OpenVoiceOS/ovos-core/compare/0.2.5...0.2.6a1) +[Full Changelog](https://github.com/OpenVoiceOS/ovos-core/compare/0.2.6...0.2.7a1) **Merged pull requests:** -- fix:move code to dependencies [\#571](https://github.com/OpenVoiceOS/ovos-core/pull/571) ([JarbasAl](https://github.com/JarbasAl)) +- da-dk/translate [\#583](https://github.com/OpenVoiceOS/ovos-core/pull/583) ([gitlocalize-app[bot]](https://github.com/apps/gitlocalize-app)) From cd736754ee2ef769ac83078bb714a19a2547d534 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Wed, 6 Nov 2024 03:38:11 +0000 Subject: [PATCH 4/7] fix: allow latest bus client version (#588) * fix: allow latest bus client version * fix: allow latest bus client version * fix: allow latest bus client version * fix: allow latest bus client version * fix: allow latest bus client version * fix: allow latest bus client version * fix: allow latest bus client version * fix: allow latest bus client version * fix: allow latest bus client version --- .github/workflows/build_tests.yml | 2 +- requirements/extra-deprecated.txt | 1 + requirements/mycroft.txt | 10 +++++----- requirements/requirements.txt | 10 +++++----- requirements/skills-audio.txt | 2 +- requirements/skills-desktop.txt | 2 +- requirements/skills-essential.txt | 2 +- requirements/skills-gui.txt | 2 +- requirements/skills-internet.txt | 4 ++-- requirements/skills-media.txt | 2 +- 10 files changed, 19 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml index f1972906b18..d13dfed09e0 100644 --- a/.github/workflows/build_tests.yml +++ b/.github/workflows/build_tests.yml @@ -40,4 +40,4 @@ jobs: python setup.py bdist_wheel - name: Install package run: | - pip install .[mycroft,lgpl,plugins,skills-essential,skills-audio,skills-gui,skills-internet,skills-media,skills-desktop] + pip install .[mycroft,lgpl,plugins,skills-essential,skills-audio,skills-gui,skills-internet,skills-media,skills-desktop] ovos-gui==1.0.0 diff --git a/requirements/extra-deprecated.txt b/requirements/extra-deprecated.txt index bfcea171d34..2760f4b4b63 100644 --- a/requirements/extra-deprecated.txt +++ b/requirements/extra-deprecated.txt @@ -10,6 +10,7 @@ pyaudio # mycroft-core imports / default plugins # for compat with mycroft namespace +# NOTE: ovos-listener is causing conflicts in dependency resolution, blocks ovos-bus-client 1.0.0 ovos-listener>=0.0.3,<1.0.0 ovos-tts-plugin-mimic>=0.2.8, <1.0.0 ovos-ww-plugin-precise>=0.1, <1.0.0 diff --git a/requirements/mycroft.txt b/requirements/mycroft.txt index 2bceb8a0b5a..433a17466f8 100644 --- a/requirements/mycroft.txt +++ b/requirements/mycroft.txt @@ -1,6 +1,6 @@ # all ovos core modules, a full install like mycroft-core used to do -ovos_PHAL[extras]>=0.2.5,<1.0.0 -ovos-audio[extras]>=0.2.4,<1.0.0 -ovos-gui[extras]>=0.2.2,<1.0.0 -ovos-messagebus>=0.0.6,<1.0.0 -ovos-dinkum-listener[extras]>=0.2.1,<1.0.0 +ovos_PHAL[extras]>=0.2.7,<1.0.0 +ovos-audio[extras]>=0.3.1,<1.0.0 +ovos-gui[extras]>=0.2.2,<2.0.0 +ovos-messagebus>=0.0.7,<1.0.0 +ovos-dinkum-listener[extras]>=0.3.2,<1.0.0 \ No newline at end of file diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 731ab8a2720..721d70d28ac 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -5,13 +5,13 @@ combo-lock>=0.2.2, <0.3 padacioso>=1.0.0, <2.0.0 ovos-adapt-parser>=1.0.4, <2.0.0 -ovos_ocp_pipeline_plugin>=1.0.4, <2.0.0 -ovos-common-query-pipeline-plugin>=1.0.2, <2.0.0 +ovos_ocp_pipeline_plugin>=1.0.5, <2.0.0 +ovos-common-query-pipeline-plugin>=1.0.4, <2.0.0 ovos-utils>=0.3.5,<1.0.0 -ovos_bus_client>=0.1.4,<1.0.0 -ovos-plugin-manager>=0.5.0,<1.0.0 +ovos_bus_client>=0.1.4,<2.0.0 +ovos-plugin-manager>=0.5.6,<1.0.0 ovos-config>=0.0.13,<1.0.0 ovos-lingua-franca>=0.4.7,<1.0.0 ovos-backend-client>=0.1.0,<2.0.0 -ovos-workshop>=2.0.0,<3.0.0 \ No newline at end of file +ovos-workshop>=2.0.1,<3.0.0 \ No newline at end of file diff --git a/requirements/skills-audio.txt b/requirements/skills-audio.txt index a14c5181201..123c65b9007 100644 --- a/requirements/skills-audio.txt +++ b/requirements/skills-audio.txt @@ -2,6 +2,6 @@ ovos-skill-boot-finished>=0.4.4,<1.0.0 ovos-skill-audio-recording>=0.2.2,<1.0.0 ovos-skill-dictation>=0.2.1,<1.0.0 -ovos-skill-parrot>=0.1.3,<1.0.0 +ovos-skill-parrot>=0.1.5,<1.0.0 ovos-skill-volume>=0.1.2,<1.0.0 ovos-skill-naptime>=0.3.3,<1.0.0 diff --git a/requirements/skills-desktop.txt b/requirements/skills-desktop.txt index 1e31de3c99f..e626bc3e408 100644 --- a/requirements/skills-desktop.txt +++ b/requirements/skills-desktop.txt @@ -1,2 +1,2 @@ # skills that require a linux desktop environment -ovos-skill-application-launcher>=0.5.3,<1.0.0 +ovos-skill-application-launcher>=0.5.4,<1.0.0 diff --git a/requirements/skills-essential.txt b/requirements/skills-essential.txt index f3b89111218..34075dbf462 100644 --- a/requirements/skills-essential.txt +++ b/requirements/skills-essential.txt @@ -1,6 +1,6 @@ # skills providing core functionality (offline) ovos-skill-fallback-unknown>=0.1.3,<1.0.0 -ovos-skill-alerts>=0.1.2,<1.0.0 +ovos-skill-alerts>=0.1.5,<1.0.0 ovos-skill-personal>=0.1.5,<1.0.0 ovos-skill-date-time>=0.3.4,<1.0.0 ovos-skill-hello-world>=0.1.7,<1.0.0 diff --git a/requirements/skills-gui.txt b/requirements/skills-gui.txt index f2c06be2d62..6f7cf233904 100644 --- a/requirements/skills-gui.txt +++ b/requirements/skills-gui.txt @@ -1 +1 @@ -ovos-skill-homescreen>=1.0.3,<2.0.0 +ovos-skill-homescreen>=1.0.4,<2.0.0 diff --git a/requirements/skills-internet.txt b/requirements/skills-internet.txt index 13f2cde85d6..2914e4ed18e 100644 --- a/requirements/skills-internet.txt +++ b/requirements/skills-internet.txt @@ -1,7 +1,7 @@ # skills that require internet connectivity, should not be installed in offline devices ovos-skill-weather>=0.1.4,<1.0.0 -skill-ddg>=0.1.3,<1.0.0 -skill-wolfie>=0.2.5,<1.0.0 +skill-ddg>=0.1.5,<1.0.0 +skill-wolfie>=0.2.7,<1.0.0 ovos-skill-wikipedia>=0.5.3,<1.0.0 skill-ovos-fallback-chatgpt>=0.1.4,<1.0.0 ovos-skill-wikihow>=0.2.5,<1.0.0 diff --git a/requirements/skills-media.txt b/requirements/skills-media.txt index 579f7e75a5e..e38496221f2 100644 --- a/requirements/skills-media.txt +++ b/requirements/skills-media.txt @@ -1,5 +1,5 @@ # skills for OCP, require audio playback plugins (usually mpv) ovos-skill-somafm>=0.1.1,<1.0.0 -skill-news>=0.1.3,<1.0.0 +skill-news>=0.1.5,<1.0.0 ovos-skill-pyradios>=0.1.3,<1.0.0 ovos-skill-local-media>=0.2.1,<1.0.0 \ No newline at end of file From e3230f062ba805f66bbf4b3cba858e6942b50c76 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Wed, 6 Nov 2024 03:38:29 +0000 Subject: [PATCH 5/7] Increment Version to 0.2.8a1 --- ovos_core/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ovos_core/version.py b/ovos_core/version.py index c5130099dad..415f7759f5d 100644 --- a/ovos_core/version.py +++ b/ovos_core/version.py @@ -1,7 +1,7 @@ # START_VERSION_BLOCK VERSION_MAJOR = 0 VERSION_MINOR = 2 -VERSION_BUILD = 7 +VERSION_BUILD = 8 VERSION_ALPHA = 1 # END_VERSION_BLOCK From f09815307d487c38c75936fb143bd6c650aad24a Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Wed, 6 Nov 2024 03:39:11 +0000 Subject: [PATCH 6/7] Update Changelog --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03eb07ddbaa..95b82127b19 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [0.2.8a1](https://github.com/OpenVoiceOS/ovos-core/tree/0.2.8a1) (2024-11-06) + +[Full Changelog](https://github.com/OpenVoiceOS/ovos-core/compare/0.2.7a1...0.2.8a1) + +**Merged pull requests:** + +- fix: allow latest bus client version [\#588](https://github.com/OpenVoiceOS/ovos-core/pull/588) ([JarbasAl](https://github.com/JarbasAl)) + ## [0.2.7a1](https://github.com/OpenVoiceOS/ovos-core/tree/0.2.7a1) (2024-11-02) [Full Changelog](https://github.com/OpenVoiceOS/ovos-core/compare/0.2.6...0.2.7a1) From b4376914a308214534be0e1cc6448e73dadd958d Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Wed, 6 Nov 2024 04:14:30 +0000 Subject: [PATCH 7/7] Update translations --- .../locale/da-dk/global_stop.intent | 31 +++++++++++++++++++ .../intent_services/locale/da-dk/stop.intent | 17 ++++++++++ 2 files changed, 48 insertions(+) create mode 100644 ovos_core/intent_services/locale/da-dk/global_stop.intent create mode 100644 ovos_core/intent_services/locale/da-dk/stop.intent diff --git a/ovos_core/intent_services/locale/da-dk/global_stop.intent b/ovos_core/intent_services/locale/da-dk/global_stop.intent new file mode 100644 index 00000000000..a8abaecb04b --- /dev/null +++ b/ovos_core/intent_services/locale/da-dk/global_stop.intent @@ -0,0 +1,31 @@ +Afbryd alle igangværende processer +Afbryd alle kørende handlinger +Afslut alle aktiviteter +Afslut alle løbende aktiviteter +Afslut alle operationer +Afslut alle processer +Afslut alle åbne opgaver +Annuller alle afventende operationer +Annuller alle opgaver +Stop alle aktive aktiviteter +Stop alle aktiviteter med det samme +Stop alle aktuelle opgaver +Stop alle handlinger +Stop alle igangværende processer +Stop alt nu +afbryd alt +afbryde alt +afslut alle +afslut alt +afslutte alle +afslutte alt +afslutte alt +afslutte alt +annuller alle +annullere alt +ophør med alt +ophøre med alt +stands alt +standse alt +stop alt +stop alt \ No newline at end of file diff --git a/ovos_core/intent_services/locale/da-dk/stop.intent b/ovos_core/intent_services/locale/da-dk/stop.intent new file mode 100644 index 00000000000..9e2604c3720 --- /dev/null +++ b/ovos_core/intent_services/locale/da-dk/stop.intent @@ -0,0 +1,17 @@ +Afslut venligst den aktuelle opgave +Annuller venligst den aktuelle opgave +Kan du stoppe nu +Lad være med at arbejde på det +Stop den aktuelle aktivitet +Stop den aktuelle handling +Stop den aktuelle handling +Stop den igangværende proces +Stop hvad du laver +Stop med at udføre den aktuelle kommando +Stop med at udføre den opgave +Stop venligst den aktuelle handling +Sæt venligst en stopper for det +Venligst stop det +stop +stop det +stop med det \ No newline at end of file