Hi,
the changes in r3817 were unfortunately incorrect and cause "make
distcheck" to fail. Instead of adding
vpn-daemons/openvpn/properties/auth-helpers.c to po/POTFILES.in, it has
to be added to po/POTFILES.skip. I also cleaned up the latter file from
2 files, which either no longer exist or don't have any translations.
To preserve the changes to the Norwegian translation, I moved them from
po/nb.po to vpn-daemons/openvpn/po/nb.po.
Please apply.
Cheers,
Michael
--
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?
Index: po/POTFILES.skip
===
--- po/POTFILES.skip (Revision 3817)
+++ po/POTFILES.skip (Arbeitskopie)
@@ -3,6 +3,7 @@
vpn-daemons/openvpn/auth-dialog/gnome-two-password-dialog.c
vpn-daemons/openvpn/auth-dialog/main.c
vpn-daemons/openvpn/nm-openvpn.desktop.in
+vpn-daemons/openvpn/properties/auth-helpers.c
vpn-daemons/openvpn/properties/nm-openvpn-dialog.glade
vpn-daemons/openvpn/properties/nm-openvpn.c
vpn-daemons/openvpn/src/nm-openvpn-service.c
@@ -21,6 +22,4 @@
vpn-daemons/vpnc/nm-vpnc.desktop.in
vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade
vpn-daemons/vpnc/properties/nm-vpnc.c
-vpn-daemons/vpnc/src/nm-utils.c
-vpn-daemons/vpnc/src/nm-vpnc-service-vpnc-helper.c
vpn-daemons/vpnc/src/nm-vpnc-service.c
Index: po/POTFILES.in
===
--- po/POTFILES.in (Revision 3817)
+++ po/POTFILES.in (Arbeitskopie)
@@ -10,4 +10,3 @@
libnm-util/crypto.c
libnm-util/crypto_gnutls.c
libnm-util/crypto_nss.c
-vpn-daemons/openvpn/properties/auth-helpers.c
Index: po/nb.po
===
--- po/nb.po (Revision 3817)
+++ po/nb.po (Arbeitskopie)
@@ -257,36 +257,3 @@
#, c-format
msgid "Couldn't decode certificate: %d"
msgstr "Kunne ikke dekode sertifikat: %d"
-
-#: ../vpn-daemons/openvpn/properties/auth-helpers.c:68
-msgid "Choose a Certificate Authority certificate..."
-msgstr ""
-
-#: ../vpn-daemons/openvpn/properties/auth-helpers.c:87
-msgid "Choose your personal certificate..."
-msgstr ""
-
-#: ../vpn-daemons/openvpn/properties/auth-helpers.c:105
-msgid "Choose your private key..."
-msgstr "Velg din private nøkkel..."
-
-#: ../vpn-daemons/openvpn/properties/auth-helpers.c:158
-msgid "Choose an OpenVPN static key..."
-msgstr "Velg en statisk nøkkel for OpenVPN..."
-
-#: ../vpn-daemons/openvpn/properties/auth-helpers.c:176
-#: ../vpn-daemons/openvpn/properties/auth-helpers.c:864
-msgid "None"
-msgstr "Ingen"
-
-#: ../vpn-daemons/openvpn/properties/auth-helpers.c:519
-msgid "PEM certificates (*.pem, *.crt, *.key)"
-msgstr "PEM-sertifikater (*.pem, *.crt, *.key)"
-
-#: ../vpn-daemons/openvpn/properties/auth-helpers.c:579
-msgid "OpenVPN Static Keys (*.key)"
-msgstr "Statisk nøkkel for OpenVPN (*.key)"
-
-#: ../vpn-daemons/openvpn/properties/auth-helpers.c:703
-msgid "Default"
-msgstr "Forvalg"
Index: vpn-daemons/openvpn/po/nb.po
===
--- vpn-daemons/openvpn/po/nb.po (Revision 3817)
+++ vpn-daemons/openvpn/po/nb.po (Arbeitskopie)
@@ -418,3 +418,36 @@
#: ../properties/nm-openvpn-dialog.glade.h:37
msgid "_none"
msgstr "i_ngen"
+
+#: ../properties/auth-helpers.c:68
+msgid "Choose a Certificate Authority certificate..."
+msgstr ""
+
+#: ../properties/auth-helpers.c:87
+msgid "Choose your personal certificate..."
+msgstr ""
+
+#: ../properties/auth-helpers.c:105
+msgid "Choose your private key..."
+msgstr "Velg din private nøkkel..."
+
+#: ../properties/auth-helpers.c:158
+msgid "Choose an OpenVPN static key..."
+msgstr "Velg en statisk nøkkel for OpenVPN..."
+
+#: ../properties/auth-helpers.c:176
+#: ../properties/auth-helpers.c:864
+msgid "None"
+msgstr "Ingen"
+
+#: ../properties/auth-helpers.c:519
+msgid "PEM certificates (*.pem, *.crt, *.key)"
+msgstr "PEM-sertifikater (*.pem, *.crt, *.key)"
+
+#: ../properties/auth-helpers.c:579
+msgid "OpenVPN Static Keys (*.key)"
+msgstr "Statisk nøkkel for OpenVPN (*.key)"
+
+#: ../properties/auth-helpers.c:703
+msgid "Default"
+msgstr "Forvalg"
signature.asc
Description: OpenPGP digital signature
___
NetworkManager-list mailing list
NetworkManager-list@gnome.org
http://mail.gnome.org/mailman/listinfo/networkmanager-list
