From ae716f52fb93497522b575ebe02a058d3b0b24e1 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Sun, 11 Sep 2022 14:57:30 +0200
Subject: update-po{,t}.sh: Omit ../ at beginning of file names in .po(t)
 file(s).

---
 update-po.sh  | 1 +
 update-pot.sh | 1 +
 2 files changed, 2 insertions(+)

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
-- 
cgit v1.2.3


From 2a5d64716b82e026a5020c39014bf85d687034ea Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Sun, 11 Sep 2022 15:03:06 +0200
Subject: Simplify .gschema.xml translation.

---
 data/CMakeLists.txt                    |  3 ---
 data/org.ayatana.common.gschema.xml    | 10 ++++++++++
 data/org.ayatana.common.gschema.xml.in | 10 ----------
 po/POTFILES.in                         |  2 +-
 4 files changed, 11 insertions(+), 14 deletions(-)
 create mode 100644 data/org.ayatana.common.gschema.xml
 delete mode 100644 data/org.ayatana.common.gschema.xml.in

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 b/data/org.ayatana.common.gschema.xml
new file mode 100644
index 0000000..bf75ffa
--- /dev/null
+++ b/data/org.ayatana.common.gschema.xml
@@ -0,0 +1,10 @@
+<schemalist>
+    <schema gettext-domain="ayatana-common" id="org.ayatana.common" path="/org/ayatana/common/">
+        <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>
+        </key>
+    </schema>
+</schemalist>
diff --git a/data/org.ayatana.common.gschema.xml.in b/data/org.ayatana.common.gschema.xml.in
deleted file mode 100644
index d8da3cd..0000000
--- a/data/org.ayatana.common.gschema.xml.in
+++ /dev/null
@@ -1,10 +0,0 @@
-<schemalist>
-    <schema gettext-domain="ayatana-common" id="org.ayatana.common" path="/org/ayatana/common/">
-        <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>
-        </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
-- 
cgit v1.2.3


From b75bd36ff55a467f4942fe793e80b0defd80209c Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Sun, 11 Sep 2022 15:03:29 +0200
Subject: po/ayatana-common.pot: Update translation template file.

---
 po/ayatana-common.pot | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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."
-- 
cgit v1.2.3