Merge branch 'sunweaver-pr/fix-and-update-translations'

Attributes GH PR #81: https://github.com/AyatanaIndicators/ayatana-indicator-session/pull/81

7 files changed, 118 insertions, 107 deletions

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 9d7fd2e..b7f4f66 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -3,13 +3,6 @@
 ##
 
 set (SCHEMA_NAME "org.ayatana.indicator.session.gschema.xml")
-set (SCHEMA_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SCHEMA_NAME}")
-set (SCHEMA_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME}.in")
-
-# generate the .xml file using intltool
-find_package(Intltool REQUIRED)
-set (ENV{LC_ALL} "C")
-intltool_merge_translations("${SCHEMA_FILE_IN}" "${SCHEMA_FILE}" ALL UTF8 STYLE "xml" NO_TRANSLATIONS)
 
 # let GSettings do the rest
 find_package(GSettings REQUIRED)
diff --git a/data/org.ayatana.indicator.session.gschema.xml b/data/org.ayatana.indicator.session.gschema.xml
new file mode 100644
index 0000000..9b1864e
--- /dev/null
+++ b/data/org.ayatana.indicator.session.gschema.xml
@@ -0,0 +1,41 @@
+<schemalist>
+  <schema gettext-domain="ayatana-indicator-session" id="org.ayatana.indicator.session" path="/org/ayatana/indicator/session/">
+    <key name="suppress-logout-restart-shutdown" type="b">
+      <default>false</default>
+      <summary>Suppress the dialog to confirm logout, restart and shutdown action</summary>
+      <description>Whether or not to show confirmation dialogs for logout, restart and shutdown actions.</description>
+    </key>
+    <key name="suppress-logout-menuitem" type="b">
+      <default>false</default>
+      <summary>Remove the Log Out item from the session menu</summary>
+      <description>Makes it so that the logout button doesn’t show in the session menu.</description>
+    </key>
+    <key name="suppress-restart-menuitem" type="b">
+      <default>false</default>
+      <summary>Remove the Restart item from the session menu.</summary>
+      <description>Makes it so that the restart button doesn’t show in the session menu.</description>
+    </key>
+    <key name="suppress-shutdown-menuitem" type="b">
+      <default>false</default>
+      <summary>Remove the shutdown item from the session menu.</summary>
+      <description>Makes it so that the shutdown button doesn’t show in the session menu.</description>
+    </key>
+    <key name="force-restart-menuitem" type="b">
+      <default>false</default>
+      <summary>Force the visibility of Restart item in the session menu</summary>
+      <description>Makes it so that the restart shows in the session menu even in the environments where it should not show.</description>
+    </key>
+    <key type="b" name="show-real-name-on-panel">
+      <default>false</default>
+      <summary>Determine the visibility of the User's real name on the panel</summary>
+      <description>Allow for the Removal of the users name from the panel</description>
+    </key>
+    <key type="b" name="user-show-menu">
+      <default>true</default>
+      <summary>Show the list of users</summary>
+      <description>Allow for the user list to be hidden by the user.</description>
+    </key>
+
+  </schema>
+  
+</schemalist>
diff --git a/data/org.ayatana.indicator.session.gschema.xml.in b/data/org.ayatana.indicator.session.gschema.xml.in
deleted file mode 100644
index c46a738..0000000
--- a/data/org.ayatana.indicator.session.gschema.xml.in
+++ /dev/null
@@ -1,41 +0,0 @@
-<schemalist>
-  <schema id="org.ayatana.indicator.session" path="/org/ayatana/indicator/session/">
-    <key name="suppress-logout-restart-shutdown" type="b">
-      <default>false</default>
-      <_summary>Suppress the dialog to confirm logout, restart and shutdown action</_summary>
-      <_description>Whether or not to show confirmation dialogs for logout, restart and shutdown actions.</_description>
-    </key>
-    <key name="suppress-logout-menuitem" type="b">
-      <default>false</default>
-      <_summary>Remove the Log Out item from the session menu</_summary>
-      <_description>Makes it so that the logout button doesn’t show in the session menu.</_description>
-    </key>
-    <key name="suppress-restart-menuitem" type="b">
-      <default>false</default>
-      <_summary>Remove the Restart item from the session menu.</_summary>
-      <_description>Makes it so that the restart button doesn’t show in the session menu.</_description>
-    </key>
-    <key name="suppress-shutdown-menuitem" type="b">
-      <default>false</default>
-      <_summary>Remove the shutdown item from the session menu.</_summary>
-      <_description>Makes it so that the shutdown button doesn’t show in the session menu.</_description>
-    </key>
-    <key name="force-restart-menuitem" type="b">
-      <default>false</default>
-      <_summary>Force the visibility of Restart item in the session menu</_summary>
-      <_description>Makes it so that the restart shows in the session menu even in the environments where it should not show.</_description>
-    </key>
-    <key type="b" name="show-real-name-on-panel">
-      <default>false</default>
-      <summary>Determine the visibility of the User's real name on the panel</summary>
-      <description>Allow for the Removal of the users name from the panel</description>
-    </key>
-    <key type="b" name="user-show-menu">
-      <default>true</default>
-      <summary>Show the list of users</summary>
-      <description>Allow for the user list to be hidden by the user.</description>
-    </key>
-
-  </schema>
-  
-</schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 17d0cf2..f60800b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,4 +1,4 @@
-data/org.ayatana.indicator.session.gschema.xml.in
+data/org.ayatana.indicator.session.gschema.xml
 src/actions.c
 src/guest.c
 src/main.c
diff --git a/po/ayatana-indicator-session.pot b/po/ayatana-indicator-session.pot
index 37892ad..9d78f9b 100644
--- a/po/ayatana-indicator-session.pot
+++ b/po/ayatana-indicator-session.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:41+0200\n"
+"POT-Creation-Date: 2022-09-11 14:20+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,173 +17,189 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in:1
+#: data/org.ayatana.indicator.session.gschema.xml:1
 msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in:2
+#: data/org.ayatana.indicator.session.gschema.xml:2
 msgid ""
 "Whether or not to show confirmation dialogs for logout, restart and shutdown "
 "actions."
 msgstr ""
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in:3
+#: data/org.ayatana.indicator.session.gschema.xml:3
 msgid "Remove the Log Out item from the session menu"
 msgstr ""
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in:4
+#: data/org.ayatana.indicator.session.gschema.xml:4
 msgid "Makes it so that the logout button doesn’t show in the session menu."
 msgstr ""
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in:5
+#: data/org.ayatana.indicator.session.gschema.xml:5
 msgid "Remove the Restart item from the session menu."
 msgstr ""
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in:6
+#: data/org.ayatana.indicator.session.gschema.xml:6
 msgid "Makes it so that the restart button doesn’t show in the session menu."
 msgstr ""
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in:7
+#: data/org.ayatana.indicator.session.gschema.xml:7
 msgid "Remove the shutdown item from the session menu."
 msgstr ""
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in:8
+#: data/org.ayatana.indicator.session.gschema.xml:8
 msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in:9
+#: data/org.ayatana.indicator.session.gschema.xml:9
 msgid "Force the visibility of Restart item in the session menu"
 msgstr ""
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in:10
+#: data/org.ayatana.indicator.session.gschema.xml:10
 msgid ""
 "Makes it so that the restart shows in the session menu even in the "
 "environments where it should not show."
 msgstr ""
 
+#: data/org.ayatana.indicator.session.gschema.xml:11
+msgid "Determine the visibility of the User's real name on the panel"
+msgstr ""
+
+#: data/org.ayatana.indicator.session.gschema.xml:12
+msgid "Allow for the Removal of the users name from the panel"
+msgstr ""
+
+#: data/org.ayatana.indicator.session.gschema.xml:13
+msgid "Show the list of users"
+msgstr ""
+
+#: data/org.ayatana.indicator.session.gschema.xml:14
+msgid "Allow for the user list to be hidden by the user."
+msgstr ""
+
 #. Translators: the name of the menu ("System"), then the user's name
-#: ../src/service.c:196
+#: src/service.c:196
 #, c-format
 msgid "System, %s"
 msgstr ""
 
-#: ../src/service.c:200 ../src/service.c:210
+#: src/service.c:200 ../src/service.c:210
 msgid "System"
 msgstr ""
 
-#: ../src/service.c:211
+#: src/service.c:211
 msgid "Session management, status and user switching"
 msgstr ""
 
-#: ../src/service.c:336
+#: src/service.c:336
 msgid "Guest"
 msgstr ""
 
-#: ../src/service.c:382
+#: src/service.c:382
 #, c-format
 msgid "%s Help"
 msgstr ""
 
-#: ../src/service.c:383
+#: src/service.c:383
 #, c-format
 msgid "%s Help…"
 msgstr ""
 
-#: ../src/service.c:387
+#: src/service.c:387
 msgid "About This Device…"
 msgstr ""
 
-#: ../src/service.c:389
+#: src/service.c:389
 msgid "About This Computer"
 msgstr ""
 
-#: ../src/service.c:400
+#: src/service.c:400
 msgid "Desktop mode"
 msgstr ""
 
-#: ../src/service.c:406
+#: src/service.c:406
 msgid "Report a Bug…"
 msgstr ""
 
-#: ../src/service.c:417
+#: src/service.c:417
 msgid "System Settings…"
 msgstr ""
 
-#: ../src/service.c:419
+#: src/service.c:419
 msgid "Online Accounts…"
 msgstr ""
 
-#: ../src/service.c:622
+#: src/service.c:622
 msgid "Start Screen Saver"
 msgstr ""
 
-#: ../src/service.c:630 ../src/service.c:646
+#: src/service.c:630 ../src/service.c:646
 msgid "Switch Account…"
 msgstr ""
 
-#: ../src/service.c:631 ../src/service.c:647
+#: src/service.c:631 ../src/service.c:647
 msgid "Switch Account"
 msgstr ""
 
-#: ../src/service.c:643
+#: src/service.c:643
 msgid "Lock/Switch Account…"
 msgstr ""
 
-#: ../src/service.c:644
+#: src/service.c:644
 msgid "Lock/Switch Account"
 msgstr ""
 
-#: ../src/service.c:650
+#: src/service.c:650
 msgid "Lock"
 msgstr ""
 
-#: ../src/service.c:695
+#: src/service.c:695
 msgid "Guest Session"
 msgstr ""
 
-#: ../src/service.c:772
+#: src/service.c:772
 msgid "Log Out…"
 msgstr ""
 
-#: ../src/service.c:772 ../src/backend-dbus/actions.c:791
-#: ../src/backend-dbus/actions.c:793
+#: src/service.c:772 ../src/backend-dbus/actions.c:791
+#: src/backend-dbus/actions.c:793
 msgid "Log Out"
 msgstr ""
 
-#: ../src/service.c:790
+#: src/service.c:790
 msgid "Suspend"
 msgstr ""
 
-#: ../src/service.c:793
+#: src/service.c:793
 msgid "Hibernate"
 msgstr ""
 
-#: ../src/service.c:798
+#: src/service.c:798
 msgid "Restart…"
 msgstr ""
 
-#: ../src/service.c:798 ../src/backend-dbus/actions.c:834
-#: ../src/backend-dbus/actions.c:836
+#: src/service.c:798 ../src/backend-dbus/actions.c:834
+#: src/backend-dbus/actions.c:836
 msgid "Restart"
 msgstr ""
 
-#: ../src/service.c:805
+#: src/service.c:805
 msgid "Shut Down…"
 msgstr ""
 
-#: ../src/service.c:805 ../src/backend-dbus/actions.c:873
-#: ../src/backend-dbus/actions.c:875
+#: src/service.c:805 ../src/backend-dbus/actions.c:873
+#: src/backend-dbus/actions.c:875
 msgid "Shut Down"
 msgstr ""
 
-#: ../src/backend-dbus/actions.c:753 ../src/backend-dbus/actions.c:904
-#: ../src/backend-dbus/actions.c:909 ../src/backend-dbus/actions.c:918
-#: ../src/backend-dbus/actions.c:937 ../src/backend-dbus/actions.c:952
-#: ../src/backend-dbus/actions.c:973
+#: src/backend-dbus/actions.c:753 ../src/backend-dbus/actions.c:904
+#: src/backend-dbus/actions.c:909 ../src/backend-dbus/actions.c:918
+#: src/backend-dbus/actions.c:937 ../src/backend-dbus/actions.c:952
+#: src/backend-dbus/actions.c:973
 msgid "Warning"
 msgstr ""
 
-#: ../src/backend-dbus/actions.c:754
+#: src/backend-dbus/actions.c:754
 msgid ""
 "The operating system's bug tracker needs to be accessed with\n"
 "a web browser.\n"
@@ -192,29 +208,29 @@ msgid ""
 "browser on your computer."
 msgstr ""
 
-#: ../src/backend-dbus/actions.c:785
+#: src/backend-dbus/actions.c:785
 msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
 
-#: ../src/backend-dbus/actions.c:786
+#: src/backend-dbus/actions.c:786
 msgid ""
 "Some software updates won't be applied until the computer next restarts."
 msgstr ""
 
-#: ../src/backend-dbus/actions.c:794 ../src/backend-dbus/actions.c:837
-#: ../src/backend-dbus/actions.c:876
+#: src/backend-dbus/actions.c:794 ../src/backend-dbus/actions.c:837
+#: src/backend-dbus/actions.c:876
 msgid "Cancel"
 msgstr ""
 
-#: ../src/backend-dbus/actions.c:835
+#: src/backend-dbus/actions.c:835
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
 
-#: ../src/backend-dbus/actions.c:874
+#: src/backend-dbus/actions.c:874
 msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
 
-#: ../src/backend-dbus/actions.c:905
+#: src/backend-dbus/actions.c:905
 msgid ""
 "The XFCE desktop's user guide needs to be accessed with\n"
 "a web browser.\n"
@@ -223,7 +239,7 @@ msgid ""
 "browser on your computer."
 msgstr ""
 
-#: ../src/backend-dbus/actions.c:910
+#: src/backend-dbus/actions.c:910
 msgid ""
 "The Ayatana Session Indicator does not know yet, how to show\n"
 "the currently running desktop's user guide or help center.\n"
@@ -232,7 +248,7 @@ msgid ""
 "https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/backend-dbus/actions.c:919
+#: src/backend-dbus/actions.c:919
 #, c-format
 msgid ""
 "Displaying information on %s  requires\n"
@@ -242,7 +258,7 @@ msgid ""
 "browser on your computer."
 msgstr ""
 
-#: ../src/backend-dbus/actions.c:938
+#: src/backend-dbus/actions.c:938
 msgid ""
 "The Ayatana Session Indicator does not support evoking the system\n"
 "settings application for your desktop environment, yet.\n"
@@ -251,7 +267,7 @@ msgid ""
 "https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/backend-dbus/actions.c:953
+#: src/backend-dbus/actions.c:953
 msgid ""
 "The Ayatana Session Indicator does not support password changes\n"
 "for your desktop environment, yet.\n"
@@ -260,7 +276,7 @@ msgid ""
 "https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/backend-dbus/actions.c:974
+#: src/backend-dbus/actions.c:974
 msgid ""
 "The Ayatana Session Indicator does not know yet, how to show\n"
 "information of the currently running desktop environment.\n"
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