<div dir="ltr">Hi,<div><br></div><div>This is a great test of the migration instructions in that wiki page. If you found any discrepancies don't hesitate to edit the page.</div><div><br></div><div>I wonder if you have the same patch on a Github branch or Bugzilla or somewhere else with a code review UI? That would be easier for me to get an overview of the changes and make comments inline.</div><div><br></div><div>I do think you should go ahead and require itstool at build time.</div><div><br></div><div>Additionally, you could check if you can assume a recent enough version of gettext that you could do without itstool and just use Gettext's built-in support for ITS rules: <a href="https://www.gnu.org/software/gettext/manual/html_node/Preparing-ITS-Rules.html#Preparing-ITS-Rules">https://www.gnu.org/software/gettext/manual/html_node/Preparing-ITS-Rules.html#Preparing-ITS-Rules</a></div><div><br></div><div>Regards,</div><div>Philip</div><br><div class="gmail_quote"><div dir="ltr">On Mon, Aug 28, 2017 at 4:54 AM Aleksander Morgado <<a href="mailto:aleksander@aleksander.es">aleksander@aleksander.es</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Instead of mixing both intltool and gettext, which not always work<br>
correctly together, this patch obsoletes intltool and uses only<br>
gettext (plus itstool for the translation of policy XML files using<br>
ITS rules, as intltool already did).<br>
<br>
See migration steps for GNOME projects here:<br>
<a href="https://wiki.gnome.org/MigratingFromIntltoolToGettext" rel="noreferrer" target="_blank">https://wiki.gnome.org/MigratingFromIntltoolToGettext</a><br>
<br>
Worth noting that this patch includes under version control the two<br>
files that are generated by itstool, so that it isn't a build<br>
dependency for the usual case of non-maintainer builds from git<br>
checkouts. These two files may be explicitly rebuilt automatically<br>
after a 'maintainer-clean' operation.<br>
<br>
Also, instead of relying on autotools to generate the policy file with<br>
the correct MM_DEFAULT_USER_POLICY substitution (based on the polkit<br>
policy type requested), we now do this ourselves after translations<br>
have been included in the XML file.<br>
---<br>
<br>
Hey,<br>
<br>
This v2 patch fixes the generation of the policy.pot file after a "make maintainer-clean".<br>
<br>
Also flagged as non-translatable several of the strings in the policy file, like e.g. the "auth_self_keep" rules or "ModemManager".<br>
<br>
---<br>
.gitignore | 3 +-<br>
Makefile.am | 16 +---<br>
autogen.sh | 3 +-<br>
<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> | 8 +-<br>
data/Makefile.am | 32 +++++--<br>
data/<a href="http://org.freedesktop.ModemManager1.policy.in" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in</a> | 112 ++++++++++++++++++++++++<br>
data/<a href="http://org.freedesktop.ModemManager1.policy.in.in" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in</a> | 45 +++++-----<br>
data/org.freedesktop.ModemManager1.policy.pot | 91 +++++++++++++++++++<br>
po/Makevars | 78 +++++++++++++++++<br>
po/POTFILES.in | 2 +-<br>
po/de.po | 80 +++++++++++++----<br>
po/uk.po | 80 +++++++++++++----<br>
12 files changed, 465 insertions(+), 85 deletions(-)<br>
create mode 100644 data/<a href="http://org.freedesktop.ModemManager1.policy.in" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in</a><br>
create mode 100644 data/org.freedesktop.ModemManager1.policy.pot<br>
create mode 100644 po/Makevars<br>
<br>
diff --git a/.gitignore b/.gitignore<br>
index 685ff84f..320b01cf 100644<br>
--- a/.gitignore<br>
+++ b/.gitignore<br>
@@ -74,7 +74,6 @@ Makefile.in<br>
/data/org.freedesktop.ModemManager1.conf<br>
/data/org.freedesktop.ModemManager1.service<br>
/data/org.freedesktop.ModemManager1.policy<br>
-/data/<a href="http://org.freedesktop.ModemManager1.policy.in" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in</a><br>
/data/ModemManager.service<br>
/data/ModemManager.pc<br>
/data/mm-common.pc<br>
@@ -94,6 +93,8 @@ Makefile.in<br>
/po/insert-header.sin<br>
/po/quot.sed<br>
/po/remove-potcdate.sin<br>
+/po/remove-potcdate.sed<br>
+/po/stamp-po<br>
/po/*.gmo<br>
<br>
/docs/reference/api/version.xml<br>
diff --git a/Makefile.am b/Makefile.am<br>
index e0c14b02..a85e4154 100644<br>
--- a/Makefile.am<br>
+++ b/Makefile.am<br>
@@ -2,6 +2,7 @@<br>
SUBDIRS = \<br>
. \<br>
build-aux \<br>
+ po \<br>
data \<br>
include \<br>
libqcdm \<br>
@@ -13,7 +14,6 @@ SUBDIRS = \<br>
vapi \<br>
introspection \<br>
uml290 \<br>
- po \<br>
test \<br>
examples \<br>
docs \<br>
@@ -25,21 +25,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \<br>
--enable-gtk-doc=yes \<br>
$(NULL)<br>
<br>
-INTLTOOL_FILES = \<br>
- <a href="http://intltool-extract.in" rel="noreferrer" target="_blank">intltool-extract.in</a> \<br>
- <a href="http://intltool-merge.in" rel="noreferrer" target="_blank">intltool-merge.in</a> \<br>
- <a href="http://intltool-update.in" rel="noreferrer" target="_blank">intltool-update.in</a> \<br>
- $(NULL)<br>
-<br>
-DISTCLEANFILES = \<br>
- intltool-extract \<br>
- intltool-merge \<br>
- intltool-update \<br>
- po/.intltool-merge-cache \<br>
- $(NULL)<br>
-<br>
EXTRA_DIST = \<br>
- $(INTLTOOL_FILES) \<br>
autogen.sh \<br>
gtester.make \<br>
COPYING.LIB \<br>
diff --git a/autogen.sh b/autogen.sh<br>
index 230a7218..a3ff2db0 100755<br>
--- a/autogen.sh<br>
+++ b/autogen.sh<br>
@@ -15,8 +15,7 @@ PKG_NAME=ModemManager<br>
<br>
(cd $srcdir;<br>
gtkdocize || exit 1<br>
- autopoint --force<br>
- AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose<br>
+ autoreconf --force --install --verbose<br>
)<br>
<br>
if test -z "$NOCONFIGURE"; then<br>
diff --git a/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> b/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
index fa46b4f5..d7085f50 100644<br>
--- a/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
+++ b/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
@@ -82,10 +82,11 @@ dnl-----------------------------------------------------------------------------<br>
dnl i18n<br>
dnl<br>
<br>
-IT_PROG_INTLTOOL([0.40.0])<br>
-<br>
AM_GNU_GETTEXT([external])<br>
-AM_GNU_GETTEXT_VERSION([0.19.3])<br>
+AM_GNU_GETTEXT_VERSION([0.19.7])<br>
+<br>
+dnl don't fail if itstool not found<br>
+AC_PATH_PROG([ITSTOOL], [itstool], [notfound])<br>
<br>
GETTEXT_PACKAGE=ModemManager<br>
AC_SUBST(GETTEXT_PACKAGE)<br>
@@ -389,7 +390,6 @@ Makefile<br>
data/Makefile<br>
data/ModemManager.pc<br>
data/mm-glib.pc<br>
-data/<a href="http://org.freedesktop.ModemManager1.policy.in" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in</a><br>
data/tests/Makefile<br>
data/tests/org.freedesktop.ModemManager1.service<br>
include/Makefile<br>
diff --git a/data/Makefile.am b/data/Makefile.am<br>
index 168895d9..49a777b9 100644<br>
--- a/data/Makefile.am<br>
+++ b/data/Makefile.am<br>
@@ -61,13 +61,32 @@ diagrams = \<br>
<br>
<br>
# Polkit<br>
-polkit_policy_in_in_files = <a href="http://org.freedesktop.ModemManager1.policy.in.in" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in</a><br>
+<br>
+org.freedesktop.ModemManager1.policy.pot: <a href="http://org.freedesktop.ModemManager1.policy.in.in" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in</a><br>
+ $(AM_V_GEN) $(ITSTOOL) -o $@.tmp $< && mv $@.tmp $@<br>
+<br>
+<a href="http://org.freedesktop.ModemManager1.policy.in" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in</a>: <a href="http://org.freedesktop.ModemManager1.policy.in.in" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in</a><br>
+ $(AM_V_GEN) $(ITSTOOL) -j $< -o $@ $(top_srcdir)/po/*.gmo<br>
+<br>
if WITH_POLKIT<br>
+org.freedesktop.ModemManager1.policy: <a href="http://org.freedesktop.ModemManager1.policy.in" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in</a><br>
+ $(AM_V_GEN) sed -e s,@MM_DEFAULT_USER_POLICY\@,$(MM_DEFAULT_USER_POLICY), $< > $@.tmp && mv $@.tmp $@<br>
polkit_policydir = $(datadir)/polkit-1/actions<br>
-polkit_policy_DATA = $(polkit_policy_in_in_files:.<a href="http://policy.in.in" rel="noreferrer" target="_blank">policy.in.in</a>=.policy)<br>
-@INTLTOOL_POLICY_RULE@<br>
+polkit_policy_DATA = org.freedesktop.ModemManager1.policy<br>
endif<br>
<br>
+# distribute the .pot and .in files as well, so that itstool isn't<br>
+# required when building from tarball<br>
+dist_noinst_DATA = \<br>
+ <a href="http://org.freedesktop.ModemManager1.policy.in.in" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in</a> \<br>
+ <a href="http://org.freedesktop.ModemManager1.policy.in" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in</a> \<br>
+ org.freedesktop.ModemManager1.policy.pot \<br>
+ $(NULL)<br>
+<br>
+MAINTAINERCLEANFILES = \<br>
+ <a href="http://org.freedesktop.ModemManager1.policy.in" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in</a> \<br>
+ org.freedesktop.ModemManager1.policy.pot \<br>
+ $(NULL)<br>
<br>
# Set up pkg-config .pc files for exported libraries<br>
pkgconfigdir = $(libdir)/pkgconfig<br>
@@ -75,23 +94,20 @@ pkgconfig_DATA = \<br>
ModemManager.pc \<br>
mm-glib.pc<br>
<br>
-<br>
DISTCLEANFILES = \<br>
+ org.freedesktop.ModemManager1.policy \<br>
$(dbusactivation_DATA) \<br>
- $(dbusservice_DATA) \<br>
- $(polkit_policy_DATA)<br>
+ $(dbusservice_DATA)<br>
<br>
if HAVE_SYSTEMD<br>
DISTCLEANFILES += $(systemdsystemunit_DATA)<br>
endif<br>
<br>
-<br>
EXTRA_DIST = \<br>
$(systemdsystemunit_in_files) \<br>
$(dbusactivation_in_files) \<br>
$(dbusservice_file_polkit) \<br>
$(dbusservice_file_nopolkit) \<br>
$(icon_DATA) \<br>
- $(polkit_policy_in_in_files) \<br>
$(logos) \<br>
$(diagrams)<br>
diff --git a/data/<a href="http://org.freedesktop.ModemManager1.policy.in" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in</a> b/data/<a href="http://org.freedesktop.ModemManager1.policy.in" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in</a><br>
new file mode 100644<br>
index 00000000..bf1036b1<br>
--- /dev/null<br>
+++ b/data/<a href="http://org.freedesktop.ModemManager1.policy.in" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in</a><br>
@@ -0,0 +1,112 @@<br>
+<?xml version="1.0" encoding="utf-8"?><br>
+<!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" "<a href="http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd" rel="noreferrer" target="_blank">http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd</a>"><br>
+<policyconfig xmlns:its="<a href="http://www.w3.org/2005/11/its" rel="noreferrer" target="_blank">http://www.w3.org/2005/11/its</a>" its:version="1.0"><br>
+<br>
+ <vendor its:translate="no">ModemManager</vendor><br>
+ <vendor_url its:translate="no"><a href="http://www.freedesktop.org/wiki/ModemManager" rel="noreferrer" target="_blank">http://www.freedesktop.org/wiki/ModemManager</a></vendor_url><br>
+ <icon_name its:translate="no">ModemManager</icon_name><br>
+<br>
+ <its:rules version="1.0"><br>
+ <its:translateRule selector="//action/defaults/allow_inactive" translate="no"/><br>
+ <its:translateRule selector="//action/defaults/allow_active" translate="no"/><br>
+ </its:rules><br>
+<br>
+ <action id="org.freedesktop.ModemManager1.Control"><br>
+ <description>Control the Modem Manager daemon</description><br>
+ <description xml:lang="de">Den Modem-Manager-Daemon steuern</description><br>
+ <description xml:lang="uk">Керування фоновою службою Modem Manager</description><br>
+ <message>System policy prevents controlling the Modem Manager.</message><br>
+ <message xml:lang="de">Die Systemrichtlinien verhindern die Steuerung von ModemManager.</message><br>
+ <message xml:lang="uk">Правила системи перешкоджають керування Modem Manager.</message><br>
+ <defaults><br>
+ <allow_inactive>no</allow_inactive><br>
+ <allow_active>auth_admin</allow_active><br>
+ </defaults><br>
+ </action><br>
+<br>
+ <action id="org.freedesktop.ModemManager1.Device.Control"><br>
+ <description>Unlock and control a mobile broadband device</description><br>
+ <description xml:lang="de">Ein mobiles Breitbandgerät entsperren und steuern</description><br>
+ <description xml:lang="uk">Розблокувати пристрій мобільної широкосмугової мережі і керувати ним</description><br>
+ <message>System policy prevents unlocking or controlling the mobile broadband device.</message><br>
+ <message xml:lang="de">Die Systemrichtlinien verhindern das Entsperren oder Steuern des mobilen Breitbandgerätes.</message><br>
+ <message xml:lang="uk">Правила системи забороняють розблокування і керування пристроями широкосмугових мобільних мереж.</message><br>
+ <defaults><br>
+ <allow_inactive>no</allow_inactive><br>
+ <allow_active>@MM_DEFAULT_USER_POLICY@</allow_active><br>
+ </defaults><br>
+ </action><br>
+<br>
+ <action id="org.freedesktop.ModemManager1.Contacts"><br>
+ <description>Add, modify, and delete mobile broadband contacts</description><br>
+ <description xml:lang="de">Kontakte für mobiles Breitband hinzufügen, ändern und löschen</description><br>
+ <description xml:lang="uk">Додати, внести зміни і вилучити контакти пристрою мобільних широкосмугових мереж</description><br>
+ <message>System policy prevents adding, modifying, or deleting this device's contacts.</message><br>
+ <message xml:lang="de">Die Systemrichtlinien verhindern das Hinzufügen, Ändern oder Löschen der Kontakte dieses Gerätes.</message><br>
+ <message xml:lang="uk">Правила системи перешкоджають додаванню, внесенню змін та вилученню записів контактів на цьому пристрої.</message><br>
+ <defaults><br>
+ <allow_inactive>no</allow_inactive><br>
+ <allow_active>@MM_DEFAULT_USER_POLICY@</allow_active><br>
+ </defaults><br>
+ </action><br>
+<br>
+ <action id="org.freedesktop.ModemManager1.Messaging"><br>
+ <description>Send, save, modify, and delete text messages</description><br>
+ <description xml:lang="de">Textnachrichten senden, speichern, bearbeiten und löschen</description><br>
+ <description xml:lang="uk">Надіслати, зберегти, внести зміни або вилучити текстові повідомлення</description><br>
+ <message>System policy prevents sending or manipulating this device's text messages.</message><br>
+ <defaults><br>
+ <allow_inactive>no</allow_inactive><br>
+ <allow_active>@MM_DEFAULT_USER_POLICY@</allow_active><br>
+ </defaults><br>
+ </action><br>
+<br>
+ <action id="org.freedesktop.ModemManager1.Voice"><br>
+ <description>Accept incoming voice calls or start outgoing voice calls.</description><br>
+ <message>System policy prevents voice calls.</message><br>
+ <defaults><br>
+ <allow_inactive>no</allow_inactive><br>
+ <allow_active>@MM_DEFAULT_USER_POLICY@</allow_active><br>
+ </defaults><br>
+ </action><br>
+<br>
+ <action id="org.freedesktop.ModemManager1.Location"><br>
+ <description>Enable and view geographic location and positioning information</description><br>
+ <description xml:lang="de">Informationen zum geografischen Standort und Positionierung aktivieren und anzeigen</description><br>
+ <description xml:lang="uk">Увімкнути або переглянути дані щодо географічного розташування і позиціювання</description><br>
+ <message>System policy prevents enabling or viewing geographic location information.</message><br>
+ <message xml:lang="de">Die Systemrichtlinien verhindern das Aktivieren oder Ändern der Informationen zum geografischen Standort.</message><br>
+ <message xml:lang="uk">Правила системи забороняють вмикання або перегляд даних щодо розташування.</message><br>
+ <defaults><br>
+ <allow_inactive>no</allow_inactive><br>
+ <allow_active>@MM_DEFAULT_USER_POLICY@</allow_active><br>
+ </defaults><br>
+ </action><br>
+<br>
+ <action id="org.freedesktop.ModemManager1.USSD"><br>
+ <description>Query and utilize network information and services</description><br>
+ <description xml:lang="de">Netzwerkinformationen und -dienste abfragen und nutzen</description><br>
+ <description xml:lang="uk">Надіслати запит і використати дані щодо мережі і служби</description><br>
+ <message>System policy prevents querying or utilizing network information and services.</message><br>
+ <message xml:lang="de">Die Systemrichtlinien verhindern die Abfrage der Netzwerkinformationen und -dienste.</message><br>
+ <message xml:lang="uk">Правила системи забороняють надсилання запитів і використання даних щодо мережі і служб.</message><br>
+ <defaults><br>
+ <allow_inactive>no</allow_inactive><br>
+ <allow_active>yes</allow_active><br>
+ </defaults><br>
+ </action><br>
+<br>
+ <action id="org.freedesktop.ModemManager1.Firmware"><br>
+ <description>Query and manage firmware on a mobile broadband device</description><br>
+ <description xml:lang="de">Firmware auf mobilen Breitbandgeräten abfragen und verwalten</description><br>
+ <description xml:lang="uk">Опитування та керування мікропрограмою на пристрої мобільної широкосмугової мережі</description><br>
+ <message>System policy prevents querying or managing this device's firmware.</message><br>
+ <message xml:lang="de">Die Systemrichtlinien verhindern die Abfrage oder Verwaltung der Firmware dieses Gerätes.</message><br>
+ <message xml:lang="uk">Правила системи перешкоджають опитуванню або керування мікропрограмою цього пристрою.</message><br>
+ <defaults><br>
+ <allow_inactive>no</allow_inactive><br>
+ <allow_active>auth_admin</allow_active><br>
+ </defaults><br>
+ </action><br>
+<br>
+</policyconfig><br>
diff --git a/data/<a href="http://org.freedesktop.ModemManager1.policy.in.in" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in</a> b/data/<a href="http://org.freedesktop.ModemManager1.policy.in.in" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in</a><br>
index bb60192b..d7689938 100644<br>
--- a/data/<a href="http://org.freedesktop.ModemManager1.policy.in.in" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in</a><br>
+++ b/data/<a href="http://org.freedesktop.ModemManager1.policy.in.in" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in</a><br>
@@ -3,15 +3,20 @@<br>
"-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"<br>
"<a href="http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd" rel="noreferrer" target="_blank">http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd</a>"><br>
<br>
-<policyconfig><br>
+<policyconfig xmlns:its="<a href="http://www.w3.org/2005/11/its" rel="noreferrer" target="_blank">http://www.w3.org/2005/11/its</a>" its:version="1.0"><br>
<br>
- <vendor>ModemManager</vendor><br>
- <vendor_url><a href="http://www.freedesktop.org/wiki/ModemManager" rel="noreferrer" target="_blank">http://www.freedesktop.org/wiki/ModemManager</a></vendor_url><br>
- <icon_name>ModemManager</icon_name><br>
+ <vendor its:translate="no">ModemManager</vendor><br>
+ <vendor_url its:translate="no"><a href="http://www.freedesktop.org/wiki/ModemManager" rel="noreferrer" target="_blank">http://www.freedesktop.org/wiki/ModemManager</a></vendor_url><br>
+ <icon_name its:translate="no">ModemManager</icon_name><br>
+<br>
+ <its:rules version="1.0"><br>
+ <its:translateRule selector="//action/defaults/allow_inactive" translate="no"/><br>
+ <its:translateRule selector="//action/defaults/allow_active" translate="no"/><br>
+ </its:rules><br>
<br>
<action id="org.freedesktop.ModemManager1.Control"><br>
- <_description>Control the Modem Manager daemon</_description><br>
- <_message>System policy prevents controlling the Modem Manager.</_message><br>
+ <description>Control the Modem Manager daemon</description><br>
+ <message>System policy prevents controlling the Modem Manager.</message><br>
<defaults><br>
<allow_inactive>no</allow_inactive><br>
<allow_active>auth_admin</allow_active><br>
@@ -19,8 +24,8 @@<br>
</action><br>
<br>
<action id="org.freedesktop.ModemManager1.Device.Control"><br>
- <_description>Unlock and control a mobile broadband device</_description><br>
- <_message>System policy prevents unlocking or controlling the mobile broadband device.</_message><br>
+ <description>Unlock and control a mobile broadband device</description><br>
+ <message>System policy prevents unlocking or controlling the mobile broadband device.</message><br>
<defaults><br>
<allow_inactive>no</allow_inactive><br>
<allow_active>@MM_DEFAULT_USER_POLICY@</allow_active><br>
@@ -28,8 +33,8 @@<br>
</action><br>
<br>
<action id="org.freedesktop.ModemManager1.Contacts"><br>
- <_description>Add, modify, and delete mobile broadband contacts</_description><br>
- <_message>System policy prevents adding, modifying, or deleting this device's contacts.</_message><br>
+ <description>Add, modify, and delete mobile broadband contacts</description><br>
+ <message>System policy prevents adding, modifying, or deleting this device's contacts.</message><br>
<defaults><br>
<allow_inactive>no</allow_inactive><br>
<allow_active>@MM_DEFAULT_USER_POLICY@</allow_active><br>
@@ -37,8 +42,8 @@<br>
</action><br>
<br>
<action id="org.freedesktop.ModemManager1.Messaging"><br>
- <_description>Send, save, modify, and delete text messages</_description><br>
- <_message>System policy prevents sending or manipulating this device's text messages.</_message><br>
+ <description>Send, save, modify, and delete text messages</description><br>
+ <message>System policy prevents sending or manipulating this device's text messages.</message><br>
<defaults><br>
<allow_inactive>no</allow_inactive><br>
<allow_active>@MM_DEFAULT_USER_POLICY@</allow_active><br>
@@ -46,8 +51,8 @@<br>
</action><br>
<br>
<action id="org.freedesktop.ModemManager1.Voice"><br>
- <_description>Accept incoming voice calls or start outgoing voice calls.</_description><br>
- <_message>System policy prevents voice calls.</_message><br>
+ <description>Accept incoming voice calls or start outgoing voice calls.</description><br>
+ <message>System policy prevents voice calls.</message><br>
<defaults><br>
<allow_inactive>no</allow_inactive><br>
<allow_active>@MM_DEFAULT_USER_POLICY@</allow_active><br>
@@ -55,8 +60,8 @@<br>
</action><br>
<br>
<action id="org.freedesktop.ModemManager1.Location"><br>
- <_description>Enable and view geographic location and positioning information</_description><br>
- <_message>System policy prevents enabling or viewing geographic location information.</_message><br>
+ <description>Enable and view geographic location and positioning information</description><br>
+ <message>System policy prevents enabling or viewing geographic location information.</message><br>
<defaults><br>
<allow_inactive>no</allow_inactive><br>
<allow_active>@MM_DEFAULT_USER_POLICY@</allow_active><br>
@@ -64,8 +69,8 @@<br>
</action><br>
<br>
<action id="org.freedesktop.ModemManager1.USSD"><br>
- <_description>Query and utilize network information and services</_description><br>
- <_message>System policy prevents querying or utilizing network information and services.</_message><br>
+ <description>Query and utilize network information and services</description><br>
+ <message>System policy prevents querying or utilizing network information and services.</message><br>
<defaults><br>
<allow_inactive>no</allow_inactive><br>
<allow_active>yes</allow_active><br>
@@ -73,8 +78,8 @@<br>
</action><br>
<br>
<action id="org.freedesktop.ModemManager1.Firmware"><br>
- <_description>Query and manage firmware on a mobile broadband device</_description><br>
- <_message>System policy prevents querying or managing this device's firmware.</_message><br>
+ <description>Query and manage firmware on a mobile broadband device</description><br>
+ <message>System policy prevents querying or managing this device's firmware.</message><br>
<defaults><br>
<allow_inactive>no</allow_inactive><br>
<allow_active>auth_admin</allow_active><br>
diff --git a/data/org.freedesktop.ModemManager1.policy.pot b/data/org.freedesktop.ModemManager1.policy.pot<br>
new file mode 100644<br>
index 00000000..47768dbc<br>
--- /dev/null<br>
+++ b/data/org.freedesktop.ModemManager1.policy.pot<br>
@@ -0,0 +1,91 @@<br>
+msgid ""<br>
+msgstr ""<br>
+"Project-Id-Version: PACKAGE VERSION\n"<br>
+"POT-Creation-Date: 2017-08-28 13:47+0200\n"<br>
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"<br>
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"<br>
+"Language-Team: LANGUAGE <<a href="mailto:LL@li.org" target="_blank">LL@li.org</a>>\n"<br>
+"MIME-Version: 1.0\n"<br>
+"Content-Type: text/plain; charset=UTF-8\n"<br>
+"Content-Transfer-Encoding: 8bit\n"<br>
+<br>
+#. (itstool) path: action/description<br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:18" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:18</a><br>
+msgid "Control the Modem Manager daemon"<br>
+msgstr ""<br>
+<br>
+#. (itstool) path: action/message<br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:19" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:19</a><br>
+msgid "System policy prevents controlling the Modem Manager."<br>
+msgstr ""<br>
+<br>
+#. (itstool) path: action/description<br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:27" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:27</a><br>
+msgid "Unlock and control a mobile broadband device"<br>
+msgstr ""<br>
+<br>
+#. (itstool) path: action/message<br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:28" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:28</a><br>
+msgid "System policy prevents unlocking or controlling the mobile broadband device."<br>
+msgstr ""<br>
+<br>
+#. (itstool) path: action/description<br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:36" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:36</a><br>
+msgid "Add, modify, and delete mobile broadband contacts"<br>
+msgstr ""<br>
+<br>
+#. (itstool) path: action/message<br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:37" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:37</a><br>
+msgid "System policy prevents adding, modifying, or deleting this device's contacts."<br>
+msgstr ""<br>
+<br>
+#. (itstool) path: action/description<br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:45" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:45</a><br>
+msgid "Send, save, modify, and delete text messages"<br>
+msgstr ""<br>
+<br>
+#. (itstool) path: action/message<br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:46" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:46</a><br>
+msgid "System policy prevents sending or manipulating this device's text messages."<br>
+msgstr ""<br>
+<br>
+#. (itstool) path: action/description<br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:54" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:54</a><br>
+msgid "Accept incoming voice calls or start outgoing voice calls."<br>
+msgstr ""<br>
+<br>
+#. (itstool) path: action/message<br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:55" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:55</a><br>
+msgid "System policy prevents voice calls."<br>
+msgstr ""<br>
+<br>
+#. (itstool) path: action/description<br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:63" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:63</a><br>
+msgid "Enable and view geographic location and positioning information"<br>
+msgstr ""<br>
+<br>
+#. (itstool) path: action/message<br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:64" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:64</a><br>
+msgid "System policy prevents enabling or viewing geographic location information."<br>
+msgstr ""<br>
+<br>
+#. (itstool) path: action/description<br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:72" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:72</a><br>
+msgid "Query and utilize network information and services"<br>
+msgstr ""<br>
+<br>
+#. (itstool) path: action/message<br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:73" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:73</a><br>
+msgid "System policy prevents querying or utilizing network information and services."<br>
+msgstr ""<br>
+<br>
+#. (itstool) path: action/description<br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:81" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:81</a><br>
+msgid "Query and manage firmware on a mobile broadband device"<br>
+msgstr ""<br>
+<br>
+#. (itstool) path: action/message<br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:82" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:82</a><br>
+msgid "System policy prevents querying or managing this device's firmware."<br>
+msgstr ""<br>
+<br>
diff --git a/po/Makevars b/po/Makevars<br>
new file mode 100644<br>
index 00000000..109c8760<br>
--- /dev/null<br>
+++ b/po/Makevars<br>
@@ -0,0 +1,78 @@<br>
+# Makefile variables for PO directory in any package using GNU gettext.<br>
+<br>
+# Usually the message domain is the same as the package name.<br>
+DOMAIN = $(PACKAGE)<br>
+<br>
+# These two variables depend on the location of this directory.<br>
+subdir = po<br>
+top_builddir = ..<br>
+<br>
+# These options get passed to xgettext.<br>
+XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=g_dngettext:2,3<br>
+<br>
+# This is the copyright holder that gets inserted into the header of the<br>
+# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding<br>
+# package. (Note that the msgstr strings, extracted from the package's<br>
+# sources, belong to the copyright holder of the package.) Translators are<br>
+# expected to transfer the copyright for their translations to this person<br>
+# or entity, or to disclaim their copyright. The empty string stands for<br>
+# the public domain; in this case the translators are expected to disclaim<br>
+# their copyright.<br>
+COPYRIGHT_HOLDER = The ModemManager developers.<br>
+<br>
+# This tells whether or not to prepend "GNU " prefix to the package<br>
+# name that gets inserted into the header of the $(DOMAIN).pot file.<br>
+# Possible values are "yes", "no", or empty. If it is empty, try to<br>
+# detect it automatically by scanning the files in $(top_srcdir) for<br>
+# "GNU packagename" string.<br>
+PACKAGE_GNU = no<br>
+<br>
+# This is the email address or URL to which the translators shall report<br>
+# bugs in the untranslated strings:<br>
+# - Strings which are not entire sentences, see the maintainer guidelines<br>
+# in the GNU gettext documentation, section 'Preparing Strings'.<br>
+# - Strings which use unclear terms or require additional context to be<br>
+# understood.<br>
+# - Strings which make invalid assumptions about notation of date, time or<br>
+# money.<br>
+# - Pluralisation problems.<br>
+# - Incorrect English spelling.<br>
+# - Incorrect formatting.<br>
+# It can be your email address, or a mailing list address where translators<br>
+# can write to without being subscribed, or the URL of a web page through<br>
+# which the translators can contact you.<br>
+MSGID_BUGS_ADDRESS = <a href="mailto:modemmanager-devel@lists.freedesktop.org" target="_blank">modemmanager-devel@lists.freedesktop.org</a><br>
+<br>
+# This is the list of locale categories, beyond LC_MESSAGES, for which the<br>
+# message catalogs shall be used. It is usually empty.<br>
+EXTRA_LOCALE_CATEGORIES =<br>
+<br>
+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'<br>
+# context. Possible values are "yes" and "no". Set this to yes if the<br>
+# package uses functions taking also a message context, like pgettext(), or<br>
+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.<br>
+USE_MSGCTXT = no<br>
+<br>
+# These options get passed to msgmerge.<br>
+# Useful options are in particular:<br>
+# --previous to keep previous msgids of translated messages,<br>
+# --quiet to reduce the verbosity.<br>
+MSGMERGE_OPTIONS =<br>
+<br>
+# These options get passed to msginit.<br>
+# If you want to disable line wrapping when writing PO files, add<br>
+# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and<br>
+# MSGINIT_OPTIONS.<br>
+MSGINIT_OPTIONS =<br>
+<br>
+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot<br>
+# has changed. Possible values are "yes" and "no". Set this to no if<br>
+# the POT file is checked in the repository and the version control<br>
+# program ignores timestamps.<br>
+PO_DEPENDS_ON_POT = yes<br>
+<br>
+# This tells whether or not to forcibly update $(DOMAIN).pot and<br>
+# regenerate PO files on "make dist". Possible values are "yes" and<br>
+# "no". Set this to no if the POT file and PO files are maintained<br>
+# externally.<br>
+DIST_DEPENDS_ON_UPDATE_PO = yes<br>
diff --git a/po/POTFILES.in b/po/POTFILES.in<br>
index 330da0fa..11602895 100644<br>
--- a/po/POTFILES.in<br>
+++ b/po/POTFILES.in<br>
@@ -1,5 +1,5 @@<br>
-[encoding: UTF-8]<br>
# List of source files containing translatable strings.<br>
# Please keep this file sorted alphabetically.<br>
data/<a href="http://org.freedesktop.ModemManager1.policy.in.in" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in</a><br>
+data/org.freedesktop.ModemManager1.policy.pot<br>
src/mm-sleep-monitor.c<br>
diff --git a/po/de.po b/po/de.po<br>
index d11e4fe5..33f3b445 100644<br>
--- a/po/de.po<br>
+++ b/po/de.po<br>
@@ -7,8 +7,8 @@<br>
msgid ""<br>
msgstr ""<br>
"Project-Id-Version: ModemManager\n"<br>
-"Report-Msgid-Bugs-To: \n"<br>
-"POT-Creation-Date: 2014-01-06 21:12+0100\n"<br>
+"Report-Msgid-Bugs-To: <a href="mailto:modemmanager-devel@lists.freedesktop.org" target="_blank">modemmanager-devel@lists.freedesktop.org</a>\n"<br>
+"POT-Creation-Date: 2017-08-28 13:49+0200\n"<br>
"PO-Revision-Date: 2014-01-06 21:23+0100\n"<br>
"Last-Translator: Mario Blättermann <<a href="mailto:mario.blaettermann@gmail.com" target="_blank">mario.blaettermann@gmail.com</a>>\n"<br>
"Language-Team: German <<a href="mailto:debian-l10n-german@lists.debian.org" target="_blank">debian-l10n-german@lists.debian.org</a>>\n"<br>
@@ -18,65 +18,103 @@ msgstr ""<br>
"Content-Transfer-Encoding: 8bit\n"<br>
"X-Generator: Poedit 1.5.4\n"<br>
<br>
-#: ../data/org.freedesktop.ModemManager1.policy.in.in.h:1<br>
+#. (itstool) path: action/description<br>
+#: data/<a href="http://org.freedesktop.ModemManager1.policy.in.in:18" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:18</a><br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:18" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:18</a><br>
msgid "Control the Modem Manager daemon"<br>
msgstr "Den Modem-Manager-Daemon steuern"<br>
<br>
-#: ../data/org.freedesktop.ModemManager1.policy.in.in.h:2<br>
+#. (itstool) path: action/message<br>
+#: data/<a href="http://org.freedesktop.ModemManager1.policy.in.in:19" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:19</a><br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:19" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:19</a><br>
msgid "System policy prevents controlling the Modem Manager."<br>
msgstr "Die Systemrichtlinien verhindern die Steuerung von ModemManager."<br>
<br>
-#: ../data/org.freedesktop.ModemManager1.policy.in.in.h:3<br>
+#. (itstool) path: action/description<br>
+#: data/<a href="http://org.freedesktop.ModemManager1.policy.in.in:27" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:27</a><br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:27" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:27</a><br>
msgid "Unlock and control a mobile broadband device"<br>
msgstr "Ein mobiles Breitbandgerät entsperren und steuern"<br>
<br>
-#: ../data/org.freedesktop.ModemManager1.policy.in.in.h:4<br>
+#. (itstool) path: action/message<br>
+#: data/<a href="http://org.freedesktop.ModemManager1.policy.in.in:28" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:28</a><br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:28" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:28</a><br>
msgid ""<br>
"System policy prevents unlocking or controlling the mobile broadband device."<br>
msgstr ""<br>
"Die Systemrichtlinien verhindern das Entsperren oder Steuern des mobilen "<br>
"Breitbandgerätes."<br>
<br>
-#: ../data/org.freedesktop.ModemManager1.policy.in.in.h:5<br>
+#. (itstool) path: action/description<br>
+#: data/<a href="http://org.freedesktop.ModemManager1.policy.in.in:36" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:36</a><br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:36" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:36</a><br>
msgid "Add, modify, and delete mobile broadband contacts"<br>
msgstr "Kontakte für mobiles Breitband hinzufügen, ändern und löschen"<br>
<br>
-#: ../data/org.freedesktop.ModemManager1.policy.in.in.h:6<br>
+#. (itstool) path: action/message<br>
+#: data/<a href="http://org.freedesktop.ModemManager1.policy.in.in:37" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:37</a><br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:37" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:37</a><br>
msgid ""<br>
"System policy prevents adding, modifying, or deleting this device's contacts."<br>
msgstr ""<br>
"Die Systemrichtlinien verhindern das Hinzufügen, Ändern oder Löschen der "<br>
"Kontakte dieses Gerätes."<br>
<br>
-#: ../data/org.freedesktop.ModemManager1.policy.in.in.h:7<br>
+#. (itstool) path: action/description<br>
+#: data/<a href="http://org.freedesktop.ModemManager1.policy.in.in:45" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:45</a><br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:45" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:45</a><br>
msgid "Send, save, modify, and delete text messages"<br>
msgstr "Textnachrichten senden, speichern, bearbeiten und löschen"<br>
<br>
-#: ../data/org.freedesktop.ModemManager1.policy.in.in.h:8<br>
+#. (itstool) path: action/message<br>
+#: data/<a href="http://org.freedesktop.ModemManager1.policy.in.in:46" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:46</a><br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:46" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:46</a><br>
+#, fuzzy<br>
msgid ""<br>
-"System policy prevents sending or maniuplating this device's text messages."<br>
+"System policy prevents sending or manipulating this device's text messages."<br>
msgstr ""<br>
"Die Systemrichtlinien verhindern das Senden oder Bearbeiten der "<br>
"Textnachrichten dieses Gerätes."<br>
<br>
-#: ../data/org.freedesktop.ModemManager1.policy.in.in.h:9<br>
+#. (itstool) path: action/description<br>
+#: data/<a href="http://org.freedesktop.ModemManager1.policy.in.in:54" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:54</a><br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:54" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:54</a><br>
+msgid "Accept incoming voice calls or start outgoing voice calls."<br>
+msgstr ""<br>
+<br>
+#. (itstool) path: action/message<br>
+#: data/<a href="http://org.freedesktop.ModemManager1.policy.in.in:55" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:55</a><br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:55" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:55</a><br>
+#, fuzzy<br>
+msgid "System policy prevents voice calls."<br>
+msgstr "Die Systemrichtlinien verhindern die Steuerung von ModemManager."<br>
+<br>
+#. (itstool) path: action/description<br>
+#: data/<a href="http://org.freedesktop.ModemManager1.policy.in.in:63" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:63</a><br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:63" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:63</a><br>
msgid "Enable and view geographic location and positioning information"<br>
msgstr ""<br>
"Informationen zum geografischen Standort und Positionierung aktivieren und "<br>
"anzeigen"<br>
<br>
-#: ../data/org.freedesktop.ModemManager1.policy.in.in.h:10<br>
+#. (itstool) path: action/message<br>
+#: data/<a href="http://org.freedesktop.ModemManager1.policy.in.in:64" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:64</a><br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:64" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:64</a><br>
msgid ""<br>
"System policy prevents enabling or viewing geographic location information."<br>
msgstr ""<br>
"Die Systemrichtlinien verhindern das Aktivieren oder Ändern der "<br>
"Informationen zum geografischen Standort."<br>
<br>
-#: ../data/org.freedesktop.ModemManager1.policy.in.in.h:11<br>
+#. (itstool) path: action/description<br>
+#: data/<a href="http://org.freedesktop.ModemManager1.policy.in.in:72" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:72</a><br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:72" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:72</a><br>
msgid "Query and utilize network information and services"<br>
msgstr "Netzwerkinformationen und -dienste abfragen und nutzen"<br>
<br>
-#: ../data/org.freedesktop.ModemManager1.policy.in.in.h:12<br>
+#. (itstool) path: action/message<br>
+#: data/<a href="http://org.freedesktop.ModemManager1.policy.in.in:73" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:73</a><br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:73" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:73</a><br>
msgid ""<br>
"System policy prevents querying or utilizing network information and "<br>
"services."<br>
@@ -84,12 +122,20 @@ msgstr ""<br>
"Die Systemrichtlinien verhindern die Abfrage der Netzwerkinformationen und -"<br>
"dienste."<br>
<br>
-#: ../data/org.freedesktop.ModemManager1.policy.in.in.h:13<br>
+#. (itstool) path: action/description<br>
+#: data/<a href="http://org.freedesktop.ModemManager1.policy.in.in:81" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:81</a><br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:81" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:81</a><br>
msgid "Query and manage firmware on a mobile broadband device"<br>
msgstr "Firmware auf mobilen Breitbandgeräten abfragen und verwalten"<br>
<br>
-#: ../data/org.freedesktop.ModemManager1.policy.in.in.h:14<br>
+#. (itstool) path: action/message<br>
+#: data/<a href="http://org.freedesktop.ModemManager1.policy.in.in:82" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:82</a><br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:82" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:82</a><br>
msgid "System policy prevents querying or managing this device's firmware."<br>
msgstr ""<br>
"Die Systemrichtlinien verhindern die Abfrage oder Verwaltung der Firmware "<br>
"dieses Gerätes."<br>
+<br>
+#: src/mm-sleep-monitor.c:114<br>
+msgid "ModemManager needs to reset devices"<br>
+msgstr ""<br>
diff --git a/po/uk.po b/po/uk.po<br>
index b4c8c5d8..8a19c512 100644<br>
--- a/po/uk.po<br>
+++ b/po/uk.po<br>
@@ -6,8 +6,8 @@<br>
msgid ""<br>
msgstr ""<br>
"Project-Id-Version: Modem Manager\n"<br>
-"Report-Msgid-Bugs-To: \n"<br>
-"POT-Creation-Date: 2013-10-19 18:13+0300\n"<br>
+"Report-Msgid-Bugs-To: <a href="mailto:modemmanager-devel@lists.freedesktop.org" target="_blank">modemmanager-devel@lists.freedesktop.org</a>\n"<br>
+"POT-Creation-Date: 2017-08-28 13:49+0200\n"<br>
"PO-Revision-Date: 2013-10-19 18:17+0300\n"<br>
"Last-Translator: Yuri Chornoivan <<a href="mailto:yurchor@ukr.net" target="_blank">yurchor@ukr.net</a>>\n"<br>
"Language-Team: Ukrainian <<a href="mailto:kde-i18n-uk@kde.org" target="_blank">kde-i18n-uk@kde.org</a>>\n"<br>
@@ -19,65 +19,103 @@ msgstr ""<br>
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"<br>
"X-Generator: Lokalize 1.5\n"<br>
<br>
-#: ../data/org.freedesktop.ModemManager1.policy.in.in.h:1<br>
+#. (itstool) path: action/description<br>
+#: data/<a href="http://org.freedesktop.ModemManager1.policy.in.in:18" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:18</a><br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:18" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:18</a><br>
msgid "Control the Modem Manager daemon"<br>
msgstr "Керування фоновою службою Modem Manager"<br>
<br>
-#: ../data/org.freedesktop.ModemManager1.policy.in.in.h:2<br>
+#. (itstool) path: action/message<br>
+#: data/<a href="http://org.freedesktop.ModemManager1.policy.in.in:19" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:19</a><br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:19" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:19</a><br>
msgid "System policy prevents controlling the Modem Manager."<br>
msgstr "Правила системи перешкоджають керування Modem Manager."<br>
<br>
-#: ../data/org.freedesktop.ModemManager1.policy.in.in.h:3<br>
+#. (itstool) path: action/description<br>
+#: data/<a href="http://org.freedesktop.ModemManager1.policy.in.in:27" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:27</a><br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:27" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:27</a><br>
msgid "Unlock and control a mobile broadband device"<br>
msgstr "Розблокувати пристрій мобільної широкосмугової мережі і керувати ним"<br>
<br>
-#: ../data/org.freedesktop.ModemManager1.policy.in.in.h:4<br>
+#. (itstool) path: action/message<br>
+#: data/<a href="http://org.freedesktop.ModemManager1.policy.in.in:28" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:28</a><br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:28" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:28</a><br>
msgid ""<br>
"System policy prevents unlocking or controlling the mobile broadband device."<br>
msgstr ""<br>
"Правила системи забороняють розблокування і керування пристроями "<br>
"широкосмугових мобільних мереж."<br>
<br>
-#: ../data/org.freedesktop.ModemManager1.policy.in.in.h:5<br>
+#. (itstool) path: action/description<br>
+#: data/<a href="http://org.freedesktop.ModemManager1.policy.in.in:36" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:36</a><br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:36" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:36</a><br>
msgid "Add, modify, and delete mobile broadband contacts"<br>
msgstr ""<br>
"Додати, внести зміни і вилучити контакти пристрою мобільних широкосмугових "<br>
"мереж"<br>
<br>
-#: ../data/org.freedesktop.ModemManager1.policy.in.in.h:6<br>
+#. (itstool) path: action/message<br>
+#: data/<a href="http://org.freedesktop.ModemManager1.policy.in.in:37" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:37</a><br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:37" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:37</a><br>
msgid ""<br>
"System policy prevents adding, modifying, or deleting this device's contacts."<br>
msgstr ""<br>
"Правила системи перешкоджають додаванню, внесенню змін та вилученню записів "<br>
"контактів на цьому пристрої."<br>
<br>
-#: ../data/org.freedesktop.ModemManager1.policy.in.in.h:7<br>
+#. (itstool) path: action/description<br>
+#: data/<a href="http://org.freedesktop.ModemManager1.policy.in.in:45" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:45</a><br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:45" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:45</a><br>
msgid "Send, save, modify, and delete text messages"<br>
msgstr "Надіслати, зберегти, внести зміни або вилучити текстові повідомлення"<br>
<br>
-#: ../data/org.freedesktop.ModemManager1.policy.in.in.h:8<br>
+#. (itstool) path: action/message<br>
+#: data/<a href="http://org.freedesktop.ModemManager1.policy.in.in:46" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:46</a><br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:46" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:46</a><br>
+#, fuzzy<br>
msgid ""<br>
-"System policy prevents sending or maniuplating this device's text messages."<br>
+"System policy prevents sending or manipulating this device's text messages."<br>
msgstr ""<br>
"Правила системи забороняють надсилання або керування текстовими "<br>
"повідомленнями цього пристрою."<br>
<br>
-#: ../data/org.freedesktop.ModemManager1.policy.in.in.h:9<br>
+#. (itstool) path: action/description<br>
+#: data/<a href="http://org.freedesktop.ModemManager1.policy.in.in:54" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:54</a><br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:54" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:54</a><br>
+msgid "Accept incoming voice calls or start outgoing voice calls."<br>
+msgstr ""<br>
+<br>
+#. (itstool) path: action/message<br>
+#: data/<a href="http://org.freedesktop.ModemManager1.policy.in.in:55" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:55</a><br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:55" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:55</a><br>
+#, fuzzy<br>
+msgid "System policy prevents voice calls."<br>
+msgstr "Правила системи перешкоджають керування Modem Manager."<br>
+<br>
+#. (itstool) path: action/description<br>
+#: data/<a href="http://org.freedesktop.ModemManager1.policy.in.in:63" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:63</a><br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:63" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:63</a><br>
msgid "Enable and view geographic location and positioning information"<br>
msgstr ""<br>
"Увімкнути або переглянути дані щодо географічного розташування і позиціювання"<br>
<br>
-#: ../data/org.freedesktop.ModemManager1.policy.in.in.h:10<br>
+#. (itstool) path: action/message<br>
+#: data/<a href="http://org.freedesktop.ModemManager1.policy.in.in:64" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:64</a><br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:64" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:64</a><br>
msgid ""<br>
"System policy prevents enabling or viewing geographic location information."<br>
msgstr ""<br>
"Правила системи забороняють вмикання або перегляд даних щодо розташування."<br>
<br>
-#: ../data/org.freedesktop.ModemManager1.policy.in.in.h:11<br>
+#. (itstool) path: action/description<br>
+#: data/<a href="http://org.freedesktop.ModemManager1.policy.in.in:72" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:72</a><br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:72" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:72</a><br>
msgid "Query and utilize network information and services"<br>
msgstr "Надіслати запит і використати дані щодо мережі і служби"<br>
<br>
-#: ../data/org.freedesktop.ModemManager1.policy.in.in.h:12<br>
+#. (itstool) path: action/message<br>
+#: data/<a href="http://org.freedesktop.ModemManager1.policy.in.in:73" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:73</a><br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:73" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:73</a><br>
msgid ""<br>
"System policy prevents querying or utilizing network information and "<br>
"services."<br>
@@ -85,14 +123,22 @@ msgstr ""<br>
"Правила системи забороняють надсилання запитів і використання даних щодо "<br>
"мережі і служб."<br>
<br>
-#: ../data/org.freedesktop.ModemManager1.policy.in.in.h:13<br>
+#. (itstool) path: action/description<br>
+#: data/<a href="http://org.freedesktop.ModemManager1.policy.in.in:81" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:81</a><br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:81" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:81</a><br>
msgid "Query and manage firmware on a mobile broadband device"<br>
msgstr ""<br>
"Опитування та керування мікропрограмою на пристрої мобільної широкосмугової "<br>
"мережі"<br>
<br>
-#: ../data/org.freedesktop.ModemManager1.policy.in.in.h:14<br>
+#. (itstool) path: action/message<br>
+#: data/<a href="http://org.freedesktop.ModemManager1.policy.in.in:82" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:82</a><br>
+#: <a href="http://org.freedesktop.ModemManager1.policy.in.in:82" rel="noreferrer" target="_blank">org.freedesktop.ModemManager1.policy.in.in:82</a><br>
msgid "System policy prevents querying or managing this device's firmware."<br>
msgstr ""<br>
"Правила системи перешкоджають опитуванню або керування мікропрограмою цього "<br>
"пристрою."<br>
+<br>
+#: src/mm-sleep-monitor.c:114<br>
+msgid "ModemManager needs to reset devices"<br>
+msgstr ""<br>
--<br>
2.14.1<br>
</blockquote></div></div>