diff options
| author | Iñigo Martínez <inigomartinez@gmail.com> | 2018-02-02 10:19:54 +0100 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2018-02-05 17:42:49 +0100 |
| commit | f69e9d8c74a46b700d751ec93cd82a3699d6c497 (patch) | |
| tree | 8dc01e925a36d4e34f1db57784462d59165d58f7 /plugins | |
| parent | 06c62bdefe3be5d366f539bdfc3a0aaf3bdcad67 (diff) | |
| download | gnome-settings-daemon-f69e9d8c74a46b700d751ec93cd82a3699d6c497.tar.gz | |
build: Migrate from Intltool to Gettext
Recent versions of Gettext are able to translate several formats
that are used in GNOME applications. This patch migrates from
Intltool to Gettext by using meson's i18n features.
Explicit encoding has also been added to the gschema files due to
an issue in gettext[0] with default encoding in XML files.
https://bugzilla.gnome.org/show_bug.cgi?id=793087
[0] https://savannah.gnu.org/bugs/?52932
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/power/meson.build | 4 | ||||
| -rw-r--r-- | plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in | 4 | ||||
| -rw-r--r-- | plugins/wacom/meson.build | 4 | ||||
| -rw-r--r-- | plugins/wacom/org.gnome.settings-daemon.plugins.wacom.policy.in.in | 8 |
4 files changed, 10 insertions, 10 deletions
diff --git a/plugins/power/meson.build b/plugins/power/meson.build index c299bc1d..bada27f0 100644 --- a/plugins/power/meson.build +++ b/plugins/power/meson.build @@ -76,11 +76,11 @@ if enable_gudev configuration: plugins_conf ) - custom_target( + i18n.merge_file( policy, input: policy_in, output: policy, - command: intltool_xml_cmd, + po_dir: po_dir, install: true, install_dir: join_paths(gsd_datadir, 'polkit-1', 'actions') ) diff --git a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in index 5adbc419..f16300f8 100644 --- a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in +++ b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in @@ -18,8 +18,8 @@ - A normal active user on the local machine does not need permission to change the backlight brightness. --> - <_description>Modify the laptop brightness</_description> - <_message>Authentication is required to modify the laptop brightness</_message> + <description>Modify the laptop brightness</description> + <message>Authentication is required to modify the laptop brightness</message> <defaults> <allow_any>no</allow_any> <allow_inactive>no</allow_inactive> diff --git a/plugins/wacom/meson.build b/plugins/wacom/meson.build index 064b5764..c150b3c6 100644 --- a/plugins/wacom/meson.build +++ b/plugins/wacom/meson.build @@ -16,11 +16,11 @@ policy_in = configure_file( configuration: plugins_conf ) -custom_target( +i18n.merge_file( policy, input: policy_in, output: policy, - command: intltool_xml_cmd, + po_dir: po_dir, install: true, install_dir: join_paths(gsd_datadir, 'polkit-1', 'actions') ) diff --git a/plugins/wacom/org.gnome.settings-daemon.plugins.wacom.policy.in.in b/plugins/wacom/org.gnome.settings-daemon.plugins.wacom.policy.in.in index 6bf77dd9..fe0df934 100644 --- a/plugins/wacom/org.gnome.settings-daemon.plugins.wacom.policy.in.in +++ b/plugins/wacom/org.gnome.settings-daemon.plugins.wacom.policy.in.in @@ -17,8 +17,8 @@ - A normal active user on the local machine does not need permission to change the LED setting for a Wacom tablet --> - <_description>Modify the lit LED for a Wacom tablet</_description> - <_message>Authentication is required to modify the lit LED for a Wacom tablet</_message> + <description>Modify the lit LED for a Wacom tablet</description> + <message>Authentication is required to modify the lit LED for a Wacom tablet</message> <defaults> <allow_any>no</allow_any> <allow_inactive>no</allow_inactive> @@ -32,8 +32,8 @@ - A normal active user on the local machine does not need permission to change the OLED images for a Wacom tablet --> - <_description>Modify the OLED image for a Wacom tablet</_description> - <_message>Authentication is required to modify the OLED image for a Wacom tablet</_message> + <description>Modify the OLED image for a Wacom tablet</description> + <message>Authentication is required to modify the OLED image for a Wacom tablet</message> <defaults> <allow_any>no</allow_any> <allow_inactive>no</allow_inactive> |