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
@@ -44,14 +44,12 @@ if conf.get('ENABLE_MACHINED') == 1
install_data('org.freedesktop.machine1.service',
install_dir : dbussystemservicedir)
i18n.merge_file(
'org.freedesktop.machine1.policy',
policy = configure_file(
input : 'org.freedesktop.machine1.policy.in',
output : 'org.freedesktop.machine1.policy',
po_dir : po_dir,
data_dirs : po_dir,
install : install_polkit,
install_dir : polkitpolicydir)
configuration : substs)
install_data(policy,
install_dir : polkitpolicydir)
endif
tests += [
+16 -16
View File
@@ -19,8 +19,8 @@
<vendor_url>http://www.freedesktop.org/wiki/Software/systemd</vendor_url>
<action id="org.freedesktop.machine1.login">
<description>Log into a local container</description>
<message>Authentication is required to log into a local container.</message>
<description gettext-domain="systemd">Log into a local container</description>
<message gettext-domain="systemd">Authentication is required to log into a local container.</message>
<defaults>
<allow_any>auth_admin</allow_any>
<allow_inactive>auth_admin</allow_inactive>
@@ -29,8 +29,8 @@
</action>
<action id="org.freedesktop.machine1.host-login">
<description>Log into the local host</description>
<message>Authentication is required to log into the local host.</message>
<description gettext-domain="systemd">Log into the local host</description>
<message gettext-domain="systemd">Authentication is required to log into the local host.</message>
<defaults>
<allow_any>auth_admin</allow_any>
<allow_inactive>auth_admin</allow_inactive>
@@ -39,8 +39,8 @@
</action>
<action id="org.freedesktop.machine1.shell">
<description>Acquire a shell in a local container</description>
<message>Authentication is required to acquire a shell in a local container.</message>
<description gettext-domain="systemd">Acquire a shell in a local container</description>
<message gettext-domain="systemd">Authentication is required to acquire a shell in a local container.</message>
<defaults>
<allow_any>auth_admin</allow_any>
<allow_inactive>auth_admin</allow_inactive>
@@ -50,8 +50,8 @@
</action>
<action id="org.freedesktop.machine1.host-shell">
<description>Acquire a shell on the local host</description>
<message>Authentication is required to acquire a shell on the local host.</message>
<description gettext-domain="systemd">Acquire a shell on the local host</description>
<message gettext-domain="systemd">Authentication is required to acquire a shell on the local host.</message>
<defaults>
<allow_any>auth_admin</allow_any>
<allow_inactive>auth_admin</allow_inactive>
@@ -61,8 +61,8 @@
</action>
<action id="org.freedesktop.machine1.open-pty">
<description>Acquire a pseudo TTY in a local container</description>
<message>Authentication is required to acquire a pseudo TTY in a local container.</message>
<description gettext-domain="systemd">Acquire a pseudo TTY in a local container</description>
<message gettext-domain="systemd">Authentication is required to acquire a pseudo TTY in a local container.</message>
<defaults>
<allow_any>auth_admin</allow_any>
<allow_inactive>auth_admin</allow_inactive>
@@ -71,8 +71,8 @@
</action>
<action id="org.freedesktop.machine1.host-open-pty">
<description>Acquire a pseudo TTY on the local host</description>
<message>Authentication is required to acquire a pseudo TTY on the local host.</message>
<description gettext-domain="systemd">Acquire a pseudo TTY on the local host</description>
<message gettext-domain="systemd">Authentication is required to acquire a pseudo TTY on the local host.</message>
<defaults>
<allow_any>auth_admin</allow_any>
<allow_inactive>auth_admin</allow_inactive>
@@ -81,8 +81,8 @@
</action>
<action id="org.freedesktop.machine1.manage-machines">
<description>Manage local virtual machines and containers</description>
<message>Authentication is required to manage local virtual machines and containers.</message>
<description gettext-domain="systemd">Manage local virtual machines and containers</description>
<message gettext-domain="systemd">Authentication is required to manage local virtual machines and containers.</message>
<defaults>
<allow_any>auth_admin</allow_any>
<allow_inactive>auth_admin</allow_inactive>
@@ -92,8 +92,8 @@
</action>
<action id="org.freedesktop.machine1.manage-images">
<description>Manage local virtual machine and container images</description>
<message>Authentication is required to manage local virtual machine and container images.</message>
<description gettext-domain="systemd">Manage local virtual machine and container images</description>
<message gettext-domain="systemd">Authentication is required to manage local virtual machine and container images.</message>
<defaults>
<allow_any>auth_admin</allow_any>
<allow_inactive>auth_admin</allow_inactive>