diff options
| author | Gunnar Hjalmarsson <gunnarhj@ubuntu.com> | 2018-02-15 21:21:58 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-02-16 13:00:52 +0100 |
| commit | 264d8dcc161e276d31dcde98a088d15cebbebbef (patch) | |
| tree | fb0e300bf8348544b0e8a178c6d028a323f8d13d /src/core | |
| parent | 730f40eb5789efe59cf105e898297d188cd0588b (diff) | |
| download | systemd-264d8dcc161e276d31dcde98a088d15cebbebbef.tar.gz | |
Gettextize policy files
* Don't merge translations into the files
* Add gettext-domain="systemd" to description and message
Closes #8162, replaces #8118.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/meson.build | 15 | ||||
| -rw-r--r-- | src/core/org.freedesktop.systemd1.policy.in.in | 20 |
2 files changed, 14 insertions, 21 deletions
diff --git a/src/core/meson.build b/src/core/meson.build index bc034082a5..c58893b7cb 100644 --- a/src/core/meson.build +++ b/src/core/meson.build @@ -211,19 +211,12 @@ install_data('org.freedesktop.systemd1.conf', install_data('org.freedesktop.systemd1.service', install_dir : dbussystemservicedir) -policy_in = configure_file( +policy = configure_file( input : 'org.freedesktop.systemd1.policy.in.in', - output : 'org.freedesktop.systemd1.policy.in', - configuration : substs) - -i18n.merge_file( - 'org.freedesktop.systemd1.policy', - input : policy_in, output : 'org.freedesktop.systemd1.policy', - po_dir : po_dir, - data_dirs : po_dir, - install : install_polkit, - install_dir : polkitpolicydir) + configuration : substs) +install_data(policy, + install_dir : polkitpolicydir) install_data('system.conf', 'user.conf', diff --git a/src/core/org.freedesktop.systemd1.policy.in.in b/src/core/org.freedesktop.systemd1.policy.in.in index 2c6ed749fd..648221b85c 100644 --- a/src/core/org.freedesktop.systemd1.policy.in.in +++ b/src/core/org.freedesktop.systemd1.policy.in.in @@ -19,8 +19,8 @@ <vendor_url>http://www.freedesktop.org/wiki/Software/systemd</vendor_url> <action id="org.freedesktop.systemd1.reply-password"> - <description>Send passphrase back to system</description> - <message>Authentication is required to send the entered passphrase back to the system.</message> + <description gettext-domain="systemd">Send passphrase back to system</description> + <message gettext-domain="systemd">Authentication is required to send the entered passphrase back to the system.</message> <defaults> <allow_any>no</allow_any> <allow_inactive>no</allow_inactive> @@ -30,8 +30,8 @@ </action> <action id="org.freedesktop.systemd1.manage-units"> - <description>Manage system services or other units</description> - <message>Authentication is required to manage system services or other units.</message> + <description gettext-domain="systemd">Manage system services or other units</description> + <message gettext-domain="systemd">Authentication is required to manage system services or other units.</message> <defaults> <allow_any>auth_admin</allow_any> <allow_inactive>auth_admin</allow_inactive> @@ -40,8 +40,8 @@ </action> <action id="org.freedesktop.systemd1.manage-unit-files"> - <description>Manage system service or unit files</description> - <message>Authentication is required to manage system service or unit files.</message> + <description gettext-domain="systemd">Manage system service or unit files</description> + <message gettext-domain="systemd">Authentication is required to manage system service or unit files.</message> <defaults> <allow_any>auth_admin</allow_any> <allow_inactive>auth_admin</allow_inactive> @@ -50,8 +50,8 @@ </action> <action id="org.freedesktop.systemd1.set-environment"> - <description>Set or unset system and service manager environment variables</description> - <message>Authentication is required to set or unset system and service manager environment variables.</message> + <description gettext-domain="systemd">Set or unset system and service manager environment variables</description> + <message gettext-domain="systemd">Authentication is required to set or unset system and service manager environment variables.</message> <defaults> <allow_any>auth_admin</allow_any> <allow_inactive>auth_admin</allow_inactive> @@ -60,8 +60,8 @@ </action> <action id="org.freedesktop.systemd1.reload-daemon"> - <description>Reload the systemd state</description> - <message>Authentication is required to reload the systemd state.</message> + <description gettext-domain="systemd">Reload the systemd state</description> + <message gettext-domain="systemd">Authentication is required to reload the systemd state.</message> <defaults> <allow_any>auth_admin</allow_any> <allow_inactive>auth_admin</allow_inactive> |