diff options
| author | Robert Tari <robert@tari.in> | 2022-09-12 01:11:20 +0200 |
|---|---|---|
| committer | Robert Tari <robert@tari.in> | 2022-09-12 01:11:20 +0200 |
| commit | f991bca9d191829f0ec4d5c7eb90e5b7fddde511 (patch) | |
| tree | d17a8241598bed5658b1771fb29b852bbd7e2ab9 | |
| parent | b86a71f7fd7286bdbeaf38fcae75c56156bee95e (diff) | |
| parent | b75bd36ff55a467f4942fe793e80b0defd80209c (diff) | |
| download | libayatana-common-f991bca9d191829f0ec4d5c7eb90e5b7fddde511.tar.gz libayatana-common-f991bca9d191829f0ec4d5c7eb90e5b7fddde511.tar.bz2 libayatana-common-f991bca9d191829f0ec4d5c7eb90e5b7fddde511.zip | |
Merge branch 'sunweaver-pr/simplify-gschema-xml-translation'
Attributes GH PR #61: https://github.com/AyatanaIndicators/libayatana-common/pull/61
| -rw-r--r-- | data/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | data/org.ayatana.common.gschema.xml (renamed from data/org.ayatana.common.gschema.xml.in) | 4 | ||||
| -rw-r--r-- | po/POTFILES.in | 2 | ||||
| -rw-r--r-- | po/ayatana-common.pot | 6 | ||||
| -rwxr-xr-x | update-po.sh | 1 | ||||
| -rwxr-xr-x | update-pot.sh | 1 |
6 files changed, 8 insertions, 9 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index b014341..d91bfd2 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -1,8 +1,5 @@ # org.ayatana.common.gschema.xml -find_package(Intltool REQUIRED) -set(ENV{LC_ALL} "C") -intltool_merge_translations("${CMAKE_CURRENT_SOURCE_DIR}/org.ayatana.common.gschema.xml.in" "${CMAKE_CURRENT_BINARY_DIR}/org.ayatana.common.gschema.xml" ALL UTF8 STYLE "xml" NO_TRANSLATIONS) find_package(GSettings REQUIRED) add_schema("org.ayatana.common.gschema.xml") diff --git a/data/org.ayatana.common.gschema.xml.in b/data/org.ayatana.common.gschema.xml index d8da3cd..bf75ffa 100644 --- a/data/org.ayatana.common.gschema.xml.in +++ b/data/org.ayatana.common.gschema.xml @@ -3,8 +3,8 @@ <key name="max-menu-text-length" type="u"> <range min="0" max="100"/> <default>50</default> - <_summary>Maximum menu text length</_summary> - <_description>The number of characters to show in dynamic menu items before the text is ellipsized. Set to 0 to leave unchanged.</_description> + <summary>Maximum menu text length</summary> + <description>The number of characters to show in dynamic menu items before the text is ellipsized. Set to 0 to leave unchanged.</description> </key> </schema> </schemalist> diff --git a/po/POTFILES.in b/po/POTFILES.in index 81b0a23..f4f4f16 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1 +1 @@ -data/org.ayatana.common.gschema.xml.in +data/org.ayatana.common.gschema.xml diff --git a/po/ayatana-common.pot b/po/ayatana-common.pot index ddd3bf0..c1af2b4 100644 --- a/po/ayatana-common.pot +++ b/po/ayatana-common.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-06-17 14:12+0200\n" +"POT-Creation-Date: 2022-09-11 15:03+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,11 +17,11 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: ../data/org.ayatana.common.gschema.xml.in:1 +#: data/org.ayatana.common.gschema.xml:1 msgid "Maximum menu text length" msgstr "" -#: ../data/org.ayatana.common.gschema.xml.in:2 +#: data/org.ayatana.common.gschema.xml:2 msgid "" "The number of characters to show in dynamic menu items before the text is " "ellipsized. Set to 0 to leave unchanged." diff --git a/update-po.sh b/update-po.sh index dff6f3a..b066610 100755 --- a/update-po.sh +++ b/update-po.sh @@ -32,6 +32,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 43a8d06..cb538a2 100755 --- a/update-pot.sh +++ b/update-pot.sh @@ -22,4 +22,5 @@ sed -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' \ + -e 's@#: \.\./@#: @g' \ -i po/${GETTEXT_DOMAIN}.pot |