diff --git a/.mkosi/mkosi.arch b/.mkosi/mkosi.arch index d7f6bc866a..dac80d38f7 100644 --- a/.mkosi/mkosi.arch +++ b/.mkosi/mkosi.arch @@ -41,11 +41,11 @@ BuildPackages= docbook-xsl elfutils gcc + gettext git gnu-efi-libs gnutls gperf - intltool iptables kmod libcap diff --git a/.mkosi/mkosi.debian b/.mkosi/mkosi.debian index a93eb7b539..de47df1847 100644 --- a/.mkosi/mkosi.debian +++ b/.mkosi/mkosi.debian @@ -37,10 +37,10 @@ BuildPackages= docbook-xml docbook-xsl gcc + gettext git gnu-efi gperf - intltool iptables-dev libacl1-dev libaudit-dev diff --git a/.mkosi/mkosi.fedora b/.mkosi/mkosi.fedora index e642c0b064..0aeb7751cb 100644 --- a/.mkosi/mkosi.fedora +++ b/.mkosi/mkosi.fedora @@ -41,12 +41,12 @@ BuildPackages= docbook-style-xsl elfutils-devel gcc + gettext git gnu-efi gnu-efi-devel gnutls-devel gperf - intltool iptables-devel kmod-devel libacl-devel diff --git a/po/POTFILES.in b/po/POTFILES.in index f610828b21..470829acae 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,9 +1,9 @@ -src/core/org.freedesktop.systemd1.policy.in.in -src/hostname/org.freedesktop.hostname1.policy.in -src/import/org.freedesktop.import1.policy.in -src/locale/org.freedesktop.locale1.policy.in -src/login/org.freedesktop.login1.policy.in -src/machine/org.freedesktop.machine1.policy.in -src/resolve/org.freedesktop.resolve1.policy.in -src/timedate/org.freedesktop.timedate1.policy.in +src/core/org.freedesktop.systemd1.policy.in +src/hostname/org.freedesktop.hostname1.policy +src/import/org.freedesktop.import1.policy +src/locale/org.freedesktop.locale1.policy +src/login/org.freedesktop.login1.policy +src/machine/org.freedesktop.machine1.policy +src/resolve/org.freedesktop.resolve1.policy +src/timedate/org.freedesktop.timedate1.policy src/core/dbus-unit.c diff --git a/po/POTFILES.skip b/po/POTFILES.skip index b56a9984c4..e6ef4d7920 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -12,9 +12,9 @@ src/core/dbus-target.c src/core/dbus-timer.c src/core/dbus-unit.c src/core/dbus-scope.c +src/core/org.freedesktop.systemd1.policy src/hostname/hostnamed.c src/locale/localed.c -src/core/org.freedesktop.systemd1.policy.in src/timedate/timedated.c units/user@.service.in units/debug-shell.service.in diff --git a/po/meson.build b/po/meson.build index 7ba08fba18..01ab7a3a54 100644 --- a/po/meson.build +++ b/po/meson.build @@ -16,6 +16,6 @@ # along with systemd; If not, see . i18n = import('i18n') -i18n.gettext(meson.project_name(), preset: 'glib') - -po_dir = meson.current_source_dir() +i18n.gettext(meson.project_name(), + preset : 'glib', + data_dirs : '.') diff --git a/src/core/meson.build b/src/core/meson.build index a89a12232d..3fc43f6335 100644 --- a/src/core/meson.build +++ b/src/core/meson.build @@ -212,19 +212,12 @@ install_data('org.freedesktop.systemd1.conf', install_data('org.freedesktop.systemd1.service', install_dir : dbussystemservicedir) -policy_in = 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, +policy = configure_file( + input : 'org.freedesktop.systemd1.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('user.conf', install_dir : pkgsysconfdir) diff --git a/src/core/org.freedesktop.systemd1.policy.in.in b/src/core/org.freedesktop.systemd1.policy.in similarity index 67% rename from src/core/org.freedesktop.systemd1.policy.in.in rename to src/core/org.freedesktop.systemd1.policy.in index 2c6ed749fd..648221b85c 100644 --- a/src/core/org.freedesktop.systemd1.policy.in.in +++ b/src/core/org.freedesktop.systemd1.policy.in @@ -19,8 +19,8 @@ http://www.freedesktop.org/wiki/Software/systemd - Send passphrase back to system - Authentication is required to send the entered passphrase back to the system. + Send passphrase back to system + Authentication is required to send the entered passphrase back to the system. no no @@ -30,8 +30,8 @@ - Manage system services or other units - Authentication is required to manage system services or other units. + Manage system services or other units + Authentication is required to manage system services or other units. auth_admin auth_admin @@ -40,8 +40,8 @@ - Manage system service or unit files - Authentication is required to manage system service or unit files. + Manage system service or unit files + Authentication is required to manage system service or unit files. auth_admin auth_admin @@ -50,8 +50,8 @@ - Set or unset system and service manager environment variables - Authentication is required to set or unset system and service manager environment variables. + Set or unset system and service manager environment variables + Authentication is required to set or unset system and service manager environment variables. auth_admin auth_admin @@ -60,8 +60,8 @@ - Reload the systemd state - Authentication is required to reload the systemd state. + Reload the systemd state + Authentication is required to reload the systemd state. auth_admin auth_admin diff --git a/src/hostname/meson.build b/src/hostname/meson.build index 75cc94874b..1ab9271b4c 100644 --- a/src/hostname/meson.build +++ b/src/hostname/meson.build @@ -20,13 +20,6 @@ if conf.get('ENABLE_HOSTNAMED') == 1 install_dir : dbuspolicydir) install_data('org.freedesktop.hostname1.service', install_dir : dbussystemservicedir) - - i18n.merge_file( - 'org.freedesktop.hostname1.policy', - 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) + install_data('org.freedesktop.hostname1.policy', + install_dir : polkitpolicydir) endif diff --git a/src/hostname/org.freedesktop.hostname1.policy.in b/src/hostname/org.freedesktop.hostname1.policy similarity index 74% rename from src/hostname/org.freedesktop.hostname1.policy.in rename to src/hostname/org.freedesktop.hostname1.policy index b10ca31ac5..4ac82c659c 100644 --- a/src/hostname/org.freedesktop.hostname1.policy.in +++ b/src/hostname/org.freedesktop.hostname1.policy @@ -19,8 +19,8 @@ http://www.freedesktop.org/wiki/Software/systemd - Set host name - Authentication is required to set the local host name. + Set host name + Authentication is required to set the local host name. auth_admin_keep auth_admin_keep @@ -29,8 +29,8 @@ - Set static host name - Authentication is required to set the statically configured local host name, as well as the pretty host name. + Set static host name + Authentication is required to set the statically configured local host name, as well as the pretty host name. auth_admin_keep auth_admin_keep @@ -40,8 +40,8 @@ - Set machine information - Authentication is required to set local machine information. + Set machine information + Authentication is required to set local machine information. auth_admin_keep auth_admin_keep diff --git a/src/import/meson.build b/src/import/meson.build index 2dcc0bcc00..975afc624d 100644 --- a/src/import/meson.build +++ b/src/import/meson.build @@ -70,15 +70,8 @@ if conf.get('ENABLE_IMPORTD') == 1 install_dir : dbuspolicydir) install_data('org.freedesktop.import1.service', install_dir : dbussystemservicedir) - - i18n.merge_file( - 'org.freedesktop.import1.policy', - input : 'org.freedesktop.import1.policy.in', - output : 'org.freedesktop.import1.policy', - po_dir : po_dir, - data_dirs : po_dir, - install : install_polkit, - install_dir : polkitpolicydir) + install_data('org.freedesktop.import1.policy', + install_dir : polkitpolicydir) install_data('import-pubring.gpg', install_dir : rootlibexecdir) diff --git a/src/import/org.freedesktop.import1.policy.in b/src/import/org.freedesktop.import1.policy similarity index 71% rename from src/import/org.freedesktop.import1.policy.in rename to src/import/org.freedesktop.import1.policy index d96ca2d060..beea5fea67 100644 --- a/src/import/org.freedesktop.import1.policy.in +++ b/src/import/org.freedesktop.import1.policy @@ -19,8 +19,8 @@ http://www.freedesktop.org/wiki/Software/systemd - Import a VM or container image - Authentication is required to import a VM or container image + Import a VM or container image + Authentication is required to import a VM or container image auth_admin auth_admin @@ -29,8 +29,8 @@ - Export a VM or container image - Authentication is required to export a VM or container image + Export a VM or container image + Authentication is required to export a VM or container image auth_admin auth_admin @@ -39,8 +39,8 @@ - Download a VM or container image - Authentication is required to download a VM or container image + Download a VM or container image + Authentication is required to download a VM or container image auth_admin auth_admin diff --git a/src/locale/meson.build b/src/locale/meson.build index dca2c51d2f..6b85f6bea6 100644 --- a/src/locale/meson.build +++ b/src/locale/meson.build @@ -28,15 +28,8 @@ if conf.get('ENABLE_LOCALED') == 1 install_dir : dbuspolicydir) install_data('org.freedesktop.locale1.service', install_dir : dbussystemservicedir) - - i18n.merge_file( - 'org.freedesktop.locale1.policy', - 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) + install_data('org.freedesktop.locale1.policy', + install_dir : polkitpolicydir) endif # If you know a way that allows the same variables to be used diff --git a/src/locale/org.freedesktop.locale1.policy.in b/src/locale/org.freedesktop.locale1.policy similarity index 78% rename from src/locale/org.freedesktop.locale1.policy.in rename to src/locale/org.freedesktop.locale1.policy index 4c1c34da09..f9241749e6 100644 --- a/src/locale/org.freedesktop.locale1.policy.in +++ b/src/locale/org.freedesktop.locale1.policy @@ -19,8 +19,8 @@ http://www.freedesktop.org/wiki/Software/systemd - Set system locale - Authentication is required to set the system locale. + Set system locale + Authentication is required to set the system locale. auth_admin_keep auth_admin_keep @@ -30,8 +30,8 @@ - Set system keyboard settings - Authentication is required to set the system keyboard settings. + Set system keyboard settings + Authentication is required to set the system keyboard settings. auth_admin_keep auth_admin_keep diff --git a/src/login/meson.build b/src/login/meson.build index e8e4f7bd7d..5b75382e5f 100644 --- a/src/login/meson.build +++ b/src/login/meson.build @@ -87,15 +87,8 @@ if conf.get('ENABLE_LOGIND') == 1 install_dir : dbuspolicydir) install_data('org.freedesktop.login1.service', install_dir : dbussystemservicedir) - - i18n.merge_file( - 'org.freedesktop.login1.policy', - input : 'org.freedesktop.login1.policy.in', - output : 'org.freedesktop.login1.policy', - po_dir : po_dir, - data_dirs : po_dir, - install : install_polkit, - install_dir : polkitpolicydir) + install_data('org.freedesktop.login1.policy', + install_dir : polkitpolicydir) install_data('70-power-switch.rules', install_dir : udevrulesdir) diff --git a/src/login/org.freedesktop.login1.policy.in b/src/login/org.freedesktop.login1.policy similarity index 63% rename from src/login/org.freedesktop.login1.policy.in rename to src/login/org.freedesktop.login1.policy index 47162022d2..f1d1f956d3 100644 --- a/src/login/org.freedesktop.login1.policy.in +++ b/src/login/org.freedesktop.login1.policy @@ -19,8 +19,8 @@ http://www.freedesktop.org/wiki/Software/systemd - Allow applications to inhibit system shutdown - Authentication is required for an application to inhibit system shutdown. + Allow applications to inhibit system shutdown + Authentication is required for an application to inhibit system shutdown. no yes @@ -30,8 +30,8 @@ - Allow applications to delay system shutdown - Authentication is required for an application to delay system shutdown. + Allow applications to delay system shutdown + Authentication is required for an application to delay system shutdown. yes yes @@ -41,8 +41,8 @@ - Allow applications to inhibit system sleep - Authentication is required for an application to inhibit system sleep. + Allow applications to inhibit system sleep + Authentication is required for an application to inhibit system sleep. no yes @@ -52,8 +52,8 @@ - Allow applications to delay system sleep - Authentication is required for an application to delay system sleep. + Allow applications to delay system sleep + Authentication is required for an application to delay system sleep. yes yes @@ -62,8 +62,8 @@ - Allow applications to inhibit automatic system suspend - Authentication is required for an application to inhibit automatic system suspend. + Allow applications to inhibit automatic system suspend + Authentication is required for an application to inhibit automatic system suspend. yes yes @@ -72,8 +72,8 @@ - Allow applications to inhibit system handling of the power key - Authentication is required for an application to inhibit system handling of the power key. + Allow applications to inhibit system handling of the power key + Authentication is required for an application to inhibit system handling of the power key. no yes @@ -83,8 +83,8 @@ - Allow applications to inhibit system handling of the suspend key - Authentication is required for an application to inhibit system handling of the suspend key. + Allow applications to inhibit system handling of the suspend key + Authentication is required for an application to inhibit system handling of the suspend key. no yes @@ -94,8 +94,8 @@ - Allow applications to inhibit system handling of the hibernate key - Authentication is required for an application to inhibit system handling of the hibernate key. + Allow applications to inhibit system handling of the hibernate key + Authentication is required for an application to inhibit system handling of the hibernate key. no yes @@ -104,8 +104,8 @@ - Allow applications to inhibit system handling of the lid switch - Authentication is required for an application to inhibit system handling of the lid switch. + Allow applications to inhibit system handling of the lid switch + Authentication is required for an application to inhibit system handling of the lid switch. no yes @@ -114,8 +114,8 @@ - Allow non-logged-in user to run programs - Explicit request is required to run programs as a non-logged-in user. + Allow non-logged-in user to run programs + Explicit request is required to run programs as a non-logged-in user. yes yes @@ -124,8 +124,8 @@ - Allow non-logged-in users to run programs - Authentication is required to run programs as a non-logged-in user. + Allow non-logged-in users to run programs + Authentication is required to run programs as a non-logged-in user. auth_admin_keep auth_admin_keep @@ -134,8 +134,8 @@ - Allow attaching devices to seats - Authentication is required for attaching a device to a seat. + Allow attaching devices to seats + Authentication is required for attaching a device to a seat. auth_admin_keep auth_admin_keep @@ -145,8 +145,8 @@ - Flush device to seat attachments - Authentication is required for resetting how devices are attached to seats. + Flush device to seat attachments + Authentication is required for resetting how devices are attached to seats. auth_admin_keep auth_admin_keep @@ -155,8 +155,8 @@ - Power off the system - Authentication is required for powering off the system. + Power off the system + Authentication is required for powering off the system. auth_admin_keep auth_admin_keep @@ -166,8 +166,8 @@ - Power off the system while other users are logged in - Authentication is required for powering off the system while other users are logged in. + Power off the system while other users are logged in + Authentication is required for powering off the system while other users are logged in. auth_admin_keep auth_admin_keep @@ -177,8 +177,8 @@ - Power off the system while an application asked to inhibit it - Authentication is required for powering off the system while an application asked to inhibit it. + Power off the system while an application asked to inhibit it + Authentication is required for powering off the system while an application asked to inhibit it. auth_admin_keep auth_admin_keep @@ -188,8 +188,8 @@ - Reboot the system - Authentication is required for rebooting the system. + Reboot the system + Authentication is required for rebooting the system. auth_admin_keep auth_admin_keep @@ -199,8 +199,8 @@ - Reboot the system while other users are logged in - Authentication is required for rebooting the system while other users are logged in. + Reboot the system while other users are logged in + Authentication is required for rebooting the system while other users are logged in. auth_admin_keep auth_admin_keep @@ -210,8 +210,8 @@ - Reboot the system while an application asked to inhibit it - Authentication is required for rebooting the system while an application asked to inhibit it. + Reboot the system while an application asked to inhibit it + Authentication is required for rebooting the system while an application asked to inhibit it. auth_admin_keep auth_admin_keep @@ -221,8 +221,8 @@ - Halt the system - Authentication is required for halting the system. + Halt the system + Authentication is required for halting the system. auth_admin_keep auth_admin_keep @@ -232,8 +232,8 @@ - Halt the system while other users are logged in - Authentication is required for halting the system while other users are logged in. + Halt the system while other users are logged in + Authentication is required for halting the system while other users are logged in. auth_admin_keep auth_admin_keep @@ -243,8 +243,8 @@ - Halt the system while an application asked to inhibit it - Authentication is required for halting the system while an application asked to inhibit it. + Halt the system while an application asked to inhibit it + Authentication is required for halting the system while an application asked to inhibit it. auth_admin_keep auth_admin_keep @@ -254,8 +254,8 @@ - Suspend the system - Authentication is required for suspending the system. + Suspend the system + Authentication is required for suspending the system. auth_admin_keep auth_admin_keep @@ -264,8 +264,8 @@ - Suspend the system while other users are logged in - Authentication is required for suspending the system while other users are logged in. + Suspend the system while other users are logged in + Authentication is required for suspending the system while other users are logged in. auth_admin_keep auth_admin_keep @@ -275,8 +275,8 @@ - Suspend the system while an application asked to inhibit it - Authentication is required for suspending the system while an application asked to inhibit it. + Suspend the system while an application asked to inhibit it + Authentication is required for suspending the system while an application asked to inhibit it. auth_admin_keep auth_admin_keep @@ -286,8 +286,8 @@ - Hibernate the system - Authentication is required for hibernating the system. + Hibernate the system + Authentication is required for hibernating the system. auth_admin_keep auth_admin_keep @@ -296,8 +296,8 @@ - Hibernate the system while other users are logged in - Authentication is required for hibernating the system while other users are logged in. + Hibernate the system while other users are logged in + Authentication is required for hibernating the system while other users are logged in. auth_admin_keep auth_admin_keep @@ -307,8 +307,8 @@ - Hibernate the system while an application asked to inhibit it - Authentication is required for hibernating the system while an application asked to inhibit it. + Hibernate the system while an application asked to inhibit it + Authentication is required for hibernating the system while an application asked to inhibit it. auth_admin_keep auth_admin_keep @@ -318,8 +318,8 @@ - Manage active sessions, users and seats - Authentication is required for managing active sessions, users and seats. + Manage active sessions, users and seats + Authentication is required for managing active sessions, users and seats. auth_admin_keep auth_admin_keep @@ -328,8 +328,8 @@ - Lock or unlock active sessions - Authentication is required to lock or unlock active sessions. + Lock or unlock active sessions + Authentication is required to lock or unlock active sessions. auth_admin_keep auth_admin_keep @@ -338,8 +338,8 @@ - Allow indication to the firmware to boot to setup interface - Authentication is required to indicate to the firmware to boot to setup interface. + Allow indication to the firmware to boot to setup interface + Authentication is required to indicate to the firmware to boot to setup interface. auth_admin_keep auth_admin_keep @@ -348,8 +348,8 @@ - Set a wall message - Authentication is required to set a wall message + Set a wall message + Authentication is required to set a wall message auth_admin_keep auth_admin_keep diff --git a/src/machine/meson.build b/src/machine/meson.build index 7ea5d9de80..b530ca6377 100644 --- a/src/machine/meson.build +++ b/src/machine/meson.build @@ -43,15 +43,8 @@ if conf.get('ENABLE_MACHINED') == 1 install_dir : dbuspolicydir) install_data('org.freedesktop.machine1.service', install_dir : dbussystemservicedir) - - i18n.merge_file( - 'org.freedesktop.machine1.policy', - 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) + install_data('org.freedesktop.machine1.policy', + install_dir : polkitpolicydir) endif tests += [ diff --git a/src/machine/org.freedesktop.machine1.policy.in b/src/machine/org.freedesktop.machine1.policy similarity index 66% rename from src/machine/org.freedesktop.machine1.policy.in rename to src/machine/org.freedesktop.machine1.policy index eeeeb4c0f8..039c3d4513 100644 --- a/src/machine/org.freedesktop.machine1.policy.in +++ b/src/machine/org.freedesktop.machine1.policy @@ -19,8 +19,8 @@ http://www.freedesktop.org/wiki/Software/systemd - Log into a local container - Authentication is required to log into a local container. + Log into a local container + Authentication is required to log into a local container. auth_admin auth_admin @@ -29,8 +29,8 @@ - Log into the local host - Authentication is required to log into the local host. + Log into the local host + Authentication is required to log into the local host. auth_admin auth_admin @@ -39,8 +39,8 @@ - Acquire a shell in a local container - Authentication is required to acquire a shell in a local container. + Acquire a shell in a local container + Authentication is required to acquire a shell in a local container. auth_admin auth_admin @@ -50,8 +50,8 @@ - Acquire a shell on the local host - Authentication is required to acquire a shell on the local host. + Acquire a shell on the local host + Authentication is required to acquire a shell on the local host. auth_admin auth_admin @@ -61,8 +61,8 @@ - Acquire a pseudo TTY in a local container - Authentication is required to acquire a pseudo TTY in a local container. + Acquire a pseudo TTY in a local container + Authentication is required to acquire a pseudo TTY in a local container. auth_admin auth_admin @@ -71,8 +71,8 @@ - Acquire a pseudo TTY on the local host - Authentication is required to acquire a pseudo TTY on the local host. + Acquire a pseudo TTY on the local host + Authentication is required to acquire a pseudo TTY on the local host. auth_admin auth_admin @@ -81,8 +81,8 @@ - Manage local virtual machines and containers - Authentication is required to manage local virtual machines and containers. + Manage local virtual machines and containers + Authentication is required to manage local virtual machines and containers. auth_admin auth_admin @@ -92,8 +92,8 @@ - Manage local virtual machine and container images - Authentication is required to manage local virtual machine and container images. + Manage local virtual machine and container images + Authentication is required to manage local virtual machine and container images. auth_admin auth_admin diff --git a/src/resolve/meson.build b/src/resolve/meson.build index 15752d24ff..16ba83ef88 100644 --- a/src/resolve/meson.build +++ b/src/resolve/meson.build @@ -154,6 +154,8 @@ if conf.get('ENABLE_RESOLVE') == 1 install_dir : dbuspolicydir) install_data('org.freedesktop.resolve1.service', install_dir : dbussystemservicedir) + install_data('org.freedesktop.resolve1.policy', + install_dir : polkitpolicydir) resolved_conf = configure_file( input : 'resolved.conf.in', @@ -164,15 +166,6 @@ if conf.get('ENABLE_RESOLVE') == 1 install_data('resolv.conf', install_dir : rootlibexecdir) - - i18n.merge_file( - 'org.freedesktop.resolve1.policy', - input : 'org.freedesktop.resolve1.policy.in', - output : 'org.freedesktop.resolve1.policy', - po_dir : po_dir, - data_dirs : po_dir, - install : install_polkit, - install_dir : polkitpolicydir) endif tests += [ diff --git a/src/resolve/org.freedesktop.resolve1.policy.in b/src/resolve/org.freedesktop.resolve1.policy similarity index 78% rename from src/resolve/org.freedesktop.resolve1.policy.in rename to src/resolve/org.freedesktop.resolve1.policy index da948eb0b7..b65ba3e56a 100644 --- a/src/resolve/org.freedesktop.resolve1.policy.in +++ b/src/resolve/org.freedesktop.resolve1.policy @@ -19,8 +19,8 @@ http://www.freedesktop.org/wiki/Software/systemd - Register a DNS-SD service - Authentication is required to register a DNS-SD service + Register a DNS-SD service + Authentication is required to register a DNS-SD service auth_admin auth_admin @@ -30,8 +30,8 @@ - Unregister a DNS-SD service - Authentication is required to unregister a DNS-SD service + Unregister a DNS-SD service + Authentication is required to unregister a DNS-SD service auth_admin auth_admin diff --git a/src/timedate/meson.build b/src/timedate/meson.build index 80e5cd21be..87482c04e5 100644 --- a/src/timedate/meson.build +++ b/src/timedate/meson.build @@ -20,13 +20,6 @@ if conf.get('ENABLE_TIMEDATED') == 1 install_dir : dbuspolicydir) install_data('org.freedesktop.timedate1.service', install_dir : dbussystemservicedir) - - i18n.merge_file( - 'org.freedesktop.timedate1.policy', - input : 'org.freedesktop.timedate1.policy.in', - output : 'org.freedesktop.timedate1.policy', - po_dir : po_dir, - data_dirs : po_dir, - install : install_polkit, - install_dir : polkitpolicydir) + install_data('org.freedesktop.timedate1.policy', + install_dir : polkitpolicydir) endif diff --git a/src/timedate/org.freedesktop.timedate1.policy.in b/src/timedate/org.freedesktop.timedate1.policy similarity index 74% rename from src/timedate/org.freedesktop.timedate1.policy.in rename to src/timedate/org.freedesktop.timedate1.policy index cc2e1652da..d488572ae3 100644 --- a/src/timedate/org.freedesktop.timedate1.policy.in +++ b/src/timedate/org.freedesktop.timedate1.policy @@ -19,8 +19,8 @@ http://www.freedesktop.org/wiki/Software/systemd - Set system time - Authentication is required to set the system time. + Set system time + Authentication is required to set the system time. auth_admin_keep auth_admin_keep @@ -30,8 +30,8 @@ - Set system timezone - Authentication is required to set the system timezone. + Set system timezone + Authentication is required to set the system timezone. auth_admin_keep auth_admin_keep @@ -40,8 +40,8 @@ - Set RTC to local timezone or UTC - Authentication is required to control whether + Set RTC to local timezone or UTC + Authentication is required to control whether the RTC stores the local or UTC time. auth_admin_keep @@ -51,8 +51,8 @@ - Turn network time synchronization on or off - Authentication is required to control whether + Turn network time synchronization on or off + Authentication is required to control whether network time synchronization shall be enabled. auth_admin_keep