From 8818b2d64a4e2a3ddea3ed94c62ea8404f7c1fa8 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 11 Sep 2022 13:11:06 +0200 Subject: Fix translating the indicator's .gschema.xml file. --- data/CMakeLists.txt | 3 --- data/org.ayatana.indicator.keyboard.gschema.xml | 19 +++++++++++++++++++ data/org.ayatana.indicator.keyboard.gschema.xml.in | 19 ------------------- po/POTFILES.in | 1 + 4 files changed, 20 insertions(+), 22 deletions(-) create mode 100644 data/org.ayatana.indicator.keyboard.gschema.xml delete mode 100644 data/org.ayatana.indicator.keyboard.gschema.xml.in diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 35bbfd54..662ca716 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -56,8 +56,5 @@ install(FILES 50-org.ayatana.indicator.keyboard.AccountsService.pkla DESTINATION # org.ayatana.indicator.keyboard.gschema.xml -find_package (Intltool REQUIRED) -set (ENV{LC_ALL} "C") -intltool_merge_translations ("${CMAKE_CURRENT_SOURCE_DIR}/org.ayatana.indicator.keyboard.gschema.xml.in" "${CMAKE_CURRENT_BINARY_DIR}/org.ayatana.indicator.keyboard.gschema.xml" ALL UTF8 STYLE "xml" NO_TRANSLATIONS) find_package (GSettings REQUIRED) add_schema ("org.ayatana.indicator.keyboard.gschema.xml") diff --git a/data/org.ayatana.indicator.keyboard.gschema.xml b/data/org.ayatana.indicator.keyboard.gschema.xml new file mode 100644 index 00000000..67a50765 --- /dev/null +++ b/data/org.ayatana.indicator.keyboard.gschema.xml @@ -0,0 +1,19 @@ + + + + true + Show the language icon in desktop mode. + If enabled, the indicator shows the current layout icon. Otherwise, it displays a generic keyboard icon. + + + false + Show the language icon in phone mode. + If enabled, the indicator shows the current layout icon. Otherwise, it displays a generic keyboard icon. + + + false + Show the language icon in the greeter. + If enabled, the indicator shows the current layout icon. Otherwise, it displays a generic keyboard icon. + + + diff --git a/data/org.ayatana.indicator.keyboard.gschema.xml.in b/data/org.ayatana.indicator.keyboard.gschema.xml.in deleted file mode 100644 index e80a89e9..00000000 --- a/data/org.ayatana.indicator.keyboard.gschema.xml.in +++ /dev/null @@ -1,19 +0,0 @@ - - - - true - <_summary>Show the language icon in desktop mode. - <_description>If enabled, the indicator shows the current layout icon. Otherwise, it displays a generic keyboard icon. - - - false - <_summary>Show the language icon in phone mode. - <_description>If enabled, the indicator shows the current layout icon. Otherwise, it displays a generic keyboard icon. - - - false - <_summary>Show the language icon in the greeter. - <_description>If enabled, the indicator shows the current layout icon. Otherwise, it displays a generic keyboard icon. - - - diff --git a/po/POTFILES.in b/po/POTFILES.in index 56552034..8dd4f062 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,3 +1,4 @@ +data/org.ayatana.indicator.keyboard.gschema.xml src/main.c src/keyboard-lomiri.c src/keyboard-x11.c -- cgit v1.2.3 From b31f62c10e04153e36f25d4109cb31882c3b7409 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 11 Sep 2022 13:46:13 +0200 Subject: update-po.sh: White-space fix. --- update-po.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update-po.sh b/update-po.sh index 59ad5c45..55a3a6e4 100755 --- a/update-po.sh +++ b/update-po.sh @@ -29,7 +29,7 @@ cat LINGUAS | while read lingua; do fi sed -e 's/\.xml\.in\.in\.h:/.xml.in.in:/g' \ - -e 's/\.xml\.in\.h:/.xml.in:/g' \ + -e 's/\.xml\.in\.h:/.xml.in:/g' \ -e 's/\.ini\.in\.h:/.ini.in:/g' \ -e 's/\.xml\.h:/.xml:/g' \ -e 's/\.ini\.h:/.ini:/g' \ -- cgit v1.2.3 From 1768f4976de610be4d97e3dd53ca2410eb402317 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 11 Sep 2022 13:14:05 +0200 Subject: update-po{,t}.sh: Omit ../ at beginning of file names in .pot file. --- update-po.sh | 1 + update-pot.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/update-po.sh b/update-po.sh index 55a3a6e4..2f4377e0 100755 --- a/update-po.sh +++ b/update-po.sh @@ -33,6 +33,7 @@ cat LINGUAS | while read lingua; do -e 's/\.ini\.in\.h:/.ini.in:/g' \ -e 's/\.xml\.h:/.xml:/g' \ -e 's/\.ini\.h:/.ini:/g' \ + -e 's@#: \.\./@#: @g' \ -i ${lingua}.po done diff --git a/update-pot.sh b/update-pot.sh index db9c8931..ae7bb10d 100755 --- a/update-pot.sh +++ b/update-pot.sh @@ -23,4 +23,5 @@ sed -e 's/\.xml\.in\.in.\h:/.xml.in.in:/g' \ -e 's/\.ini\.in\.h:/.ini.in:/g' \ -e 's/\.xml\.h:/.xml:/g' \ -e 's/\.ini\.h:/.ini:/g' \ + -e 's@#: \.\./@#: @g' \ -i po/${GETTEXT_DOMAIN}.pot -- cgit v1.2.3 From 800c3ef6dc1f22a744985f94d3a648fcff387d7d Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 11 Sep 2022 13:11:33 +0200 Subject: po/ayatana-indicator-keyboard.pot: Update translation template file. --- po/ayatana-indicator-keyboard.pot | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/po/ayatana-indicator-keyboard.pot b/po/ayatana-indicator-keyboard.pot index 254f14fe..0d55d939 100644 --- a/po/ayatana-indicator-keyboard.pot +++ b/po/ayatana-indicator-keyboard.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-09-05 13:18+0200\n" +"POT-Creation-Date: 2022-09-11 13:13+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,18 +17,36 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../src/service.c:89 +#: data/org.ayatana.indicator.keyboard.gschema.xml:1 +msgid "Show the language icon in desktop mode." +msgstr "" + +#: data/org.ayatana.indicator.keyboard.gschema.xml:2 +msgid "" +"If enabled, the indicator shows the current layout icon. Otherwise, it " +"displays a generic keyboard icon." +msgstr "" + +#: data/org.ayatana.indicator.keyboard.gschema.xml:3 +msgid "Show the language icon in phone mode." +msgstr "" + +#: data/org.ayatana.indicator.keyboard.gschema.xml:4 +msgid "Show the language icon in the greeter." +msgstr "" + +#: src/service.c:90 msgid "Keyboard" msgstr "" -#: ../src/service.c:90 +#: src/service.c:91 msgid "Keyboard layout switcher and settings" msgstr "" -#: ../src/service.c:109 +#: src/service.c:128 msgid "Current keyboard layout" msgstr "" -#: ../src/service.c:166 +#: src/service.c:185 msgid "Keyboard Settings…" msgstr "" -- cgit v1.2.3