Gettextize policy files

* Don't merge translations into the files
* Add gettext-domain="systemd" to description and message

Closes #8162, replaces #8118.
This commit is contained in:
Gunnar Hjalmarsson
2018-02-16 13:00:52 +01:00
committed by Zbigniew Jędrzejewski-Szmek
parent 730f40eb57
commit 264d8dcc16
16 changed files with 150 additions and 171 deletions
+4 -6
View File
@@ -29,14 +29,12 @@ if conf.get('ENABLE_LOCALED') == 1
install_data('org.freedesktop.locale1.service',
install_dir : dbussystemservicedir)
i18n.merge_file(
'org.freedesktop.locale1.policy',
policy = configure_file(
input : 'org.freedesktop.locale1.policy.in',
output : 'org.freedesktop.locale1.policy',
po_dir : po_dir,
data_dirs : po_dir,
install : install_polkit,
install_dir : polkitpolicydir)
configuration : substs)
install_data(policy,
install_dir : polkitpolicydir)
endif
# If you know a way that allows the same variables to be used
+4 -4
View File
@@ -19,8 +19,8 @@
<vendor_url>http://www.freedesktop.org/wiki/Software/systemd</vendor_url>
<action id="org.freedesktop.locale1.set-locale">
<description>Set system locale</description>
<message>Authentication is required to set the system locale.</message>
<description gettext-domain="systemd">Set system locale</description>
<message gettext-domain="systemd">Authentication is required to set the system locale.</message>
<defaults>
<allow_any>auth_admin_keep</allow_any>
<allow_inactive>auth_admin_keep</allow_inactive>
@@ -30,8 +30,8 @@
</action>
<action id="org.freedesktop.locale1.set-keyboard">
<description>Set system keyboard settings</description>
<message>Authentication is required to set the system keyboard settings.</message>
<description gettext-domain="systemd">Set system keyboard settings</description>
<message gettext-domain="systemd">Authentication is required to set the system keyboard settings.</message>
<defaults>
<allow_any>auth_admin_keep</allow_any>
<allow_inactive>auth_admin_keep</allow_inactive>