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/hostname | |
| parent | Merge pull request #8184 from poettering/color-ask-pw (diff) | |
| download | systemd-264d8dcc161e276d31dcde98a088d15cebbebbef.tar.xz systemd-264d8dcc161e276d31dcde98a088d15cebbebbef.zip | |
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/hostname')
| -rw-r--r-- | src/hostname/meson.build | 10 | ||||
| -rw-r--r-- | src/hostname/org.freedesktop.hostname1.policy.in | 12 |
2 files changed, 10 insertions, 12 deletions
diff --git a/src/hostname/meson.build b/src/hostname/meson.build index 75cc94874b..c35c6688ba 100644 --- a/src/hostname/meson.build +++ b/src/hostname/meson.build @@ -21,12 +21,10 @@ if conf.get('ENABLE_HOSTNAMED') == 1 install_data('org.freedesktop.hostname1.service', install_dir : dbussystemservicedir) - i18n.merge_file( - 'org.freedesktop.hostname1.policy', + policy = configure_file( input : 'org.freedesktop.hostname1.policy.in', output : 'org.freedesktop.hostname1.policy', - po_dir : po_dir, - data_dirs : po_dir, - install : install_polkit, - install_dir : polkitpolicydir) + configuration : substs) + install_data(policy, + install_dir : polkitpolicydir) endif diff --git a/src/hostname/org.freedesktop.hostname1.policy.in b/src/hostname/org.freedesktop.hostname1.policy.in index b10ca31ac5..4ac82c659c 100644 --- a/src/hostname/org.freedesktop.hostname1.policy.in +++ b/src/hostname/org.freedesktop.hostname1.policy.in @@ -19,8 +19,8 @@ <vendor_url>http://www.freedesktop.org/wiki/Software/systemd</vendor_url> <action id="org.freedesktop.hostname1.set-hostname"> - <description>Set host name</description> - <message>Authentication is required to set the local host name.</message> + <description gettext-domain="systemd">Set host name</description> + <message gettext-domain="systemd">Authentication is required to set the local host name.</message> <defaults> <allow_any>auth_admin_keep</allow_any> <allow_inactive>auth_admin_keep</allow_inactive> @@ -29,8 +29,8 @@ </action> <action id="org.freedesktop.hostname1.set-static-hostname"> - <description>Set static host name</description> - <message>Authentication is required to set the statically configured local host name, as well as the pretty host name.</message> + <description gettext-domain="systemd">Set static host name</description> + <message gettext-domain="systemd">Authentication is required to set the statically configured local host name, as well as the pretty host name.</message> <defaults> <allow_any>auth_admin_keep</allow_any> <allow_inactive>auth_admin_keep</allow_inactive> @@ -40,8 +40,8 @@ </action> <action id="org.freedesktop.hostname1.set-machine-info"> - <description>Set machine information</description> - <message>Authentication is required to set local machine information.</message> + <description gettext-domain="systemd">Set machine information</description> + <message gettext-domain="systemd">Authentication is required to set local machine information.</message> <defaults> <allow_any>auth_admin_keep</allow_any> <allow_inactive>auth_admin_keep</allow_inactive> |