From 3d4cdb793d94b780173bafb0a4634de05f23f6a1 Mon Sep 17 00:00:00 2001 From: Francesco Giudici Date: Fri, 12 Oct 2018 11:58:06 +0200 Subject: [PATCH] Update to 1.2.10 release - rebase on upstream 1.2.10 release - import latest translations --- .gitignore | 1 + ...ranslations-from-Red-Hat-translators.patch | 4082 ++++++++ NetworkManager-libreswan-1.2.6-ikev2.patch | 8616 ----------------- NetworkManager-libreswan.spec | 39 +- sources | 2 +- 5 files changed, 4113 insertions(+), 8627 deletions(-) create mode 100644 0001-po-import-translations-from-Red-Hat-translators.patch delete mode 100644 NetworkManager-libreswan-1.2.6-ikev2.patch diff --git a/.gitignore b/.gitignore index 0d6925f..5a40371 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ NetworkManager-openswan-0.8.tar.gz /NetworkManager-libreswan-1.2.2.tar.xz /NetworkManager-libreswan-1.2.4.tar.xz /NetworkManager-libreswan-1.2.6.tar.xz +/NetworkManager-libreswan-1.2.10.tar.xz diff --git a/0001-po-import-translations-from-Red-Hat-translators.patch b/0001-po-import-translations-from-Red-Hat-translators.patch new file mode 100644 index 0000000..6e3e679 --- /dev/null +++ b/0001-po-import-translations-from-Red-Hat-translators.patch @@ -0,0 +1,4082 @@ +From a5f91fcc1622306a630177ad8dc18c00217ce6c1 Mon Sep 17 00:00:00 2001 +From: Lubomir Rintel +Date: Tue, 16 Oct 2018 15:00:37 +0200 +Subject: [PATCH] po: import translations from Red Hat translators + +--- + po/de.po | 9 +- + po/es.po | 322 +++++++++++++++++----------------- + po/fr.po | 458 +++++++++++++++++++++++++++++++++++------------- + po/it.po | 186 +++++++++++++++----- + po/ja.po | 262 ++++++++++++++++++++++------ + po/ko.po | 489 ++++++++++++++++++++++++++++++---------------------- + po/pt_BR.po | 56 ++---- + po/ru.po | 454 ++++++++++++++++++++++++++++++++++-------------- + po/zh_CN.po | 459 +++++++++++++++++++++++++++++++----------------- + po/zh_TW.po | 475 ++++++++++++++++++++++++++++++-------------------- + 10 files changed, 2064 insertions(+), 1106 deletions(-) + +diff --git a/po/de.po b/po/de.po +index 69f98a7..3ca9323 100644 +--- a/po/de.po ++++ b/po/de.po +@@ -5,13 +5,13 @@ + # Mario Blättermann , 2008, 2016, 2018. + # Christian Kirbach , 2013. + # Wolfgang Stöggl , 2013, 2016. +-# ++# ljanda , 2018. #zanata ++# lrintel , 2018. #zanata + msgid "" + msgstr "" + "Project-Id-Version: NetworkManager Libreswan\n" +-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/NetworkManager-" +-"libreswan/issues\n" +-"POT-Creation-Date: 2018-10-09 07:59+0000\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2018-10-16 15:10+0200\n" + "PO-Revision-Date: 2018-10-12 19:23+0200\n" + "Last-Translator: Christian Kirbach \n" + "Language-Team: de \n" +@@ -20,6 +20,7 @@ msgstr "" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "X-Generator: Poedit 2.2\n" ++"Plural-Forms: nplurals=2; plural=(n != 1)\n" + + #: ../appdata/network-manager-libreswan.metainfo.xml.in.h:1 + msgid "IPsec VPN client" +diff --git a/po/es.po b/po/es.po +index 635a46d..7a317e7 100644 +--- a/po/es.po ++++ b/po/es.po +@@ -10,22 +10,22 @@ + # Pablo Iranzo Gómez , 2000. + # Jorge González , 2007, 2008. + # Daniel Mustieles , 2012, 2014, 2015, 2016, 2017. +-# ++# ljanda , 2018. #zanata ++# lrintel , 2018. #zanata + msgid "" + msgstr "" +-"Project-Id-Version: NetworkManager-vpnc.HEAD\n" +-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" +-"product=NetworkManager&keywords=I18N+L10N&component=VPN: libreswan\n" +-"POT-Creation-Date: 2017-10-31 08:58+0000\n" +-"PO-Revision-Date: 2017-12-14 13:27+0100\n" +-"Last-Translator: Daniel Mustieles \n" ++"Project-Id-Version: PACKAGE VERSION\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2018-10-16 15:10+0200\n" ++"PO-Revision-Date: 2018-08-20 09:48+0000\n" ++"Last-Translator: Copied by Zanata \n" + "Language-Team: es \n" + "Language: es\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=2; plural=(n != 1);\n" +-"X-Generator: Gtranslator 2.91.6\n" ++"X-Generator: Zanata 4.6.2\n" + + #: ../appdata/network-manager-libreswan.metainfo.xml.in.h:1 + msgid "IPsec VPN client" +@@ -83,30 +83,30 @@ msgid "IPsec based VPN" + msgstr "VPN basada en IPsec" + + #: ../properties/nm-libreswan-editor-plugin.c:44 +-msgid "IPsec based VPN using IKEv1" +-msgstr "VPN basada en IPsec usando IKEv1" ++msgid "IPsec based VPN for remote clients" ++msgstr "" + +-#: ../properties/nm-libreswan-editor-plugin.c:80 +-#: ../properties/nm-libreswan-editor-plugin.c:158 ++#: ../properties/nm-libreswan-editor-plugin.c:98 ++#: ../properties/nm-libreswan-editor-plugin.c:276 + #, c-format + msgid "Can’t open file “%s”: %s" + msgstr "No se puede abrir el archivo «%s»: %s" + +-#: ../properties/nm-libreswan-editor-plugin.c:135 ++#: ../properties/nm-libreswan-editor-plugin.c:228 + #, c-format + msgid "Missing “conn” section in “%s”" + msgstr "Falta la sección «conn» en «%s»" + +-#: ../properties/nm-libreswan-editor-plugin.c:176 ++#: ../properties/nm-libreswan-editor-plugin.c:294 + #, c-format + msgid "Error writing to file “%s”: %s" + msgstr "Error al escribir en el archivo «%s»: %s" + +-#: ../src/nm-libreswan-service.c:1452 ++#: ../src/nm-libreswan-service.c:1464 + msgid "A password is required." + msgstr "Se requiere una contraseña." + +-#: ../src/nm-libreswan-service.c:1836 ++#: ../src/nm-libreswan-service.c:1874 + msgid "" + "Could not process the request because the VPN connection settings were " + "invalid." +@@ -114,45 +114,45 @@ msgstr "" + "No se pudo procesar la solicitud porque la configuración de la conexión VPN " + "no es válida." + +-#: ../src/nm-libreswan-service.c:1850 ++#: ../src/nm-libreswan-service.c:1888 + msgid "Unhandled pending authentication." + msgstr "Autenticación pendiente no manejada." + +-#: ../src/nm-libreswan-service.c:1992 ++#: ../src/nm-libreswan-service.c:2030 + msgid "Don’t quit when VPN connection terminates" + msgstr "No salir cuando termine la conexión VPN" + +-#: ../src/nm-libreswan-service.c:1993 ++#: ../src/nm-libreswan-service.c:2031 + msgid "Enable verbose debug logging (may expose passwords)" + msgstr "Activar el registro detallado del depurado (puede mostrar contraseñas)" + +-#: ../src/nm-libreswan-service.c:1994 ++#: ../src/nm-libreswan-service.c:2032 + msgid "D-Bus name to use for this instance" + msgstr "Nombre D-Bus que usar para esta instancia" + +-#: ../src/nm-libreswan-service.c:2017 ++#: ../src/nm-libreswan-service.c:2055 + msgid "" + "This service provides integrated IPsec VPN capability to NetworkManager." + msgstr "" + "Este servicio proporciona la capacidad de integrar VPN IPsec en " + "NetworkManager." + +-#: ../shared/utils.c:85 ++#: ../shared/utils.c:86 + #, c-format + msgid "Error writing config: %s" + msgstr "Error al escribir la configuración: %s" + +-#: ../shared/nm-utils/nm-shared-utils.c:312 ++#: ../shared/nm-utils/nm-shared-utils.c:1087 + #, c-format + msgid "object class '%s' has no property named '%s'" + msgstr "la clase del objeto «%s» no tiene ninguna propiedad llamada «%s»" + +-#: ../shared/nm-utils/nm-shared-utils.c:319 ++#: ../shared/nm-utils/nm-shared-utils.c:1094 + #, c-format + msgid "property '%s' of object class '%s' is not writable" + msgstr "la propiedad «%s» del objeto de la clase «%s» no se puede escribir" + +-#: ../shared/nm-utils/nm-shared-utils.c:326 ++#: ../shared/nm-utils/nm-shared-utils.c:1101 + #, c-format + msgid "" + "construct property \"%s\" for object '%s' can't be set after construction" +@@ -160,21 +160,21 @@ msgstr "" + "no se puede establecer la propiedad «%s» del constructor para el objeto «%s» " + "después de la construcción" + +-#: ../shared/nm-utils/nm-shared-utils.c:334 ++#: ../shared/nm-utils/nm-shared-utils.c:1109 + #, c-format + msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" + msgstr "" + "«%s::%s» no es un nombre de propiedad válido; «%s» no es un subtipo de " + "GObject" + +-#: ../shared/nm-utils/nm-shared-utils.c:343 ++#: ../shared/nm-utils/nm-shared-utils.c:1118 + #, c-format + msgid "unable to set property '%s' of type '%s' from value of type '%s'" + msgstr "" + "no se puede establecer la propiedad «%s» de tipo «%s» con un valor de tipo " + "«%s»" + +-#: ../shared/nm-utils/nm-shared-utils.c:354 ++#: ../shared/nm-utils/nm-shared-utils.c:1129 + #, c-format + msgid "" + "value \"%s\" of type '%s' is invalid or out of range for property '%s' of " +@@ -203,185 +203,199 @@ msgid "unknown error creating editor instance" + msgstr "error desconocido al crear la instancia del editor" + + #: ../properties/nm-libreswan-dialog.ui.h:1 +-msgid "General" +-msgstr "General" ++msgid "IKEv1 (XAUTH)" ++msgstr "" + + #: ../properties/nm-libreswan-dialog.ui.h:2 +-msgid "_Gateway:" +-msgstr "_Pasarela:" ++msgid "IKEv2 (Certificate)" ++msgstr "" + + #: ../properties/nm-libreswan-dialog.ui.h:3 +-msgid "Show passwords" +-msgstr "Mostrar contraseñas" ++msgid "General" ++msgstr "General" + + #: ../properties/nm-libreswan-dialog.ui.h:4 +-msgid "_Secret:" +-msgstr "_Secreto:" ++msgid "_Gateway:" ++msgstr "_Pasarela:" + + #: ../properties/nm-libreswan-dialog.ui.h:5 +-msgid "_User password:" +-msgstr "Contraseña del _usuario:" ++msgid "Authentication" ++msgstr "Autenticación" + +-# clients/lan_dns.ycp:280 +-# clients/lan_dns.ycp:269 +-# include/users/ui.ycp:1021 + #: ../properties/nm-libreswan-dialog.ui.h:6 +-msgid "G_roup name:" +-msgstr "Nombre del g_rupo:" ++msgid "Type:" ++msgstr "Teclear:" + + #: ../properties/nm-libreswan-dialog.ui.h:7 + msgid "User name:" + msgstr "Nombre de usuario:" + + #: ../properties/nm-libreswan-dialog.ui.h:8 +-msgid "Phase2 Algorithms:" +-msgstr "Algoritmos de fase 2:" ++msgid "_User password:" ++msgstr "Contraseña del _usuario:" + ++# clients/lan_dns.ycp:280 ++# clients/lan_dns.ycp:269 ++# include/users/ui.ycp:1021 + #: ../properties/nm-libreswan-dialog.ui.h:9 +-msgid "Domain:" +-msgstr "Dominio:" ++msgid "G_roup name:" ++msgstr "Nombre del g_rupo:" + + #: ../properties/nm-libreswan-dialog.ui.h:10 +-msgid "Phase1 Algorithms:" +-msgstr "Algoritmos de fase 1:" ++msgid "_Secret:" ++msgstr "_Secreto:" + + #: ../properties/nm-libreswan-dialog.ui.h:11 +-#| msgid "Phase1 Algorithms:" +-msgid "Phase1 Lifetime:" +-msgstr "Tiempo de vida de la fase 1:" ++msgid "Show passwords" ++msgstr "Mostrar contraseñas" + + #: ../properties/nm-libreswan-dialog.ui.h:12 +-#| msgid "Phase2 Algorithms:" +-msgid "Phase2 Lifetime:" +-msgstr "Tiempo de vida de la fase 2:" ++msgid "_Certificate name:" ++msgstr "" + + #: ../properties/nm-libreswan-dialog.ui.h:13 +-#| msgid "Network" +-msgid "Remote Network:" +-msgstr "Red remota:" ++msgid "_Remote ID:" ++msgstr "" + + #: ../properties/nm-libreswan-dialog.ui.h:14 +-msgid "Ad_vanced" ++#, fuzzy ++msgid "Ad_vanced…" + msgstr "A_vanzado" + +-#~ msgid " " +-#~ msgstr " " +- +-#~ msgid "Request VPN authentication" +-#~ msgstr "Solicitar autenticación VPN" +- +-#~ msgid "IPsec, IKEv1, IKEv2 based VPN" +-#~ msgstr "VPN basada en IPsec, IKEv1, IKEv2" +- +-#~ msgid "Saved" +-#~ msgstr "Guardado" +- +-#~ msgid "Always Ask" +-#~ msgstr "Preguntar siempre" +- +-#~ msgid "Not Required" +-#~ msgstr "No requerido" +- +-#~ msgid "Gro_up password:" +-#~ msgstr "Contraseña del gr_upo:" ++#: ../properties/nm-libreswan-dialog.ui.h:15 ++msgid "no" ++msgstr "" + +-#~ msgid "Optional" +-#~ msgstr "Opcional" ++#: ../properties/nm-libreswan-dialog.ui.h:16 ++msgid "yes" ++msgstr "" + +-# include/network/modem/dialogs.ycp:400 +-#~ msgid "IPsec Based VPN Connection Manager (libreswan)" +-#~ msgstr "Gestor de conexiones VPNbasado en IPsec (libreswan)" ++#: ../properties/nm-libreswan-dialog.ui.h:17 ++msgid "force" ++msgstr "" + +-#~ msgid "Add, Remove, and Edit VPN Connections" +-#~ msgstr "Añadir, eliminar y editar conexiones VPN" ++#: ../properties/nm-libreswan-dialog.ui.h:18 ++msgid "IPsec Advanced Options" ++msgstr "" + +-#~ msgid "_Secondary Password:" +-#~ msgstr "Contraseña _secundaria:" ++#: ../properties/nm-libreswan-dialog.ui.h:19 ++#, fuzzy ++msgid "Identification" ++msgstr "Autenticación" + +-#~ msgid "_Password:" +-#~ msgstr "_Contraseña:" ++#: ../properties/nm-libreswan-dialog.ui.h:20 ++msgid "Domain:" ++msgstr "Dominio:" + +-#~ msgid "Sh_ow passwords" +-#~ msgstr "M_ostrar contraseñas" ++#: ../properties/nm-libreswan-dialog.ui.h:21 ++msgid "" ++"(NT-)Domain name for authentication.\n" ++"config: Domain " ++msgstr "" + +-# include/partitioning/custom_part_dialogs.ycp:67 +-# include/partitioning/custom_part_dialogs.ycp:67 +-# include/partitioning/custom_part_dialogs.ycp:67 include/partitioning/custom_part_dialogs.ycp:197 +-#~ msgid "_Remember passwords for this session" +-#~ msgstr "_Recordar contraseñas para esta sesión" ++#: ../properties/nm-libreswan-dialog.ui.h:23 ++msgid "Security" ++msgstr "" + +-#~ msgid "_Save passwords in keyring" +-#~ msgstr "_Guardar contraseñas en el depósito de claves" ++#: ../properties/nm-libreswan-dialog.ui.h:24 ++msgid "Phase1 Algorithms:" ++msgstr "Algoritmos de fase 1:" + +-#~ msgid "Cisco Compatible VPN (vpnc)" +-#~ msgstr "Compatible con Cisco VPN (vpnc)" ++#: ../properties/nm-libreswan-dialog.ui.h:25 ++msgid "" ++"IKE encryption/authentication algorithm to be used for the connection (phase " ++"1 aka ISAKMP SA). The format is “cipher-hash;modpgroup, cipher-hash;" ++"modpgroup, …”.\n" ++"config: ike " ++msgstr "" + +-#~ msgid "" +-#~ "Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-" +-#~ "based VPN gateways." +-#~ msgstr "" +-#~ "Compatible con varias puertas de enlace VPN basadas en IpSec como Cisco, " +-#~ "Juniper, Netscreen y Sonicwall." ++#: ../properties/nm-libreswan-dialog.ui.h:27 ++msgid "Phase2 Algorithms:" ++msgstr "Algoritmos de fase 2:" + +-#~ msgid "Secure (default)" +-#~ msgstr "Seguro (predeterminado)" ++#: ../properties/nm-libreswan-dialog.ui.h:28 ++msgid "" ++"Specifies the algorithms that will be offered/accepted for a phase2 " ++"negotiation. The format is “cipher-hash;modpgroup, cipher-hash;modpgroup, " ++"…”.\n" ++"config: esp " ++msgstr "" + +-#~ msgid "Weak (use with caution)" +-#~ msgstr "Débil (usar con cautela)" ++#: ../properties/nm-libreswan-dialog.ui.h:30 ++msgid "Phase1 Lifetime:" ++msgstr "Tiempo de vida de la fase 1:" + +-#~ msgid "None (completely insecure)" +-#~ msgstr "Ninguno (completamente inseguro)" ++#: ../properties/nm-libreswan-dialog.ui.h:31 ++msgid "" ++"How long the keying channel of a connection should last before being " ++"renegotiated. The value is expressed by a number followed by an optional " ++"“s”(econds), “m”(inutes), “h”(ours) or “d”(ays).\n" ++"config: ikelifetime " ++msgstr "" + +-#~ msgid "Cisco UDP (default)" +-#~ msgstr "Cisco UDP (predeterminado)" ++#: ../properties/nm-libreswan-dialog.ui.h:33 ++msgid "Phase2 Lifetime:" ++msgstr "Tiempo de vida de la fase 2:" + +-#~ msgid "NAT-T" +-#~ msgstr "NAT-T" ++#: ../properties/nm-libreswan-dialog.ui.h:34 ++msgid "" ++"How long a particular instance of a connection (a set of encryption/" ++"authentication keys for user packets) should last, from successful " ++"negotiation to expiry. The value is expressed by a number followed by an " ++"optional “s”(econds), “m”(inutes), “h”(ours) or “d”(ays).\n" ++"config: salifetime " ++msgstr "" + +-#~ msgid "Disabled" +-#~ msgstr "Desactivado" ++#: ../properties/nm-libreswan-dialog.ui.h:36 ++msgid "Disable rekeying" ++msgstr "" + +-#~ msgid "TCP tunneling not supported" +-#~ msgstr "No se soporta el túnel por TCP" ++#: ../properties/nm-libreswan-dialog.ui.h:37 ++msgid "" ++"Whether a connection should not be renegotiated when it is about to expire.\n" ++"config: rekey " ++msgstr "" + +-#~ msgid "" +-#~ "The VPN settings file '%s' specifies that VPN traffic should be tunneled " +-#~ "through TCP which is currently not supported in the vpnc software.\n" +-#~ "\n" +-#~ "The connection can still be created, with TCP tunneling disabled, however " +-#~ "it may not work as expected." +-#~ msgstr "" +-#~ "El archivo de ajustes para VPN «%s» especifica que el tráfico VPN se " +-#~ "debería usar un túnel a través de TCP lo que actualmente no está " +-#~ "soportado en el software VPNC.\n" +-#~ "\n" +-#~ "Aún se puede crear la conexión con el túnel TCP deshabilitado, no " +-#~ "obstante puede que no funcione como se esperaba." ++#: ../properties/nm-libreswan-dialog.ui.h:39 ++msgid "Disable PFS" ++msgstr "" + +-#~ msgid "Disable Dead Peer Detection" +-#~ msgstr "Desactivar la detección de pares muertos" ++#: ../properties/nm-libreswan-dialog.ui.h:40 ++msgid "" ++"Disable perfect forward security. Enable this option only if the server " ++"doesn’t support PFS.\n" ++"config: pfs " ++msgstr "" + +-#~ msgid "Encryption method:" +-#~ msgstr "Método de cifrado:" ++#: ../properties/nm-libreswan-dialog.ui.h:42 ++msgid "Connectivity" ++msgstr "" + +-#~ msgid "NAT traversal:" +-#~ msgstr "NAT transversal:" ++#: ../properties/nm-libreswan-dialog.ui.h:43 ++msgid "Remote Network:" ++msgstr "Red remota:" + +-#~ msgid "_Username:" +-#~ msgstr "Nombre de _usuario:" ++#: ../properties/nm-libreswan-dialog.ui.h:44 ++msgid "" ++"Private subnet behind the remote participant, expressed as network/netmask.\n" ++"config: rightsubnet " ++msgstr "" + +-#~ msgid "_Domain:" +-#~ msgstr "_Dominio:" ++#: ../properties/nm-libreswan-dialog.ui.h:46 ++msgid "Enable fragmentation" ++msgstr "" + +-# include/printconf/dialogs.ycp:150 +-#~ msgid "Connect _anonymously" +-#~ msgstr "Conectar _anónimamente" ++#: ../properties/nm-libreswan-dialog.ui.h:47 ++msgid "narrowing" ++msgstr "" + +-# include/scanner/scanner_overview.ycp:85 +-# include/scanner/scanner_overview.ycp:85 +-# include/scanner/scanner_overview.ycp:85 +-#~ msgid "Connect as _user:" +-#~ msgstr "Conectar como _usuario:" ++#: ../properties/nm-libreswan-dialog.ui.h:48 ++msgid "" ++"IKEv2 negotiation may allow establishing an IPsec connection with narrowed " ++"down traffic selectors. This option is ignored for IKEv1.\n" ++"config: narrowing " ++msgstr "" + +-#~ msgid "NAT-T (default)" +-#~ msgstr "NAT-T (predeterminado)" ++#: ../properties/nm-libreswan-dialog.ui.h:50 ++msgid "Enable MOBIKE" ++msgstr "" +diff --git a/po/fr.po b/po/fr.po +index bbc2176..e54de9e 100644 +--- a/po/fr.po ++++ b/po/fr.po +@@ -5,179 +5,391 @@ + # Jonathan Ernst , 2007. + # Claude Paroz , 2007-2009. + # Robert-André Mauchin , 2007-2008. +-# ++# croe , 2018. #zanata ++# ljanda , 2018. #zanata ++# lrintel , 2018. #zanata + msgid "" + msgstr "" +-"Project-Id-Version: NetworkManager-vpnc\n" ++"Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-03-10 10:43+0100\n" +-"PO-Revision-Date: 2009-03-10 10:47+0100\n" +-"Last-Translator: Claude Paroz \n" ++"POT-Creation-Date: 2018-10-16 15:10+0200\n" ++"PO-Revision-Date: 2018-08-29 11:42+0000\n" ++"Last-Translator: croe \n" + "Language-Team: GNOME French Team \n" + "Language: fr\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=2; plural=n>1;\n" ++"X-Generator: Zanata 4.6.2\n" + +-#: ../auth-dialog/gnome-two-password-dialog.c:103 +-msgid "_Secondary Password:" +-msgstr "Mot de passe _secondaire :" ++#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:1 ++msgid "IPsec VPN client" ++msgstr "IPsec VPN client" + +-#: ../auth-dialog/gnome-two-password-dialog.c:159 +-msgid "_Password:" +-msgstr "Mot de _passe :" ++#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:2 ++msgid "Libreswan based client for IKEv1 based IPsec virtual private networks" ++msgstr "" ++"Client basé Libreswan pour les réseaux privés virtuels IPsec basé IKEv1" + +-#: ../auth-dialog/gnome-two-password-dialog.c:240 +-msgid "Sh_ow passwords" +-msgstr "Afficher les _mots de passe" ++#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:3 ++msgid "" ++"Support for configuring IKEv1 based IPsec virtual private network " ++"connections." ++msgstr "" ++"Support de configuration pour les connexions de réseau privé virtuel IPsec " ++"basé IKEv1" + +-#: ../auth-dialog/gnome-two-password-dialog.c:300 +-msgid "_Remember passwords for this session" +-msgstr "_Conserver les mots de passe pour cette session" ++#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:4 ++msgid "Compatible with Libreswan and Cisco IPsec VPN servers." ++msgstr "Compatible avec les serveurs VPN IPsec Cisco et Libreswan." + +-#: ../auth-dialog/gnome-two-password-dialog.c:301 +-msgid "_Save passwords in keyring" +-msgstr "_Enregistrer les mots de passe dans le trousseau" ++#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:5 ++msgid "The NetworkManager Developers" ++msgstr "Les développeurs de NetworkManager" + +-#: ../auth-dialog/main.c:170 ++#: ../auth-dialog/main.c:165 + #, c-format +-msgid "You need to authenticate to access the Virtual Private Network '%s'." +-msgstr "" +-"Vous devez vous authentifier pour accéder au réseau privé virtuel « %s »." ++msgid "Authenticate VPN %s" ++msgstr "Authentifier le VPN %s" ++ ++#: ../auth-dialog/main.c:182 ++msgid "Password:" ++msgstr "Mot de passe :" ++ ++#: ../auth-dialog/main.c:192 ++msgid "Group Password:" ++msgstr "Mot de passe de groupe :" + +-#: ../auth-dialog/main.c:171 ++#: ../auth-dialog/main.c:228 + msgid "Authenticate VPN" + msgstr "Authentifier le VPN" + +-#: ../auth-dialog/main.c:175 ++#: ../auth-dialog/main.c:237 + msgid "_Group Password:" + msgstr "Mot de passe du _groupe :" + +-#: ../nm-vpnc.desktop.in.h:1 +-msgid "Add, Remove, and Edit VPN Connections" +-msgstr "Ajoute, supprime et modifie des connexions VPN" ++#: ../auth-dialog/main.c:487 ++#, c-format ++msgid "You need to authenticate to access the Virtual Private Network “%s”." ++msgstr "" ++"Vous devez vous authentifier pour accéder au réseau privé virtuel « %s »." ++ ++#: ../properties/nm-libreswan-editor-plugin.c:43 ++msgid "IPsec based VPN" ++msgstr "VPN basé IPsec" ++ ++#: ../properties/nm-libreswan-editor-plugin.c:44 ++msgid "IPsec based VPN for remote clients" ++msgstr "VPN basé IPsec pour les clients distants" ++ ++#: ../properties/nm-libreswan-editor-plugin.c:98 ++#: ../properties/nm-libreswan-editor-plugin.c:276 ++#, c-format ++msgid "Can’t open file “%s”: %s" ++msgstr "Impossible d’ouvrir le fichier « %s » : %s" ++ ++#: ../properties/nm-libreswan-editor-plugin.c:228 ++#, c-format ++msgid "Missing “conn” section in “%s”" ++msgstr "Section « conn » de « %s » manquante" + +-#: ../nm-vpnc.desktop.in.h:2 +-msgid "VPN Connection Manager (vpnc)" +-msgstr "Gestionnaire de connexions VPN (vpnc)" ++#: ../properties/nm-libreswan-editor-plugin.c:294 ++#, c-format ++msgid "Error writing to file “%s”: %s" ++msgstr "Erreur lors de l'écriture sur fichier « %s » : %s" + +-#: ../properties/nm-vpnc.c:53 +-msgid "Cisco Compatible VPN (vpnc)" +-msgstr "VPN compatible Cisco (vpnc)" ++#: ../src/nm-libreswan-service.c:1464 ++msgid "A password is required." ++msgstr "Mot de passe obligatoire" + +-#: ../properties/nm-vpnc.c:54 ++#: ../src/nm-libreswan-service.c:1874 + msgid "" +-"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-based " +-"VPN gateways." ++"Could not process the request because the VPN connection settings were " ++"invalid." + msgstr "" +-"Compatible avec de nombreuses passerelles VPN basées sur IPsec de Cisco, " +-"Juniper, Netscreen et Sonicwall." ++"La requête n'a pas pu être traitée car le paramétrage de la connexion VPN " ++"n'était pas valide." + +-#: ../properties/nm-vpnc.c:339 +-msgid "Saved" +-msgstr "Enregistré" ++#: ../src/nm-libreswan-service.c:1888 ++msgid "Unhandled pending authentication." ++msgstr "Authentification en attente non gérée" + +-#: ../properties/nm-vpnc.c:346 +-msgid "Always Ask" +-msgstr "Toujours demander" ++#: ../src/nm-libreswan-service.c:2030 ++msgid "Don’t quit when VPN connection terminates" ++msgstr "Ne pas abandonner quand la connexion VPN se termine" + +-#: ../properties/nm-vpnc.c:353 +-msgid "Not Required" +-msgstr "Pas nécessaire" ++#: ../src/nm-libreswan-service.c:2031 ++msgid "Enable verbose debug logging (may expose passwords)" ++msgstr "" ++"Active la journalisation détaillée de débogage (peut afficher les mots de " ++"passe)" + +-#: ../properties/nm-vpnc.c:412 +-msgid "Secure (default)" +-msgstr "Sécurisé (par défaut)" ++#: ../src/nm-libreswan-service.c:2032 ++msgid "D-Bus name to use for this instance" ++msgstr "Nom de D-Bus à utiliser pour cette instance" + +-#: ../properties/nm-vpnc.c:415 +-msgid "Weak (use with caution)" +-msgstr "Faible (à utiliser avec précaution)" ++#: ../src/nm-libreswan-service.c:2055 ++msgid "" ++"This service provides integrated IPsec VPN capability to NetworkManager." ++msgstr "Ce service fournit une fonction VPN Ipsec intégrée au NetworkManager." + +-#: ../properties/nm-vpnc.c:423 +-msgid "None (completely insecure)" +-msgstr "Aucun (complètement non sécurisé)" ++#: ../shared/utils.c:86 ++#, c-format ++msgid "Error writing config: %s" ++msgstr "Erreur d'écriture de la config : %s" + +-#: ../properties/nm-vpnc.c:471 +-msgid "Cisco UDP (default)" +-msgstr "UDP Cisco (par défaut)" ++#: ../shared/nm-utils/nm-shared-utils.c:1087 ++#, c-format ++msgid "object class '%s' has no property named '%s'" ++msgstr "classe d'objet « %s » n'a pas de propriété nommée « %s »" + +-#: ../properties/nm-vpnc.c:478 +-msgid "NAT-T" +-msgstr "NAT-T" ++#: ../shared/nm-utils/nm-shared-utils.c:1094 ++#, c-format ++msgid "property '%s' of object class '%s' is not writable" ++msgstr "propriété « %s » de la classe d'objet « %s » n'est pas en écriture" + +-#: ../properties/nm-vpnc.c:485 +-msgid "Disabled" +-msgstr "Désactivé" ++#: ../shared/nm-utils/nm-shared-utils.c:1101 ++#, c-format ++msgid "" ++"construct property \"%s\" for object '%s' can't be set after construction" ++msgstr "" ++"propriété de construction « %s » de l'objet « %s » ne peut pas être définie " ++"après la construction" + +-#: ../properties/nm-vpnc.c:1116 +-msgid "TCP tunneling not supported" +-msgstr "Utilisation d'un tunnel TCP non pris en charge" ++#: ../shared/nm-utils/nm-shared-utils.c:1109 ++#, c-format ++msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" ++msgstr "" ++"« %s::%s » n'est pas un nom de propriété valide ; « %s » n'est pas un sous-" ++"type de GObject" + +-#: ../properties/nm-vpnc.c:1118 ++#: ../shared/nm-utils/nm-shared-utils.c:1118 ++#, c-format ++msgid "unable to set property '%s' of type '%s' from value of type '%s'" ++msgstr "" ++"impossible de définir la propriété « %s » de type « %s » à partir de valeurs " ++"de type « %s »" ++ ++#: ../shared/nm-utils/nm-shared-utils.c:1129 + #, c-format + msgid "" +-"The VPN settings file '%s' specifies that VPN traffic should be tunneled " +-"through TCP which is currently not supported in the vpnc software.\n" +-"\n" +-"The connection can still be created, with TCP tunneling disabled, however it " +-"may not work as expected." +-msgstr "" +-"Le fichier de configuration VPN « %s » indique que le trafic VPN devrait " +-"transiter par un tunnel TCP, mais ceci n'est pas pris en charge actuellement " +-"par le logiciel vpnc.\n" +-"\n" +-"La connexion sera néanmoins créée sans tunnel TCP ; pour cette raison, la " +-"connexion pourrait ne pas fonctionner comme prévu." +- +-#: ../properties/nm-vpnc-dialog.glade.h:1 +-msgid " " +-msgstr " " +- +-#: ../properties/nm-vpnc-dialog.glade.h:2 +-msgid "General" +-msgstr "Général" +- +-#: ../properties/nm-vpnc-dialog.glade.h:3 +-msgid "Optional" +-msgstr "Facultatif" +- +-#: ../properties/nm-vpnc-dialog.glade.h:4 +-msgid "Disable Dead Peer Detection" +-msgstr "Désactiver la détection des pairs bloqués" +- +-#: ../properties/nm-vpnc-dialog.glade.h:5 +-msgid "Domain:" +-msgstr "Domaine :" ++"value \"%s\" of type '%s' is invalid or out of range for property '%s' of " ++"type '%s'" ++msgstr "" ++"valeur « %s » de type « %s » est non valide ou en dehors de la plage de " ++"valeurs pour la propriété « %s » de type « %s »" + +-#: ../properties/nm-vpnc-dialog.glade.h:6 +-msgid "Encryption method:" +-msgstr "Méthode de chiffrement :" ++#: ../shared/nm-utils/nm-vpn-plugin-utils.c:80 ++#, c-format ++msgid "missing plugin file \"%s\"" ++msgstr "Fichier de plugin « %s » manquant" + +-#: ../properties/nm-vpnc-dialog.glade.h:7 +-msgid "G_roup name:" +-msgstr "Nom de g_roupe :" ++#: ../shared/nm-utils/nm-vpn-plugin-utils.c:86 ++#, c-format ++msgid "cannot load editor plugin: %s" ++msgstr "impossible de charger le plugin : %s" + +-#: ../properties/nm-vpnc-dialog.glade.h:8 +-msgid "Gro_up password:" +-msgstr "Mot de passe du _groupe :" ++#: ../shared/nm-utils/nm-vpn-plugin-utils.c:95 ++#, c-format ++msgid "cannot load factory %s from plugin: %s" ++msgstr "impossible de charger la fabrique %s du plugin : %s" + +-#: ../properties/nm-vpnc-dialog.glade.h:9 +-msgid "NAT traversal:" +-msgstr "Traversée du NAT :" ++#: ../shared/nm-utils/nm-vpn-plugin-utils.c:121 ++msgid "unknown error creating editor instance" ++msgstr "Erreur inconnue lors de la création de l'instance d'éditeur" + +-#: ../properties/nm-vpnc-dialog.glade.h:10 +-msgid "Show passwords" +-msgstr "Afficher les mots de passe" ++#: ../properties/nm-libreswan-dialog.ui.h:1 ++msgid "IKEv1 (XAUTH)" ++msgstr "IKEv1 (XAUTH)" + +-#: ../properties/nm-vpnc-dialog.glade.h:11 +-msgid "User name:" +-msgstr "Nom d'utilisateur :" ++#: ../properties/nm-libreswan-dialog.ui.h:2 ++msgid "IKEv2 (Certificate)" ++msgstr "IKEv2 (Certificat)" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:3 ++msgid "General" ++msgstr "Général" + +-#: ../properties/nm-vpnc-dialog.glade.h:12 ++#: ../properties/nm-libreswan-dialog.ui.h:4 + msgid "_Gateway:" + msgstr "_Passerelle :" + +-#: ../properties/nm-vpnc-dialog.glade.h:13 ++#: ../properties/nm-libreswan-dialog.ui.h:5 ++msgid "Authentication" ++msgstr "Authentification" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:6 ++msgid "Type:" ++msgstr "Type :" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:7 ++msgid "User name:" ++msgstr "Nom d'utilisateur :" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:8 + msgid "_User password:" + msgstr "Mot de passe _utilisateur :" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:9 ++msgid "G_roup name:" ++msgstr "Nom de g_roupe :" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:10 ++msgid "_Secret:" ++msgstr "_Secret:" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:11 ++msgid "Show passwords" ++msgstr "Afficher les mots de passe" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:12 ++msgid "_Certificate name:" ++msgstr "_Nom de certificate :" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:13 ++msgid "_Remote ID:" ++msgstr "_ID distant :" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:14 ++#, fuzzy ++msgid "Ad_vanced…" ++msgstr "Ad_vanced" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:15 ++msgid "no" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:16 ++msgid "yes" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:17 ++msgid "force" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:18 ++msgid "IPsec Advanced Options" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:19 ++#, fuzzy ++msgid "Identification" ++msgstr "Authentification" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:20 ++msgid "Domain:" ++msgstr "Domaine :" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:21 ++msgid "" ++"(NT-)Domain name for authentication.\n" ++"config: Domain " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:23 ++msgid "Security" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:24 ++msgid "Phase1 Algorithms:" ++msgstr "Phase1 Algorithmes :" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:25 ++msgid "" ++"IKE encryption/authentication algorithm to be used for the connection (phase " ++"1 aka ISAKMP SA). The format is “cipher-hash;modpgroup, cipher-hash;" ++"modpgroup, …”.\n" ++"config: ike " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:27 ++msgid "Phase2 Algorithms:" ++msgstr "Phase2 Algorithmes :" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:28 ++msgid "" ++"Specifies the algorithms that will be offered/accepted for a phase2 " ++"negotiation. The format is “cipher-hash;modpgroup, cipher-hash;modpgroup, " ++"…”.\n" ++"config: esp " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:30 ++msgid "Phase1 Lifetime:" ++msgstr "Phase1 Durée de vie :" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:31 ++msgid "" ++"How long the keying channel of a connection should last before being " ++"renegotiated. The value is expressed by a number followed by an optional " ++"“s”(econds), “m”(inutes), “h”(ours) or “d”(ays).\n" ++"config: ikelifetime " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:33 ++msgid "Phase2 Lifetime:" ++msgstr "Phase2 Durée de vie :" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:34 ++msgid "" ++"How long a particular instance of a connection (a set of encryption/" ++"authentication keys for user packets) should last, from successful " ++"negotiation to expiry. The value is expressed by a number followed by an " ++"optional “s”(econds), “m”(inutes), “h”(ours) or “d”(ays).\n" ++"config: salifetime " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:36 ++msgid "Disable rekeying" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:37 ++msgid "" ++"Whether a connection should not be renegotiated when it is about to expire.\n" ++"config: rekey " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:39 ++msgid "Disable PFS" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:40 ++msgid "" ++"Disable perfect forward security. Enable this option only if the server " ++"doesn’t support PFS.\n" ++"config: pfs " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:42 ++msgid "Connectivity" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:43 ++msgid "Remote Network:" ++msgstr "Réseau distant :" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:44 ++msgid "" ++"Private subnet behind the remote participant, expressed as network/netmask.\n" ++"config: rightsubnet " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:46 ++msgid "Enable fragmentation" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:47 ++msgid "narrowing" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:48 ++msgid "" ++"IKEv2 negotiation may allow establishing an IPsec connection with narrowed " ++"down traffic selectors. This option is ignored for IKEv1.\n" ++"config: narrowing " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:50 ++msgid "Enable MOBIKE" ++msgstr "" +diff --git a/po/it.po b/po/it.po +index b879f51..91a8906 100644 +--- a/po/it.po ++++ b/po/it.po +@@ -3,15 +3,15 @@ + # This file is distributed under the same license as the NetworkManager-libreswan package. + # Francesco Marletta , 2006, 2007, 2008, 2009. + # Milo Casagrande , 2012, 2013, 2014, 2015, 2016, 2017, 2018. +-# ++# lrintel , 2018. #zanata ++# phrdina , 2018. #zanata + msgid "" + msgstr "" + "Project-Id-Version: network-manager-libreswan\n" +-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/NetworkManager-" +-"libreswan/issues\n" +-"POT-Creation-Date: 2018-08-10 17:14+0000\n" +-"PO-Revision-Date: 2018-08-27 15:01+0200\n" +-"Last-Translator: Milo Casagrande \n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2018-10-16 15:10+0200\n" ++"PO-Revision-Date: 2018-08-20 09:48+0000\n" ++"Last-Translator: Copied by Zanata \n" + "Language-Team: Italian \n" + "Language: it\n" + "MIME-Version: 1.0\n" +@@ -80,27 +80,27 @@ msgstr "VPN basata su IPsec" + msgid "IPsec based VPN for remote clients" + msgstr "VPN basata su IPsec per client remoti" + +-#: ../properties/nm-libreswan-editor-plugin.c:80 +-#: ../properties/nm-libreswan-editor-plugin.c:158 ++#: ../properties/nm-libreswan-editor-plugin.c:98 ++#: ../properties/nm-libreswan-editor-plugin.c:276 + #, c-format + msgid "Can’t open file “%s”: %s" + msgstr "Impossibile aprire il file «%s»: %s" + +-#: ../properties/nm-libreswan-editor-plugin.c:135 ++#: ../properties/nm-libreswan-editor-plugin.c:228 + #, c-format + msgid "Missing “conn” section in “%s”" + msgstr "Manca la sezione «conn» in «%s»" + +-#: ../properties/nm-libreswan-editor-plugin.c:176 ++#: ../properties/nm-libreswan-editor-plugin.c:294 + #, c-format + msgid "Error writing to file “%s”: %s" + msgstr "Errore nello scrivere sul file «%s»: %s" + +-#: ../src/nm-libreswan-service.c:1463 ++#: ../src/nm-libreswan-service.c:1464 + msgid "A password is required." + msgstr "È richiesta una password." + +-#: ../src/nm-libreswan-service.c:1873 ++#: ../src/nm-libreswan-service.c:1874 + msgid "" + "Could not process the request because the VPN connection settings were " + "invalid." +@@ -108,44 +108,44 @@ msgstr "" + "Impossibile elaborare la richiesta poiché le impostazioni della connessione " + "VPN non sono valide." + +-#: ../src/nm-libreswan-service.c:1887 ++#: ../src/nm-libreswan-service.c:1888 + msgid "Unhandled pending authentication." + msgstr "Autenticazione pendente non gestita." + +-#: ../src/nm-libreswan-service.c:2029 ++#: ../src/nm-libreswan-service.c:2030 + msgid "Don’t quit when VPN connection terminates" + msgstr "Non esce quando la connessione VPN termina" + +-#: ../src/nm-libreswan-service.c:2030 ++#: ../src/nm-libreswan-service.c:2031 + msgid "Enable verbose debug logging (may expose passwords)" + msgstr "Abilita output di debug prolisso (potrebbe esporre le password)" + +-#: ../src/nm-libreswan-service.c:2031 ++#: ../src/nm-libreswan-service.c:2032 + msgid "D-Bus name to use for this instance" + msgstr "Nome D-Bus da usare per questa istanza" + +-#: ../src/nm-libreswan-service.c:2054 ++#: ../src/nm-libreswan-service.c:2055 + msgid "" + "This service provides integrated IPsec VPN capability to NetworkManager." + msgstr "" + "Questo servizio fornisce funzionalità VPN IPsec integrate con NetworkManager." + +-#: ../shared/utils.c:85 ++#: ../shared/utils.c:86 + #, c-format + msgid "Error writing config: %s" + msgstr "Errore nello scrivere la configurazione: %s" + +-#: ../shared/nm-utils/nm-shared-utils.c:312 ++#: ../shared/nm-utils/nm-shared-utils.c:1087 + #, c-format + msgid "object class '%s' has no property named '%s'" + msgstr "l'oggetto di classe «%s» non ha una proprietà di nome «%s»" + +-#: ../shared/nm-utils/nm-shared-utils.c:319 ++#: ../shared/nm-utils/nm-shared-utils.c:1094 + #, c-format + msgid "property '%s' of object class '%s' is not writable" + msgstr "la proprietà «%s» dell'oggetto di classe «%s» non è scrivibile" + +-#: ../shared/nm-utils/nm-shared-utils.c:326 ++#: ../shared/nm-utils/nm-shared-utils.c:1101 + #, c-format + msgid "" + "construct property \"%s\" for object '%s' can't be set after construction" +@@ -153,19 +153,19 @@ msgstr "" + "proprietà costruttore «%s» dell'oggetto «%s» non può essere impostata dopo " + "l'inizializzazione" + +-#: ../shared/nm-utils/nm-shared-utils.c:334 ++#: ../shared/nm-utils/nm-shared-utils.c:1109 + #, c-format + msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" + msgstr "" + "«%s::%s» non è un nome valido di proprietà; «%s» non un sotto-tipo GObject" + +-#: ../shared/nm-utils/nm-shared-utils.c:343 ++#: ../shared/nm-utils/nm-shared-utils.c:1118 + #, c-format + msgid "unable to set property '%s' of type '%s' from value of type '%s'" + msgstr "" + "impossibile impostare la proprietà «%s» di tipo «%s» dal valore di tipo «%s»" + +-#: ../shared/nm-utils/nm-shared-utils.c:354 ++#: ../shared/nm-utils/nm-shared-utils.c:1129 + #, c-format + msgid "" + "value \"%s\" of type '%s' is invalid or out of range for property '%s' of " +@@ -246,38 +246,144 @@ msgid "_Remote ID:" + msgstr "ID _remoto:" + + #: ../properties/nm-libreswan-dialog.ui.h:14 +-msgid "Phase1 Algorithms:" +-msgstr "Algoritmi phase1:" ++#, fuzzy ++msgid "Ad_vanced…" ++msgstr "A_vanzate" + + #: ../properties/nm-libreswan-dialog.ui.h:15 +-msgid "Phase2 Algorithms:" +-msgstr "Algoritmi phase2:" ++msgid "no" ++msgstr "" + + #: ../properties/nm-libreswan-dialog.ui.h:16 ++msgid "yes" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:17 ++msgid "force" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:18 ++msgid "IPsec Advanced Options" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:19 ++#, fuzzy ++msgid "Identification" ++msgstr "Autenticazione" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:20 + msgid "Domain:" + msgstr "Dominio:" + +-#: ../properties/nm-libreswan-dialog.ui.h:17 ++#: ../properties/nm-libreswan-dialog.ui.h:21 ++msgid "" ++"(NT-)Domain name for authentication.\n" ++"config: Domain " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:23 ++msgid "Security" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:24 ++msgid "Phase1 Algorithms:" ++msgstr "Algoritmi phase1:" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:25 ++msgid "" ++"IKE encryption/authentication algorithm to be used for the connection (phase " ++"1 aka ISAKMP SA). The format is “cipher-hash;modpgroup, cipher-hash;" ++"modpgroup, …”.\n" ++"config: ike " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:27 ++msgid "Phase2 Algorithms:" ++msgstr "Algoritmi phase2:" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:28 ++msgid "" ++"Specifies the algorithms that will be offered/accepted for a phase2 " ++"negotiation. The format is “cipher-hash;modpgroup, cipher-hash;modpgroup, " ++"…”.\n" ++"config: esp " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:30 + msgid "Phase1 Lifetime:" + msgstr "Durata phase1:" + +-#: ../properties/nm-libreswan-dialog.ui.h:18 ++#: ../properties/nm-libreswan-dialog.ui.h:31 ++msgid "" ++"How long the keying channel of a connection should last before being " ++"renegotiated. The value is expressed by a number followed by an optional " ++"“s”(econds), “m”(inutes), “h”(ours) or “d”(ays).\n" ++"config: ikelifetime " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:33 + msgid "Phase2 Lifetime:" + msgstr "Durata phase2:" + +-#: ../properties/nm-libreswan-dialog.ui.h:19 ++#: ../properties/nm-libreswan-dialog.ui.h:34 ++msgid "" ++"How long a particular instance of a connection (a set of encryption/" ++"authentication keys for user packets) should last, from successful " ++"negotiation to expiry. The value is expressed by a number followed by an " ++"optional “s”(econds), “m”(inutes), “h”(ours) or “d”(ays).\n" ++"config: salifetime " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:36 ++msgid "Disable rekeying" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:37 ++msgid "" ++"Whether a connection should not be renegotiated when it is about to expire.\n" ++"config: rekey " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:39 ++msgid "Disable PFS" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:40 ++msgid "" ++"Disable perfect forward security. Enable this option only if the server " ++"doesn’t support PFS.\n" ++"config: pfs " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:42 ++msgid "Connectivity" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:43 + msgid "Remote Network:" + msgstr "Rete remota:" + +-#: ../properties/nm-libreswan-dialog.ui.h:20 +-msgid "Ad_vanced" +-msgstr "A_vanzate" ++#: ../properties/nm-libreswan-dialog.ui.h:44 ++msgid "" ++"Private subnet behind the remote participant, expressed as network/netmask.\n" ++"config: rightsubnet " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:46 ++msgid "Enable fragmentation" ++msgstr "" + +-#~ msgid "IPsec based VPN using IKEv1" +-#~ msgstr "VPN basata su IPsec con IKEv1" ++#: ../properties/nm-libreswan-dialog.ui.h:47 ++msgid "narrowing" ++msgstr "" + +-#~ msgid " " +-#~ msgstr " " ++#: ../properties/nm-libreswan-dialog.ui.h:48 ++msgid "" ++"IKEv2 negotiation may allow establishing an IPsec connection with narrowed " ++"down traffic selectors. This option is ignored for IKEv1.\n" ++"config: narrowing " ++msgstr "" + +-#~ msgid "Request VPN authentication" +-#~ msgstr "Richiede autenticazione VPN" ++#: ../properties/nm-libreswan-dialog.ui.h:50 ++msgid "Enable MOBIKE" ++msgstr "" +diff --git a/po/ja.po b/po/ja.po +index b78d3a9..5ac0a56 100644 +--- a/po/ja.po ++++ b/po/ja.po +@@ -2,21 +2,22 @@ + # Copyright (C) 2006 THE NetworkManager-vpnc's COPYRIGHT HOLDER + # This file is distributed under the same license as the NetworkManager-vpnc package. + # Satoru SATOH , 2006. +-# kmoriguc , 2017. #zanata +-# lrintel , 2017. #zanata ++# kemorigu , 2018. #zanata ++# ljanda , 2018. #zanata ++# lrintel , 2018. #zanata + msgid "" + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2017-05-16 10:52+0200\n" +-"PO-Revision-Date: 2017-05-19 12:59+0000\n" +-"Last-Translator: kmoriguc \n" ++"POT-Creation-Date: 2018-10-16 15:10+0200\n" ++"PO-Revision-Date: 2018-08-24 01:03+0000\n" ++"Last-Translator: kemorigu \n" + "Language-Team: Japanese \n" + "Language: ja\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +-"X-Generator: Zanata 4.1.1\n" ++"X-Generator: Zanata 4.6.2\n" + "Plural-Forms: nplurals=1; plural=0\n" + + #: ../appdata/network-manager-libreswan.metainfo.xml.in.h:1 +@@ -67,82 +68,82 @@ msgstr "グループパスワード(_G):" + + #: ../auth-dialog/main.c:487 + #, c-format +-msgid "You need to authenticate to access the Virtual Private Network '%s'." +-msgstr "仮想プライベートネットワーク '%s' にアクセスするには認証が必要です。" ++msgid "You need to authenticate to access the Virtual Private Network “%s”." ++msgstr "仮想プライベートネットワーク “%s” にアクセスするには認証が必要です。" + + #: ../properties/nm-libreswan-editor-plugin.c:43 + msgid "IPsec based VPN" + msgstr "IPsec ベースの VPN" + + #: ../properties/nm-libreswan-editor-plugin.c:44 +-msgid "IPsec based VPN using IKEv1" +-msgstr "IKEv1 を使った IPsec ベースの VPN" ++msgid "IPsec based VPN for remote clients" ++msgstr "リモートクライアント向け IPsec ベースの VPN" + +-#: ../properties/nm-libreswan-editor-plugin.c:80 +-#: ../properties/nm-libreswan-editor-plugin.c:149 ++#: ../properties/nm-libreswan-editor-plugin.c:98 ++#: ../properties/nm-libreswan-editor-plugin.c:276 + #, c-format +-msgid "Can't open file '%s': %s" +-msgstr "ファイル '%s' を開けません: %s" ++msgid "Can’t open file “%s”: %s" ++msgstr "ファイル “%s” を開けません: %s" + +-#: ../properties/nm-libreswan-editor-plugin.c:126 ++#: ../properties/nm-libreswan-editor-plugin.c:228 + #, c-format +-msgid "Missing \"conn\" section in \"%s\"" +-msgstr "\"%s\" に \"conn\" セクションがありません" ++msgid "Missing “conn” section in “%s”" ++msgstr "“%s” に “conn” セクションがありません" + +-#: ../properties/nm-libreswan-editor-plugin.c:167 ++#: ../properties/nm-libreswan-editor-plugin.c:294 + #, c-format +-msgid "Error writing to file '%s': %s" +-msgstr "ファイル '%s' への書き込みでエラー: %s" ++msgid "Error writing to file “%s”: %s" ++msgstr "ファイル “%s” への書き込みでエラー: %s" + +-#: ../src/nm-libreswan-service.c:1449 ++#: ../src/nm-libreswan-service.c:1464 + msgid "A password is required." + msgstr "パスワードが必要です" + +-#: ../src/nm-libreswan-service.c:1833 ++#: ../src/nm-libreswan-service.c:1874 + msgid "" + "Could not process the request because the VPN connection settings were " + "invalid." + msgstr "VPN 接続設定が無効のため、リクエストを処理できませんでした。" + +-#: ../src/nm-libreswan-service.c:1847 ++#: ../src/nm-libreswan-service.c:1888 + msgid "Unhandled pending authentication." + msgstr "保留中の認証を未処理" + +-#: ../src/nm-libreswan-service.c:1989 +-msgid "Don't quit when VPN connection terminates" +-msgstr "終了時に VPN 接続を切断しない" ++#: ../src/nm-libreswan-service.c:2030 ++msgid "Don’t quit when VPN connection terminates" ++msgstr "VPN 接続の切断時に終了しません" + +-#: ../src/nm-libreswan-service.c:1990 ++#: ../src/nm-libreswan-service.c:2031 + msgid "Enable verbose debug logging (may expose passwords)" + msgstr "" + "詳細なデバッグログ機能を有効化する (パスワードが露出する可能性があります)" + +-#: ../src/nm-libreswan-service.c:1991 ++#: ../src/nm-libreswan-service.c:2032 + msgid "D-Bus name to use for this instance" + msgstr "このインスタンスに使用する D-Bus 名" + +-#: ../src/nm-libreswan-service.c:2014 ++#: ../src/nm-libreswan-service.c:2055 + msgid "" + "This service provides integrated IPsec VPN capability to NetworkManager." + msgstr "このサービスは、統合 IPsec VPN 機能を NetworkManager に提供します。" + +-#: ../shared/utils.c:85 ++#: ../shared/utils.c:86 + #, c-format + msgid "Error writing config: %s" + msgstr "config への書き込みでエラー: %s" + +-#: ../shared/nm-utils/nm-shared-utils.c:185 ++#: ../shared/nm-utils/nm-shared-utils.c:1087 + #, c-format + msgid "object class '%s' has no property named '%s'" + msgstr "オブジェクトクラス '%s' には '%s' という名前のプロパティーがありません" + +-#: ../shared/nm-utils/nm-shared-utils.c:192 ++#: ../shared/nm-utils/nm-shared-utils.c:1094 + #, c-format + msgid "property '%s' of object class '%s' is not writable" + msgstr "" + "オブジェクトクラス '%s' のプロパティー '%s' は、書き込み可能ではありません" + +-#: ../shared/nm-utils/nm-shared-utils.c:199 ++#: ../shared/nm-utils/nm-shared-utils.c:1101 + #, c-format + msgid "" + "construct property \"%s\" for object '%s' can't be set after construction" +@@ -150,19 +151,19 @@ msgstr "" + "オブジェクト '%s' のコンストラクトプロパティー \"%s\" は構築後に設定できませ" + "ん" + +-#: ../shared/nm-utils/nm-shared-utils.c:207 ++#: ../shared/nm-utils/nm-shared-utils.c:1109 + #, c-format + msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" + msgstr "" + "'%s::%s' は有効なプロパティー名ではありません。'%s' は GObject サブタイプでは" + "ありません" + +-#: ../shared/nm-utils/nm-shared-utils.c:216 ++#: ../shared/nm-utils/nm-shared-utils.c:1118 + #, c-format + msgid "unable to set property '%s' of type '%s' from value of type '%s'" + msgstr "プロパティー '%s' (タイプ '%s') をタイプ '%s' の値から設定できません" + +-#: ../shared/nm-utils/nm-shared-utils.c:227 ++#: ../shared/nm-utils/nm-shared-utils.c:1129 + #, c-format + msgid "" + "value \"%s\" of type '%s' is invalid or out of range for property '%s' of " +@@ -191,49 +192,196 @@ msgid "unknown error creating editor instance" + msgstr "エディターインスタンスの作成中に不明なエラー" + + #: ../properties/nm-libreswan-dialog.ui.h:1 +-msgid "General" +-msgstr "全般" ++msgid "IKEv1 (XAUTH)" ++msgstr "IKEv1 (XAUTH)" + + #: ../properties/nm-libreswan-dialog.ui.h:2 +-msgid "_Gateway:" +-msgstr "ゲートウェイ(_G):" ++msgid "IKEv2 (Certificate)" ++msgstr "IKEv2 (証明書)" + + #: ../properties/nm-libreswan-dialog.ui.h:3 +-msgid "Show passwords" +-msgstr "パスワードを表示する" ++msgid "General" ++msgstr "全般" + + #: ../properties/nm-libreswan-dialog.ui.h:4 +-msgid "_Secret:" +-msgstr "シークレット(_S):" ++msgid "_Gateway:" ++msgstr "ゲートウェイ(_G):" + + #: ../properties/nm-libreswan-dialog.ui.h:5 +-msgid "_User password:" +-msgstr "ユーザーパスワード(_U):" ++msgid "Authentication" ++msgstr "認証" + + #: ../properties/nm-libreswan-dialog.ui.h:6 +-msgid "G_roup name:" +-msgstr "グループ名(_R):" ++msgid "Type:" ++msgstr "種類:" + + #: ../properties/nm-libreswan-dialog.ui.h:7 + msgid "User name:" + msgstr "ユーザー名:" + + #: ../properties/nm-libreswan-dialog.ui.h:8 +-msgid "Phase2 Algorithms:" +-msgstr "フェーズ2 アルゴリズム:" ++msgid "_User password:" ++msgstr "ユーザーパスワード(_U):" + + #: ../properties/nm-libreswan-dialog.ui.h:9 ++msgid "G_roup name:" ++msgstr "グループ名(_R):" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:10 ++msgid "_Secret:" ++msgstr "シークレット(_S):" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:11 ++msgid "Show passwords" ++msgstr "パスワードを表示する" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:12 ++msgid "_Certificate name:" ++msgstr "証明書の名前 (_C)" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:13 ++msgid "_Remote ID:" ++msgstr "リモート ID (_R)" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:14 ++#, fuzzy ++msgid "Ad_vanced…" ++msgstr "高度な(_V)" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:15 ++msgid "no" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:16 ++msgid "yes" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:17 ++msgid "force" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:18 ++msgid "IPsec Advanced Options" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:19 ++#, fuzzy ++msgid "Identification" ++msgstr "認証" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:20 + msgid "Domain:" + msgstr "ドメイン:" + +-#: ../properties/nm-libreswan-dialog.ui.h:10 ++#: ../properties/nm-libreswan-dialog.ui.h:21 ++msgid "" ++"(NT-)Domain name for authentication.\n" ++"config: Domain " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:23 ++msgid "Security" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:24 + msgid "Phase1 Algorithms:" + msgstr "フェーズ1 アルゴリズム:" + +-#: ../properties/nm-libreswan-dialog.ui.h:11 +-msgid "Ad_vanced" +-msgstr "高度な(_V)" ++#: ../properties/nm-libreswan-dialog.ui.h:25 ++msgid "" ++"IKE encryption/authentication algorithm to be used for the connection (phase " ++"1 aka ISAKMP SA). The format is “cipher-hash;modpgroup, cipher-hash;" ++"modpgroup, …”.\n" ++"config: ike " ++msgstr "" + +-#: ../properties/nm-libreswan-dialog.ui.h:12 +-msgid " " +-msgstr " " ++#: ../properties/nm-libreswan-dialog.ui.h:27 ++msgid "Phase2 Algorithms:" ++msgstr "フェーズ2 アルゴリズム:" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:28 ++msgid "" ++"Specifies the algorithms that will be offered/accepted for a phase2 " ++"negotiation. The format is “cipher-hash;modpgroup, cipher-hash;modpgroup, " ++"…”.\n" ++"config: esp " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:30 ++msgid "Phase1 Lifetime:" ++msgstr "Phase1 ライフタイム:" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:31 ++msgid "" ++"How long the keying channel of a connection should last before being " ++"renegotiated. The value is expressed by a number followed by an optional " ++"“s”(econds), “m”(inutes), “h”(ours) or “d”(ays).\n" ++"config: ikelifetime " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:33 ++msgid "Phase2 Lifetime:" ++msgstr "Phase2 ライフタイム:" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:34 ++msgid "" ++"How long a particular instance of a connection (a set of encryption/" ++"authentication keys for user packets) should last, from successful " ++"negotiation to expiry. The value is expressed by a number followed by an " ++"optional “s”(econds), “m”(inutes), “h”(ours) or “d”(ays).\n" ++"config: salifetime " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:36 ++msgid "Disable rekeying" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:37 ++msgid "" ++"Whether a connection should not be renegotiated when it is about to expire.\n" ++"config: rekey " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:39 ++msgid "Disable PFS" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:40 ++msgid "" ++"Disable perfect forward security. Enable this option only if the server " ++"doesn’t support PFS.\n" ++"config: pfs " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:42 ++msgid "Connectivity" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:43 ++msgid "Remote Network:" ++msgstr "リモートネットワーク:" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:44 ++msgid "" ++"Private subnet behind the remote participant, expressed as network/netmask.\n" ++"config: rightsubnet " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:46 ++msgid "Enable fragmentation" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:47 ++msgid "narrowing" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:48 ++msgid "" ++"IKEv2 negotiation may allow establishing an IPsec connection with narrowed " ++"down traffic selectors. This option is ignored for IKEv1.\n" ++"config: narrowing " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:50 ++msgid "Enable MOBIKE" ++msgstr "" +diff --git a/po/ko.po b/po/ko.po +index e99da89..156cf22 100644 +--- a/po/ko.po ++++ b/po/ko.po +@@ -3,300 +3,381 @@ + # This file is distributed under the same license as the nm-vpnc package. + # Young-Ho Cha , 2007. + # Namhyung Kim , 2007. +-# +-# ++# ++# eukim , 2018. #zanata ++# ljanda , 2018. #zanata ++# lrintel , 2018. #zanata ++# phrdina , 2018. #zanata + msgid "" + msgstr "" +-"Project-Id-Version: nm-vpnc\n" ++"Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2007-12-05 22:06+0000\n" +-"PO-Revision-Date: 2007-12-24 17:15+0900\n" +-"Last-Translator: Namhyung kim \n" ++"POT-Creation-Date: 2018-10-16 15:10+0200\n" ++"PO-Revision-Date: 2018-09-27 12:58+0000\n" ++"Last-Translator: eukim \n" + "Language-Team: GNOME Korea \n" + "Language: ko\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" ++"X-Generator: Zanata 4.6.2\n" ++"Plural-Forms: nplurals=1; plural=0\n" + +-#: ../auth-dialog/gnome-two-password-dialog.c:144 +-msgid "_Secondary Password:" +-msgstr "보조 암호(_S):" ++#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:1 ++msgid "IPsec VPN client" ++msgstr "IPsec VPN 클라이언트 " + +-#: ../auth-dialog/gnome-two-password-dialog.c:258 +-msgid "_Username:" +-msgstr "사용자 이름(_U):" ++#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:2 ++msgid "Libreswan based client for IKEv1 based IPsec virtual private networks" ++msgstr " IKEv1 기반 IPsec VPN의 Libreswan 기반 클라이언트 " + +-#: ../auth-dialog/gnome-two-password-dialog.c:260 +-msgid "_Domain:" +-msgstr "도메인(_D):" +- +-#: ../auth-dialog/gnome-two-password-dialog.c:262 +-msgid "_Password:" +-msgstr "암호(_P):" ++#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:3 ++msgid "" ++"Support for configuring IKEv1 based IPsec virtual private network " ++"connections." ++msgstr "IKEv1 기반 IPsec VPN 연결 설정 지원 " + +-#: ../auth-dialog/gnome-two-password-dialog.c:351 +-msgid "Connect _anonymously" +-msgstr "익명으로 연결(_A)" ++#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:4 ++msgid "Compatible with Libreswan and Cisco IPsec VPN servers." ++msgstr " Libreswan 및 Cisco IPsec VPN 서버와 호환됩니다. " + +-#: ../auth-dialog/gnome-two-password-dialog.c:356 +-msgid "Connect as _user:" +-msgstr "사용자로 연결(_U):" ++#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:5 ++msgid "The NetworkManager Developers" ++msgstr "NetworkManager 개발자 " + +-#: ../auth-dialog/gnome-two-password-dialog.c:465 +-msgid "_Remember passwords for this session" +-msgstr "이 세션에서 암호 기억(_R)" ++#: ../auth-dialog/main.c:165 ++#, c-format ++msgid "Authenticate VPN %s" ++msgstr "VPN %s 인증 " + +-#: ../auth-dialog/gnome-two-password-dialog.c:467 +-msgid "_Save passwords in keyring" +-msgstr "키링에 암호 저장(_S)" ++#: ../auth-dialog/main.c:182 ++msgid "Password:" ++msgstr "암호:" + +-#: ../auth-dialog/main.c:172 +-#, c-format +-msgid "You need to authenticate to access the Virtual Private Network '%s'." +-msgstr "가상 사설 네트워크 '%s'에 접근할 때 인증이 필요합니다." ++#: ../auth-dialog/main.c:192 ++msgid "Group Password:" ++msgstr "그룹 암호: " + +-#: ../auth-dialog/main.c:173 ++#: ../auth-dialog/main.c:228 + msgid "Authenticate VPN" + msgstr "VPN 인증" + +-#: ../auth-dialog/main.c:180 ++#: ../auth-dialog/main.c:237 + msgid "_Group Password:" + msgstr "그룹 암호(_G):" + +-#: ../nm-vpnc.desktop.in.h:1 +-msgid "Add, Remove, and Edit VPN Connections" +-msgstr "VPN 연결 더하기, 지우기, 편집" +- +-#: ../nm-vpnc.desktop.in.h:2 +-msgid "VPN Connection Manager (vpnc)" +-msgstr "VPN 연결 관리자 (vpnc)" ++#: ../auth-dialog/main.c:487 ++#, c-format ++msgid "You need to authenticate to access the Virtual Private Network “%s”." ++msgstr "VPN \"%s\"에 액세스하려면 인증이 필요합니다. " + +-#: ../properties/nm-vpnc.c:98 +-msgid "Compatible Cisco VPN client (vpnc)" +-msgstr "Cisco VPN 클라이언트 호환 (vpnc)" ++#: ../properties/nm-libreswan-editor-plugin.c:43 ++msgid "IPsec based VPN" ++msgstr "IPsec 기반 VPN" + +-#: ../properties/nm-vpnc.c:543 +-msgid "The following vpnc VPN connection will be created:" +-msgstr "다음 vpnc VPN 연결이 만들어집니다:" ++#: ../properties/nm-libreswan-editor-plugin.c:44 ++msgid "IPsec based VPN for remote clients" ++msgstr "원격 클라이언트 용 IPsec 기반 VPN" + +-#: ../properties/nm-vpnc.c:545 ++#: ../properties/nm-libreswan-editor-plugin.c:98 ++#: ../properties/nm-libreswan-editor-plugin.c:276 + #, c-format +-msgid "Name: %s" +-msgstr "이름: %s" ++msgid "Can’t open file “%s”: %s" ++msgstr "파일 “%s”을/를 열 수 없습니다: %s" + +-#: ../properties/nm-vpnc.c:548 ++#: ../properties/nm-libreswan-editor-plugin.c:228 + #, c-format +-msgid "Gateway: %s" +-msgstr "게이트웨이: %s" ++msgid "Missing “conn” section in “%s”" ++msgstr "“%s”에 누락된 “conn” 항목" + +-#: ../properties/nm-vpnc.c:550 ++#: ../properties/nm-libreswan-editor-plugin.c:294 + #, c-format +-msgid "Group Name: %s" +-msgstr "그룹 이름: %s" ++msgid "Error writing to file “%s”: %s" ++msgstr "파일 “%s”에 쓰기 오류: %s" + +-#: ../properties/nm-vpnc.c:554 +-#, c-format +-msgid "Username: %s" +-msgstr "사용자이름: %s" ++#: ../src/nm-libreswan-service.c:1464 ++msgid "A password is required." ++msgstr "암호가 필요합니다. " + +-#: ../properties/nm-vpnc.c:559 +-#, c-format +-msgid "Domain: %s" +-msgstr "도메인: %s" ++#: ../src/nm-libreswan-service.c:1874 ++msgid "" ++"Could not process the request because the VPN connection settings were " ++"invalid." ++msgstr "VPN 연결 설정을 사용하지 않아 요청을 처리할 수 없습니다. " + +-#: ../properties/nm-vpnc.c:564 +-#, c-format +-msgid "Routes: %s" +-msgstr "경로: %s" ++#: ../src/nm-libreswan-service.c:1888 ++msgid "Unhandled pending authentication." ++msgstr "보류중인 인증을 처리할 수 없습니다." + +-#: ../properties/nm-vpnc.c:568 +-#, c-format +-msgid "NAT-Keepalive packet interval: %s" +-msgstr "NAT-keepalive 패킷 간격: %s" ++#: ../src/nm-libreswan-service.c:2030 ++msgid "Don’t quit when VPN connection terminates" ++msgstr "VPN 연결이 중단된 경우 종료할 수 없습니다. " ++ ++#: ../src/nm-libreswan-service.c:2031 ++msgid "Enable verbose debug logging (may expose passwords)" ++msgstr "자세한 디버그 로깅 사용 (암호가 노출될 수 있음)" + +-#: ../properties/nm-vpnc.c:572 +-msgid "Enable Single DES" +-msgstr "싱글 DES 사용" ++#: ../src/nm-libreswan-service.c:2032 ++msgid "D-Bus name to use for this instance" ++msgstr "인스턴스에 사용할 D-Bus 이름 " + +-#: ../properties/nm-vpnc.c:576 +-msgid "Disable NAT Traversal" +-msgstr "NAT 탐색 사용 안함" ++#: ../src/nm-libreswan-service.c:2055 ++msgid "" ++"This service provides integrated IPsec VPN capability to NetworkManager." ++msgstr "이 서비스는 통합된 IPsec VPN 기능을 NetworkManager에 제공합니다." + +-#: ../properties/nm-vpnc.c:580 +-msgid "The connection details can be changed using the \"Edit\" button." +-msgstr "\"편집\" 단추를 눌러서 연결 설정을 바꿀 수 있습니다." ++#: ../shared/utils.c:86 ++#, c-format ++msgid "Error writing config: %s" ++msgstr " config 쓰기 오류: %s" + +-#: ../properties/nm-vpnc.c:665 +-msgid "TCP tunneling not supported" +-msgstr "TCP 터널링은 지원하지 않습니다" ++#: ../shared/nm-utils/nm-shared-utils.c:1087 ++#, c-format ++msgid "object class '%s' has no property named '%s'" ++msgstr "개체 클래스 '%s'에 이름이 '%s'인 속성이 없습니다" + +-#: ../properties/nm-vpnc.c:667 ++#: ../shared/nm-utils/nm-shared-utils.c:1094 ++#, c-format ++msgid "property '%s' of object class '%s' is not writable" ++msgstr "개체 클래스의 '%s'의 속성 '%s'에는 쓸 수 없습니다" ++ ++#: ../shared/nm-utils/nm-shared-utils.c:1101 + #, c-format + msgid "" +-"The VPN settings file '%s' specifies that VPN traffic should be tunneled " +-"through TCP which is currently not supported in the vpnc software.\n" +-"\n" +-"The connection can still be created, with TCP tunneling disabled, however it " +-"may not work as expected." ++"construct property \"%s\" for object '%s' can't be set after construction" ++msgstr "구성 후에는 개체 '%s'의 구성 속성 ''%s''을(를) 설정할 수 없습니다" ++ ++#: ../shared/nm-utils/nm-shared-utils.c:1109 ++#, c-format ++msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" + msgstr "" +-"VPN 설정 파일 '%s'에 VPN연결이 TCP를 통해 터널을 뚫도록 되어있습니다만, vpnc " +-"소프트웨어에서 현재 지원하지 않습니다.\n" +-"\n" +-"TCP 터널링이 꺼진채로 연결이 만들어집니다만, 제대로 동작하지 않을 것입니다." ++"'%s::%s'은(는) 올바른 속성 이름이 아닙니다. '%s'은(는) GObject 하위 유형이 아" ++"닙니다" + +-#: ../properties/nm-vpnc.c:687 +-msgid "Settings import incomplete" +-msgstr "설정 가져오기 미완료" ++#: ../shared/nm-utils/nm-shared-utils.c:1118 ++#, c-format ++msgid "unable to set property '%s' of type '%s' from value of type '%s'" ++msgstr "유형 '%s'의 값에서 유형 '%s'의 속성 '%s'(을)를 설정할 수 없습니다" + +-#: ../properties/nm-vpnc.c:689 ++#: ../shared/nm-utils/nm-shared-utils.c:1129 + #, c-format + msgid "" +-"The VPN settings file '%s' is incomplete. You may not be able to connect " +-"without providing further information." ++"value \"%s\" of type '%s' is invalid or out of range for property '%s' of " ++"type '%s'" + msgstr "" +-"VPN 설정 파일 '%s'의 정보가 충분하지 않습니다. 필요한 정보를 제공하지 않으면 " +-"연결할 수 없습니다." ++"유형 '%s'의 값 \"%s\"이(가) 잘못되었거나 유형 '%s'의 속성 '%s' 범위에서 벗어" ++"났습니다" + +-#: ../properties/nm-vpnc.c:709 +-msgid "Cannot import settings" +-msgstr "설정을 가져올 수 없음" ++#: ../shared/nm-utils/nm-vpn-plugin-utils.c:80 ++#, c-format ++msgid "missing plugin file \"%s\"" ++msgstr "누락된 플러그인 파일 \"%s\"" + +-#: ../properties/nm-vpnc.c:711 ++#: ../shared/nm-utils/nm-vpn-plugin-utils.c:86 + #, c-format +-msgid "The VPN settings file '%s' could not be read or is invalid." +-msgstr "VPN 설정 파일 '%s'을(를) 읽을 수 없거나 올바르지 않습니다." ++msgid "cannot load editor plugin: %s" ++msgstr "편집기 플러그인을 로딩할 수 없습니다: %s" + +-#: ../properties/nm-vpnc.c:726 +-msgid "Select file to import" +-msgstr "가져올 파일 선택" ++#: ../shared/nm-utils/nm-vpn-plugin-utils.c:95 ++#, c-format ++msgid "cannot load factory %s from plugin: %s" ++msgstr "플러그인에서 %s 팩토리를 로드할 수 없습니다: %s" + +-#: ../properties/nm-vpnc.c:908 +-msgid "Save as..." +-msgstr "다른 이름으로 저장..." ++#: ../shared/nm-utils/nm-vpn-plugin-utils.c:121 ++msgid "unknown error creating editor instance" ++msgstr "편집기 인스턴스 작성 중 알 수 없는 오류 " + +-#: ../properties/nm-vpnc.c:937 +-#, c-format +-msgid "A file named \"%s\" already exists." +-msgstr "\"%s\" 파일이 이미 있습니다." ++#: ../properties/nm-libreswan-dialog.ui.h:1 ++msgid "IKEv1 (XAUTH)" ++msgstr "IKEv1 (XAUTH)" + +-#: ../properties/nm-vpnc.c:940 +-msgid "Do you want to replace it with the one you are saving?" +-msgstr "이를 저장할 파일로 바꾸겠습니까?" ++#: ../properties/nm-libreswan-dialog.ui.h:2 ++msgid "IKEv2 (Certificate)" ++msgstr "IKEv2 (인증서)" + +-#: ../properties/nm-vpnc.c:954 +-msgid "Failed to export configuration" +-msgstr "설정 내보내기 실패" ++#: ../properties/nm-libreswan-dialog.ui.h:3 ++msgid "General" ++msgstr "일반" + +-#: ../properties/nm-vpnc.c:956 +-#, c-format +-msgid "Failed to save file %s" +-msgstr "파일 %s(으)로 저장 실패" ++#: ../properties/nm-libreswan-dialog.ui.h:4 ++msgid "_Gateway:" ++msgstr "게이트웨이(_G):" + +-#: ../properties/nm-vpnc-dialog.glade.h:1 +-msgid "example: 172.16.0.0/16 10.11.12.0/24" +-msgstr "예: 172.16.0.0/16 10.11.12.0/24" ++#: ../properties/nm-libreswan-dialog.ui.h:5 ++msgid "Authentication" ++msgstr "인증" + +-#: ../properties/nm-vpnc-dialog.glade.h:2 +-msgid "Connection na_me:" +-msgstr "연결 이름(_M):" ++#: ../properties/nm-libreswan-dialog.ui.h:6 ++msgid "Type:" ++msgstr "유형:" + +-#: ../properties/nm-vpnc-dialog.glade.h:3 +-msgid "Disable NAT _traversal" +-msgstr "NAT 탐색 사용 안함(_T)" ++#: ../properties/nm-libreswan-dialog.ui.h:7 ++msgid "User name:" ++msgstr "사용자명:" + +-#: ../properties/nm-vpnc-dialog.glade.h:4 +-msgid "Enable _weak single DES encryption" +-msgstr "weak single DES 암호화 사용(_W)" ++#: ../properties/nm-libreswan-dialog.ui.h:8 ++msgid "_User password:" ++msgstr "사용자 암호(_U): " + +-#: ../properties/nm-vpnc-dialog.glade.h:5 ++#: ../properties/nm-libreswan-dialog.ui.h:9 + msgid "G_roup name:" + msgstr "그룹 이름(_R):" + +-#: ../properties/nm-vpnc-dialog.glade.h:6 +-msgid "Import _Saved Configuration..." +-msgstr "저장된 설정 가져오기(_S)..." ++#: ../properties/nm-libreswan-dialog.ui.h:10 ++msgid "_Secret:" ++msgstr "비밀 정보(_S):" + +-#: ../properties/nm-vpnc-dialog.glade.h:7 +-msgid "Interval:" +-msgstr "간격:" ++#: ../properties/nm-libreswan-dialog.ui.h:11 ++msgid "Show passwords" ++msgstr "암호 표시 " + +-#: ../properties/nm-vpnc-dialog.glade.h:8 +-msgid "" +-"Name used to identify the connection to the private network, e.g. \"Campus " +-"VPN\" or \"Corporate Network\"" +-msgstr "사설 네트워크 연결에 붙일 이름. (예: \"학교 VPN\", \"회사 네트워크\")" ++#: ../properties/nm-libreswan-dialog.ui.h:12 ++msgid "_Certificate name:" ++msgstr "인증서 이름(_C):" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:13 ++msgid "_Remote ID:" ++msgstr "원격 ID(_R):" + +-#: ../properties/nm-vpnc-dialog.glade.h:9 +-msgid "Optional" +-msgstr "추가 정보" ++#: ../properties/nm-libreswan-dialog.ui.h:14 ++#, fuzzy ++msgid "Ad_vanced…" ++msgstr "고급(_V)" + +-#: ../properties/nm-vpnc-dialog.glade.h:10 +-msgid "Override _user name" +-msgstr "사용자 이름 덮어쓰기(_U)" ++#: ../properties/nm-libreswan-dialog.ui.h:15 ++msgid "no" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:16 ++msgid "yes" ++msgstr "" + +-#: ../properties/nm-vpnc-dialog.glade.h:11 ++#: ../properties/nm-libreswan-dialog.ui.h:17 ++msgid "force" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:18 ++msgid "IPsec Advanced Options" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:19 ++#, fuzzy ++msgid "Identification" ++msgstr "인증" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:20 ++msgid "Domain:" ++msgstr "도메인:" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:21 + msgid "" +-"Please enter the information provided by your system administrator below. Do " +-"not enter your password here as you will be prompted when connecting." ++"(NT-)Domain name for authentication.\n" ++"config: Domain " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:23 ++msgid "Security" + msgstr "" +-"시스템 관리자에게 받은 정보를 입력하십시오. 연결될 때 나타나는 화면에 암호를 " +-"입력하지 마십시오." + +-#: ../properties/nm-vpnc-dialog.glade.h:12 ++#: ../properties/nm-libreswan-dialog.ui.h:24 ++msgid "Phase1 Algorithms:" ++msgstr "1 단계 알고리즘:" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:25 + msgid "" +-"Please note that the file you import is not a Cisco VPN or VPNC " +-"configuration file. Ask your adminstrator for the file." ++"IKE encryption/authentication algorithm to be used for the connection (phase " ++"1 aka ISAKMP SA). The format is “cipher-hash;modpgroup, cipher-hash;" ++"modpgroup, …”.\n" ++"config: ike " + msgstr "" +-"가져온 파일이 Cisco VPN이나 VPNC 설정 파일이 아닙니다. 관리자에게 문의하십시" +-"오." + +-#: ../properties/nm-vpnc-dialog.glade.h:13 +-msgid "Required" +-msgstr "필수 정보" ++#: ../properties/nm-libreswan-dialog.ui.h:27 ++msgid "Phase2 Algorithms:" ++msgstr "2 단계 알고리즘: " + +-#: ../properties/nm-vpnc-dialog.glade.h:14 +-msgid "Use NAT _keepalive packets" +-msgstr "NAT keepalive 패킷 사용(_K)" ++#: ../properties/nm-libreswan-dialog.ui.h:28 ++msgid "" ++"Specifies the algorithms that will be offered/accepted for a phase2 " ++"negotiation. The format is “cipher-hash;modpgroup, cipher-hash;modpgroup, " ++"…”.\n" ++"config: esp " ++msgstr "" + +-#: ../properties/nm-vpnc-dialog.glade.h:15 +-msgid "Use _domain for authentication" +-msgstr "인증에 도메인 사용(_D)" ++#: ../properties/nm-libreswan-dialog.ui.h:30 ++msgid "Phase1 Lifetime:" ++msgstr "1 단계 수명: " + +-#: ../properties/nm-vpnc-dialog.glade.h:16 +-msgid "_Gateway:" +-msgstr "게이트웨이(_G):" ++#: ../properties/nm-libreswan-dialog.ui.h:31 ++msgid "" ++"How long the keying channel of a connection should last before being " ++"renegotiated. The value is expressed by a number followed by an optional " ++"“s”(econds), “m”(inutes), “h”(ours) or “d”(ays).\n" ++"config: ikelifetime " ++msgstr "" + +-#: ../properties/nm-vpnc-dialog.glade.h:17 +-msgid "_Only use VPN connection for these addresses" +-msgstr "이 주소에 VPN 연결 만 사용(_O)" ++#: ../properties/nm-libreswan-dialog.ui.h:33 ++msgid "Phase2 Lifetime:" ++msgstr "2 단계 수명: " + +-msgid "Connection Information" +-msgstr "연결 정보" ++#: ../properties/nm-libreswan-dialog.ui.h:34 ++msgid "" ++"How long a particular instance of a connection (a set of encryption/" ++"authentication keys for user packets) should last, from successful " ++"negotiation to expiry. The value is expressed by a number followed by an " ++"optional “s”(econds), “m”(inutes), “h”(ours) or “d”(ays).\n" ++"config: salifetime " ++msgstr "" + +-msgid "Connection Name" +-msgstr "연결 이름" ++#: ../properties/nm-libreswan-dialog.ui.h:36 ++msgid "Disable rekeying" ++msgstr "" + ++#: ../properties/nm-libreswan-dialog.ui.h:37 + msgid "" +-"The VPN login failed because the user name and password were not accepted." +-msgstr "사용자 이름과 열쇠글이 틀려서 로그인 실패했습니다." ++"Whether a connection should not be renegotiated when it is about to expire.\n" ++"config: rekey " ++msgstr "" + +-msgid "The VPN login failed because the VPN program could not be started." +-msgstr "VPN 프로그램을 시작할 수 없어서 로그인 실패했습니다." ++#: ../properties/nm-libreswan-dialog.ui.h:39 ++msgid "Disable PFS" ++msgstr "" + ++#: ../properties/nm-libreswan-dialog.ui.h:40 + msgid "" +-"The VPN login failed because the VPN program could not connect to the VPN " +-"server." +-msgstr "VPN 프로그램이 VPN 서버에 연결하지 못해서 로그인 실패했습니다." ++"Disable perfect forward security. Enable this option only if the server " ++"doesn’t support PFS.\n" ++"config: pfs " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:42 ++msgid "Connectivity" ++msgstr "" + ++#: ../properties/nm-libreswan-dialog.ui.h:43 ++msgid "Remote Network:" ++msgstr "원격 네트워크:" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:44 + msgid "" +-"The VPN login failed because the VPN configuration options were invalid." +-msgstr "VPN 설정 옵션이 잘못되어서 로그인 실패했습니다." ++"Private subnet behind the remote participant, expressed as network/netmask.\n" ++"config: rightsubnet " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:46 ++msgid "Enable fragmentation" ++msgstr "" + ++#: ../properties/nm-libreswan-dialog.ui.h:47 ++msgid "narrowing" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:48 + msgid "" +-"The VPN login failed because the VPN program received an invalid " +-"configuration from the VPN server." ++"IKEv2 negotiation may allow establishing an IPsec connection with narrowed " ++"down traffic selectors. This option is ignored for IKEv1.\n" ++"config: narrowing " + msgstr "" +-"VPN 프로그램이 VPN 서버에서 잘못된 설정값을 받아서 로그인 실패했습니다." + +-msgid "O_ptional Information" +-msgstr "기타 정보(_P)" ++#: ../properties/nm-libreswan-dialog.ui.h:50 ++msgid "Enable MOBIKE" ++msgstr "" +diff --git a/po/pt_BR.po b/po/pt_BR.po +index b6d9084..10b8352 100644 +--- a/po/pt_BR.po ++++ b/po/pt_BR.po +@@ -7,21 +7,22 @@ + # Henrique P Machado , 2008 + # Enrico Nicoletto , 2013. + # Rafael Fontenelle , 2016-2018. ++# ljanda , 2018. #zanata ++# lrintel , 2018. #zanata + msgid "" + msgstr "" + "Project-Id-Version: NetworkManager-vpnc\n" +-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/" +-"NetworkManager-libreswan/issues\n" +-"POT-Creation-Date: 2018-09-22 09:00+0000\n" +-"PO-Revision-Date: 2018-10-05 11:08-0200\n" +-"Last-Translator: Rafael Fontenelle \n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2018-10-16 15:10+0200\n" ++"PO-Revision-Date: 2018-08-20 09:48+0000\n" ++"Last-Translator: Copied by Zanata \n" + "Language-Team: Brazilian Portuguese \n" + "Language: pt_BR\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=2; plural=(n > 1);\n" +-"X-Generator: Virtaal 1.0.0-beta1\n" ++"X-Generator: Zanata 4.6.2\n" + "X-Project-Style: gnome\n" + + #: ../appdata/network-manager-libreswan.metainfo.xml.in.h:1 +@@ -85,18 +86,18 @@ msgstr "VPN baseada em IPsec" + msgid "IPsec based VPN for remote clients" + msgstr "VPN baseada em IPsec para clientes remotos" + +-#: ../properties/nm-libreswan-editor-plugin.c:80 +-#: ../properties/nm-libreswan-editor-plugin.c:158 ++#: ../properties/nm-libreswan-editor-plugin.c:98 ++#: ../properties/nm-libreswan-editor-plugin.c:276 + #, c-format + msgid "Can’t open file “%s”: %s" + msgstr "Não foi possível abrir o arquivo “%s”: %s" + +-#: ../properties/nm-libreswan-editor-plugin.c:135 ++#: ../properties/nm-libreswan-editor-plugin.c:228 + #, c-format + msgid "Missing “conn” section in “%s”" + msgstr "Faltando seção “conn” em “%s”" + +-#: ../properties/nm-libreswan-editor-plugin.c:176 ++#: ../properties/nm-libreswan-editor-plugin.c:294 + #, c-format + msgid "Error writing to file “%s”: %s" + msgstr "Erro ao gravar o arquivo “%s”: %s" +@@ -372,7 +373,6 @@ msgstr "" + "config: rekey " + + #: ../properties/nm-libreswan-dialog.ui.h:39 +-#| msgid "Disabled" + msgid "Disable PFS" + msgstr "Desabilitar PFS" + +@@ -651,35 +651,5 @@ msgstr "Habilitar MOBIKE" + #~ msgid "_Only use VPN connection for these addresses" + #~ msgstr "Usar conexão VPN _apenas para estes endereços" + +-#~ msgid "" +-#~ "The VPN login failed because the user name and password were not accepted." +-#~ msgstr "" +-#~ "A autenticação na VPN falhou porque o nome do usuário e a senha não foram " +-#~ "aceitos." +- +-#~ msgid "The VPN login failed because the VPN program could not be started." +-#~ msgstr "" +-#~ "A autenticação na VPN falhou porque o programa VPN não pôde ser iniciado." +- +-#~ msgid "" +-#~ "The VPN login failed because the VPN program could not connect to the VPN " +-#~ "server." +-#~ msgstr "" +-#~ "A autenticação na VPN falhou porque o programa VPN não pôde conectar ao " +-#~ "servidor VPN." +- +-#~ msgid "" +-#~ "The VPN login failed because the VPN program received an invalid " +-#~ "configuration from the VPN server." +-#~ msgstr "" +-#~ "A autenticação na VPN falhou porque o programa VPN recebeu uma " +-#~ "configuração inválida do servidor VPN." +- +-#~ msgid "Connection Information" +-#~ msgstr "Informações da conexão" +- +-#~ msgid "Connection Name" +-#~ msgstr "Nome da conexão" +- +-#~ msgid "O_ptional Information" +-#~ msgstr "_Informações opcionais" ++#~ msgid "Ad_vanced" ++#~ msgstr "A_vançado" +diff --git a/po/ru.po b/po/ru.po +index 6e56ea2..a1fb325 100644 +--- a/po/ru.po ++++ b/po/ru.po +@@ -6,191 +6,381 @@ + # Maxim Dziumanenko , 2005-2007. + # Leonid Kanter , 2007, 2008. + # Артём Попов , 2009. ++# lrintel , 2018. #zanata ++# phrdina , 2018. #zanata + msgid "" + msgstr "" +-"Project-Id-Version: ru\n" ++"Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-02-20 10:34+0300\n" +-"PO-Revision-Date: 2009-02-12 16:57+0600\n" +-"Last-Translator: Артём Попов \n" ++"POT-Creation-Date: 2018-10-16 15:10+0200\n" ++"PO-Revision-Date: 2018-08-20 09:48+0000\n" ++"Last-Translator: Copied by Zanata \n" + "Language-Team: Russian \n" + "Language: ru\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" ++"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" ++"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" ++"X-Generator: Zanata 4.6.2\n" + +-#: ../auth-dialog/gnome-two-password-dialog.c:103 +-msgid "_Secondary Password:" +-msgstr "_Вторичный пароль:" ++#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:1 ++msgid "IPsec VPN client" ++msgstr "" + +-#: ../auth-dialog/gnome-two-password-dialog.c:159 +-msgid "_Password:" +-msgstr "_Пароль:" ++#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:2 ++msgid "Libreswan based client for IKEv1 based IPsec virtual private networks" ++msgstr "" + +-#: ../auth-dialog/gnome-two-password-dialog.c:240 +-msgid "Sh_ow passwords" +-msgstr "П_оказать пароли" ++#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:3 ++msgid "" ++"Support for configuring IKEv1 based IPsec virtual private network " ++"connections." ++msgstr "" + +-#: ../auth-dialog/gnome-two-password-dialog.c:300 +-msgid "_Remember passwords for this session" +-msgstr "_Запомнить пароли для этого сеанса" ++#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:4 ++msgid "Compatible with Libreswan and Cisco IPsec VPN servers." ++msgstr "" + +-#: ../auth-dialog/gnome-two-password-dialog.c:301 +-msgid "_Save passwords in keyring" +-msgstr "_Сохранить пароли на брелоке" ++#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:5 ++msgid "The NetworkManager Developers" ++msgstr "Разработчики NetworkManager" + +-#: ../auth-dialog/main.c:170 ++#: ../auth-dialog/main.c:165 + #, c-format +-msgid "You need to authenticate to access the Virtual Private Network '%s'." +-msgstr "Для доступа к виртуальной частной сети «%s» требуется аутентификация." ++msgid "Authenticate VPN %s" ++msgstr "" ++ ++#: ../auth-dialog/main.c:182 ++msgid "Password:" ++msgstr "Пароль:" ++ ++#: ../auth-dialog/main.c:192 ++msgid "Group Password:" ++msgstr "" + +-#: ../auth-dialog/main.c:171 ++#: ../auth-dialog/main.c:228 + msgid "Authenticate VPN" + msgstr "Аутентификация VPN" + +-#: ../auth-dialog/main.c:175 ++#: ../auth-dialog/main.c:237 + msgid "_Group Password:" + msgstr "Пароль _группы:" + +-#: ../nm-vpnc.desktop.in.h:1 +-msgid "Add, Remove, and Edit VPN Connections" +-msgstr "Добавление, изменение и удаление соединений VPN" ++#: ../auth-dialog/main.c:487 ++#, c-format ++msgid "You need to authenticate to access the Virtual Private Network “%s”." ++msgstr "" + +-#: ../nm-vpnc.desktop.in.h:2 +-msgid "VPN Connection Manager (vpnc)" +-msgstr "Менеджер соединений VPN (vpnc)" ++#: ../properties/nm-libreswan-editor-plugin.c:43 ++msgid "IPsec based VPN" ++msgstr "" + +-#: ../properties/nm-vpnc.c:53 +-msgid "Cisco Compatible VPN (vpnc)" +-msgstr "Cisco-совместимая VPN (vpnc)" ++#: ../properties/nm-libreswan-editor-plugin.c:44 ++msgid "IPsec based VPN for remote clients" ++msgstr "" + +-#: ../properties/nm-vpnc.c:54 ++#: ../properties/nm-libreswan-editor-plugin.c:98 ++#: ../properties/nm-libreswan-editor-plugin.c:276 ++#, c-format ++msgid "Can’t open file “%s”: %s" ++msgstr "" ++ ++#: ../properties/nm-libreswan-editor-plugin.c:228 ++#, c-format ++msgid "Missing “conn” section in “%s”" ++msgstr "" ++ ++#: ../properties/nm-libreswan-editor-plugin.c:294 ++#, c-format ++msgid "Error writing to file “%s”: %s" ++msgstr "" ++ ++#: ../src/nm-libreswan-service.c:1464 ++msgid "A password is required." ++msgstr "" ++ ++#: ../src/nm-libreswan-service.c:1874 + msgid "" +-"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-based " +-"VPN gateways." +-msgstr "Совместим с различными роутерами Cisco, Juniper, Netscreen, Sonicwall." ++"Could not process the request because the VPN connection settings were " ++"invalid." ++msgstr "" + +-#: ../properties/nm-vpnc.c:339 +-msgid "Saved" +-msgstr "Сохранённый" ++#: ../src/nm-libreswan-service.c:1888 ++msgid "Unhandled pending authentication." ++msgstr "" + +-#: ../properties/nm-vpnc.c:346 +-msgid "Always Ask" +-msgstr "Всегда спрашивать" ++#: ../src/nm-libreswan-service.c:2030 ++msgid "Don’t quit when VPN connection terminates" ++msgstr "" + +-#: ../properties/nm-vpnc.c:353 +-msgid "Not Required" +-msgstr "Не требуется" ++#: ../src/nm-libreswan-service.c:2031 ++msgid "Enable verbose debug logging (may expose passwords)" ++msgstr "" ++ ++#: ../src/nm-libreswan-service.c:2032 ++msgid "D-Bus name to use for this instance" ++msgstr "" + +-#: ../properties/nm-vpnc.c:412 +-msgid "Secure (default)" +-msgstr "Строгое (по умолчанию)" ++#: ../src/nm-libreswan-service.c:2055 ++msgid "" ++"This service provides integrated IPsec VPN capability to NetworkManager." ++msgstr "" + +-#: ../properties/nm-vpnc.c:415 +-msgid "Weak (use with caution)" +-msgstr "Слабое (использовать с осторожностью)" ++#: ../shared/utils.c:86 ++#, c-format ++msgid "Error writing config: %s" ++msgstr "" + +-#: ../properties/nm-vpnc.c:423 +-msgid "None (completely insecure)" +-msgstr "Нет (без шифрования)" ++#: ../shared/nm-utils/nm-shared-utils.c:1087 ++#, c-format ++msgid "object class '%s' has no property named '%s'" ++msgstr "класс объекта «%s» не содержит свойства «%s»" + +-#: ../properties/nm-vpnc.c:471 +-msgid "Cisco UDP (default)" +-msgstr "Cisco UDP (по умолчанию)" ++#: ../shared/nm-utils/nm-shared-utils.c:1094 ++#, c-format ++msgid "property '%s' of object class '%s' is not writable" ++msgstr "свойство «%s» класса объекта «%s» недоступно для записи" + +-#: ../properties/nm-vpnc.c:478 +-msgid "NAT-T" +-msgstr "NAT-T" ++#: ../shared/nm-utils/nm-shared-utils.c:1101 ++#, c-format ++msgid "" ++"construct property \"%s\" for object '%s' can't be set after construction" ++msgstr "" ++"формирование свойства «%s» для объекта «%s» не может быть настроено после " ++"сборки" + +-#: ../properties/nm-vpnc.c:485 +-msgid "Disabled" +-msgstr "Выключено" ++#: ../shared/nm-utils/nm-shared-utils.c:1109 ++#, c-format ++msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" ++msgstr "" ++"Недопустимое название свойства: «%s::%s». «%s» не является подтипом GObject" + +-#: ../properties/nm-vpnc.c:1116 +-msgid "TCP tunneling not supported" +-msgstr "Туннелирование TCP не поддерживается" ++#: ../shared/nm-utils/nm-shared-utils.c:1118 ++#, c-format ++msgid "unable to set property '%s' of type '%s' from value of type '%s'" ++msgstr "" ++"не удалось установить свойство «%s», так как его тип «%s» не может быть " ++"заменен типом «%s»" + +-#: ../properties/nm-vpnc.c:1118 ++#: ../shared/nm-utils/nm-shared-utils.c:1129 + #, c-format + msgid "" +-"The VPN settings file '%s' specifies that VPN traffic should be tunneled " +-"through TCP which is currently not supported in the vpnc software.\n" +-"\n" +-"The connection can still be created, with TCP tunneling disabled, however it " +-"may not work as expected." +-msgstr "" +-"Файл параметров VPN \"%s\" указывает, что трафик VPN должен быть " +-"туннелирован через TCP. Эта функция сейчас не поддерживается программой " +-"vpnc.\n" +-"\n" +-"Подключение может быть создано с отключенным туннелированием TCP, но оно " +-"может работать не так, как ожидается." +- +-#: ../properties/nm-vpnc-dialog.glade.h:1 +-msgid " " +-msgstr " " +- +-#: ../properties/nm-vpnc-dialog.glade.h:2 +-msgid "General" +-msgstr "Общие" +- +-#: ../properties/nm-vpnc-dialog.glade.h:3 +-msgid "Optional" +-msgstr "Необязательные" +- +-#: ../properties/nm-vpnc-dialog.glade.h:4 +-msgid "Disable Dead Peer Detection" +-msgstr "Отключить Dead Peer Detection" +- +-#: ../properties/nm-vpnc-dialog.glade.h:5 +-msgid "Domain:" +-msgstr "Домен:" ++"value \"%s\" of type '%s' is invalid or out of range for property '%s' of " ++"type '%s'" ++msgstr "" ++"значение «%s» с типом «%s» неверное или выходит за пределы диапазона для " ++"свойства «%s» с типом «%s»" + +-#: ../properties/nm-vpnc-dialog.glade.h:6 +-msgid "Encryption method:" +-msgstr "Метод шифрования:" ++#: ../shared/nm-utils/nm-vpn-plugin-utils.c:80 ++#, c-format ++msgid "missing plugin file \"%s\"" ++msgstr "" + +-#: ../properties/nm-vpnc-dialog.glade.h:7 +-msgid "G_roup name:" +-msgstr "Имя г_руппы:" ++#: ../shared/nm-utils/nm-vpn-plugin-utils.c:86 ++#, c-format ++msgid "cannot load editor plugin: %s" ++msgstr "" + +-#: ../properties/nm-vpnc-dialog.glade.h:8 +-msgid "Gro_up password:" +-msgstr "Пароль гр_уппы:" ++#: ../shared/nm-utils/nm-vpn-plugin-utils.c:95 ++#, c-format ++msgid "cannot load factory %s from plugin: %s" ++msgstr "" + +-#: ../properties/nm-vpnc-dialog.glade.h:9 +-msgid "NAT traversal:" +-msgstr "Обход NAT:" ++#: ../shared/nm-utils/nm-vpn-plugin-utils.c:121 ++msgid "unknown error creating editor instance" ++msgstr "" + +-#: ../properties/nm-vpnc-dialog.glade.h:10 +-msgid "Show passwords" +-msgstr "Показать пароли" ++#: ../properties/nm-libreswan-dialog.ui.h:1 ++msgid "IKEv1 (XAUTH)" ++msgstr "" + +-#: ../properties/nm-vpnc-dialog.glade.h:11 +-msgid "User name:" +-msgstr "Имя пользователя:" ++#: ../properties/nm-libreswan-dialog.ui.h:2 ++msgid "IKEv2 (Certificate)" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:3 ++msgid "General" ++msgstr "Основное" + +-#: ../properties/nm-vpnc-dialog.glade.h:12 ++#: ../properties/nm-libreswan-dialog.ui.h:4 + msgid "_Gateway:" + msgstr "_Шлюз:" + +-#: ../properties/nm-vpnc-dialog.glade.h:13 ++#: ../properties/nm-libreswan-dialog.ui.h:5 ++msgid "Authentication" ++msgstr "Аутентификация" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:6 ++msgid "Type:" ++msgstr "Тип:" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:7 ++msgid "User name:" ++msgstr "Имя пользователя:" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:8 + msgid "_User password:" + msgstr "Пароль _пользователя:" + +-#~ msgid "_Username:" +-#~ msgstr "_Имя пользователя:" ++#: ../properties/nm-libreswan-dialog.ui.h:9 ++msgid "G_roup name:" ++msgstr "Имя г_руппы:" + +-#~ msgid "_Domain:" +-#~ msgstr "_Домен:" ++#: ../properties/nm-libreswan-dialog.ui.h:10 ++msgid "_Secret:" ++msgstr "" + +-#~ msgid "Connect _anonymously" +-#~ msgstr "Подключаться _анонимно" ++#: ../properties/nm-libreswan-dialog.ui.h:11 ++msgid "Show passwords" ++msgstr "Показать пароли" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:12 ++msgid "_Certificate name:" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:13 ++msgid "_Remote ID:" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:14 ++msgid "Ad_vanced…" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:15 ++msgid "no" ++msgstr "" + +-#~ msgid "Connect as _user:" +-#~ msgstr "_Подключаться как пользователь:" ++#: ../properties/nm-libreswan-dialog.ui.h:16 ++msgid "yes" ++msgstr "" + +-#~ msgid "NAT-T (default)" +-#~ msgstr "NAT-T (по умолчанию)" ++#: ../properties/nm-libreswan-dialog.ui.h:17 ++msgid "force" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:18 ++msgid "IPsec Advanced Options" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:19 ++#, fuzzy ++msgid "Identification" ++msgstr "Аутентификация" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:20 ++msgid "Domain:" ++msgstr "Домен:" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:21 ++msgid "" ++"(NT-)Domain name for authentication.\n" ++"config: Domain " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:23 ++msgid "Security" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:24 ++msgid "Phase1 Algorithms:" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:25 ++msgid "" ++"IKE encryption/authentication algorithm to be used for the connection (phase " ++"1 aka ISAKMP SA). The format is “cipher-hash;modpgroup, cipher-hash;" ++"modpgroup, …”.\n" ++"config: ike " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:27 ++msgid "Phase2 Algorithms:" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:28 ++msgid "" ++"Specifies the algorithms that will be offered/accepted for a phase2 " ++"negotiation. The format is “cipher-hash;modpgroup, cipher-hash;modpgroup, " ++"…”.\n" ++"config: esp " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:30 ++msgid "Phase1 Lifetime:" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:31 ++msgid "" ++"How long the keying channel of a connection should last before being " ++"renegotiated. The value is expressed by a number followed by an optional " ++"“s”(econds), “m”(inutes), “h”(ours) or “d”(ays).\n" ++"config: ikelifetime " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:33 ++msgid "Phase2 Lifetime:" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:34 ++msgid "" ++"How long a particular instance of a connection (a set of encryption/" ++"authentication keys for user packets) should last, from successful " ++"negotiation to expiry. The value is expressed by a number followed by an " ++"optional “s”(econds), “m”(inutes), “h”(ours) or “d”(ays).\n" ++"config: salifetime " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:36 ++msgid "Disable rekeying" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:37 ++msgid "" ++"Whether a connection should not be renegotiated when it is about to expire.\n" ++"config: rekey " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:39 ++msgid "Disable PFS" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:40 ++msgid "" ++"Disable perfect forward security. Enable this option only if the server " ++"doesn’t support PFS.\n" ++"config: pfs " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:42 ++msgid "Connectivity" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:43 ++msgid "Remote Network:" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:44 ++msgid "" ++"Private subnet behind the remote participant, expressed as network/netmask.\n" ++"config: rightsubnet " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:46 ++msgid "Enable fragmentation" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:47 ++msgid "narrowing" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:48 ++msgid "" ++"IKEv2 negotiation may allow establishing an IPsec connection with narrowed " ++"down traffic selectors. This option is ignored for IKEv1.\n" ++"config: narrowing " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:50 ++msgid "Enable MOBIKE" ++msgstr "" +diff --git a/po/zh_CN.po b/po/zh_CN.po +index 4ee26bc..e38d326 100644 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -3,232 +3,375 @@ + # This file is distributed under the same license as the PACKAGE package. + # Funda Wang , 2006. + # Wei Mingzhi , 2009. +-# ++# ljanda , 2018. #zanata ++# lrintel , 2018. #zanata ++# tfu , 2018. #zanata + msgid "" + msgstr "" +-"Project-Id-Version: NetworkManager-vpnc HEAD\n" +-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +-"product=NetworkManager&component=VPN: vpnc\n" +-"POT-Creation-Date: 2009-02-17 01:49+0000\n" +-"PO-Revision-Date: 2009-02-18 15:07+0800\n" +-"Last-Translator: Wei Mingzhi \n" ++"Project-Id-Version: PACKAGE VERSION\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2018-10-16 15:10+0200\n" ++"PO-Revision-Date: 2018-09-18 04:19+0000\n" ++"Last-Translator: tfu \n" + "Language-Team: zh_CN \n" +-"Language: zh_CN\n" ++"Language: zh_Hans\n" + "MIME-Version: 1.0\n" +-"Content-Type: text/plain; charset=utf-8\n" ++"Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" ++"X-Generator: Zanata 4.6.2\n" ++"Plural-Forms: nplurals=1; plural=0\n" + +-#: ../auth-dialog/gnome-two-password-dialog.c:103 +-msgid "_Secondary Password:" +-msgstr "次要密码(_S):" ++#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:1 ++msgid "IPsec VPN client" ++msgstr "IPsec VPN 客户端" + +-#: ../auth-dialog/gnome-two-password-dialog.c:159 +-msgid "_Password:" +-msgstr "密码(_P):" ++#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:2 ++msgid "Libreswan based client for IKEv1 based IPsec virtual private networks" ++msgstr "基于 IKEv1 的 IPsec VPN 的基于 Libreswan 的客户端" + +-#: ../auth-dialog/gnome-two-password-dialog.c:240 +-msgid "Sh_ow passwords" +-msgstr "显示密码(_O)" ++#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:3 ++msgid "" ++"Support for configuring IKEv1 based IPsec virtual private network " ++"connections." ++msgstr "支持配置基于 IKEv1 的 IPsec VPN 连接。" + +-#: ../auth-dialog/gnome-two-password-dialog.c:300 +-msgid "_Remember passwords for this session" +-msgstr "本次会话记住密码(_R)" ++#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:4 ++msgid "Compatible with Libreswan and Cisco IPsec VPN servers." ++msgstr "与 Libreswan 和 Cisco IPsec VPN 服务器兼容。" + +-#: ../auth-dialog/gnome-two-password-dialog.c:301 +-msgid "_Save passwords in keyring" +-msgstr "在密钥环中保存密码(_S)" ++#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:5 ++msgid "The NetworkManager Developers" ++msgstr "NetworkManager Developers" + +-#: ../auth-dialog/main.c:170 ++#: ../auth-dialog/main.c:165 + #, c-format +-msgid "You need to authenticate to access the Virtual Private Network '%s'." +-msgstr "您需要进行身份验证才能访问“%s”。" ++msgid "Authenticate VPN %s" ++msgstr "验证 VPN %s" ++ ++#: ../auth-dialog/main.c:182 ++msgid "Password:" ++msgstr "密码：" ++ ++#: ../auth-dialog/main.c:192 ++msgid "Group Password:" ++msgstr "组密码：" + +-#: ../auth-dialog/main.c:171 ++#: ../auth-dialog/main.c:228 + msgid "Authenticate VPN" + msgstr "认证 VPN" + +-#: ../auth-dialog/main.c:175 ++#: ../auth-dialog/main.c:237 + msgid "_Group Password:" + msgstr "组密码(_G):" + +-#: ../nm-vpnc.desktop.in.h:1 +-msgid "Add, Remove, and Edit VPN Connections" +-msgstr "添加、删除及编辑 VPN 连接" ++#: ../auth-dialog/main.c:487 ++#, c-format ++msgid "You need to authenticate to access the Virtual Private Network “%s”." ++msgstr "您需要验证来访问 VPN “%s”。" ++ ++#: ../properties/nm-libreswan-editor-plugin.c:43 ++msgid "IPsec based VPN" ++msgstr "基于 IPsec 的 VPN" ++ ++#: ../properties/nm-libreswan-editor-plugin.c:44 ++msgid "IPsec based VPN for remote clients" ++msgstr "远程客户端的基于 IPsec 的 VPN" + +-#: ../nm-vpnc.desktop.in.h:2 +-msgid "VPN Connection Manager (vpnc)" +-msgstr "VPN 连接管理器(vpnc)" ++#: ../properties/nm-libreswan-editor-plugin.c:98 ++#: ../properties/nm-libreswan-editor-plugin.c:276 ++#, c-format ++msgid "Can’t open file “%s”: %s" ++msgstr "无法打开文件 “%s”: %s" ++ ++#: ../properties/nm-libreswan-editor-plugin.c:228 ++#, c-format ++msgid "Missing “conn” section in “%s”" ++msgstr "“%s” 中缺少 “conn” 项 " ++ ++#: ../properties/nm-libreswan-editor-plugin.c:294 ++#, c-format ++msgid "Error writing to file “%s”: %s" ++msgstr "写文件 “%s” 错误 : %s" + +-#: ../properties/nm-vpnc.c:53 +-msgid "Cisco Compatible VPN (vpnc)" +-msgstr "Cisco 兼容 VPN (vpnc)" ++#: ../src/nm-libreswan-service.c:1464 ++msgid "A password is required." ++msgstr "需要一个密码。" + +-#: ../properties/nm-vpnc.c:54 ++#: ../src/nm-libreswan-service.c:1874 + msgid "" +-"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-based " +-"VPN gateways." +-msgstr "" +-"与多种 Cisco, Juniper, Netscreen 以及 Sonicwall 的基于 IPsec 的 VPN 网关兼" +-"容。" ++"Could not process the request because the VPN connection settings were " ++"invalid." ++msgstr "无法处理请求，因为 VPN 的连接设置无效。" + +-#: ../properties/nm-vpnc.c:339 +-msgid "Saved" +-msgstr "已保存" ++#: ../src/nm-libreswan-service.c:1888 ++msgid "Unhandled pending authentication." ++msgstr "无法处理待定的验证。" + +-#: ../properties/nm-vpnc.c:346 +-msgid "Always Ask" +-msgstr "总是提示" ++#: ../src/nm-libreswan-service.c:2030 ++msgid "Don’t quit when VPN connection terminates" ++msgstr "当 VPN 连接中断时不能退出" + +-#: ../properties/nm-vpnc.c:353 +-msgid "Not Required" +-msgstr "不需要" ++#: ../src/nm-libreswan-service.c:2031 ++msgid "Enable verbose debug logging (may expose passwords)" ++msgstr "启用详细的 debug logging（可能会暴露密码）" + +-#: ../properties/nm-vpnc.c:412 +-msgid "Secure (default)" +-msgstr "安全的 (默认)" ++#: ../src/nm-libreswan-service.c:2032 ++msgid "D-Bus name to use for this instance" ++msgstr "这个实例要使用的 D-Bus 名称" + +-#: ../properties/nm-vpnc.c:415 +-msgid "Weak (use with caution)" +-msgstr "弱安全性 (谨慎使用)" ++#: ../src/nm-libreswan-service.c:2055 ++msgid "" ++"This service provides integrated IPsec VPN capability to NetworkManager." ++msgstr "这个服务为 NetworkManager 提供了集成的 IPsec VPN 功能。" + +-#: ../properties/nm-vpnc.c:423 +-msgid "None (completely insecure)" +-msgstr "无 (完全不安全)" ++#: ../shared/utils.c:86 ++#, c-format ++msgid "Error writing config: %s" ++msgstr "错误写配置: %s" + +-#: ../properties/nm-vpnc.c:471 +-msgid "Cisco UDP (default)" +-msgstr "Cisco UDP (默认)" ++#: ../shared/nm-utils/nm-shared-utils.c:1087 ++#, c-format ++msgid "object class '%s' has no property named '%s'" ++msgstr "对象类 '%s' 没有名为 '%s' 的属性" + +-#: ../properties/nm-vpnc.c:478 +-msgid "NAT-T" +-msgstr "NAT-T" ++#: ../shared/nm-utils/nm-shared-utils.c:1094 ++#, c-format ++msgid "property '%s' of object class '%s' is not writable" ++msgstr "对象类 '%s' 的 '%s' 属性是不可写的" + +-#: ../properties/nm-vpnc.c:485 +-msgid "Disabled" +-msgstr "禁用" ++#: ../shared/nm-utils/nm-shared-utils.c:1101 ++#, c-format ++msgid "" ++"construct property \"%s\" for object '%s' can't be set after construction" ++msgstr "对象 '%s' 的构造属性 \"%s\" 在构造后不能被设置" + +-#: ../properties/nm-vpnc.c:1116 +-msgid "TCP tunneling not supported" +-msgstr "不支持 TCP 隧道" ++#: ../shared/nm-utils/nm-shared-utils.c:1109 ++#, c-format ++msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" ++msgstr "'%s::%s' 不是有效的属性名，'%s' 不是 GObject 子类型。" + +-#: ../properties/nm-vpnc.c:1118 ++#: ../shared/nm-utils/nm-shared-utils.c:1118 ++#, c-format ++msgid "unable to set property '%s' of type '%s' from value of type '%s'" ++msgstr "无法从类型 '%s' 的值设置类型为 '%s' 的属性 '%s'" ++ ++#: ../shared/nm-utils/nm-shared-utils.c:1129 + #, c-format + msgid "" +-"The VPN settings file '%s' specifies that VPN traffic should be tunneled " +-"through TCP which is currently not supported in the vpnc software.\n" +-"\n" +-"The connection can still be created, with TCP tunneling disabled, however it " +-"may not work as expected." +-msgstr "" +-"VPN 设置文件 '%s' 指定 VPN 流量经由 TCP 隧道，当前 vpnc 软件不支持此特性。\n" +-"\n" +-"连接仍然可以建立，但 TCP 隧道将被禁用。连接可能无法正确工作。" ++"value \"%s\" of type '%s' is invalid or out of range for property '%s' of " ++"type '%s'" ++msgstr "类型 '%s' 的值 \"%s\" 是无效的或超出类型为 '%s' 的属性 '%s' 的范围" + +-#: ../properties/nm-vpnc-dialog.glade.h:1 +-msgid " " +-msgstr " " ++#: ../shared/nm-utils/nm-vpn-plugin-utils.c:80 ++#, c-format ++msgid "missing plugin file \"%s\"" ++msgstr "缺少插件文件 \"%s\"" + +-#: ../properties/nm-vpnc-dialog.glade.h:2 +-msgid "General" +-msgstr "一般" ++#: ../shared/nm-utils/nm-vpn-plugin-utils.c:86 ++#, c-format ++msgid "cannot load editor plugin: %s" ++msgstr "无法加载编辑器插件 : %s" + +-#: ../properties/nm-vpnc-dialog.glade.h:3 +-msgid "Optional" +-msgstr "可选" ++#: ../shared/nm-utils/nm-vpn-plugin-utils.c:95 ++#, c-format ++msgid "cannot load factory %s from plugin: %s" ++msgstr "无法从插件加载 factory %s : %s" + +-#: ../properties/nm-vpnc-dialog.glade.h:4 +-msgid "Disable Dead Peer Detection" +-msgstr "禁用死端检测" ++#: ../shared/nm-utils/nm-vpn-plugin-utils.c:121 ++msgid "unknown error creating editor instance" ++msgstr "创建编辑器未知的错误" + +-#: ../properties/nm-vpnc-dialog.glade.h:5 +-msgid "Domain:" +-msgstr "域:" ++#: ../properties/nm-libreswan-dialog.ui.h:1 ++msgid "IKEv1 (XAUTH)" ++msgstr "IKEv1 (XAUTH)" + +-#: ../properties/nm-vpnc-dialog.glade.h:6 +-msgid "Encryption method:" +-msgstr "加密方法:" ++#: ../properties/nm-libreswan-dialog.ui.h:2 ++msgid "IKEv2 (Certificate)" ++msgstr "IKEv2 (证书)" + +-#: ../properties/nm-vpnc-dialog.glade.h:7 +-msgid "G_roup name:" +-msgstr "组名称(_R):" ++#: ../properties/nm-libreswan-dialog.ui.h:3 ++msgid "General" ++msgstr "常规" + +-#: ../properties/nm-vpnc-dialog.glade.h:8 +-msgid "Gro_up password:" +-msgstr "组密码(_U):" ++#: ../properties/nm-libreswan-dialog.ui.h:4 ++msgid "_Gateway:" ++msgstr "网关(_G):" + +-#: ../properties/nm-vpnc-dialog.glade.h:9 +-msgid "NAT traversal:" +-msgstr "NAT 遍历:" ++#: ../properties/nm-libreswan-dialog.ui.h:5 ++msgid "Authentication" ++msgstr "认证" + +-#: ../properties/nm-vpnc-dialog.glade.h:10 +-msgid "Show passwords" +-msgstr "显示密码" ++#: ../properties/nm-libreswan-dialog.ui.h:6 ++msgid "Type:" ++msgstr "类型:" + +-#: ../properties/nm-vpnc-dialog.glade.h:11 ++#: ../properties/nm-libreswan-dialog.ui.h:7 + msgid "User name:" + msgstr "用户名:" + +-#: ../properties/nm-vpnc-dialog.glade.h:12 +-msgid "_Gateway:" +-msgstr "网关(_G):" +- +-#: ../properties/nm-vpnc-dialog.glade.h:13 ++#: ../properties/nm-libreswan-dialog.ui.h:8 + msgid "_User password:" + msgstr "用户密码(_U):" + +-#~ msgid "Connect _anonymously" +-#~ msgstr "匿名连接(_A)" ++#: ../properties/nm-libreswan-dialog.ui.h:9 ++msgid "G_roup name:" ++msgstr "组名称(_R):" + +-#~ msgid "Connect as _user:" +-#~ msgstr "以用户连接(_U)：" ++#: ../properties/nm-libreswan-dialog.ui.h:10 ++msgid "_Secret:" ++msgstr "秘密(_S):" + +-#~ msgid "Name: %s" +-#~ msgstr "名称：%s" ++#: ../properties/nm-libreswan-dialog.ui.h:11 ++msgid "Show passwords" ++msgstr "显示密码" + +-#~ msgid "Gateway: %s" +-#~ msgstr "网关：%s" ++#: ../properties/nm-libreswan-dialog.ui.h:12 ++msgid "_Certificate name:" ++msgstr "证书名称(_C):" + +-#~ msgid "Group Name: %s" +-#~ msgstr "组名称：%s" ++#: ../properties/nm-libreswan-dialog.ui.h:13 ++msgid "_Remote ID:" ++msgstr "远程 ID(_R):" + +-#~ msgid "Username: %s" +-#~ msgstr "用户名：%s" ++#: ../properties/nm-libreswan-dialog.ui.h:14 ++#, fuzzy ++msgid "Ad_vanced…" ++msgstr "Ad_vanced" + +-#~ msgid "Domain: %s" +-#~ msgstr "域：%s" ++#: ../properties/nm-libreswan-dialog.ui.h:15 ++msgid "no" ++msgstr "" + +-#~ msgid "Routes: %s" +-#~ msgstr "路由：%s" ++#: ../properties/nm-libreswan-dialog.ui.h:16 ++msgid "yes" ++msgstr "" + +-#~ msgid "The connection details can be changed using the \"Edit\" button." +-#~ msgstr "连接细节可使用“编辑”按钮更改。" ++#: ../properties/nm-libreswan-dialog.ui.h:17 ++msgid "force" ++msgstr "" + +-#~ msgid "Select file to import" +-#~ msgstr "选择要导入的文件" ++#: ../properties/nm-libreswan-dialog.ui.h:18 ++msgid "IPsec Advanced Options" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:19 ++#, fuzzy ++msgid "Identification" ++msgstr "认证" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:20 ++msgid "Domain:" ++msgstr "域:" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:21 ++msgid "" ++"(NT-)Domain name for authentication.\n" ++"config: Domain " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:23 ++msgid "Security" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:24 ++msgid "Phase1 Algorithms:" ++msgstr "阶段 1 算法：" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:25 ++msgid "" ++"IKE encryption/authentication algorithm to be used for the connection (phase " ++"1 aka ISAKMP SA). The format is “cipher-hash;modpgroup, cipher-hash;" ++"modpgroup, …”.\n" ++"config: ike " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:27 ++msgid "Phase2 Algorithms:" ++msgstr "阶段 2 算法：" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:28 ++msgid "" ++"Specifies the algorithms that will be offered/accepted for a phase2 " ++"negotiation. The format is “cipher-hash;modpgroup, cipher-hash;modpgroup, " ++"…”.\n" ++"config: esp " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:30 ++msgid "Phase1 Lifetime:" ++msgstr "阶段 1 的生命时间：" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:31 ++msgid "" ++"How long the keying channel of a connection should last before being " ++"renegotiated. The value is expressed by a number followed by an optional " ++"“s”(econds), “m”(inutes), “h”(ours) or “d”(ays).\n" ++"config: ikelifetime " ++msgstr "" + +-#~ msgid "Save as..." +-#~ msgstr "另存为..." ++#: ../properties/nm-libreswan-dialog.ui.h:33 ++msgid "Phase2 Lifetime:" ++msgstr "阶段 2 的生命时间：" + +-#~ msgid "A file named \"%s\" already exists." +-#~ msgstr "已经存在名为“%s”的文件。" ++#: ../properties/nm-libreswan-dialog.ui.h:34 ++msgid "" ++"How long a particular instance of a connection (a set of encryption/" ++"authentication keys for user packets) should last, from successful " ++"negotiation to expiry. The value is expressed by a number followed by an " ++"optional “s”(econds), “m”(inutes), “h”(ours) or “d”(ays).\n" ++"config: salifetime " ++msgstr "" + +-#~ msgid "Failed to save file %s" +-#~ msgstr "保存文件 %s 失败" ++#: ../properties/nm-libreswan-dialog.ui.h:36 ++msgid "Disable rekeying" ++msgstr "" + +-#~ msgid "Required Information" +-#~ msgstr "所需信息" ++#: ../properties/nm-libreswan-dialog.ui.h:37 ++msgid "" ++"Whether a connection should not be renegotiated when it is about to expire.\n" ++"config: rekey " ++msgstr "" + +-#~ msgid "example: 172.16.0.0/16 10.11.12.0/24" +-#~ msgstr "如：172.16.0.0/16 10.11.12.0/24" ++#: ../properties/nm-libreswan-dialog.ui.h:39 ++msgid "Disable PFS" ++msgstr "" + +-#~ msgid "O_ptional Information" +-#~ msgstr "可选信息(_P)" ++#: ../properties/nm-libreswan-dialog.ui.h:40 ++msgid "" ++"Disable perfect forward security. Enable this option only if the server " ++"doesn’t support PFS.\n" ++"config: pfs " ++msgstr "" + +-#~ msgid "Override _user name" +-#~ msgstr "覆盖用户名(_U)" ++#: ../properties/nm-libreswan-dialog.ui.h:42 ++msgid "Connectivity" ++msgstr "" + +-#~ msgid "_Import Saved Configuration..." +-#~ msgstr "导入已存的配置(_I)..." ++#: ../properties/nm-libreswan-dialog.ui.h:43 ++msgid "Remote Network:" ++msgstr "远程网络：" + +-#~ msgid "_Only use VPN connection for these addresses" +-#~ msgstr "仅对这些地址使用 VPN 连接(_O)" ++#: ../properties/nm-libreswan-dialog.ui.h:44 ++msgid "" ++"Private subnet behind the remote participant, expressed as network/netmask.\n" ++"config: rightsubnet " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:46 ++msgid "Enable fragmentation" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:47 ++msgid "narrowing" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:48 ++msgid "" ++"IKEv2 negotiation may allow establishing an IPsec connection with narrowed " ++"down traffic selectors. This option is ignored for IKEv1.\n" ++"config: narrowing " ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:50 ++msgid "Enable MOBIKE" ++msgstr "" +diff --git a/po/zh_TW.po b/po/zh_TW.po +index baf41a0..8afe66f 100644 +--- a/po/zh_TW.po ++++ b/po/zh_TW.po +@@ -1,280 +1,373 @@ + # Chinese (Taiwan) translation of NetworkManager-vpnc. + # Copyright (C) 2007 Free Software Foundation, Inc. + # Chao-Hsiung Liao , 2007. ++# lrintel , 2018. #zanata ++# phrdina , 2018. #zanata + msgid "" + msgstr "" +-"Project-Id-Version: NetworkManager-vpnc 0.7.0\n" ++"Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-04-23 21:22+0800\n" +-"PO-Revision-Date: 2009-04-21 19:28+0800\n" +-"Last-Translator: Chao-Hsiung Liao \n" ++"POT-Creation-Date: 2018-10-16 15:10+0200\n" ++"PO-Revision-Date: 2018-08-20 09:48+0000\n" ++"Last-Translator: Copied by Zanata \n" + "Language-Team: Chinese (traditional) \n" +-"Language: zh_TW\n" ++"Language: zh_Hant\n" + "MIME-Version: 1.0\n" +-"Content-Type: text/plain; charset=utf-8\n" ++"Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" ++"X-Generator: Zanata 4.6.2\n" ++"Plural-Forms: nplurals=1; plural=0\n" + +-#: ../auth-dialog/gnome-two-password-dialog.c:103 +-msgid "_Secondary Password:" +-msgstr "第二組密碼(_S):" ++#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:1 ++msgid "IPsec VPN client" ++msgstr "" + +-#: ../auth-dialog/gnome-two-password-dialog.c:159 +-msgid "_Password:" +-msgstr "密碼(_P):" ++#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:2 ++msgid "Libreswan based client for IKEv1 based IPsec virtual private networks" ++msgstr "" + +-#: ../auth-dialog/gnome-two-password-dialog.c:240 +-msgid "Sh_ow passwords" +-msgstr "顯示密碼(_O)" ++#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:3 ++msgid "" ++"Support for configuring IKEv1 based IPsec virtual private network " ++"connections." ++msgstr "" + +-#: ../auth-dialog/gnome-two-password-dialog.c:300 +-msgid "_Remember passwords for this session" +-msgstr "在這個作業階段記住密碼(_R)" ++#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:4 ++msgid "Compatible with Libreswan and Cisco IPsec VPN servers." ++msgstr "" + +-#: ../auth-dialog/gnome-two-password-dialog.c:301 +-msgid "_Save passwords in keyring" +-msgstr "將密碼儲存在金鑰圈內(_S)" ++#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:5 ++msgid "The NetworkManager Developers" ++msgstr "" + +-#: ../auth-dialog/main.c:170 ++#: ../auth-dialog/main.c:165 + #, c-format +-msgid "You need to authenticate to access the Virtual Private Network '%s'." +-msgstr "您需要驗證才能存取虛擬私人網路「%s」。" ++msgid "Authenticate VPN %s" ++msgstr "" ++ ++#: ../auth-dialog/main.c:182 ++msgid "Password:" ++msgstr "密碼：" + +-#: ../auth-dialog/main.c:171 ++#: ../auth-dialog/main.c:192 ++msgid "Group Password:" ++msgstr "" ++ ++#: ../auth-dialog/main.c:228 + msgid "Authenticate VPN" + msgstr "驗證 VPN" + +-#: ../auth-dialog/main.c:175 ++#: ../auth-dialog/main.c:237 + msgid "_Group Password:" + msgstr "群組密碼(_G):" + +-#: ../nm-vpnc.desktop.in.h:1 +-msgid "Add, Remove, and Edit VPN Connections" +-msgstr "加入、移除與編輯 VPN 連線" ++#: ../auth-dialog/main.c:487 ++#, c-format ++msgid "You need to authenticate to access the Virtual Private Network “%s”." ++msgstr "" + +-#: ../nm-vpnc.desktop.in.h:2 +-msgid "VPN Connection Manager (vpnc)" +-msgstr "VPN 連線管理程式 (vpnc)" ++#: ../properties/nm-libreswan-editor-plugin.c:43 ++msgid "IPsec based VPN" ++msgstr "" + +-#: ../properties/nm-vpnc.c:53 +-msgid "Cisco Compatible VPN (vpnc)" +-msgstr "Cisco 相容 VPN (vpnc)" ++#: ../properties/nm-libreswan-editor-plugin.c:44 ++msgid "IPsec based VPN for remote clients" ++msgstr "" + +-#: ../properties/nm-vpnc.c:54 ++#: ../properties/nm-libreswan-editor-plugin.c:98 ++#: ../properties/nm-libreswan-editor-plugin.c:276 ++#, c-format ++msgid "Can’t open file “%s”: %s" ++msgstr "" ++ ++#: ../properties/nm-libreswan-editor-plugin.c:228 ++#, c-format ++msgid "Missing “conn” section in “%s”" ++msgstr "" ++ ++#: ../properties/nm-libreswan-editor-plugin.c:294 ++#, c-format ++msgid "Error writing to file “%s”: %s" ++msgstr "" ++ ++#: ../src/nm-libreswan-service.c:1464 ++msgid "A password is required." ++msgstr "" ++ ++#: ../src/nm-libreswan-service.c:1874 + msgid "" +-"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-based " +-"VPN gateways." ++"Could not process the request because the VPN connection settings were " ++"invalid." + msgstr "" +-"相容於各式 Cisco、Juniper、Netscreen和 Sonicwall 基於 IPsec 的 VPN 通訊閘。" + +-#: ../properties/nm-vpnc.c:339 +-msgid "Saved" +-msgstr "已儲存" ++#: ../src/nm-libreswan-service.c:1888 ++msgid "Unhandled pending authentication." ++msgstr "" + +-#: ../properties/nm-vpnc.c:346 +-msgid "Always Ask" +-msgstr "永遠詢問" ++#: ../src/nm-libreswan-service.c:2030 ++msgid "Don’t quit when VPN connection terminates" ++msgstr "" + +-#: ../properties/nm-vpnc.c:353 +-msgid "Not Required" +-msgstr "不需要" ++#: ../src/nm-libreswan-service.c:2031 ++msgid "Enable verbose debug logging (may expose passwords)" ++msgstr "" + +-#: ../properties/nm-vpnc.c:412 +-msgid "Secure (default)" +-msgstr "安全（預設值）" ++#: ../src/nm-libreswan-service.c:2032 ++msgid "D-Bus name to use for this instance" ++msgstr "" + +-#: ../properties/nm-vpnc.c:415 +-msgid "Weak (use with caution)" +-msgstr "脆弱（請小心使用）" ++#: ../src/nm-libreswan-service.c:2055 ++msgid "" ++"This service provides integrated IPsec VPN capability to NetworkManager." ++msgstr "" + +-#: ../properties/nm-vpnc.c:423 +-msgid "None (completely insecure)" +-msgstr "無（完全不安全）" ++#: ../shared/utils.c:86 ++#, c-format ++msgid "Error writing config: %s" ++msgstr "" ++ ++#: ../shared/nm-utils/nm-shared-utils.c:1087 ++#, c-format ++msgid "object class '%s' has no property named '%s'" ++msgstr "" + +-#: ../properties/nm-vpnc.c:471 +-msgid "Cisco UDP (default)" +-msgstr "Cisco UDP (預設值)" ++#: ../shared/nm-utils/nm-shared-utils.c:1094 ++#, c-format ++msgid "property '%s' of object class '%s' is not writable" ++msgstr "" + +-#: ../properties/nm-vpnc.c:478 +-msgid "NAT-T" +-msgstr "NAT-T" ++#: ../shared/nm-utils/nm-shared-utils.c:1101 ++#, c-format ++msgid "" ++"construct property \"%s\" for object '%s' can't be set after construction" ++msgstr "" + +-#: ../properties/nm-vpnc.c:485 +-msgid "Disabled" +-msgstr "已停用" ++#: ../shared/nm-utils/nm-shared-utils.c:1109 ++#, c-format ++msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" ++msgstr "" + +-#: ../properties/nm-vpnc.c:1116 +-msgid "TCP tunneling not supported" +-msgstr "不支援 TCP 穿隧功能" ++#: ../shared/nm-utils/nm-shared-utils.c:1118 ++#, c-format ++msgid "unable to set property '%s' of type '%s' from value of type '%s'" ++msgstr "" + +-#: ../properties/nm-vpnc.c:1118 ++#: ../shared/nm-utils/nm-shared-utils.c:1129 + #, c-format + msgid "" +-"The VPN settings file '%s' specifies that VPN traffic should be tunneled " +-"through TCP which is currently not supported in the vpnc software.\n" +-"\n" +-"The connection can still be created, with TCP tunneling disabled, however it " +-"may not work as expected." ++"value \"%s\" of type '%s' is invalid or out of range for property '%s' of " ++"type '%s'" + msgstr "" +-"VPN 設定檔案「%s」指定 VPN 通訊應透過 TCP 穿隧（目前 vpnc 軟體尚未支援）。\n" +-"\n" +-"若停用 TCP 穿隧功能，此連線仍然可以建立，然而它可能無法如預期的方式運作。" + +-#: ../properties/nm-vpnc-dialog.glade.h:1 +-msgid " " +-msgstr " " ++#: ../shared/nm-utils/nm-vpn-plugin-utils.c:80 ++#, c-format ++msgid "missing plugin file \"%s\"" ++msgstr "" + +-#: ../properties/nm-vpnc-dialog.glade.h:2 +-msgid "General" +-msgstr "一般" ++#: ../shared/nm-utils/nm-vpn-plugin-utils.c:86 ++#, c-format ++msgid "cannot load editor plugin: %s" ++msgstr "" + +-#: ../properties/nm-vpnc-dialog.glade.h:3 +-msgid "Optional" +-msgstr "選擇性" ++#: ../shared/nm-utils/nm-vpn-plugin-utils.c:95 ++#, c-format ++msgid "cannot load factory %s from plugin: %s" ++msgstr "" + +-#: ../properties/nm-vpnc-dialog.glade.h:4 +-msgid "Disable Dead Peer Detection" +-msgstr "停用斷線端偵測(DPD)" ++#: ../shared/nm-utils/nm-vpn-plugin-utils.c:121 ++msgid "unknown error creating editor instance" ++msgstr "" + +-#: ../properties/nm-vpnc-dialog.glade.h:5 +-msgid "Domain:" +-msgstr "網域:" ++#: ../properties/nm-libreswan-dialog.ui.h:1 ++msgid "IKEv1 (XAUTH)" ++msgstr "" + +-#: ../properties/nm-vpnc-dialog.glade.h:6 +-msgid "Encryption method:" +-msgstr "加密方法:" ++#: ../properties/nm-libreswan-dialog.ui.h:2 ++msgid "IKEv2 (Certificate)" ++msgstr "" + +-#: ../properties/nm-vpnc-dialog.glade.h:7 +-msgid "G_roup name:" +-msgstr "群組名稱(_R):" ++#: ../properties/nm-libreswan-dialog.ui.h:3 ++msgid "General" ++msgstr "一般" + +-#: ../properties/nm-vpnc-dialog.glade.h:8 +-msgid "Gro_up password:" +-msgstr "群組密碼(_U):" ++#: ../properties/nm-libreswan-dialog.ui.h:4 ++msgid "_Gateway:" ++msgstr "通訊閘(_G):" + +-#: ../properties/nm-vpnc-dialog.glade.h:9 +-#, fuzzy +-#| msgid "NAT Traversal:" +-msgid "NAT traversal:" +-msgstr "NAT 連結逾時" ++#: ../properties/nm-libreswan-dialog.ui.h:5 ++msgid "Authentication" ++msgstr "身份認證" + +-#: ../properties/nm-vpnc-dialog.glade.h:10 +-msgid "Show passwords" +-msgstr "顯示密碼" ++#: ../properties/nm-libreswan-dialog.ui.h:6 ++msgid "Type:" ++msgstr "類型：" + +-#: ../properties/nm-vpnc-dialog.glade.h:11 ++#: ../properties/nm-libreswan-dialog.ui.h:7 + msgid "User name:" + msgstr "使用者名稱:" + +-#: ../properties/nm-vpnc-dialog.glade.h:12 +-msgid "_Gateway:" +-msgstr "通訊閘(_G):" +- +-#: ../properties/nm-vpnc-dialog.glade.h:13 ++#: ../properties/nm-libreswan-dialog.ui.h:8 + msgid "_User password:" + msgstr "使用者密碼(_U):" + +-#~ msgid "_Username:" +-#~ msgstr "使用者名稱(_U):" ++#: ../properties/nm-libreswan-dialog.ui.h:9 ++msgid "G_roup name:" ++msgstr "群組名稱(_R):" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:10 ++msgid "_Secret:" ++msgstr "" ++ ++#: ../properties/nm-libreswan-dialog.ui.h:11 ++msgid "Show passwords" ++msgstr "顯示密碼" + +-#~ msgid "_Domain:" +-#~ msgstr "網域(_D):" ++#: ../properties/nm-libreswan-dialog.ui.h:12 ++msgid "_Certificate name:" ++msgstr "" + +-#~ msgid "Connect _anonymously" +-#~ msgstr "匿名連線(_A)" ++#: ../properties/nm-libreswan-dialog.ui.h:13 ++msgid "_Remote ID:" ++msgstr "" + +-#~ msgid "Connect as _user:" +-#~ msgstr "以使用者連線(_U):" ++#: ../properties/nm-libreswan-dialog.ui.h:14 ++msgid "Ad_vanced…" ++msgstr "" + +-#~ msgid "NAT-T (default)" +-#~ msgstr "NAT-T（預設值）" ++#: ../properties/nm-libreswan-dialog.ui.h:15 ++msgid "no" ++msgstr "" + +-#~ msgid "Name: %s" +-#~ msgstr "名稱: %s" ++#: ../properties/nm-libreswan-dialog.ui.h:16 ++msgid "yes" ++msgstr "" + +-#~ msgid "Gateway: %s" +-#~ msgstr "閘道: %s" ++#: ../properties/nm-libreswan-dialog.ui.h:17 ++msgid "force" ++msgstr "" + +-#~ msgid "Group Name: %s" +-#~ msgstr "群組名稱: %s" ++#: ../properties/nm-libreswan-dialog.ui.h:18 ++msgid "IPsec Advanced Options" ++msgstr "" + +-#~ msgid "Username: %s" +-#~ msgstr "使用者名稱: %s" ++#: ../properties/nm-libreswan-dialog.ui.h:19 ++#, fuzzy ++msgid "Identification" ++msgstr "身份認證" + +-#~ msgid "Domain: %s" +-#~ msgstr "網域: %s" ++#: ../properties/nm-libreswan-dialog.ui.h:20 ++msgid "Domain:" ++msgstr "網域:" + +-#~ msgid "Routes: %s" +-#~ msgstr "路由: %s" ++#: ../properties/nm-libreswan-dialog.ui.h:21 ++msgid "" ++"(NT-)Domain name for authentication.\n" ++"config: Domain " ++msgstr "" + +-#~ msgid "The connection details can be changed using the \"Edit\" button." +-#~ msgstr "連線詳細資訊可以使用「編輯」按鈕改變。" ++#: ../properties/nm-libreswan-dialog.ui.h:23 ++msgid "Security" ++msgstr "" + +-#~ msgid "Cannot import settings" +-#~ msgstr "不能匯入設定值" ++#: ../properties/nm-libreswan-dialog.ui.h:24 ++msgid "Phase1 Algorithms:" ++msgstr "" + +-#~ msgid "The VPN settings file '%s' does not contain valid data." +-#~ msgstr "VPN 設定檔「%s」沒有包含有效的資料。" ++#: ../properties/nm-libreswan-dialog.ui.h:25 ++msgid "" ++"IKE encryption/authentication algorithm to be used for the connection (phase " ++"1 aka ISAKMP SA). The format is “cipher-hash;modpgroup, cipher-hash;" ++"modpgroup, …”.\n" ++"config: ike " ++msgstr "" + +-#~ msgid "Select file to import" +-#~ msgstr "選取要匯入的檔案" ++#: ../properties/nm-libreswan-dialog.ui.h:27 ++msgid "Phase2 Algorithms:" ++msgstr "" + +-#~ msgid "Save as..." +-#~ msgstr "另存為..." ++#: ../properties/nm-libreswan-dialog.ui.h:28 ++msgid "" ++"Specifies the algorithms that will be offered/accepted for a phase2 " ++"negotiation. The format is “cipher-hash;modpgroup, cipher-hash;modpgroup, " ++"…”.\n" ++"config: esp " ++msgstr "" + +-#~ msgid "A file named \"%s\" already exists." +-#~ msgstr "已存在一個名為「%s」的檔案。" ++#: ../properties/nm-libreswan-dialog.ui.h:30 ++msgid "Phase1 Lifetime:" ++msgstr "" + +-#~ msgid "Do you want to replace it with the one you are saving?" +-#~ msgstr "是否要以儲存的版本來替換它？" ++#: ../properties/nm-libreswan-dialog.ui.h:31 ++msgid "" ++"How long the keying channel of a connection should last before being " ++"renegotiated. The value is expressed by a number followed by an optional " ++"“s”(econds), “m”(inutes), “h”(ours) or “d”(ays).\n" ++"config: ikelifetime " ++msgstr "" + +-#~ msgid "Failed to export configuration" +-#~ msgstr "匯出組態失敗" ++#: ../properties/nm-libreswan-dialog.ui.h:33 ++msgid "Phase2 Lifetime:" ++msgstr "" + +-#~ msgid "Failed to save file %s" +-#~ msgstr "儲存檔案「%s」時失敗" ++#: ../properties/nm-libreswan-dialog.ui.h:34 ++msgid "" ++"How long a particular instance of a connection (a set of encryption/" ++"authentication keys for user packets) should last, from successful " ++"negotiation to expiry. The value is expressed by a number followed by an " ++"optional “s”(econds), “m”(inutes), “h”(ours) or “d”(ays).\n" ++"config: salifetime " ++msgstr "" + +-#~ msgid "Connection Information" +-#~ msgstr "連線資訊" ++#: ../properties/nm-libreswan-dialog.ui.h:36 ++msgid "Disable rekeying" ++msgstr "" + +-#~ msgid "example: 172.16.0.0/16 10.11.12.0/24" +-#~ msgstr "範例: 172.16.0.0/16 10.11.12.0/24" ++#: ../properties/nm-libreswan-dialog.ui.h:37 ++msgid "" ++"Whether a connection should not be renegotiated when it is about to expire.\n" ++"config: rekey " ++msgstr "" + +-#~ msgid "Connection Name" +-#~ msgstr "連線名稱" ++#: ../properties/nm-libreswan-dialog.ui.h:39 ++msgid "Disable PFS" ++msgstr "" + +-#~ msgid "" +-#~ "Please enter the information provided by your system administrator below. " +-#~ "Do not enter your password here as you will be prompted when connecting." +-#~ msgstr "" +-#~ "請在下面輸入您的系統管理者提供的資訊。請勿在此輸入密碼，當進行連線時便會提" +-#~ "示您輸入。" ++#: ../properties/nm-libreswan-dialog.ui.h:40 ++msgid "" ++"Disable perfect forward security. Enable this option only if the server " ++"doesn’t support PFS.\n" ++"config: pfs " ++msgstr "" + +-#~ msgid "" +-#~ "Please note that the file you import is not a Cisco VPN or VPNC " +-#~ "configuration file. Ask your adminstrator for the file." +-#~ msgstr "" +-#~ "注意：您準備匯入的檔案不是 Cisco VPN 或 VPNC 設定檔。請向管理員查詢如果取" +-#~ "得該檔案。" ++#: ../properties/nm-libreswan-dialog.ui.h:42 ++msgid "Connectivity" ++msgstr "" + +-#~ msgid "_Import Saved Configuration..." +-#~ msgstr "匯入儲存的組態(_I)..." ++#: ../properties/nm-libreswan-dialog.ui.h:43 ++msgid "Remote Network:" ++msgstr "" + +-#~ msgid "_Only use VPN connection for these addresses" +-#~ msgstr "只對這些位址使用 _VPN 連線" ++#: ../properties/nm-libreswan-dialog.ui.h:44 ++msgid "" ++"Private subnet behind the remote participant, expressed as network/netmask.\n" ++"config: rightsubnet " ++msgstr "" + +-#~ msgid "The VPN login failed because the VPN program could not be started." +-#~ msgstr "VPN 登入失敗，因為 VPN 程式無法啟動。" ++#: ../properties/nm-libreswan-dialog.ui.h:46 ++msgid "Enable fragmentation" ++msgstr "" + +-#~ msgid "" +-#~ "The VPN login failed because the VPN program could not connect to the VPN " +-#~ "server." +-#~ msgstr "VPN 登入失敗，因為 VPN 程式無法連線至 VPN 伺服器。" ++#: ../properties/nm-libreswan-dialog.ui.h:47 ++msgid "narrowing" ++msgstr "" + +-#~ msgid "" +-#~ "The VPN login failed because the VPN configuration options were invalid." +-#~ msgstr "VPN 登入失敗，因為 VPN 組態選項無效。" ++#: ../properties/nm-libreswan-dialog.ui.h:48 ++msgid "" ++"IKEv2 negotiation may allow establishing an IPsec connection with narrowed " ++"down traffic selectors. This option is ignored for IKEv1.\n" ++"config: narrowing " ++msgstr "" + +-#~ msgid "" +-#~ "The VPN login failed because the VPN program received an invalid " +-#~ "configuration from the VPN server." +-#~ msgstr "VPN 登入失敗，因為 VPN 程式從 VPN 伺服器接收到無效的組態。" ++#: ../properties/nm-libreswan-dialog.ui.h:50 ++msgid "Enable MOBIKE" ++msgstr "" +-- +2.19.1 + +From 22eefe7dd2011f502b892b121b2fd2fbb85792a5 Mon Sep 17 00:00:00 2001 +From: Lubomir Rintel +Date: Mon, 29 May 2017 19:06:24 +0200 +Subject: [PATCH 1/2] po: add zanata.xml + +--- + zanata.xml | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + create mode 100644 zanata.xml + +diff --git a/zanata.xml b/zanata.xml +new file mode 100644 +index 0000000..9c0d19c +--- /dev/null ++++ b/zanata.xml +@@ -0,0 +1,14 @@ ++ ++ ++ ++ https://vendors.zanata.redhat.com/ ++ nm-applet ++ RHEL-8.0 ++ gettext ++ po ++ po ++ ++ +-- +2.19.1 + diff --git a/NetworkManager-libreswan-1.2.6-ikev2.patch b/NetworkManager-libreswan-1.2.6-ikev2.patch deleted file mode 100644 index ad8e010..0000000 --- a/NetworkManager-libreswan-1.2.6-ikev2.patch +++ /dev/null @@ -1,8616 +0,0 @@ -diff -Naur NetworkManager-libreswan-1.2.6-orig/appdata/network-manager-libreswan.metainfo.xml.in NetworkManager-libreswan-1.2.6/appdata/network-manager-libreswan.metainfo.xml.in ---- NetworkManager-libreswan-1.2.6-orig/appdata/network-manager-libreswan.metainfo.xml.in 2016-05-09 15:54:25.000000000 -0400 -+++ NetworkManager-libreswan-1.2.6/appdata/network-manager-libreswan.metainfo.xml.in 2018-08-21 23:09:09.645782937 -0400 -@@ -27,12 +27,12 @@ - - - -- https://git.gnome.org/browse/network-manager-libreswan/plain/appdata/libreswan.png -+ https://gitlab.gnome.org/GNOME/NetworkManager-libreswan/raw/master/appdata/libreswan.png - - - - https://wiki.gnome.org/Projects/NetworkManager/VPN -- https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager -+ https://gitlab.gnome.org/GNOME/NetworkManager-libreswan/issues - networkmanager-maint@gnome.bugs - NetworkManager-libreswan - <_developer_name>The NetworkManager Developers -diff -Naur NetworkManager-libreswan-1.2.6-orig/auth-dialog/Makefile.am NetworkManager-libreswan-1.2.6/auth-dialog/Makefile.am ---- NetworkManager-libreswan-1.2.6-orig/auth-dialog/Makefile.am 2016-06-24 06:16:16.000000000 -0400 -+++ NetworkManager-libreswan-1.2.6/auth-dialog/Makefile.am 1969-12-31 19:00:00.000000000 -0500 -@@ -1,30 +0,0 @@ --AM_CPPFLAGS = \ -- $(GLIB_CFLAGS) \ -- $(LIBNM_CFLAGS) \ -- $(LIBNMA_CFLAGS) \ -- $(GTK_CFLAGS) \ -- $(LIBSECRET_CFLAGS) \ -- -I"$(top_srcdir)/shared/" \ -- -DICONDIR=\""$(datadir)/pixmaps"\" \ -- -DBINDIR=\""$(bindir)"\" \ -- -DGNOMELOCALEDIR=\"$(datadir)/locale\" -- --libexec_PROGRAMS = nm-libreswan-auth-dialog -- --nm_libreswan_auth_dialog_SOURCES = main.c -- --nm_libreswan_auth_dialog_LDADD = \ -- $(LIBNM_LIBS) \ -- $(GTK_LIBS) \ -- $(LIBNMA_LIBS) \ -- $(LIBSECRET_LIBS) -- --EXTRA_DIST = \ -- $(desktop_in_in_files) -- --CLEANFILES = \ -- *~ \ -- $(desktop_DATA) -- --DISTCLEANFILES = \ -- $(desktop_in_files) -diff -Naur NetworkManager-libreswan-1.2.6-orig/configure.ac NetworkManager-libreswan-1.2.6/configure.ac ---- NetworkManager-libreswan-1.2.6-orig/configure.ac 2017-01-24 09:05:01.000000000 -0500 -+++ NetworkManager-libreswan-1.2.6/configure.ac 2018-08-21 23:09:09.645782937 -0400 -@@ -1,11 +1,12 @@ - AC_PREREQ(2.52) - - AC_INIT(NetworkManager-libreswan, -- 1.2.6, -- https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager, -+ 1.2.7, -+ https://gitlab.gnome.org/GNOME/NetworkManager-libreswan/issues, - NetworkManager-libreswan) --AM_INIT_AUTOMAKE([no-dist-gzip dist-xz]) -+AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz -Wno-portability]) - AM_MAINTAINER_MODE -+AM_SILENT_RULES([yes]) - - AC_CONFIG_MACRO_DIR([m4]) - -@@ -13,6 +14,12 @@ - - AC_USE_SYSTEM_EXTENSIONS - -+dnl Prefer gcc-* variants; the ones libtool would choose don't work with LTO -+AC_CHECK_TOOLS(AR, [gcc-ar ar], false) -+AC_CHECK_TOOLS(RANLIB, [gcc-ranlib ranlib], :) -+ -+LT_INIT([disable-static]) -+ - dnl - dnl Require programs - dnl -@@ -21,6 +28,17 @@ - AC_PROG_INSTALL - AC_PROG_LIBTOOL - AC_PROG_LN_S -+AC_PROG_MKDIR_P -+ -+AC_CHECK_PROG([has_file], file, yes, no) -+if test x$has_file = xno ; then -+ AC_MSG_ERROR(["file" utility not found.]) -+fi -+ -+AC_CHECK_PROG([has_find], find, yes, no) -+if test x$has_find = xno ; then -+ AC_MSG_ERROR(["find" utility not found.]) -+fi - - dnl - dnl Required headers -@@ -55,19 +73,19 @@ - fi - AC_SUBST([ACLOCAL_AMFLAGS]) - --AC_ARG_WITH(nm-ipsec-conf, AS_HELP_STRING([--with-nm-ipsec-conf=path], [The IPSec configuration file, defaults to /etc/ipsec.conf]), [], [with_nm_ipsec_conf=]) -+AC_ARG_WITH(nm-ipsec-conf, AS_HELP_STRING([--with-nm-ipsec-conf=path], [The IPsec configuration file, defaults to /etc/ipsec.conf]), [], [with_nm_ipsec_conf=]) - AS_IF([test -z "$with_nm_ipsec_conf"], with_nm_ipsec_conf="/etc/ipsec.conf") - if (printf '%s' "$with_nm_ipsec_conf" | grep -v -q '^/'); then - AC_MSG_ERROR([--with-nm-ipsec-conf must be an absolute path, instead it is '$with_nm_ipsec_conf']) - fi --AC_DEFINE_UNQUOTED(NM_IPSEC_CONF, "$with_nm_ipsec_conf", [IPSec configuration file]) -+AC_DEFINE_UNQUOTED(NM_IPSEC_CONF, "$with_nm_ipsec_conf", [IPsec configuration file]) - --AC_ARG_WITH(nm-ipsec-secrets-dir, AS_HELP_STRING([--with-nm-ipsec-secrets-dir=path], [The directory where to put IPSec secrets, defaults to /etc/ipsec.d/]), [], [with_nm_ipsec_secrets_dir=]) -+AC_ARG_WITH(nm-ipsec-secrets-dir, AS_HELP_STRING([--with-nm-ipsec-secrets-dir=path], [The directory where to put IPsec secrets, defaults to /etc/ipsec.d/]), [], [with_nm_ipsec_secrets_dir=]) - AS_IF([test -z "$with_nm_ipsec_secrets_dir"], with_nm_ipsec_secrets_dir="/etc/ipsec.d") - if (printf '%s' "$with_nm_ipsec_secrets_dir" | grep -v -q '^/'); then - AC_MSG_ERROR([--with-nm-ipsec-secrets-dir must be an absolute path, instead it is '$with_nm_ipsec_secrets_dir']) - fi --AC_DEFINE_UNQUOTED(NM_IPSEC_SECRETS_DIR, "$with_nm_ipsec_secrets_dir", [IPSec secret dir]) -+AC_DEFINE_UNQUOTED(NM_IPSEC_SECRETS_DIR, "$with_nm_ipsec_secrets_dir", [IPsec secret dir]) - - dnl - dnl GNOME support -@@ -137,6 +155,8 @@ - AC_SUBST(NM_VPN_SERVICE_DIR) - - NM_COMPILER_WARNINGS([yes]) -+NM_LTO -+NM_LD_GC - - NM_PLUGIN_DIR="$libdir/NetworkManager" - AC_SUBST(NM_PLUGIN_DIR) -@@ -158,11 +178,9 @@ - - AC_CONFIG_FILES([ - Makefile --src/Makefile --auth-dialog/Makefile --properties/Makefile - po/Makefile.in --shared/Makefile -+man/Makefile -+man/nm-settings-libreswan.5 - ]) - AC_OUTPUT - -@@ -174,3 +192,6 @@ - echo " --enable-more-warnings=$set_more_warnings" - echo " --with-nm-ipsec-conf=$with_nm_ipsec_conf" - echo " --with-nm-ipsec-secrets-dir=$with_nm_ipsec_secrets_dir" -+echo " --enable-lto=$enable_lto" -+echo " --enable-ld-gc=$enable_ld_gc" -+echo "" -diff -Naur NetworkManager-libreswan-1.2.6-orig/m4/attributes.m4 NetworkManager-libreswan-1.2.6/m4/attributes.m4 ---- NetworkManager-libreswan-1.2.6-orig/m4/attributes.m4 1969-12-31 19:00:00.000000000 -0500 -+++ NetworkManager-libreswan-1.2.6/m4/attributes.m4 2018-08-21 23:09:09.646782982 -0400 -@@ -0,0 +1,292 @@ -+dnl Macros to check the presence of generic (non-typed) symbols. -+dnl Copyright (c) 2006-2008 Diego Pettenò -+dnl Copyright (c) 2006-2008 xine project -+dnl Copyright (c) 2012 Lucas De Marchi -+dnl -+dnl This program is free software; you can redistribute it and/or modify -+dnl it under the terms of the GNU General Public License as published by -+dnl the Free Software Foundation; either version 2, or (at your option) -+dnl any later version. -+dnl -+dnl This program is distributed in the hope that it will be useful, -+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+dnl GNU General Public License for more details. -+dnl -+dnl You should have received a copy of the GNU General Public License -+dnl along with this program; if not, write to the Free Software -+dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -+dnl 02110-1301, USA. -+dnl -+dnl As a special exception, the copyright owners of the -+dnl macro gives unlimited permission to copy, distribute and modify the -+dnl configure scripts that are the output of Autoconf when processing the -+dnl Macro. You need not follow the terms of the GNU General Public -+dnl License when using or distributing such scripts, even though portions -+dnl of the text of the Macro appear in them. The GNU General Public -+dnl License (GPL) does govern all other use of the material that -+dnl constitutes the Autoconf Macro. -+dnl -+dnl This special exception to the GPL applies to versions of the -+dnl Autoconf Macro released by this project. When you make and -+dnl distribute a modified version of the Autoconf Macro, you may extend -+dnl this special exception to the GPL to apply to your modified version as -+dnl well. -+ -+dnl Check if FLAG in ENV-VAR is supported by compiler and append it -+dnl to WHERE-TO-APPEND variable. Note that we invert -Wno-* checks to -+dnl -W* as gcc cannot test for negated warnings. If a C snippet is passed, -+dnl use it, otherwise use a simple main() definition that just returns 0. -+dnl CC_CHECK_FLAG_APPEND([WHERE-TO-APPEND], [ENV-VAR], [FLAG], [C-SNIPPET]) -+ -+AC_DEFUN([CC_CHECK_FLAG_APPEND], [ -+ AC_CACHE_CHECK([if $CC supports flag $3 in envvar $2], -+ AS_TR_SH([cc_cv_$2_$3]), -+ [eval "AS_TR_SH([cc_save_$2])='${$2}'" -+ eval "AS_TR_SH([$2])='${cc_save_$2} -Werror `echo "$3" | sed 's/^-Wno-/-W/'`'" -+ AC_LINK_IFELSE([AC_LANG_SOURCE(ifelse([$4], [], -+ [int main(void) { return 0; } ], -+ [$4]))], -+ [eval "AS_TR_SH([cc_cv_$2_$3])='yes'"], -+ [eval "AS_TR_SH([cc_cv_$2_$3])='no'"]) -+ eval "AS_TR_SH([$2])='$cc_save_$2'"]) -+ -+ AS_IF([eval test x$]AS_TR_SH([cc_cv_$2_$3])[ = xyes], -+ [eval "$1='${$1} $3'"]) -+]) -+ -+dnl CC_CHECK_FLAGS_APPEND([WHERE-TO-APPEND], [ENV-VAR], [FLAG1 FLAG2], [C-SNIPPET]) -+AC_DEFUN([CC_CHECK_FLAGS_APPEND], [ -+ for flag in [$3]; do -+ CC_CHECK_FLAG_APPEND([$1], [$2], $flag, [$4]) -+ done -+]) -+ -+dnl Check if the flag is supported by linker (cacheable) -+dnl CC_CHECK_LDFLAGS([FLAG], [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) -+ -+AC_DEFUN([CC_CHECK_LDFLAGS], [ -+ AC_CACHE_CHECK([if $CC supports $1 flag], -+ AS_TR_SH([cc_cv_ldflags_$1]), -+ [ac_save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS $1" -+ AC_LINK_IFELSE([int main() { return 1; }], -+ [eval "AS_TR_SH([cc_cv_ldflags_$1])='yes'"], -+ [eval "AS_TR_SH([cc_cv_ldflags_$1])="]) -+ LDFLAGS="$ac_save_LDFLAGS" -+ ]) -+ -+ AS_IF([eval test x$]AS_TR_SH([cc_cv_ldflags_$1])[ = xyes], -+ [$2], [$3]) -+]) -+ -+dnl define the LDFLAGS_NOUNDEFINED variable with the correct value for -+dnl the current linker to avoid undefined references in a shared object. -+AC_DEFUN([CC_NOUNDEFINED], [ -+ dnl We check $host for which systems to enable this for. -+ AC_REQUIRE([AC_CANONICAL_HOST]) -+ -+ case $host in -+ dnl FreeBSD (et al.) does not complete linking for shared objects when pthreads -+ dnl are requested, as different implementations are present; to avoid problems -+ dnl use -Wl,-z,defs only for those platform not behaving this way. -+ *-freebsd* | *-openbsd*) ;; -+ *) -+ dnl First of all check for the --no-undefined variant of GNU ld. This allows -+ dnl for a much more readable command line, so that people can understand what -+ dnl it does without going to look for what the heck -z defs does. -+ for possible_flags in "-Wl,--no-undefined" "-Wl,-z,defs"; do -+ CC_CHECK_LDFLAGS([$possible_flags], [LDFLAGS_NOUNDEFINED="$possible_flags"]) -+ break -+ done -+ ;; -+ esac -+ -+ AC_SUBST([LDFLAGS_NOUNDEFINED]) -+]) -+ -+dnl Check for a -Werror flag or equivalent. -Werror is the GCC -+dnl and ICC flag that tells the compiler to treat all the warnings -+dnl as fatal. We usually need this option to make sure that some -+dnl constructs (like attributes) are not simply ignored. -+dnl -+dnl Other compilers don't support -Werror per se, but they support -+dnl an equivalent flag: -+dnl - Sun Studio compiler supports -errwarn=%all -+AC_DEFUN([CC_CHECK_WERROR], [ -+ AC_CACHE_CHECK( -+ [for $CC way to treat warnings as errors], -+ [cc_cv_werror], -+ [CC_CHECK_CFLAGS_SILENT([-Werror], [cc_cv_werror=-Werror], -+ [CC_CHECK_CFLAGS_SILENT([-errwarn=%all], [cc_cv_werror=-errwarn=%all])]) -+ ]) -+]) -+ -+AC_DEFUN([CC_CHECK_ATTRIBUTE], [ -+ AC_REQUIRE([CC_CHECK_WERROR]) -+ AC_CACHE_CHECK([if $CC supports __attribute__(( ifelse([$2], , [$1], [$2]) ))], -+ AS_TR_SH([cc_cv_attribute_$1]), -+ [ac_save_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS $cc_cv_werror" -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([$3])], -+ [eval "AS_TR_SH([cc_cv_attribute_$1])='yes'"], -+ [eval "AS_TR_SH([cc_cv_attribute_$1])='no'"]) -+ CFLAGS="$ac_save_CFLAGS" -+ ]) -+ -+ AS_IF([eval test x$]AS_TR_SH([cc_cv_attribute_$1])[ = xyes], -+ [AC_DEFINE( -+ AS_TR_CPP([SUPPORT_ATTRIBUTE_$1]), 1, -+ [Define this if the compiler supports __attribute__(( ifelse([$2], , [$1], [$2]) ))] -+ ) -+ $4], -+ [$5]) -+]) -+ -+AC_DEFUN([CC_ATTRIBUTE_CONSTRUCTOR], [ -+ CC_CHECK_ATTRIBUTE( -+ [constructor],, -+ [void __attribute__((constructor)) ctor() { int a; }], -+ [$1], [$2]) -+]) -+ -+AC_DEFUN([CC_ATTRIBUTE_FORMAT], [ -+ CC_CHECK_ATTRIBUTE( -+ [format], [format(printf, n, n)], -+ [void __attribute__((format(printf, 1, 2))) printflike(const char *fmt, ...) { fmt = (void *)0; }], -+ [$1], [$2]) -+]) -+ -+AC_DEFUN([CC_ATTRIBUTE_FORMAT_ARG], [ -+ CC_CHECK_ATTRIBUTE( -+ [format_arg], [format_arg(printf)], -+ [char *__attribute__((format_arg(1))) gettextlike(const char *fmt) { fmt = (void *)0; }], -+ [$1], [$2]) -+]) -+ -+AC_DEFUN([CC_ATTRIBUTE_VISIBILITY], [ -+ CC_CHECK_ATTRIBUTE( -+ [visibility_$1], [visibility("$1")], -+ [void __attribute__((visibility("$1"))) $1_function() { }], -+ [$2], [$3]) -+]) -+ -+AC_DEFUN([CC_ATTRIBUTE_NONNULL], [ -+ CC_CHECK_ATTRIBUTE( -+ [nonnull], [nonnull()], -+ [void __attribute__((nonnull())) some_function(void *foo, void *bar) { foo = (void*)0; bar = (void*)0; }], -+ [$1], [$2]) -+]) -+ -+AC_DEFUN([CC_ATTRIBUTE_UNUSED], [ -+ CC_CHECK_ATTRIBUTE( -+ [unused], , -+ [void some_function(void *foo, __attribute__((unused)) void *bar);], -+ [$1], [$2]) -+]) -+ -+AC_DEFUN([CC_ATTRIBUTE_SENTINEL], [ -+ CC_CHECK_ATTRIBUTE( -+ [sentinel], , -+ [void some_function(void *foo, ...) __attribute__((sentinel));], -+ [$1], [$2]) -+]) -+ -+AC_DEFUN([CC_ATTRIBUTE_DEPRECATED], [ -+ CC_CHECK_ATTRIBUTE( -+ [deprecated], , -+ [void some_function(void *foo, ...) __attribute__((deprecated));], -+ [$1], [$2]) -+]) -+ -+AC_DEFUN([CC_ATTRIBUTE_ALIAS], [ -+ CC_CHECK_ATTRIBUTE( -+ [alias], [weak, alias], -+ [void other_function(void *foo) { } -+ void some_function(void *foo) __attribute__((weak, alias("other_function")));], -+ [$1], [$2]) -+]) -+ -+AC_DEFUN([CC_ATTRIBUTE_MALLOC], [ -+ CC_CHECK_ATTRIBUTE( -+ [malloc], , -+ [void * __attribute__((malloc)) my_alloc(int n);], -+ [$1], [$2]) -+]) -+ -+AC_DEFUN([CC_ATTRIBUTE_PACKED], [ -+ CC_CHECK_ATTRIBUTE( -+ [packed], , -+ [struct astructure { char a; int b; long c; void *d; } __attribute__((packed));], -+ [$1], [$2]) -+]) -+ -+AC_DEFUN([CC_ATTRIBUTE_CONST], [ -+ CC_CHECK_ATTRIBUTE( -+ [const], , -+ [int __attribute__((const)) twopow(int n) { return 1 << n; } ], -+ [$1], [$2]) -+]) -+ -+AC_DEFUN([CC_FLAG_VISIBILITY], [ -+ AC_REQUIRE([CC_CHECK_WERROR]) -+ AC_CACHE_CHECK([if $CC supports -fvisibility=hidden], -+ [cc_cv_flag_visibility], -+ [cc_flag_visibility_save_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS $cc_cv_werror" -+ CC_CHECK_CFLAGS_SILENT([-fvisibility=hidden], -+ cc_cv_flag_visibility='yes', -+ cc_cv_flag_visibility='no') -+ CFLAGS="$cc_flag_visibility_save_CFLAGS"]) -+ -+ AS_IF([test "x$cc_cv_flag_visibility" = "xyes"], -+ [AC_DEFINE([SUPPORT_FLAG_VISIBILITY], 1, -+ [Define this if the compiler supports the -fvisibility flag]) -+ $1], -+ [$2]) -+]) -+ -+AC_DEFUN([CC_FUNC_EXPECT], [ -+ AC_REQUIRE([CC_CHECK_WERROR]) -+ AC_CACHE_CHECK([if compiler has __builtin_expect function], -+ [cc_cv_func_expect], -+ [ac_save_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS $cc_cv_werror" -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE( -+ [int some_function() { -+ int a = 3; -+ return (int)__builtin_expect(a, 3); -+ }])], -+ [cc_cv_func_expect=yes], -+ [cc_cv_func_expect=no]) -+ CFLAGS="$ac_save_CFLAGS" -+ ]) -+ -+ AS_IF([test "x$cc_cv_func_expect" = "xyes"], -+ [AC_DEFINE([SUPPORT__BUILTIN_EXPECT], 1, -+ [Define this if the compiler supports __builtin_expect() function]) -+ $1], -+ [$2]) -+]) -+ -+AC_DEFUN([CC_ATTRIBUTE_ALIGNED], [ -+ AC_REQUIRE([CC_CHECK_WERROR]) -+ AC_CACHE_CHECK([highest __attribute__ ((aligned ())) supported], -+ [cc_cv_attribute_aligned], -+ [ac_save_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS $cc_cv_werror" -+ for cc_attribute_align_try in 64 32 16 8 4 2; do -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([ -+ int main() { -+ static char c __attribute__ ((aligned($cc_attribute_align_try))) = 0; -+ return c; -+ }])], [cc_cv_attribute_aligned=$cc_attribute_align_try; break]) -+ done -+ CFLAGS="$ac_save_CFLAGS" -+ ]) -+ -+ if test "x$cc_cv_attribute_aligned" != "x"; then -+ AC_DEFINE_UNQUOTED([ATTRIBUTE_ALIGNED_MAX], [$cc_cv_attribute_aligned], -+ [Define the highest alignment supported]) -+ fi -+]) -diff -Naur NetworkManager-libreswan-1.2.6-orig/m4/compiler_options.m4 NetworkManager-libreswan-1.2.6/m4/compiler_options.m4 ---- NetworkManager-libreswan-1.2.6-orig/m4/compiler_options.m4 2017-01-24 08:51:55.000000000 -0500 -+++ NetworkManager-libreswan-1.2.6/m4/compiler_options.m4 2018-08-21 23:09:09.646782982 -0400 -@@ -61,16 +61,31 @@ - CFLAGS_MORE_WARNINGS="$CFLAGS_MORE_WARNINGS -Werror" - fi - -- for option in -Wshadow -Wmissing-declarations -Wmissing-prototypes \ -- -Wdeclaration-after-statement -Wformat-security \ -- -Wfloat-equal -Wno-unused-parameter -Wno-sign-compare \ -- -Wno-duplicate-decl-specifier \ -+ for option in \ -+ -Wextra \ -+ -Wdeclaration-after-statement \ -+ -Wfloat-equal \ -+ -Wformat-nonliteral \ -+ -Wformat-security \ -+ -Wimplicit-fallthrough \ -+ -Wimplicit-function-declaration \ -+ -Winit-self \ -+ -Wmissing-declarations \ -+ -Wmissing-include-dirs \ -+ -Wmissing-prototypes \ -+ -Wpointer-arith \ -+ -Wshadow \ - -Wstrict-prototypes \ -- -Wno-unused-but-set-variable \ -+ -Wundef \ -+ -Wno-duplicate-decl-specifier \ -+ -Wno-format-truncation \ - -Wno-format-y2k \ -- -Wundef -Wimplicit-function-declaration \ -- -Wpointer-arith -Winit-self -Wformat-nonliteral \ -- -Wmissing-include-dirs -Wno-pragmas; do -+ -Wno-missing-field-initializers \ -+ -Wno-pragmas \ -+ -Wno-sign-compare \ -+ -Wno-unused-but-set-variable \ -+ -Wno-unused-parameter \ -+ ; do - dnl GCC 4.4 does not warn when checking for -Wno-* flags (https://gcc.gnu.org/wiki/FAQ#wnowarning) - _NM_COMPILER_FLAG([$(printf '%s' "$option" | sed 's/^-Wno-/-W/')], [], - [CFLAGS_MORE_WARNINGS="$CFLAGS_MORE_WARNINGS $option"], []) -@@ -109,3 +124,35 @@ - AC_MSG_RESULT(no) - fi - ]) -+ -+AC_DEFUN([NM_LTO], -+[AC_ARG_ENABLE(lto, AS_HELP_STRING([--enable-lto], [Enable Link Time Optimization for smaller size (default: no)])) -+if (test "${enable_lto}" = "yes"); then -+ CC_CHECK_FLAG_APPEND([lto_flags], [CFLAGS], [-flto]) -+ if (test -n "${lto_flags}"); then -+ CFLAGS="-flto $CFLAGS" -+ else -+ AC_MSG_ERROR([Link Time Optimization -flto is not supported.]) -+ fi -+else -+ enable_lto='no' -+fi -+]) -+ -+AC_DEFUN([NM_LD_GC], -+[AC_ARG_ENABLE(ld-gc, AS_HELP_STRING([--enable-ld-gc], [Enable garbage collection of unused symbols on linking (default: auto)])) -+if (test "${enable_ld_gc}" != "no"); then -+ CC_CHECK_FLAG_APPEND([ld_gc_flags], [CFLAGS], [-fdata-sections -ffunction-sections -Wl,--gc-sections]) -+ if (test -n "${ld_gc_flags}"); then -+ enable_ld_gc="yes" -+ CFLAGS="$ld_gc_flags $CFLAGS" -+ else -+ if (test "${enable_ld_gc}" = "yes"); then -+ AC_MSG_ERROR([Unused symbol eviction requested but not supported.]) -+ else -+ enable_ld_gc="no" -+ fi -+ fi -+fi -+]) -+ -diff -Naur NetworkManager-libreswan-1.2.6-orig/Makefile.am NetworkManager-libreswan-1.2.6/Makefile.am ---- NetworkManager-libreswan-1.2.6-orig/Makefile.am 2016-06-24 06:16:16.000000000 -0400 -+++ NetworkManager-libreswan-1.2.6/Makefile.am 2018-08-21 23:09:09.644782891 -0400 -@@ -1,10 +1,27 @@ --AUTOMAKE_OPTIONS = foreign -+AUTOMAKE_OPTIONS = subdir-objects - --SUBDIRS = shared properties src po -+EXTRA_DIST = - --if WITH_GNOME --SUBDIRS += auth-dialog --endif -+CLEANFILES = -+ -+DISTCLEANFILES = -+ -+DISTCHECK_CONFIGURE_FLAGS = --enable-more-warnings=yes -+ -+ACLOCAL_AMFLAGS = -I m4 -+ -+plugindir = $(libdir)/NetworkManager -+plugin_LTLIBRARIES = -+ -+noinst_LTLIBRARIES = -+ -+libexec_PROGRAMS = -+ -+noinst_PROGRAMS = -+ -+SUBDIRS = po man -+ -+############################################################################### - - dbusservicedir = $(sysconfdir)/dbus-1/system.d - dbusservice_DATA = nm-libreswan-service.conf -@@ -12,11 +29,284 @@ - nmvpnservicedir = $(NM_VPN_SERVICE_DIR) - nmvpnservice_DATA = nm-libreswan-service.name - -+uidir = $(datadir)/gnome-vpn-properties/libreswan -+if WITH_GNOME -+ui_DATA = properties/nm-libreswan-dialog.ui -+endif -+ -+############################################################################### -+ -+plugin_sources = \ -+ properties/nm-libreswan-editor-plugin.c \ -+ properties/nm-libreswan-editor-plugin.h -+ -+editor_sources = \ -+ properties/nm-libreswan-editor.c \ -+ properties/nm-libreswan-editor.h -+ -+common_CFLAGS = \ -+ -DICONDIR=\""$(datadir)/pixmaps"\" \ -+ -DUIDIR=\""$(uidir)"\" \ -+ -DLOCALEDIR=\"$(datadir)/locale\" \ -+ -I$(srcdir)/shared \ -+ $(GLIB_CFLAGS) -+ -+############################################################################### -+ -+noinst_LTLIBRARIES += properties/libutils.la -+ -+properties_libutils_la_SOURCES = \ -+ shared/utils.c \ -+ shared/utils.h \ -+ shared/nm-utils/nm-vpn-plugin-utils.c \ -+ shared/nm-utils/nm-vpn-plugin-utils.h \ -+ shared/nm-service-defines.h -+ -+properties_libutils_la_CPPFLAGS = \ -+ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_BASE \ -+ -DNM_PLUGIN_DIR=\"$(NM_PLUGIN_DIR)\" \ -+ $(common_CFLAGS) \ -+ $(LIBNM_CFLAGS) -+ -+plugin_LTLIBRARIES += properties/libnm-vpn-plugin-libreswan.la -+ -+properties_libnm_vpn_plugin_libreswan_la_CFLAGS = \ -+ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_BASE \ -+ -DNM_PLUGIN_DIR=\"$(NM_PLUGIN_DIR)\" \ -+ $(common_CFLAGS) \ -+ $(LIBNM_CFLAGS) -+ -+properties_libnm_vpn_plugin_libreswan_la_SOURCES = \ -+ $(plugin_sources) -+ -+properties_libnm_vpn_plugin_libreswan_la_LIBADD = \ -+ properties/libutils.la \ -+ $(LIBNM_LIBS) \ -+ $(DL_LIBS) -+ -+properties_libnm_vpn_plugin_libreswan_la_LDFLAGS = \ -+ -avoid-version \ -+ -Wl,--version-script="$(srcdir)/properties/libnm-vpn-plugin-libreswan.ver" -+ -+############################################################################### -+ -+if WITH_GNOME -+plugin_LTLIBRARIES += properties/libnm-vpn-plugin-libreswan-editor.la -+endif -+ -+properties_libnm_vpn_plugin_libreswan_editor_la_CFLAGS = \ -+ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_EDITOR \ -+ $(common_CFLAGS) \ -+ $(GTK_CFLAGS) \ -+ $(LIBNM_CFLAGS) \ -+ $(LIBNMA_CFLAGS) -+ -+properties_libnm_vpn_plugin_libreswan_editor_la_SOURCES = \ -+ $(editor_sources) -+ -+properties_libnm_vpn_plugin_libreswan_editor_la_LIBADD = \ -+ $(GTK_LIBS) \ -+ $(LIBNM_LIBS) \ -+ $(LIBNMA_LIBS) -+ -+properties_libnm_vpn_plugin_libreswan_editor_la_LDFLAGS = \ -+ -avoid-version \ -+ -Wl,--version-script="$(srcdir)/properties/libnm-vpn-plugin-libreswan-editor.ver" -+ -+############################################################################### -+ -+if WITH_GNOME -+if WITH_LIBNM_GLIB -+plugin_LTLIBRARIES += properties/libnm-libreswan-properties.la -+endif -+endif -+ -+properties_libnm_libreswan_properties_la_CFLAGS = \ -+ -DNM_VPN_OLD \ -+ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ -+ $(common_CFLAGS) \ -+ $(GTK_CFLAGS) \ -+ $(LIBNM_GLIB_CFLAGS) \ -+ $(LIBNM_GTK_CFLAGS) -+ -+properties_libnm_libreswan_properties_la_SOURCES = \ -+ shared/utils.c \ -+ shared/utils.h \ -+ $(plugin_sources) \ -+ $(editor_sources) -+ -+properties_libnm_libreswan_properties_la_LIBADD = \ -+ $(GTK_LIBS) \ -+ $(LIBNM_GLIB_LIBS) \ -+ $(LIBNM_GTK_LIBS) -+ -+properties_libnm_libreswan_properties_la_LDFLAGS = \ -+ -avoid-version \ -+ -Wl,--version-script="$(srcdir)/properties/libnm-libreswan-properties.ver" -+ -+############################################################################### -+ -+EXTRA_DIST += \ -+ properties/libnm-libreswan-properties.ver \ -+ properties/libnm-vpn-plugin-libreswan.ver \ -+ properties/libnm-vpn-plugin-libreswan-editor.ver \ -+ properties/nm-libreswan-dialog.ui -+ -+############################################################################### -+ -+if WITH_GNOME -+libexec_PROGRAMS += auth-dialog/nm-libreswan-auth-dialog -+endif -+ -+auth_dialog_nm_libreswan_auth_dialog_CPPFLAGS = \ -+ -DICONDIR=\""$(datadir)/pixmaps"\" \ -+ -DBINDIR=\""$(bindir)"\" \ -+ -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ -+ -I$(srcdir)/shared \ -+ $(GLIB_CFLAGS) \ -+ $(LIBNM_CFLAGS) \ -+ $(LIBNMA_CFLAGS) \ -+ $(GTK_CFLAGS) \ -+ $(LIBSECRET_CFLAGS) -+ -+auth_dialog_nm_libreswan_auth_dialog_SOURCES = \ -+ auth-dialog/main.c -+ -+auth_dialog_nm_libreswan_auth_dialog_LDADD = \ -+ $(LIBNM_LIBS) \ -+ $(GTK_LIBS) \ -+ $(LIBNMA_LIBS) \ -+ $(LIBSECRET_LIBS) -+ -+############################################################################### -+ -+src_cppflags = \ -+ -DBINDIR=\"$(bindir)\" \ -+ -DPREFIX=\""$(prefix)"\" \ -+ -DLIBDIR=\""$(libdir)"\" \ -+ -DLIBEXECDIR=\""$(libexecdir)"\" \ -+ -DLOCALSTATEDIR=\""$(localstatedir)"\" \ -+ -DDATADIR=\"$(datadir)\" \ -+ -DNM_LIBRESWAN_LOCALEDIR=\"$(datadir)/locale\" \ -+ -I$(srcdir)/shared \ -+ -I$(builddir)/src \ -+ -I$(srcdir)/src \ -+ $(GLIB_CFLAGS) \ -+ $(LIBNM_CFLAGS) \ -+ $(LIBNL_CFLAGS) -+ -+noinst_LTLIBRARIES += src/libnm-libreswan-helper-service-dbus.la -+ -+nodist_src_libnm_libreswan_helper_service_dbus_la_SOURCES = \ -+ src/nm-libreswan-helper-service-dbus.c \ -+ src/nm-libreswan-helper-service-dbus.h -+ -+src_libnm_libreswan_helper_service_dbus_la_CPPFLAGS = $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(src_cppflags)) -+ -+src/nm-libreswan-helper-service-dbus.h: src/nm-libreswan-helper-service.xml -+ @$(MKDIR_P) src -+ $(AM_V_GEN) gdbus-codegen \ -+ --generate-c-code $(basename $@) \ -+ --c-namespace NMDBus \ -+ --interface-prefix org.freedesktop.NetworkManager \ -+ $< -+ -+src/nm-libreswan-helper-service-dbus.c: src/nm-libreswan-helper-service-dbus.h -+ @true -+ -+noinst_LTLIBRARIES += src/libutils.la -+ -+src_libutils_la_SOURCES = \ -+ shared/nm-utils/nm-shared-utils.c \ -+ shared/nm-utils/nm-shared-utils.h \ -+ shared/utils.c \ -+ shared/utils.h \ -+ shared/nm-service-defines.h -+ -+src_libutils_la_CPPFLAGS = \ -+ $(src_cppflags) -+ -+src_libutils_la_LIBADD = \ -+ $(GLIB_LIBS) \ -+ $(LIBNM_LIBS) -+ -+############################################################################### -+ -+libexec_PROGRAMS += src/nm-libreswan-service -+ -+src_nm_libreswan_service_CPPFLAGS = \ -+ $(src_cppflags) -+ -+src_nm_libreswan_service_LDADD = \ -+ src/libnm-libreswan-helper-service-dbus.la \ -+ src/libutils.la \ -+ $(GLIB_LIBS) \ -+ $(LIBNM_LIBS) \ -+ $(LIBNL_LIBS) \ -+ -lutil -+ -+$(src_nm_libreswan_service_OBJECTS): src/nm-libreswan-helper-service-dbus.h -+ -+############################################################################### -+ -+libexec_PROGRAMS += src/nm-libreswan-service-helper -+ -+src_nm_libreswan_service_helper_CPPFLAGS = \ -+ $(src_cppflags) -+ -+src_nm_libreswan_service_helper_LDADD = \ -+ src/libnm-libreswan-helper-service-dbus.la \ -+ src/libutils.la \ -+ $(GLIB_LIBS) \ -+ $(LIBNM_LIBS) -+ -+$(src_nm_libreswan_service_helper_OBJECTS): src/nm-libreswan-helper-service-dbus.h -+ -+############################################################################### -+ -+noinst_PROGRAMS += src/show-xfrm -+ -+src_show_xfrm_CPPFLAGS = \ -+ $(src_cppflags) -+ -+src_show_xfrm_LDADD = \ -+ $(LIBNL_LIBS) \ -+ $(GLIB_LIBS) -+ -+############################################################################### -+ -+CLEANFILES += \ -+ src/nm-libreswan-helper-service-dbus.h \ -+ src/nm-libreswan-helper-service-dbus.c -+ -+EXTRA_DIST += \ -+ src/nm-libreswan-helper-service.xml -+ -+############################################################################### -+ -+EXTRA_DIST += \ -+ shared/README \ -+ shared/nm-utils/gsystem-local-alloc.h \ -+ shared/nm-utils/nm-glib.h \ -+ shared/nm-utils/nm-macros-internal.h \ -+ shared/nm-utils/nm-shared-utils.c \ -+ shared/nm-utils/nm-shared-utils.h \ -+ shared/nm-utils/nm-vpn-plugin-utils.c \ -+ shared/nm-utils/nm-vpn-plugin-utils.h \ -+ shared/nm-utils/nm-vpn-plugin-macros.h \ -+ shared/nm-default.h \ -+ shared/nm-service-defines.h \ -+ shared/utils.c \ -+ shared/utils.h \ -+ $(NULL) -+ -+############################################################################### -+ - if WITH_LIBNM_GLIB - # Install a file with full path to plugins for an old gnome-shell - # https://bugzilla.gnome.org/show_bug.cgi?id=693590 - install-data-hook: -- mkdir -p $(DESTDIR)$(sysconfdir)/NetworkManager/VPN -+ @$(MKDIR_P) $(DESTDIR)$(sysconfdir)/NetworkManager/VPN - sed -e "1s|^|# This file is obsoleted by a file in $(NM_VPN_SERVICE_DIR)\n\n|" \ - -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \ - -e 's|[@]PLUGINDIR[@]|@NM_PLUGIN_DIR@|g' \ -@@ -40,19 +330,21 @@ - -e 's|[@]PLUGINDIR[@]/|@NM_PLUGIN_DIR_NAME_FILE@|g' \ - $< >$@ - --DISTCHECK_CONFIGURE_FLAGS = --enable-more-warnings=yes -- --EXTRA_DIST = nm-libreswan-service.name.in \ -- $(dbusservice_DATA) \ -- $(appdata_in_files) \ -- $(appdata_files) \ -- intltool-extract.in \ -- intltool-merge.in \ -- intltool-update.in -- --CLEANFILES = $(nmvpnservice_DATA) \ -- $(appdata_files) -+EXTRA_DIST += \ -+ nm-libreswan-service.name.in \ -+ $(dbusservice_DATA) \ -+ $(appdata_in_files) \ -+ $(appdata_files) \ -+ intltool-extract.in \ -+ intltool-merge.in \ -+ intltool-update.in -+ -+CLEANFILES += \ -+ $(nmvpnservice_DATA) \ -+ $(appdata_files) -+ -+DISTCLEANFILES += \ -+ intltool-extract \ -+ intltool-merge \ -+ intltool-update - --DISTCLEANFILES = intltool-extract intltool-merge intltool-update -- --ACLOCAL_AMFLAGS = -I m4 -diff -Naur NetworkManager-libreswan-1.2.6-orig/man/Makefile.am NetworkManager-libreswan-1.2.6/man/Makefile.am ---- NetworkManager-libreswan-1.2.6-orig/man/Makefile.am 1969-12-31 19:00:00.000000000 -0500 -+++ NetworkManager-libreswan-1.2.6/man/Makefile.am 2018-08-21 23:09:09.646782982 -0400 -@@ -0,0 +1 @@ -+man_MANS = nm-settings-libreswan.5 -diff -Naur NetworkManager-libreswan-1.2.6-orig/man/nm-settings-libreswan.5.in NetworkManager-libreswan-1.2.6/man/nm-settings-libreswan.5.in ---- NetworkManager-libreswan-1.2.6-orig/man/nm-settings-libreswan.5.in 1969-12-31 19:00:00.000000000 -0500 -+++ NetworkManager-libreswan-1.2.6/man/nm-settings-libreswan.5.in 2018-08-21 23:09:09.647783028 -0400 -@@ -0,0 +1,168 @@ -+.\" nm-settings-libreswan(5) manual page -+.\" -+.\" This is free documentation; you can redistribute it and/or -+.\" modify it under the terms of the GNU General Public License as -+.\" published by the Free Software Foundation; either version 2 of -+.\" the License, or (at your option) any later version. -+.\" -+.\" The GNU General Public License's references to "object code" -+.\" and "executables" are to be interpreted as the output of any -+.\" document formatting or typesetting system, including -+.\" intermediate and printed output. -+.\" -+.\" This manual is distributed in the hope that it will be useful, -+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of -+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+.\" GNU General Public License for more details. -+.\" -+.\" You should have received a copy of the GNU General Public Licence along -+.\" with this manual; if not, write to the Free Software Foundation, Inc., -+.\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+.\" -+.\" Copyright (C) 2018 Red Hat, Inc. -+.\" -+.TH NM-SETTINGS-LIBRESWAN "5" "9 July 2018" -+ -+.SH NAME -+nm\-setting\-libreswan \- NetworkManager Libreswan plugin supported options -+ -+.SH DESCRIPTION -+.PP -+NetworkManager is based on the concept of connection profiles made up of settings -+containing the network configuration (see -+\fBnm-settings\fR(5) -+for details). -+The data and secret keys belonging to the vpn setting take dictionaries of key/value -+pairs which depends on the specific VPN plugin. Here the list of the allowed key/value pairs -+for the NetworkManager Libreswan plugin. -+ -+.SH VPN.DATA -+.PP -+Many key/value pairs in the \fBvpn.data\fR property are passed unchanged to the Libreswan service. -+The configuration is first validated by the NetworkManager plugin, which will also add some extra Libreswan -+parameters and defaults as needed. There are some key/value pairs used for the plugin configuration only, -+e.g., the flags used to manage the secrets needed by the connection. -+Here the full list of the allowed parameters: -+.TP -+.I "right" -+contains the address of the remote VPN endpoint. Corresponds to the Libreswan parameter of the same name. -+Always Required. -+.TP -+.I "rightid" -+specifies the remote identifier to be used during IKE negotiation. Corresponds to the Libreswan -+parameter of the same name. -+.TP -+.I "rightrsasigkey" -+specifies the remote's public key for RSA authentication. -+When the 'leftcert' key is defined a default value of "%cert" is assumed. -+.TP -+.I "left" -+contains the local address that should be used during IKE negotiation. If not specified, the value -+"%defaultroute" is assumed. Corresponds to the Libreswan parameter of the same name. -+.TP -+.I "leftid" -+specifies the local identifier to be used during IKE negotiation. When this property is specified and the -+IKEv1 protocol is used the key exchange will be performed in aggressive mode and the identifier will be -+considered a literal string (it will be automatically prefixed with '@' when passed to Libreswan). -+Corresponds to the Libreswan parameter of the same name. -+.TP -+.I "leftrsasigkey" -+specifies the local public key for RSA authentication. The key should be already installed in the *swan NSS database. -+When the 'leftcert' key is defined a default value of "%cert" is assumed. -+.TP -+.I "leftcert" -+this defines the certificate nickname of your certificate in the NSS database. -+The certificate should be already installed in the NSS database. -+.TP -+.I "leftxauthusername" -+the username to be used during XAUTH authentication. If not specified, the -+current user will be implicitly assumed. Corresponds to the Libreswan parameter -+of the same name. -+.TP -+.I "dhgroup" -+ignored. -+.TP -+.I "pfsgroup" -+ignored. -+.TP -+.I "dpdtimeout" -+ignored. -+.TP -+.I "ike" -+allowed ciphers to be negotiatied to establish the IKE SAs. Corresponds to the -+Libreswan parameter of the same name. Default value depends on Libreswan but for -+IKEv1 aggressive negotiation: in that case the default is forced to 'aes256-sha1;modp1536'. -+.TP -+.I "esp" -+allowed ciphers for establishing phase2 SAs. Matches the Libreswan -+parameter of the same name. Default value depends on Libreswan but for IKEv1 aggressive -+negotiation: in that case the default is forced to 'aes256-sha1'. -+.TP -+.I "ikelifetime" -+how long the phase1 SA of a connection should last. Matches the Libreswan -+parameter of the same name. Default value is '24h'. -+.TP -+.I "salifetime" -+how long the pashe2 SA of a connection should last. Matches the Libreswan -+parameter of the same name. Default value is '24h'. -+.TP -+.I "vendor" -+when equals 'Cisco', the 'cisco-unity=yes' will be passed to Libreswan, to allow -+ending the CISCO_UNITY payload to the peer. The option is ignored otherwise. -+.TP -+.I "rightsubnet" -+the destination subnet that should be reached throught the VPN. If omitted, will -+be filled with '0.0.0.0/0'. Matches the Libreswan parameter of the same name. -+.TP -+.I "ikev2" -+use IKEv2 negotiation. Allowed values are: 'permit', 'no'/'never', 'yes'/'propose' and 'insist'. -+Matches the Libreswan parameter of the same name. -+.TP -+.I "narrowing" -+only effective in IKEv2 negotiation. Allowed values are: 'yes' and 'no'. -+Matches the Libreswan parameter of the same name. -+.TP -+.I "rekey" -+Allowed values are: 'yes' and 'no'. -+Defaults to 'yes'. -+Matches the Libreswan parameter of the same name. -+.TP -+.I "fragmentation" -+Allowed values are: 'yes' and 'no'. -+Matches the Libreswan parameter of the same name. -+.TP -+.I "mobike" -+Allowed values are: 'yes' and 'no'. -+Matches the Libreswan parameter of the same name. -+.TP -+.I "pskinputmodes" -+where the 'pskvalue' can be retrieved. Used internally by the plugin. Allowed values are: 'unused', 'save', 'ask'. -+.TP -+.I "xauthpasswordinputmodes" -+where the 'xauthpassword' can be retrieved. Used internally by the plugin. Allowed values are: 'unused', 'save', 'ask'. -+.TP -+.I "pskvalue-flags" -+how to handle the 'pskvalue' secret. See the "Secret flag type" section at -+\fBnm-settings\fR(5) -+for details. -+.TP -+.I "xauthpassword-flags" -+how to handle the 'xauthpassword' secret. See the "Secret flag type" section at -+\fBnm-settings\fR(5) -+for details. -+ -+.SH VPN.SECRETS -+.PP -+The \fBvpn.secrets\fR property holds the secrets stored in the connection (if any). -+The allowed keys are: -+.TP -+.I "pskvalue" -+if specified, its value is configured in the Libreswan secret file for the authentication -+of the connection. -+.TP -+.I "xauthpassword" -+if specified, its value is provided to Libreswan during XAUTH authentication. -+ -+.SH SEE ALSO -+.BR NetworkManager(8), -+.BR nm\-settings(5). -diff -Naur NetworkManager-libreswan-1.2.6-orig/NetworkManager-libreswan.doap NetworkManager-libreswan-1.2.6/NetworkManager-libreswan.doap ---- NetworkManager-libreswan-1.2.6-orig/NetworkManager-libreswan.doap 1969-12-31 19:00:00.000000000 -0500 -+++ NetworkManager-libreswan-1.2.6/NetworkManager-libreswan.doap 2018-08-21 23:09:09.644782891 -0400 -@@ -0,0 +1,60 @@ -+ -+ -+ NetworkManager-libreswan -+ Libreswan VPN client plugin for NetworkManager -+ Provides easy connections to IPsec VPNs using NetworkManager and Libreswan. -+ -+ -+ -+ -+ -+ -+ C -+ -+ -+ -+ Lubomir Rintel -+ -+ lkundrak -+ -+ -+ -+ -+ Thomas Haller -+ -+ thaller -+ -+ -+ -+ -+ Beniamino Galvani -+ -+ bgalvani -+ -+ -+ -+ -+ Francesco Giudici -+ -+ fgiudici -+ -+ -+ -+ -+ Dan Williams -+ -+ dcbw -+ -+ -+ -+ -+ Avesh Agarwal -+ -+ -+ -+ -+ -diff -Naur NetworkManager-libreswan-1.2.6-orig/NEWS NetworkManager-libreswan-1.2.6/NEWS ---- NetworkManager-libreswan-1.2.6-orig/NEWS 2017-01-24 09:00:58.000000000 -0500 -+++ NetworkManager-libreswan-1.2.6/NEWS 2018-08-21 23:09:09.644782891 -0400 -@@ -1,4 +1,25 @@ - ======================================================== -+NetworkManager-libreswan-1.2.8 (not released yet) -+Overview of changes since NetworkManager-libreswan-1.2.6 -+======================================================== -+ -+This is a snapshot of NetworkManager-libreswan-1.2.8 development series. -+The API is subject to change and not guaranteed to be compatible -+with the later release. -+USE AT YOUR OWN RISK. NOT RECOMMENDED FOR PRODUCTION USE! -+ -+* GUI allows to select IKEv2 certificate-based config. -+* Added support to many new Libreswan options: "'rightid', 'narrowing', 'rekey', -+ 'fragmentation', mobike' ... see man page for full list. -+* Added support to IKEv2. -+* Added nm-settings-libreswan man page to document supported options. -+* Added 'ikelifetime', 'salifetime' and 'rightsubnet' settings. -+* Updated Brazilian, Portuguese, Danish, Serbian, Lithuanian, Italian, Indonesian, -+ Japan, Finnish, Polish, Spanish, Hingarian, Czech, Swedish, Dutch, Latvian, -+ German and Catalan translations. -+ -+ -+======================================================== - NetworkManager-libreswan-1.2.6 - Overview of changes since NetworkManager-libreswan-1.2.4 - ======================================================== -diff -Naur NetworkManager-libreswan-1.2.6-orig/po/ca.po NetworkManager-libreswan-1.2.6/po/ca.po ---- NetworkManager-libreswan-1.2.6-orig/po/ca.po 2016-09-08 07:49:03.000000000 -0400 -+++ NetworkManager-libreswan-1.2.6/po/ca.po 2018-08-21 23:09:09.648783073 -0400 -@@ -9,15 +9,17 @@ - msgid "" - msgstr "" - "Project-Id-Version: NetworkManager-vpnc\n" --"Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2016-09-07 21:02+0200\n" --"PO-Revision-Date: 2016-09-06 17:55+0200\n" -+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/NetworkManager-" -+"libreswan/issues\n" -+"POT-Creation-Date: 2018-06-04 12:19+0000\n" -+"PO-Revision-Date: 2018-07-22 16:30+0200\n" - "Last-Translator: Walter Garcia-Fontes \n" - "Language-Team: Catalan \n" - "Language: ca\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" -+"X-Generator: Poedit 1.8.11\n" - - #: ../appdata/network-manager-libreswan.metainfo.xml.in.h:1 - msgid "IPsec VPN client" -@@ -68,7 +70,7 @@ - - #: ../auth-dialog/main.c:487 - #, c-format --msgid "You need to authenticate to access the Virtual Private Network '%s'." -+msgid "You need to authenticate to access the Virtual Private Network “%s”." - msgstr "Us heu d'autenticar per poder accedir a la xarxa privada virtual «%s»." - - #: ../properties/nm-libreswan-editor-plugin.c:43 -@@ -80,26 +82,26 @@ - msgstr "VPN basada en IPsec usant IKEv1" - - #: ../properties/nm-libreswan-editor-plugin.c:80 --#: ../properties/nm-libreswan-editor-plugin.c:149 -+#: ../properties/nm-libreswan-editor-plugin.c:158 - #, c-format --msgid "Can't open file '%s': %s" -+msgid "Can’t open file “%s”: %s" - msgstr "No s'ha pogut obrir el fitxer «%s» %s" - --#: ../properties/nm-libreswan-editor-plugin.c:126 -+#: ../properties/nm-libreswan-editor-plugin.c:135 - #, c-format --msgid "Missing \"conn\" section in \"%s\"" -+msgid "Missing “conn” section in “%s”" - msgstr "Secció absent «conn» a «%s»" - --#: ../properties/nm-libreswan-editor-plugin.c:167 -+#: ../properties/nm-libreswan-editor-plugin.c:176 - #, c-format --msgid "Error writing to file '%s': %s" -+msgid "Error writing to file “%s”: %s" - msgstr "S'ha produït un error mentre s'escrivia el fitxer «%s»: %s" - --#: ../src/nm-libreswan-service.c:1449 -+#: ../src/nm-libreswan-service.c:1452 - msgid "A password is required." - msgstr "Cal una contrasenya." - --#: ../src/nm-libreswan-service.c:1833 -+#: ../src/nm-libreswan-service.c:1836 - msgid "" - "Could not process the request because the VPN connection settings were " - "invalid." -@@ -107,25 +109,25 @@ - "No s'ha pogut processar la sol·licitud perquè la configuració de la connexió " - "VPN no era vàlida." - --#: ../src/nm-libreswan-service.c:1847 -+#: ../src/nm-libreswan-service.c:1850 - msgid "Unhandled pending authentication." - msgstr "Autenticació pendent no gestionada" - --#: ../src/nm-libreswan-service.c:1989 --msgid "Don't quit when VPN connection terminates" -+#: ../src/nm-libreswan-service.c:1992 -+msgid "Don’t quit when VPN connection terminates" - msgstr "No surtis quan s'acabi la connexió VPN" - --#: ../src/nm-libreswan-service.c:1990 -+#: ../src/nm-libreswan-service.c:1993 - msgid "Enable verbose debug logging (may expose passwords)" - msgstr "" - "Habilita el registre de depuració amb missatges (pot exposar les " - "contrasenyes)" - --#: ../src/nm-libreswan-service.c:1991 -+#: ../src/nm-libreswan-service.c:1994 - msgid "D-Bus name to use for this instance" - msgstr "Nom D-BUS a usar per a aquesta instància" - --#: ../src/nm-libreswan-service.c:2014 -+#: ../src/nm-libreswan-service.c:2017 - msgid "" - "This service provides integrated IPsec VPN capability to NetworkManager." - msgstr "" -@@ -137,17 +139,17 @@ - msgid "Error writing config: %s" - msgstr "S'ha produït un error quan s'escrivia la configuració: %s" - --#: ../shared/nm-utils/nm-shared-utils.c:185 -+#: ../shared/nm-utils/nm-shared-utils.c:312 - #, c-format - msgid "object class '%s' has no property named '%s'" - msgstr "l'objecte de classe «%s» no té una propietat anomenada «%s»" - --#: ../shared/nm-utils/nm-shared-utils.c:192 -+#: ../shared/nm-utils/nm-shared-utils.c:319 - #, c-format - msgid "property '%s' of object class '%s' is not writable" - msgstr "la propietat «%s» de l'objecte classe «%s» no es pot escriure" - --#: ../shared/nm-utils/nm-shared-utils.c:199 -+#: ../shared/nm-utils/nm-shared-utils.c:326 - #, c-format - msgid "" - "construct property \"%s\" for object '%s' can't be set after construction" -@@ -155,20 +157,20 @@ - "la propietat «%s» de construcció per a l'objecte «%s» no es pot establir " - "després de la construcció" - --#: ../shared/nm-utils/nm-shared-utils.c:207 -+#: ../shared/nm-utils/nm-shared-utils.c:334 - #, c-format - msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" - msgstr "" - "«%s::%s» no és un nom de propietat vàlid; «%s» no és un subtipus GObject" - --#: ../shared/nm-utils/nm-shared-utils.c:216 -+#: ../shared/nm-utils/nm-shared-utils.c:343 - #, c-format - msgid "unable to set property '%s' of type '%s' from value of type '%s'" - msgstr "" - "no s'ha pogut establir la propietat «%s» del tipus «%s» a partir del valor " - "de tipus «%s»" - --#: ../shared/nm-utils/nm-shared-utils.c:227 -+#: ../shared/nm-utils/nm-shared-utils.c:354 - #, c-format - msgid "" - "value \"%s\" of type '%s' is invalid or out of range for property '%s' of " -@@ -198,8 +200,8 @@ - "s'ha produït un error desconegut quan es creava la instància de l'editor" - - #: ../properties/nm-libreswan-dialog.ui.h:1 --msgid "General" --msgstr "General" -+msgid "General" -+msgstr "General" - - #: ../properties/nm-libreswan-dialog.ui.h:2 - msgid "_Gateway:" -@@ -238,15 +240,23 @@ - msgstr "Algoritmes Phase1:" - - #: ../properties/nm-libreswan-dialog.ui.h:11 --msgid "Ad_vanced" --msgstr "A_vançat" -+msgid "Phase1 Lifetime:" -+msgstr "Temps de vida Phase1:" - - #: ../properties/nm-libreswan-dialog.ui.h:12 --msgid " " --msgstr " " -+msgid "Phase2 Lifetime:" -+msgstr "Temps de vida Phase2:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:13 -+msgid "Remote Network:" -+msgstr "Xarxa remota:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:14 -+msgid "Ad_vanced" -+msgstr "A_vançat" - --#~ msgid "Network" --#~ msgstr "Xarxa" -+#~ msgid " " -+#~ msgstr " " - - #~ msgid "Request VPN authentication" - #~ msgstr "Demana l'autenticació de la VPN" -diff -Naur NetworkManager-libreswan-1.2.6-orig/po/cs.po NetworkManager-libreswan-1.2.6/po/cs.po ---- NetworkManager-libreswan-1.2.6-orig/po/cs.po 2016-10-06 08:02:29.000000000 -0400 -+++ NetworkManager-libreswan-1.2.6/po/cs.po 2018-08-21 23:09:09.648783073 -0400 -@@ -5,15 +5,15 @@ - # Jakub Friedl , 2006. - # Jiří Eischmann , 2008. - # Marek Černocký , 2013. --# Zdeněk Hataš , 2009 - 2016. -+# Zdeněk Hataš , 2009 - 2017. - # - msgid "" - msgstr "" - "Project-Id-Version: network-manager-libreswan\n" --"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" - "product=NetworkManager&keywords=I18N+L10N&component=VPN: libreswan\n" --"POT-Creation-Date: 2016-10-03 19:54+0000\n" --"PO-Revision-Date: 2016-06-30 14:38+0100\n" -+"POT-Creation-Date: 2017-10-31 08:58+0000\n" -+"PO-Revision-Date: 2017-11-27 14:07+0100\n" - "Last-Translator: Zdeněk Hataš \n" - "Language-Team: čeština \n" - "Language: cs\n" -@@ -21,7 +21,7 @@ - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" --"X-Generator: Poedit 1.5.4\n" -+"X-Generator: Poedit 1.8.7.1\n" - - #: ../appdata/network-manager-libreswan.metainfo.xml.in.h:1 - msgid "IPsec VPN client" -@@ -81,49 +81,49 @@ - msgstr "VPN pomocí IPsec s použitím IKEv1" - - #: ../properties/nm-libreswan-editor-plugin.c:80 --#: ../properties/nm-libreswan-editor-plugin.c:149 -+#: ../properties/nm-libreswan-editor-plugin.c:158 - #, c-format - msgid "Can’t open file “%s”: %s" - msgstr "Nelze otevřít soubor „%s“: %s" - --#: ../properties/nm-libreswan-editor-plugin.c:126 -+#: ../properties/nm-libreswan-editor-plugin.c:135 - #, c-format - msgid "Missing “conn” section in “%s”" - msgstr "Chybějící sekce „conn“ v „%s“" - --#: ../properties/nm-libreswan-editor-plugin.c:167 -+#: ../properties/nm-libreswan-editor-plugin.c:176 - #, c-format - msgid "Error writing to file “%s”: %s" - msgstr "Chyba při zápisu do souboru „%s“: %s" - --#: ../src/nm-libreswan-service.c:1449 -+#: ../src/nm-libreswan-service.c:1452 - msgid "A password is required." - msgstr "Je požadováno heslo." - --#: ../src/nm-libreswan-service.c:1833 -+#: ../src/nm-libreswan-service.c:1836 - msgid "" - "Could not process the request because the VPN connection settings were " - "invalid." - msgstr "" - "Nelze zpracovat požadavek, protože nastavení připojení VPN nejsou platná." - --#: ../src/nm-libreswan-service.c:1847 -+#: ../src/nm-libreswan-service.c:1850 - msgid "Unhandled pending authentication." - msgstr "Neošetřené čekající ověření." - --#: ../src/nm-libreswan-service.c:1989 -+#: ../src/nm-libreswan-service.c:1992 - msgid "Don’t quit when VPN connection terminates" - msgstr "Neskončit, dokud se spojení VPN ukončuje" - --#: ../src/nm-libreswan-service.c:1990 -+#: ../src/nm-libreswan-service.c:1993 - msgid "Enable verbose debug logging (may expose passwords)" - msgstr "Zapnout podrobnou evidenci ladění (může odhalit hesla)" - --#: ../src/nm-libreswan-service.c:1991 -+#: ../src/nm-libreswan-service.c:1994 - msgid "D-Bus name to use for this instance" - msgstr "Název použitý pro tuto instanci v D-Bus" - --#: ../src/nm-libreswan-service.c:2014 -+#: ../src/nm-libreswan-service.c:2017 - msgid "" - "This service provides integrated IPsec VPN capability to NetworkManager." - msgstr "" -@@ -135,34 +135,34 @@ - msgid "Error writing config: %s" - msgstr "Chyba při zápisu nastavení: %s" - --#: ../shared/nm-utils/nm-shared-utils.c:185 -+#: ../shared/nm-utils/nm-shared-utils.c:312 - #, c-format - msgid "object class '%s' has no property named '%s'" - msgstr "objektová třída „%s“ nemá vlastnost nazvanou „%s“" - --#: ../shared/nm-utils/nm-shared-utils.c:192 -+#: ../shared/nm-utils/nm-shared-utils.c:319 - #, c-format - msgid "property '%s' of object class '%s' is not writable" - msgstr "vlastnost „%s“ objektové třídy „%s“ není zapisovatelná" - --#: ../shared/nm-utils/nm-shared-utils.c:199 -+#: ../shared/nm-utils/nm-shared-utils.c:326 - #, c-format - msgid "" - "construct property \"%s\" for object '%s' can't be set after construction" - msgstr "" - "vytvoření vlastnosti „%s“ objektu „%s“ nemůže být nastaveno po vytvoření" - --#: ../shared/nm-utils/nm-shared-utils.c:207 -+#: ../shared/nm-utils/nm-shared-utils.c:334 - #, c-format - msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" - msgstr "'%s::%s' není platný název vlastnosti; „%s“ není podtyp GObject" - --#: ../shared/nm-utils/nm-shared-utils.c:216 -+#: ../shared/nm-utils/nm-shared-utils.c:343 - #, c-format - msgid "unable to set property '%s' of type '%s' from value of type '%s'" - msgstr "nelze nastavit vlastnost „%s“ typu „%s“ z hodnoty typu „%s“" - --#: ../shared/nm-utils/nm-shared-utils.c:227 -+#: ../shared/nm-utils/nm-shared-utils.c:354 - #, c-format - msgid "" - "value \"%s\" of type '%s' is invalid or out of range for property '%s' of " -@@ -229,6 +229,17 @@ - msgstr "Algoritmy Fáze1:" - - #: ../properties/nm-libreswan-dialog.ui.h:11 -+msgid "Phase1 Lifetime:" -+msgstr "Životnost fáze1:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:12 -+msgid "Phase2 Lifetime:" -+msgstr "Životnost fáze2:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:13 -+msgid "Remote Network:" -+msgstr "Vzdálená síť:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:14 - msgid "Ad_vanced" - msgstr "P_okročilé" -- -diff -Naur NetworkManager-libreswan-1.2.6-orig/po/da.po NetworkManager-libreswan-1.2.6/po/da.po ---- NetworkManager-libreswan-1.2.6-orig/po/da.po 2016-08-23 15:16:28.000000000 -0400 -+++ NetworkManager-libreswan-1.2.6/po/da.po 2018-08-21 23:09:09.649783119 -0400 -@@ -1,185 +1,362 @@ - # Danish translation of NetworkManager-vpnc --# Copyright (C) 2005-2009 -+# Copyright (C) 2005-2017 - # This file is distributed under the same license as the NetworkManager-vpnc package. - # David Zeuthen , 2005. - # Lasse Bang Mikkelsen , 2006, 07. - # Mads Bille Lundby , 2017. - # - msgid "" - msgstr "" - "Project-Id-Version: NetworkManager-vpnc\n" --"Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2009-02-24 23:54+0100\n" --"PO-Revision-Date: 2009-02-24 17:35+0100\n" --"Last-Translator: Mads Lundby \n" -+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" -+"product=NetworkManager&keywords=I18N+L10N&component=VPN: libreswan\n" -+"POT-Creation-Date: 2017-11-11 17:58+0000\n" -+"PO-Revision-Date: 2018-03-08 13:12+0100\n" -+"Last-Translator: Alan Mortensen \n" - "Language-Team: Danish \n" - "Language: da\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=2; plural=(n > 1);\n" -+"X-Generator: Poedit 2.0.6\n" - --#: ../auth-dialog/gnome-two-password-dialog.c:103 --msgid "_Secondary Password:" --msgstr "_Sekundær adgangskode:" -+#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:1 -+msgid "IPsec VPN client" -+msgstr "IPsec-VPN-klient" - --#: ../auth-dialog/gnome-two-password-dialog.c:159 --msgid "_Password:" --msgstr "_Adgangskode:" -- --#: ../auth-dialog/gnome-two-password-dialog.c:240 --msgid "Sh_ow passwords" --msgstr "_Vis adgangskoder" -+#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:2 -+msgid "Libreswan based client for IKEv1 based IPsec virtual private networks" -+msgstr "" -+"Klient baseret på Libreswan til IKEv1-baserede virtuelle private IPsec-" -+"netværk" - --#: ../auth-dialog/gnome-two-password-dialog.c:300 --msgid "_Remember passwords for this session" --msgstr "_Husk adgangskoder for denne session" -+#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:3 -+msgid "" -+"Support for configuring IKEv1 based IPsec virtual private network " -+"connections." -+msgstr "" -+"Understøttelse af konfigurering af IKEv1-baserede virtuelle private IPsec-" -+"netværksforbindelser." - --#: ../auth-dialog/gnome-two-password-dialog.c:301 --msgid "_Save passwords in keyring" --msgstr "_Gem adgangskoder i nøglering" -+#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:4 -+msgid "Compatible with Libreswan and Cisco IPsec VPN servers." -+msgstr "Kompatibel med Libreswan og Ciscos IPsec-VPN-servere." -+ -+#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:5 -+msgid "The NetworkManager Developers" -+msgstr "Udviklerne af Netværkshåndtering" - --#: ../auth-dialog/main.c:170 -+#: ../auth-dialog/main.c:165 - #, c-format --msgid "You need to authenticate to access the Virtual Private Network '%s'." --msgstr "" --"Du skal opnå godkendelse for at tilgå det virtuelle private netværk \"%s\"." -+msgid "Authenticate VPN %s" -+msgstr "Godkend VPN %s" -+ -+#: ../auth-dialog/main.c:182 -+msgid "Password:" -+msgstr "Adgangskode:" -+ -+#: ../auth-dialog/main.c:192 -+msgid "Group Password:" -+msgstr "Gruppeadgangskode:" - --#: ../auth-dialog/main.c:171 -+# findes også i pptp -+#: ../auth-dialog/main.c:228 - msgid "Authenticate VPN" --msgstr "VPN-godkendelse" -+msgstr "Godkend VPN" - --#: ../auth-dialog/main.c:175 -+#: ../auth-dialog/main.c:237 - msgid "_Group Password:" - msgstr "_Gruppeadgangskode:" - --#: ../nm-vpnc.desktop.in.h:1 --msgid "Add, Remove, and Edit VPN Connections" --msgstr "Tilføj, fjern og redigér VPN-forbindelser" -+#: ../auth-dialog/main.c:487 -+#, c-format -+msgid "You need to authenticate to access the Virtual Private Network “%s”." -+msgstr "" -+"Du skal opnå godkendelse for at tilgå det virtuelle private netværk “%s”." - --# --#: ../nm-vpnc.desktop.in.h:2 --msgid "VPN Connection Manager (vpnc)" --msgstr "Håndtering af VPN-forbindelser (vpnc)" -- --#: ../properties/nm-vpnc.c:53 --msgid "Cisco Compatible VPN (vpnc)" --msgstr "Cisco-kompatibelt VPN (vpnc)" -+#: ../properties/nm-libreswan-editor-plugin.c:43 -+msgid "IPsec based VPN" -+msgstr "VPN baseret på IPsec" -+ -+#: ../properties/nm-libreswan-editor-plugin.c:44 -+msgid "IPsec based VPN using IKEv1" -+msgstr "VPN baseret på IPsec med brug af IKEv1" -+ -+#: ../properties/nm-libreswan-editor-plugin.c:80 -+#: ../properties/nm-libreswan-editor-plugin.c:158 -+#, c-format -+msgid "Can’t open file “%s”: %s" -+msgstr "Kan ikke åbne filen “%s”: %s" -+ -+# står conn for connection - og skal det i givet fald oversættes til forb? -+#: ../properties/nm-libreswan-editor-plugin.c:135 -+#, c-format -+msgid "Missing “conn” section in “%s”" -+msgstr "Manglende “conn”-afsnit i “%s”" -+ -+#: ../properties/nm-libreswan-editor-plugin.c:176 -+#, c-format -+msgid "Error writing to file “%s”: %s" -+msgstr "Fejl under skrivning til filen “%s”: %s" -+ -+#: ../src/nm-libreswan-service.c:1452 -+msgid "A password is required." -+msgstr "Adgangskode er krævet." -+ -+#: ../src/nm-libreswan-service.c:1836 -+msgid "" -+"Could not process the request because the VPN connection settings were " -+"invalid." -+msgstr "" -+"Kunne ikke behandle forespørgslen, fordi indstillingerne for VPN-" -+"forbindelsen var ugyldige." -+ -+#: ../src/nm-libreswan-service.c:1850 -+msgid "Unhandled pending authentication." -+msgstr "Uhåndteret ventende godkendelse." -+ -+#: ../src/nm-libreswan-service.c:1992 -+msgid "Don’t quit when VPN connection terminates" -+msgstr "Afslut ikke, når VPN-forbindelsen afsluttes" -+ -+# findes også i pptp -+#: ../src/nm-libreswan-service.c:1993 -+msgid "Enable verbose debug logging (may expose passwords)" -+msgstr "Aktivér uddybende fejlsøgningslog (kan afsløre adgangskoder)" -+ -+# findes også i pptp -+#: ../src/nm-libreswan-service.c:1994 -+msgid "D-Bus name to use for this instance" -+msgstr "Navn på D-Bus der skal bruges i dette tilfælde" - --#: ../properties/nm-vpnc.c:54 -+#: ../src/nm-libreswan-service.c:2017 - msgid "" --"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-based " --"VPN gateways." -+"This service provides integrated IPsec VPN capability to NetworkManager." - msgstr "" --"Kompatibel med forskellige Cisco, Juniper, Netscreen, og Sonicwall IPsec-" --"baserede VPN-adgangspunkter." -+"Denne tjeneste tilbyder integreret Ipsec-VPN-kapacitet til " -+"Netværkshåndtering." -+ -+#: ../shared/utils.c:85 -+#, c-format -+msgid "Error writing config: %s" -+msgstr "Fejl under skrivning af konfiguration: %s" - --#: ../properties/nm-vpnc.c:339 --msgid "Saved" --msgstr "Gemt" -- --#: ../properties/nm-vpnc.c:346 --msgid "Always Ask" --msgstr "Spørg altid" -- --#: ../properties/nm-vpnc.c:353 --msgid "Not Required" --msgstr "Ikke påkrævet" -- --#: ../properties/nm-vpnc.c:412 --msgid "Secure (default)" --msgstr "Sikker (standard)" -- --#: ../properties/nm-vpnc.c:415 --msgid "Weak (use with caution)" --msgstr "Svag (anvend med forsigtighed)" -- --#: ../properties/nm-vpnc.c:423 --msgid "None (completely insecure)" --msgstr "Ingen (fuldstændig usikker)" -- --#: ../properties/nm-vpnc.c:471 --msgid "Cisco UDP (default)" --msgstr "Cisco-UDP (standard)" -- --#: ../properties/nm-vpnc.c:478 --msgid "NAT-T" --msgstr "NAT-T" -- --#: ../properties/nm-vpnc.c:485 --msgid "Disabled" --msgstr "Deaktiveret" -- --#: ../properties/nm-vpnc.c:1116 --msgid "TCP tunneling not supported" --msgstr "TCP-tunnel er ikke understøttet" -+# streng også i modulet applet -+#: ../shared/nm-utils/nm-shared-utils.c:312 -+#, c-format -+msgid "object class '%s' has no property named '%s'" -+msgstr "objektklassen “%s” har ingen egenskab ved navn “%s”" - --#: ../properties/nm-vpnc.c:1118 -+# streng også i modulet applet -+#: ../shared/nm-utils/nm-shared-utils.c:319 -+#, c-format -+msgid "property '%s' of object class '%s' is not writable" -+msgstr "egenskaben “%s” for objektklassen “%s” er skrivebeskyttet" -+ -+# streng også i modulet applet -+#: ../shared/nm-utils/nm-shared-utils.c:326 - #, c-format - msgid "" --"The VPN settings file '%s' specifies that VPN traffic should be tunneled " --"through TCP which is currently not supported in the vpnc software.\n" --"\n" --"The connection can still be created, with TCP tunneling disabled, however it " --"may not work as expected." -+"construct property \"%s\" for object '%s' can't be set after construction" - msgstr "" --"VPN-opsætningsfilen \"%s\" angiver, at VPN-trafikken skal sendes gennem en " --"TCP-tunnel, som i øjeblikket ikke er understøttet i vpnc-programmet.\n" --"\n" --"Forbindelsen kan stadig oprettes uden TCP-tunnel, men vil muligvis ikke " --"fungere som forventet." -- --#: ../properties/nm-vpnc-dialog.glade.h:1 --msgid " " --msgstr " " -- --#: ../properties/nm-vpnc-dialog.glade.h:2 --msgid "General" --msgstr "Generelt" -- --#: ../properties/nm-vpnc-dialog.glade.h:3 --msgid "Optional" --msgstr "Valgfri" -- --#: ../properties/nm-vpnc-dialog.glade.h:4 --msgid "Disable Dead Peer Detection" --msgstr "Deaktivér genkendelse af døde ligemænd (peers)" -+"construct-egenskaben “%s” for objektet “%s” kan ikke angives efter " -+"konstruktion" - --#: ../properties/nm-vpnc-dialog.glade.h:5 --msgid "Domain:" --msgstr "Domæne:" -+# streng også i modulet applet -+#: ../shared/nm-utils/nm-shared-utils.c:334 -+#, c-format -+msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" -+msgstr "" -+"“%s::%s” er ikke et gyldigt egenskabsnavn; “%s” er ikke en undertype af " -+"GObjekt" - --#: ../properties/nm-vpnc-dialog.glade.h:6 --msgid "Encryption method:" --msgstr "Krypteringsmetode:" -+# streng også i modulet applet -+#: ../shared/nm-utils/nm-shared-utils.c:343 -+#, c-format -+msgid "unable to set property '%s' of type '%s' from value of type '%s'" -+msgstr "" -+"kan ikke angive egenskaben “%s” af type “%s” ud fra værdien af typen “%s”" - --#: ../properties/nm-vpnc-dialog.glade.h:7 --msgid "G_roup name:" --msgstr "G_ruppenavn:" -+# streng også i modulet applet -+#: ../shared/nm-utils/nm-shared-utils.c:354 -+#, c-format -+msgid "" -+"value \"%s\" of type '%s' is invalid or out of range for property '%s' of " -+"type '%s'" -+msgstr "" -+"værdien “%s” af typen “%s” er ugyldig eller uden for intervallet for " -+"egenskaben “%s” af typen “%s”" - --#: ../properties/nm-vpnc-dialog.glade.h:8 --msgid "Gro_up password:" --msgstr "Gr_uppeadgangskode:" -- --#: ../properties/nm-vpnc-dialog.glade.h:9 --msgid "NAT traversal:" --msgstr "NAT-krydsning:" -+# streng også i modulerne vpnc og pptp -+#: ../shared/nm-utils/nm-vpn-plugin-utils.c:80 -+#, c-format -+msgid "missing plugin file \"%s\"" -+msgstr "manglende udvidelsesmodulfil “%s”" -+ -+# streng også i modulerne vpnc og pptp -+#: ../shared/nm-utils/nm-vpn-plugin-utils.c:86 -+#, c-format -+msgid "cannot load editor plugin: %s" -+msgstr "kan ikke indlæse udvidelsesmodul til redigering: %s" -+ -+# streng også i modulerne vpnc og pptp -+#: ../shared/nm-utils/nm-vpn-plugin-utils.c:95 -+#, c-format -+msgid "cannot load factory %s from plugin: %s" -+msgstr "kan ikke indlæse fabrikken %s fra udvidelsesmodul: %s" -+ -+# streng også i modulerne vpnc og pptp -+#: ../shared/nm-utils/nm-vpn-plugin-utils.c:121 -+msgid "unknown error creating editor instance" -+msgstr "ukendt fejl i forsøget på at danne redigeringsinstans" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:1 -+msgid "General" -+msgstr "Generelt" - --#: ../properties/nm-vpnc-dialog.glade.h:10 -+#: ../properties/nm-libreswan-dialog.ui.h:2 -+msgid "_Gateway:" -+msgstr "_Gateway:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:3 - msgid "Show passwords" - msgstr "Vis adgangskoder" - --#: ../properties/nm-vpnc-dialog.glade.h:11 -+#: ../properties/nm-libreswan-dialog.ui.h:4 -+msgid "_Secret:" -+msgstr "_Hemmelighed:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:5 -+msgid "_User password:" -+msgstr "Br_ugeradgangskode:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:6 -+msgid "G_roup name:" -+msgstr "G_ruppenavn:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:7 - msgid "User name:" - msgstr "Brugernavn:" - --#: ../properties/nm-vpnc-dialog.glade.h:12 --msgid "_Gateway:" --msgstr "Ad_gangspunkt:" -+#: ../properties/nm-libreswan-dialog.ui.h:8 -+msgid "Phase2 Algorithms:" -+msgstr "Phase2-algoritmer:" - --#: ../properties/nm-vpnc-dialog.glade.h:13 --msgid "_User password:" --msgstr "Br_ugeradgangskode:" -+#: ../properties/nm-libreswan-dialog.ui.h:9 -+msgid "Domain:" -+msgstr "Domæne:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:10 -+msgid "Phase1 Algorithms:" -+msgstr "Phase1-algoritmer:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:11 -+msgid "Phase1 Lifetime:" -+msgstr "Phase1-levetid:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:12 -+msgid "Phase2 Lifetime:" -+msgstr "Phase2-levetid:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:13 -+msgid "Remote Network:" -+msgstr "Fjernnetværk:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:14 -+msgid "Ad_vanced" -+msgstr "A_vanceret" -+ -+#~ msgid "_Secondary Password:" -+#~ msgstr "_Sekundær adgangskode:" -+ -+#~ msgid "Sh_ow passwords" -+#~ msgstr "_Vis adgangskoder" -+ -+#~ msgid "_Remember passwords for this session" -+#~ msgstr "_Husk adgangskoder for denne session" -+ -+#~ msgid "_Save passwords in keyring" -+#~ msgstr "_Gem adgangskoder i nøglering" -+ -+#~ msgid "Add, Remove, and Edit VPN Connections" -+#~ msgstr "Tilføj, fjern og redigér VPN-forbindelser" -+ -+# -+#~ msgid "VPN Connection Manager (vpnc)" -+#~ msgstr "Håndtering af VPN-forbindelser (vpnc)" -+ -+#~ msgid "Cisco Compatible VPN (vpnc)" -+#~ msgstr "Cisco-kompatibelt VPN (vpnc)" -+ -+#~ msgid "" -+#~ "Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-" -+#~ "based VPN gateways." -+#~ msgstr "" -+#~ "Kompatibel med forskellige Cisco, Juniper, Netscreen, og Sonicwall IPsec-" -+#~ "baserede VPN-adgangspunkter." -+ -+#~ msgid "Saved" -+#~ msgstr "Gemt" -+ -+#~ msgid "Always Ask" -+#~ msgstr "Spørg altid" -+ -+#~ msgid "Not Required" -+#~ msgstr "Ikke påkrævet" -+ -+#~ msgid "Secure (default)" -+#~ msgstr "Sikker (standard)" -+ -+#~ msgid "Weak (use with caution)" -+#~ msgstr "Svag (anvend med forsigtighed)" -+ -+#~ msgid "None (completely insecure)" -+#~ msgstr "Ingen (fuldstændig usikker)" -+ -+#~ msgid "Cisco UDP (default)" -+#~ msgstr "Cisco-UDP (standard)" -+ -+#~ msgid "NAT-T" -+#~ msgstr "NAT-T" -+ -+#~ msgid "Disabled" -+#~ msgstr "Deaktiveret" -+ -+#~ msgid "TCP tunneling not supported" -+#~ msgstr "TCP-tunnel er ikke understøttet" -+ -+#~ msgid "" -+#~ "The VPN settings file '%s' specifies that VPN traffic should be tunneled " -+#~ "through TCP which is currently not supported in the vpnc software.\n" -+#~ "\n" -+#~ "The connection can still be created, with TCP tunneling disabled, however " -+#~ "it may not work as expected." -+#~ msgstr "" -+#~ "VPN-opsætningsfilen “%s” angiver, at VPN-trafikken skal sendes gennem en " -+#~ "TCP-tunnel, som i øjeblikket ikke er understøttet i vpnc-programmet.\n" -+#~ "\n" -+#~ "Forbindelsen kan stadig oprettes uden TCP-tunnel, men vil muligvis ikke " -+#~ "fungere som forventet." -+ -+#~ msgid " " -+#~ msgstr " " -+ -+#~ msgid "Optional" -+#~ msgstr "Valgfri" -+ -+#~ msgid "Disable Dead Peer Detection" -+#~ msgstr "Deaktivér genkendelse af døde ligemænd (peers)" -+ -+#~ msgid "Encryption method:" -+#~ msgstr "Krypteringsmetode:" -+ -+#~ msgid "Gro_up password:" -+#~ msgstr "Gr_uppeadgangskode:" -+ -+#~ msgid "NAT traversal:" -+#~ msgstr "NAT-krydsning:" - - #~ msgid "Connect _anonymously" - #~ msgstr "Tilslut _anonymt" -@@ -209,7 +386,7 @@ - #~ msgstr "Ruter: %s" - - #~ msgid "The connection details can be changed using the \"Edit\" button." --#~ msgstr "Forbindelsens detaljer kan ændres ved at bruge knappen \"Redigér\"." -+#~ msgstr "Forbindelsens detaljer kan ændres ved at bruge knappen “Redigér”." - - #~ msgid "Cannot import settings" - #~ msgstr "Kan ikke importere opsætning" -@@ -221,10 +398,10 @@ - #~ msgstr "Vælg fil der skal importeres" - - #~ msgid "Save as..." --#~ msgstr "Gem som..." -+#~ msgstr "Gem som …" - - #~ msgid "A file named \"%s\" already exists." --#~ msgstr "En fil med navnet \"%s\" eksisterer allerede." -+#~ msgstr "En fil med navnet “%s” eksisterer allerede." - - #~ msgid "Do you want to replace it with the one you are saving?" - #~ msgstr "Vil du erstatte den med den du gemmer?" -@@ -252,7 +429,7 @@ - #~ "\"Campus VPN\" or \"Corporate Network\"" - #~ msgstr "" - #~ "Navn brugt til at identificere forbindelsen til det private netværk, f." --#~ "eks. \"Universitets VPN\" eller \"Virksomhedens netværk\"" -+#~ "eks. “Universitets VPN” eller “Virksomhedens netværk”" - - #~ msgid "Override _user name" - #~ msgstr "Overskriv br_ugernavn" -@@ -271,11 +448,8 @@ - #~ "Bemærk venligst at filen du importerer ikke er en Cisco VPN eller VPNC " - #~ "konfigurationsfil. Spørg din administrator efter filen." - --#~ msgid "Use _domain for authentication" --#~ msgstr "Brug _domæne til brugerverifikation" -- - #~ msgid "_Import Saved Configuration..." --#~ msgstr "_Importér gemt konfiguration..." -+#~ msgstr "_Importér gemt konfiguration …" - - #~ msgid "_Only use VPN connection for these addresses" - #~ msgstr "_Brug kun VPN-forbindelse til flg. adresser" -@@ -295,10 +469,6 @@ - #~ "serveren." - - #~ msgid "" --#~ "The VPN login failed because the VPN configuration options were invalid." --#~ msgstr "VPN-tjenesten fejlede fordi VPN-konfigurationen var ugyldig." -- --#~ msgid "" - #~ "The VPN login failed because the VPN program received an invalid " - #~ "configuration from the VPN server." - #~ msgstr "" -diff -Naur NetworkManager-libreswan-1.2.6-orig/po/de.po NetworkManager-libreswan-1.2.6/po/de.po ---- NetworkManager-libreswan-1.2.6-orig/po/de.po 2016-10-24 07:51:48.000000000 -0400 -+++ NetworkManager-libreswan-1.2.6/po/de.po 2018-08-21 23:09:09.649783119 -0400 -@@ -2,24 +2,24 @@ - # Copyright (C) 2007 THE PACKAGE'S COPYRIGHT HOLDER - # This file is distributed under the same license as the network-manager-libreswan package. - # Thomas Gier , 2007. --# Mario Blättermann , 2008, 2016. -+# Mario Blättermann , 2008, 2016, 2018. - # Christian Kirbach , 2013. - # Wolfgang Stöggl , 2013, 2016. - # - msgid "" - msgstr "" - "Project-Id-Version: NetworkManager Libreswan\n" --"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" --"product=NetworkManager&keywords=I18N+L10N&component=VPN: libreswan\n" --"POT-Creation-Date: 2016-10-03 19:54+0000\n" --"PO-Revision-Date: 2016-10-13 16:29+0200\n" -+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/NetworkManager-" -+"libreswan/issues\n" -+"POT-Creation-Date: 2018-08-10 17:14+0000\n" -+"PO-Revision-Date: 2018-08-19 18:09+0200\n" - "Last-Translator: Mario Blättermann \n" - "Language-Team: de \n" - "Language: de\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" --"X-Generator: Poedit 1.8.9\n" -+"X-Generator: Poedit 2.1.1\n" - - #: ../appdata/network-manager-libreswan.metainfo.xml.in.h:1 - msgid "IPsec VPN client" -@@ -28,7 +28,7 @@ - #: ../appdata/network-manager-libreswan.metainfo.xml.in.h:2 - msgid "Libreswan based client for IKEv1 based IPsec virtual private networks" - msgstr "" --"Auf Libreswan basierender Client für IKEv1 basierte IPsec virtuelle private " -+"Auf Libreswan basierender Client für IKEv1-basierte IPsec virtuelle private " - "Netze" - - #: ../appdata/network-manager-libreswan.metainfo.xml.in.h:3 -@@ -36,7 +36,7 @@ - "Support for configuring IKEv1 based IPsec virtual private network " - "connections." - msgstr "" --"Unterstützung für die Konfiguration von IKEv1 basierten IPsec virtuellen " -+"Unterstützung für die Konfiguration von IKEv1-basierten IPsec virtuellen " - "privaten Netz-Verbindungen." - - #: ../appdata/network-manager-libreswan.metainfo.xml.in.h:4 -@@ -80,30 +80,31 @@ - msgstr "IPsec-basiertes VPN" - - #: ../properties/nm-libreswan-editor-plugin.c:44 --msgid "IPsec based VPN using IKEv1" --msgstr "IPsec-basiertes VPN mit IKEv1" -+#| msgid "IPsec VPN client" -+msgid "IPsec based VPN for remote clients" -+msgstr "IPsec-basiertes VPN für entfernte Clients" - - #: ../properties/nm-libreswan-editor-plugin.c:80 --#: ../properties/nm-libreswan-editor-plugin.c:149 -+#: ../properties/nm-libreswan-editor-plugin.c:158 - #, c-format - msgid "Can’t open file “%s”: %s" - msgstr "Datei »%s« kann nicht geöffnet werden: %s" - --#: ../properties/nm-libreswan-editor-plugin.c:126 -+#: ../properties/nm-libreswan-editor-plugin.c:135 - #, c-format - msgid "Missing “conn” section in “%s”" - msgstr "Abschnitt »conn« in »%s« fehlt" - --#: ../properties/nm-libreswan-editor-plugin.c:167 -+#: ../properties/nm-libreswan-editor-plugin.c:176 - #, c-format - msgid "Error writing to file “%s”: %s" - msgstr "Fehler beim Schreiben in die Datei »%s«: %s" - --#: ../src/nm-libreswan-service.c:1449 -+#: ../src/nm-libreswan-service.c:1463 - msgid "A password is required." - msgstr "Ein Passwort ist notwendig." - --#: ../src/nm-libreswan-service.c:1833 -+#: ../src/nm-libreswan-service.c:1873 - msgid "" - "Could not process the request because the VPN connection settings were " - "invalid." -@@ -111,23 +112,23 @@ - "Die Anfrage konnte nicht verarbeitet werden, weil die VPN-" - "Konfigurationseinstellungen ungültig waren." - --#: ../src/nm-libreswan-service.c:1847 -+#: ../src/nm-libreswan-service.c:1887 - msgid "Unhandled pending authentication." - msgstr "Nicht verarbeitete, ausstehende Legitimierung." - --#: ../src/nm-libreswan-service.c:1989 -+#: ../src/nm-libreswan-service.c:2029 - msgid "Don’t quit when VPN connection terminates" - msgstr "Nicht bei Abbruch der VPN-Verbindung beenden" - --#: ../src/nm-libreswan-service.c:1990 -+#: ../src/nm-libreswan-service.c:2030 - msgid "Enable verbose debug logging (may expose passwords)" - msgstr "Ausführliches Diagnoseprotokoll aktivieren (kann Passwörter enthalten)" - --#: ../src/nm-libreswan-service.c:1991 -+#: ../src/nm-libreswan-service.c:2031 - msgid "D-Bus name to use for this instance" - msgstr "Für diese Instanz zu verwendender D-Bus-Name" - --#: ../src/nm-libreswan-service.c:2014 -+#: ../src/nm-libreswan-service.c:2054 - msgid "" - "This service provides integrated IPsec VPN capability to NetworkManager." - msgstr "Dieser Dienst bietet ein integriertes IPsec-VPN für NetworkManager." -@@ -137,17 +138,17 @@ - msgid "Error writing config: %s" - msgstr "Fehler beim Schreiben der Konfiguration: %s" - --#: ../shared/nm-utils/nm-shared-utils.c:185 -+#: ../shared/nm-utils/nm-shared-utils.c:312 - #, c-format - msgid "object class '%s' has no property named '%s'" - msgstr "Objektklasse »%s« hat keine Eigenschaft namens »%s«" - --#: ../shared/nm-utils/nm-shared-utils.c:192 -+#: ../shared/nm-utils/nm-shared-utils.c:319 - #, c-format - msgid "property '%s' of object class '%s' is not writable" - msgstr "Eigenschaft »%s« von Objektklasse »%s« ist nicht schreibbar" - --#: ../shared/nm-utils/nm-shared-utils.c:199 -+#: ../shared/nm-utils/nm-shared-utils.c:326 - #, c-format - msgid "" - "construct property \"%s\" for object '%s' can't be set after construction" -@@ -155,20 +156,20 @@ - "Konstruktor-Eigenschaft »%s« für Objekt »%s« kann nicht nach der " - "Konstruktion gesetzt werden" - --#: ../shared/nm-utils/nm-shared-utils.c:207 -+#: ../shared/nm-utils/nm-shared-utils.c:334 - #, c-format - msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" - msgstr "" - "»%s::%s« ist ein ungültiger Eigenschaftsname. »%s« ist kein GObject-Untertyp" - --#: ../shared/nm-utils/nm-shared-utils.c:216 -+#: ../shared/nm-utils/nm-shared-utils.c:343 - #, c-format - msgid "unable to set property '%s' of type '%s' from value of type '%s'" - msgstr "" - "Eigenschaft »%s« des Typs »%s« von Wert des Typs »%s« kann nicht gesetzt " - "werden" - --#: ../shared/nm-utils/nm-shared-utils.c:227 -+#: ../shared/nm-utils/nm-shared-utils.c:354 - #, c-format - msgid "" - "value \"%s\" of type '%s' is invalid or out of range for property '%s' of " -@@ -197,278 +198,81 @@ - msgstr "Unbekannter Fehler beim Erstellen der Editor-Instanz" - - #: ../properties/nm-libreswan-dialog.ui.h:1 --msgid "General" --msgstr "Allgemein" -+msgid "IKEv1 (XAUTH)" -+msgstr "IKEv1 (XAUTH)" - - #: ../properties/nm-libreswan-dialog.ui.h:2 --msgid "_Gateway:" --msgstr "_Gateway:" -+msgid "IKEv2 (Certificate)" -+msgstr "IKEv2 (Zertifikat)" - - #: ../properties/nm-libreswan-dialog.ui.h:3 --msgid "Show passwords" --msgstr "Passwörter anzeigen" -+msgid "General" -+msgstr "Allgemein" - - #: ../properties/nm-libreswan-dialog.ui.h:4 --msgid "_Secret:" --msgstr "Geheimni_s:" -+msgid "_Gateway:" -+msgstr "_Gateway:" - - #: ../properties/nm-libreswan-dialog.ui.h:5 --msgid "_User password:" --msgstr "Ben_utzerpasswort:" -+msgid "Authentication" -+msgstr "Legitimierung" - - #: ../properties/nm-libreswan-dialog.ui.h:6 --msgid "G_roup name:" --msgstr "G_ruppenname:" -+msgid "Type:" -+msgstr "Typ:" - - #: ../properties/nm-libreswan-dialog.ui.h:7 - msgid "User name:" - msgstr "Benutzername:" - - #: ../properties/nm-libreswan-dialog.ui.h:8 --msgid "Phase2 Algorithms:" --msgstr "Phase2-Algorithmen:" -+msgid "_User password:" -+msgstr "Ben_utzerpasswort:" - - #: ../properties/nm-libreswan-dialog.ui.h:9 --msgid "Domain:" --msgstr "Domäne:" -+msgid "G_roup name:" -+msgstr "G_ruppenname:" - - #: ../properties/nm-libreswan-dialog.ui.h:10 --msgid "Phase1 Algorithms:" --msgstr "Phase1-Algorithmen:" -+msgid "_Secret:" -+msgstr "Geheimni_s:" - - #: ../properties/nm-libreswan-dialog.ui.h:11 --msgid "Ad_vanced" --msgstr "Er_weitert" -- --#~ msgid " " --#~ msgstr " " -- --#~ msgid "Network" --#~ msgstr "Netzwerk" -- --#~ msgid "Request VPN authentication" --#~ msgstr "Legitimierung für VPN anfordern" -- --#~ msgid "IPsec, IKEv1, IKEv2 based VPN" --#~ msgstr "IPsec, IKEv1, IKEv2-basiertes VPN" -- --#~ msgid "Saved" --#~ msgstr "Gespeichert" -- --#~ msgid "Always Ask" --#~ msgstr "Immer fragen" -- --#~ msgid "Not Required" --#~ msgstr "Nicht notwendig" -- --#~ msgid "Gro_up password:" --#~ msgstr "_Gruppenpasswort:" -- --#~ msgid "Optional" --#~ msgstr "Optional" -- --#~ msgid "_Secondary Password:" --#~ msgstr "_Zweitpasswort:" -- --#~ msgid "_Password:" --#~ msgstr "_Passwort:" -- --#~ msgid "Sh_ow passwords" --#~ msgstr "Passwörter an_zeigen" -- --#~ msgid "IPsec Based VPN Connection Manager (libreswan)" --#~ msgstr "Auf IPsec basierender VPN-Verbindungsmanager (libreswan)" -- --#~ msgid "Add, Remove, and Edit VPN Connections" --#~ msgstr "VPN-Verbindungen hinzufügen, entfernen und bearbeiten" -- --#~ msgid "_Remember passwords for this session" --#~ msgstr "Passwo_rt für diese Sitzung behalten" -- --#~ msgid "_Save passwords in keyring" --#~ msgstr "Passwort im _Schlüsselbund speichern" -- --#~ msgid "Cisco Compatible VPN (vpnc)" --#~ msgstr "Cisco-kompatibler VPN-Client (vpnc)" -- --#~ msgid "" --#~ "Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-" --#~ "based VPN gateways." --#~ msgstr "" --#~ "Kompatibel zu verschiedenen VPN-Gateways von Cisco, Juniper, Netscreen " --#~ "und Sonicwall (IPsec-basiert)." -- --#~ msgid "Secure (default)" --#~ msgstr "Sicher (Vorgabe)" -- --#~ msgid "Weak (use with caution)" --#~ msgstr "Weich (mit Vorsicht zu verwenden)" -- --#~ msgid "None (completely insecure)" --#~ msgstr "Keine (komplett unsicher)" -- --#~ msgid "Cisco UDP (default)" --#~ msgstr "Cisco-UDP (Vorgabe)" -- --#~ msgid "NAT-T" --#~ msgstr "NAT-T" -- --#~ msgid "Disabled" --#~ msgstr "Deaktiviert" -- --#~ msgid "TCP tunneling not supported" --#~ msgstr "TCP-Tunneling wird nicht unterstützt" -- --#~ msgid "" --#~ "The VPN settings file '%s' specifies that VPN traffic should be tunneled " --#~ "through TCP which is currently not supported in the vpnc software.\n" --#~ "\n" --#~ "The connection can still be created, with TCP tunneling disabled, however " --#~ "it may not work as expected." --#~ msgstr "" --#~ "Die VPN-Einstellungsdatei »%s« legt fest, dass VPN-Verkehr über TCP " --#~ "getunnelt werden soll, was jedoch zur Zeit nicht in der vpnc-Software " --#~ "unterstützt wird.\n" --#~ "\n" --#~ "Die Verbindung kann dennoch mit unterdrücktem TCP-Tunneling erzeugt " --#~ "werden, allerdings besteht die Möglichkeit, dass sie nicht wie erwartet " --#~ "funktioniert." -- --#~ msgid "Disable Dead Peer Detection" --#~ msgstr "Peer-To-Peer-Erkennung deaktivieren" -- --#~ msgid "Encryption method:" --#~ msgstr "Verschlüsselungsmethode:" -- --#~ msgid "NAT traversal:" --#~ msgstr "NAT-Traversal:" -- --#~ msgid "_Username:" --#~ msgstr "_Benutzername:" -- --#~ msgid "_Domain:" --#~ msgstr "_Domäne:" -- --#~ msgid "Connect _anonymously" --#~ msgstr "_Anonym verbinden" -- --#~ msgid "Connect as _user:" --#~ msgstr "Als Ben_utzer verbinden:" -- --#~ msgid "The following vpnc VPN connection will be created:" --#~ msgstr "Folgende vpnc-VPN-Verbindung wird erzeugt:" -- --#~ msgid "Name: %s" --#~ msgstr "Name: »%s«" -- --#~ msgid "Gateway: %s" --#~ msgstr "Gateway: »%s«" -- --#~ msgid "Group Name: %s" --#~ msgstr "Gruppenname: »%s«" -- --#~ msgid "Username: %s" --#~ msgstr "Benutzername: »%s«" -- --#~ msgid "Domain: %s" --#~ msgstr "Domäne: »%s«" -- --#~ msgid "Routes: %s" --#~ msgstr "Routen: »%s«" -- --#~ msgid "The connection details can be changed using the \"Edit\" button." --#~ msgstr "" --#~ "Die Verbindungsdetails können mit Hilfe des »Bearbeiten«-Knopfes geändert " --#~ "werden." -- --#~ msgid "Cannot import settings" --#~ msgstr "Einstellungen können nicht importiert werden" -- --#~ msgid "The VPN settings file '%s' does not contain valid data." --#~ msgstr "Die VPN-Einstellungendatei »%s« enthält keine gültigen Daten." -- --#~ msgid "Select file to import" --#~ msgstr "Datei zum Import auswählen" -- --#~ msgid "Save as..." --#~ msgstr "Speichern unter …" -- --#~ msgid "A file named \"%s\" already exists." --#~ msgstr "Eine Datei mit dem Namen »%s« existiert bereits." -- --#~ msgid "Do you want to replace it with the one you are saving?" --#~ msgstr "Möchten Sie sie mit der aktuellen Datei ersetzen?" -- --#~ msgid "Failed to export configuration" --#~ msgstr "Export der Konfiguration gescheitert" -- --#~ msgid "Failed to save file %s" --#~ msgstr "Speichern der Datei »%s« gescheitert" -- --#~ msgid "Connection Information" --#~ msgstr "Verbindungsinformationen" -- --#~ msgid "Connection Name" --#~ msgstr "Verbindungsname" -- --#~ msgid "example: 172.16.0.0/16 10.11.12.0/24" --#~ msgstr "Beispiel: 172.16.0.0/16 10.11.12.0/24" -- --#~ msgid "Connection Name" --#~ msgstr "Verbindungsname" -- --#~ msgid "" --#~ "Name used to identify the connection to the private network, e.g. " --#~ "\"Campus VPN\" or \"Corporate Network\"" --#~ msgstr "" --#~ "Name, der zur Identifikation der Verbindung zum privaten Netzwerk " --#~ "verwendet wird, z.B. »Campus VPN« oder »Firmennetzwerk«" -- --#~ msgid "Override _user name" --#~ msgstr "Ben_utzernamen außer Kraft setzen" -- --#~ msgid "" --#~ "Please enter the information provided by your system administrator below. " --#~ "Do not enter your password here as you will be prompted when connecting." --#~ msgstr "" --#~ "Bitte tragen Sie die Informationen, die Sie von Ihrem Systemadministrator " --#~ "erhalten haben unten ein. Geben Sie Ihr Kennwort nicht ein, da Sie beim " --#~ "Verbinden danach gefragt werden." -- --#~ msgid "" --#~ "Please note that the file you import is not a Cisco VPN or VPNC " --#~ "configuration file. Ask your adminstrator for the file." --#~ msgstr "" --#~ "Beachten Sie bitte, dass die Datei, die Sie importieren, keine Cisco VPN " --#~ "oder VPNC-Konfigurationsdatei ist. Wenden Sie sich an Ihren Administrator." -+msgid "Show passwords" -+msgstr "Passwörter anzeigen" - --#~ msgid "_Import Saved Configuration..." --#~ msgstr "Gespeicherte Konfiguration importieren …" -+#: ../properties/nm-libreswan-dialog.ui.h:12 -+msgid "_Certificate name:" -+msgstr "_Zertifikatname:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:13 -+msgid "_Remote ID:" -+msgstr "Fe_rne Kennung:" - --#~ msgid "_Only use VPN connection for these addresses" --#~ msgstr "_VPN-Verbindung nur für diese Adressen verwenden" -+#: ../properties/nm-libreswan-dialog.ui.h:14 -+msgid "Phase1 Algorithms:" -+msgstr "Phase1-Algorithmen:" - --#~ msgid "" --#~ "The VPN login failed because the user name and password were not accepted." --#~ msgstr "" --#~ "Die VPN-Anmeldung scheiterte, da Benutzername und Kennwort nicht " --#~ "akzeptiert wurden." -+#: ../properties/nm-libreswan-dialog.ui.h:15 -+msgid "Phase2 Algorithms:" -+msgstr "Phase2-Algorithmen:" - --#~ msgid "The VPN login failed because the VPN program could not be started." --#~ msgstr "" --#~ "Die VPN-Anmeldung scheiterte, weil das VPN-Porgramm nicht gestartet " --#~ "werden konnte." -+#: ../properties/nm-libreswan-dialog.ui.h:16 -+msgid "Domain:" -+msgstr "Domäne:" - --#~ msgid "" --#~ "The VPN login failed because the VPN program could not connect to the VPN " --#~ "server." --#~ msgstr "" --#~ "Die VPN-Anmeldung scheiterte, weil das VPN-Programm sich nicht mit dem " --#~ "VPN-Server verbinden konnte." -+#: ../properties/nm-libreswan-dialog.ui.h:17 -+msgid "Phase1 Lifetime:" -+msgstr "Phase1-Lebensdauer:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:18 -+msgid "Phase2 Lifetime:" -+msgstr "Phase2-Lebensdauer:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:19 -+msgid "Remote Network:" -+msgstr "Entferntes Netzwerk:" - --#~ msgid "" --#~ "The VPN login failed because the VPN program received an invalid " --#~ "configuration from the VPN server." --#~ msgstr "" --#~ "Die VPN-Anmeldung scheiterte, weil das VPN-Programm eine ungültige " --#~ "Konfiguration vom VPN-Server erhielt." -+#: ../properties/nm-libreswan-dialog.ui.h:20 -+msgid "Ad_vanced" -+msgstr "Er_weitert" -diff -Naur NetworkManager-libreswan-1.2.6-orig/po/es.po NetworkManager-libreswan-1.2.6/po/es.po ---- NetworkManager-libreswan-1.2.6-orig/po/es.po 2017-01-04 04:48:44.000000000 -0500 -+++ NetworkManager-libreswan-1.2.6/po/es.po 2018-08-21 23:09:09.650783165 -0400 -@@ -9,15 +9,15 @@ - # Jordi Jaen Pallares , 1999, 2000, 2001. - # Pablo Iranzo Gómez , 2000. - # Jorge González , 2007, 2008. --# Daniel Mustieles , 2012, 2014, 2015, 2016. -+# Daniel Mustieles , 2012, 2014, 2015, 2016, 2017. - # - msgid "" - msgstr "" - "Project-Id-Version: NetworkManager-vpnc.HEAD\n" --"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" - "product=NetworkManager&keywords=I18N+L10N&component=VPN: libreswan\n" --"POT-Creation-Date: 2016-10-03 19:54+0000\n" --"PO-Revision-Date: 2016-12-21 11:14+0100\n" -+"POT-Creation-Date: 2017-10-31 08:58+0000\n" -+"PO-Revision-Date: 2017-12-14 13:27+0100\n" - "Last-Translator: Daniel Mustieles \n" - "Language-Team: es \n" - "Language: es\n" -@@ -75,7 +75,6 @@ - - #: ../auth-dialog/main.c:487 - #, c-format --#| msgid "You need to authenticate to access the Virtual Private Network '%s'." - msgid "You need to authenticate to access the Virtual Private Network “%s”." - msgstr "Debe autenticarse para acceder a la red privada virtual «%s»." - -@@ -88,29 +87,26 @@ - msgstr "VPN basada en IPsec usando IKEv1" - - #: ../properties/nm-libreswan-editor-plugin.c:80 --#: ../properties/nm-libreswan-editor-plugin.c:149 -+#: ../properties/nm-libreswan-editor-plugin.c:158 - #, c-format --#| msgid "Can't open file '%s': %s" - msgid "Can’t open file “%s”: %s" - msgstr "No se puede abrir el archivo «%s»: %s" - --#: ../properties/nm-libreswan-editor-plugin.c:126 -+#: ../properties/nm-libreswan-editor-plugin.c:135 - #, c-format --#| msgid "Missing \"conn\" section in \"%s\"" - msgid "Missing “conn” section in “%s”" - msgstr "Falta la sección «conn» en «%s»" - --#: ../properties/nm-libreswan-editor-plugin.c:167 -+#: ../properties/nm-libreswan-editor-plugin.c:176 - #, c-format --#| msgid "Error writing to file '%s': %s" - msgid "Error writing to file “%s”: %s" - msgstr "Error al escribir en el archivo «%s»: %s" - --#: ../src/nm-libreswan-service.c:1449 -+#: ../src/nm-libreswan-service.c:1452 - msgid "A password is required." - msgstr "Se requiere una contraseña." - --#: ../src/nm-libreswan-service.c:1833 -+#: ../src/nm-libreswan-service.c:1836 - msgid "" - "Could not process the request because the VPN connection settings were " - "invalid." -@@ -118,24 +114,23 @@ - "No se pudo procesar la solicitud porque la configuración de la conexión VPN " - "no es válida." - --#: ../src/nm-libreswan-service.c:1847 -+#: ../src/nm-libreswan-service.c:1850 - msgid "Unhandled pending authentication." - msgstr "Autenticación pendiente no manejada." - --#: ../src/nm-libreswan-service.c:1989 --#| msgid "Don't quit when VPN connection terminates" -+#: ../src/nm-libreswan-service.c:1992 - msgid "Don’t quit when VPN connection terminates" - msgstr "No salir cuando termine la conexión VPN" - --#: ../src/nm-libreswan-service.c:1990 -+#: ../src/nm-libreswan-service.c:1993 - msgid "Enable verbose debug logging (may expose passwords)" - msgstr "Activar el registro detallado del depurado (puede mostrar contraseñas)" - --#: ../src/nm-libreswan-service.c:1991 -+#: ../src/nm-libreswan-service.c:1994 - msgid "D-Bus name to use for this instance" - msgstr "Nombre D-Bus que usar para esta instancia" - --#: ../src/nm-libreswan-service.c:2014 -+#: ../src/nm-libreswan-service.c:2017 - msgid "" - "This service provides integrated IPsec VPN capability to NetworkManager." - msgstr "" -@@ -147,17 +142,17 @@ - msgid "Error writing config: %s" - msgstr "Error al escribir la configuración: %s" - --#: ../shared/nm-utils/nm-shared-utils.c:185 -+#: ../shared/nm-utils/nm-shared-utils.c:312 - #, c-format - msgid "object class '%s' has no property named '%s'" - msgstr "la clase del objeto «%s» no tiene ninguna propiedad llamada «%s»" - --#: ../shared/nm-utils/nm-shared-utils.c:192 -+#: ../shared/nm-utils/nm-shared-utils.c:319 - #, c-format - msgid "property '%s' of object class '%s' is not writable" - msgstr "la propiedad «%s» del objeto de la clase «%s» no se puede escribir" - --#: ../shared/nm-utils/nm-shared-utils.c:199 -+#: ../shared/nm-utils/nm-shared-utils.c:326 - #, c-format - msgid "" - "construct property \"%s\" for object '%s' can't be set after construction" -@@ -165,21 +160,21 @@ - "no se puede establecer la propiedad «%s» del constructor para el objeto «%s» " - "después de la construcción" - --#: ../shared/nm-utils/nm-shared-utils.c:207 -+#: ../shared/nm-utils/nm-shared-utils.c:334 - #, c-format - msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" - msgstr "" - "«%s::%s» no es un nombre de propiedad válido; «%s» no es un subtipo de " - "GObject" - --#: ../shared/nm-utils/nm-shared-utils.c:216 -+#: ../shared/nm-utils/nm-shared-utils.c:343 - #, c-format - msgid "unable to set property '%s' of type '%s' from value of type '%s'" - msgstr "" - "no se puede establecer la propiedad «%s» de tipo «%s» con un valor de tipo " - "«%s»" - --#: ../shared/nm-utils/nm-shared-utils.c:227 -+#: ../shared/nm-utils/nm-shared-utils.c:354 - #, c-format - msgid "" - "value \"%s\" of type '%s' is invalid or out of range for property '%s' of " -@@ -208,7 +203,6 @@ - msgstr "error desconocido al crear la instancia del editor" - - #: ../properties/nm-libreswan-dialog.ui.h:1 --#| msgid "General" - msgid "General" - msgstr "General" - -@@ -252,15 +246,27 @@ - msgstr "Algoritmos de fase 1:" - - #: ../properties/nm-libreswan-dialog.ui.h:11 -+#| msgid "Phase1 Algorithms:" -+msgid "Phase1 Lifetime:" -+msgstr "Tiempo de vida de la fase 1:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:12 -+#| msgid "Phase2 Algorithms:" -+msgid "Phase2 Lifetime:" -+msgstr "Tiempo de vida de la fase 2:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:13 -+#| msgid "Network" -+msgid "Remote Network:" -+msgstr "Red remota:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:14 - msgid "Ad_vanced" - msgstr "A_vanzado" - - #~ msgid " " - #~ msgstr " " - --#~ msgid "Network" --#~ msgstr "Red" -- - #~ msgid "Request VPN authentication" - #~ msgstr "Solicitar autenticación VPN" - -diff -Naur NetworkManager-libreswan-1.2.6-orig/po/fi.po NetworkManager-libreswan-1.2.6/po/fi.po ---- NetworkManager-libreswan-1.2.6-orig/po/fi.po 2015-11-04 09:38:50.000000000 -0500 -+++ NetworkManager-libreswan-1.2.6/po/fi.po 2018-08-21 23:09:09.650783165 -0400 -@@ -8,10 +8,10 @@ - msgid "" - msgstr "" - "Project-Id-Version: network-manager-vpnc\n" --"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" --"product=network-manager-libreswan&keywords=I18N+L10N&component=general\n" --"POT-Creation-Date: 2013-09-11 18:22+0000\n" --"PO-Revision-Date: 2013-09-22 19:59+0300\n" -+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" -+"product=NetworkManager&keywords=I18N+L10N&component=VPN: libreswan\n" -+"POT-Creation-Date: 2017-02-24 18:06+0000\n" -+"PO-Revision-Date: 2017-09-25 20:18+0300\n" - "Last-Translator: Jiri Grönroos \n" - "Language-Team: suomi \n" - "Language: fi\n" -@@ -19,121 +19,239 @@ - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=2; plural=(n != 1);\n" --"X-Generator: Gtranslator 2.91.6\n" -+"X-Generator: Poedit 1.8.7.1\n" - --#: ../auth-dialog/main.c:188 --#, c-format --msgid "You need to authenticate to access the Virtual Private Network '%s'." --msgstr "Yhteydenotto VPN-verkkoon \"%s\" vaatii kirjautumista." -+#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:1 -+msgid "IPsec VPN client" -+msgstr "IPsec VPN -asiakasohjelmisto" - --#: ../auth-dialog/main.c:197 ../auth-dialog/main.c:221 --msgid "Authenticate VPN" --msgstr "Todenna VPN-yhteyden avaus" -+#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:2 -+msgid "Libreswan based client for IKEv1 based IPsec virtual private networks" -+msgstr "" -+ -+#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:3 -+msgid "" -+"Support for configuring IKEv1 based IPsec virtual private network " -+"connections." -+msgstr "" - --#: ../auth-dialog/main.c:200 --#| msgid "_Password:" -+#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:4 -+msgid "Compatible with Libreswan and Cisco IPsec VPN servers." -+msgstr "Yhteensopiva Libreswan- ja Cisco IPsec VPN -palvelimien kanssa." -+ -+#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:5 -+msgid "The NetworkManager Developers" -+msgstr "NetworkManagerin kehittäjät" -+ -+#: ../auth-dialog/main.c:165 -+#, c-format -+msgid "Authenticate VPN %s" -+msgstr "Todenna VPN %s" -+ -+#: ../auth-dialog/main.c:182 - msgid "Password:" - msgstr "Salasana:" - --#: ../auth-dialog/main.c:202 --#| msgid "_Group Password:" -+#: ../auth-dialog/main.c:192 - msgid "Group Password:" - msgstr "Ryhmän salasana:" - --#: ../auth-dialog/main.c:223 -+#: ../auth-dialog/main.c:228 -+msgid "Authenticate VPN" -+msgstr "Todenna VPN-yhteyden avaus" -+ -+#: ../auth-dialog/main.c:237 - msgid "_Group Password:" - msgstr "_Ryhmän salasana:" - --#: ../nm-libreswan.desktop.in.h:1 --#| msgid "VPN Connection Manager (vpnc)" --msgid "IPsec Based VPN Connection Manager (libreswan)" --msgstr "IPsec-pohjainen VPN-yhteysohjelmisto (libreswan)" -- --#: ../nm-libreswan.desktop.in.h:2 --msgid "Add, Remove, and Edit VPN Connections" --msgstr "Lisää, poista tai muokkaa VPN-yhteyksiä" -+#: ../auth-dialog/main.c:487 -+#, c-format -+msgid "You need to authenticate to access the Virtual Private Network “%s”." -+msgstr "Yhteydenotto VPN-verkkoon “%s” vaatii tunnistautumisen." - --#: ../properties/nm-libreswan.c:47 -+#: ../properties/nm-libreswan-editor-plugin.c:43 - msgid "IPsec based VPN" - msgstr "IPsec-pohjainen VPN" - --#: ../properties/nm-libreswan.c:48 --msgid "IPsec, IKEv1, IKEv2 based VPN" --msgstr "IPsec-, IKEv1- ja IKEv2-pohjainen VPN" -- --#: ../properties/nm-libreswan.c:274 --msgid "Saved" --msgstr "Tallennettu" -- --#: ../properties/nm-libreswan.c:281 --msgid "Always Ask" --msgstr "Kysy aina" -- --#: ../properties/nm-libreswan.c:288 --msgid "Not Required" --msgstr "Ei vaadittu" -+#: ../properties/nm-libreswan-editor-plugin.c:44 -+msgid "IPsec based VPN using IKEv1" -+msgstr "IPsec-pohjainen VPN käyttäen IKEv1:tä" -+ -+#: ../properties/nm-libreswan-editor-plugin.c:80 -+#: ../properties/nm-libreswan-editor-plugin.c:149 -+#, c-format -+msgid "Can’t open file “%s”: %s" -+msgstr "Ei voida avata tiedostoa “%s”: %s" -+ -+#: ../properties/nm-libreswan-editor-plugin.c:126 -+#, c-format -+msgid "Missing “conn” section in “%s”" -+msgstr "" -+ -+#: ../properties/nm-libreswan-editor-plugin.c:167 -+#, c-format -+msgid "Error writing to file “%s”: %s" -+msgstr "Virhe kirjoittaessa tiedostoon “%s”: %s" -+ -+#: ../src/nm-libreswan-service.c:1449 -+msgid "A password is required." -+msgstr "Salasana vaaditaan." -+ -+#: ../src/nm-libreswan-service.c:1833 -+msgid "" -+"Could not process the request because the VPN connection settings were " -+"invalid." -+msgstr "" -+ -+#: ../src/nm-libreswan-service.c:1847 -+msgid "Unhandled pending authentication." -+msgstr "" -+ -+#: ../src/nm-libreswan-service.c:1989 -+msgid "Don’t quit when VPN connection terminates" -+msgstr "Älä lopeta VPN-yhteyden päättyessä" -+ -+#: ../src/nm-libreswan-service.c:1990 -+msgid "Enable verbose debug logging (may expose passwords)" -+msgstr "" -+ -+#: ../src/nm-libreswan-service.c:1991 -+msgid "D-Bus name to use for this instance" -+msgstr "" -+ -+#: ../src/nm-libreswan-service.c:2014 -+msgid "" -+"This service provides integrated IPsec VPN capability to NetworkManager." -+msgstr "Tämä palvelu integroi IPsec VPN -ominaisuudet NetworkManageriin." -+ -+#: ../shared/utils.c:85 -+#, c-format -+msgid "Error writing config: %s" -+msgstr "" -+ -+#: ../shared/nm-utils/nm-shared-utils.c:312 -+#, c-format -+msgid "object class '%s' has no property named '%s'" -+msgstr "" -+ -+#: ../shared/nm-utils/nm-shared-utils.c:319 -+#, c-format -+msgid "property '%s' of object class '%s' is not writable" -+msgstr "" -+ -+#: ../shared/nm-utils/nm-shared-utils.c:326 -+#, c-format -+msgid "" -+"construct property \"%s\" for object '%s' can't be set after construction" -+msgstr "" -+ -+#: ../shared/nm-utils/nm-shared-utils.c:334 -+#, c-format -+msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" -+msgstr "" -+ -+#: ../shared/nm-utils/nm-shared-utils.c:343 -+#, c-format -+msgid "unable to set property '%s' of type '%s' from value of type '%s'" -+msgstr "" -+ -+#: ../shared/nm-utils/nm-shared-utils.c:354 -+#, c-format -+msgid "" -+"value \"%s\" of type '%s' is invalid or out of range for property '%s' of " -+"type '%s'" -+msgstr "" -+ -+#: ../shared/nm-utils/nm-vpn-plugin-utils.c:80 -+#, c-format -+msgid "missing plugin file \"%s\"" -+msgstr "" -+ -+#: ../shared/nm-utils/nm-vpn-plugin-utils.c:86 -+#, c-format -+msgid "cannot load editor plugin: %s" -+msgstr "" -+ -+#: ../shared/nm-utils/nm-vpn-plugin-utils.c:95 -+#, c-format -+msgid "cannot load factory %s from plugin: %s" -+msgstr "" -+ -+#: ../shared/nm-utils/nm-vpn-plugin-utils.c:121 -+msgid "unknown error creating editor instance" -+msgstr "" - - #: ../properties/nm-libreswan-dialog.ui.h:1 --msgid " " --msgstr " " -+msgid "General" -+msgstr "Yleiset" - - #: ../properties/nm-libreswan-dialog.ui.h:2 --msgid "General" --msgstr "Yleisasetukset" -+msgid "_Gateway:" -+msgstr "_Yhdyskäytävä:" - - #: ../properties/nm-libreswan-dialog.ui.h:3 - msgid "Show passwords" - msgstr "Näytä salasanat" - - #: ../properties/nm-libreswan-dialog.ui.h:4 --msgid "Gro_up password:" --msgstr "_Ryhmän salasana:" -+msgid "_Secret:" -+msgstr "_Salaisuus:" - - #: ../properties/nm-libreswan-dialog.ui.h:5 --msgid "_Gateway:" --msgstr "_Yhdyskäytävä:" -+msgid "_User password:" -+msgstr "_Käyttäjän salasana:" - - #: ../properties/nm-libreswan-dialog.ui.h:6 - msgid "G_roup name:" - msgstr "_Ryhmän nimi:" - - #: ../properties/nm-libreswan-dialog.ui.h:7 --msgid "_User password:" --msgstr "_Käyttäjän salasana:" -+msgid "User name:" -+msgstr "Käyttäjätunnus:" - - #: ../properties/nm-libreswan-dialog.ui.h:8 --msgid "Optional" --msgstr "Lisäasetukset" -+msgid "Phase2 Algorithms:" -+msgstr "Phase2-algoritmit:" - - #: ../properties/nm-libreswan-dialog.ui.h:9 --msgid "User name:" --msgstr "Käyttäjätunnus:" -+msgid "Domain:" -+msgstr "Toimialue:" - - #: ../properties/nm-libreswan-dialog.ui.h:10 - msgid "Phase1 Algorithms:" - msgstr "Phase1-algoritmit:" - - #: ../properties/nm-libreswan-dialog.ui.h:11 --msgid "Phase2 Algorithms:" --msgstr "Phase2-algoritmit:" -+msgid "Ad_vanced" -+msgstr "_Lisäasetukset" - --#: ../properties/nm-libreswan-dialog.ui.h:12 --msgid "Domain:" --msgstr "Toimialue:" -+#~| msgid "VPN Connection Manager (vpnc)" -+#~ msgid "IPsec Based VPN Connection Manager (libreswan)" -+#~ msgstr "IPsec-pohjainen VPN-yhteysohjelmisto (libreswan)" - --#: ../src/nm-libreswan-service.c:877 --msgid "Don't quit when VPN connection terminates" --msgstr "Älä lopeta VPN-yhteyden päättyessä" -+#~ msgid "Add, Remove, and Edit VPN Connections" -+#~ msgstr "Lisää, poista tai muokkaa VPN-yhteyksiä" - --#: ../src/nm-libreswan-service.c:878 --msgid "Enable verbose debug logging (may expose passwords)" --msgstr "" -+#~ msgid "IPsec, IKEv1, IKEv2 based VPN" -+#~ msgstr "IPsec-, IKEv1- ja IKEv2-pohjainen VPN" - --#: ../src/nm-libreswan-service.c:901 --msgid "" --"nm-libreswan-service provides integrated IPsec VPN capability to " --"NetworkManager." --msgstr "" -+#~ msgid "Saved" -+#~ msgstr "Tallennettu" -+ -+#~ msgid "Always Ask" -+#~ msgstr "Kysy aina" -+ -+#~ msgid "Not Required" -+#~ msgstr "Ei vaadittu" -+ -+#~ msgid " " -+#~ msgstr " " -+ -+#~ msgid "Gro_up password:" -+#~ msgstr "_Ryhmän salasana:" -+ -+#~ msgid "Optional" -+#~ msgstr "Lisäasetukset" - - #~ msgid "_Secondary Password:" - #~ msgstr "_Toissijainen salasana:" -diff -Naur NetworkManager-libreswan-1.2.6-orig/po/fur.po NetworkManager-libreswan-1.2.6/po/fur.po ---- NetworkManager-libreswan-1.2.6-orig/po/fur.po 1969-12-31 19:00:00.000000000 -0500 -+++ NetworkManager-libreswan-1.2.6/po/fur.po 2018-08-21 23:09:09.651783210 -0400 -@@ -0,0 +1,237 @@ -+# Friulian translation for network-manager-libreswan. -+# Copyright (C) 2017 network-manager-libreswan's COPYRIGHT HOLDER -+# This file is distributed under the same license as the network-manager-libreswan package. -+# Fabio Tomat , 2017. -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: network-manager-libreswan master\n" -+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" -+"product=NetworkManager&keywords=I18N+L10N&component=VPN: libreswan\n" -+"POT-Creation-Date: 2017-03-20 11:29+0000\n" -+"PO-Revision-Date: 2017-04-09 21:50+0200\n" -+"Language-Team: Friulian \n" -+"Language: fur\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"Last-Translator: Fabio Tomat \n" -+"X-Generator: Poedit 1.8.12\n" -+ -+#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:1 -+msgid "IPsec VPN client" -+msgstr "Client VPN di IPsec" -+ -+#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:2 -+msgid "Libreswan based client for IKEv1 based IPsec virtual private networks" -+msgstr "" -+"Client basât su Libreswan par rêts privadis virtuâls IPsec basadis su IKEv1" -+ -+#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:3 -+msgid "" -+"Support for configuring IKEv1 based IPsec virtual private network " -+"connections." -+msgstr "" -+"Supuart par configurâ lis consessions di rêts privadis virtuâls IPsec " -+"basadis su IKEv1." -+ -+#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:4 -+msgid "Compatible with Libreswan and Cisco IPsec VPN servers." -+msgstr "Compatibil cun servidôrs VPN IPsec Libreswan e Cisco." -+ -+#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:5 -+msgid "The NetworkManager Developers" -+msgstr "I svilupadôrs di NetworkManager" -+ -+#: ../auth-dialog/main.c:165 -+#, c-format -+msgid "Authenticate VPN %s" -+msgstr "Autentiche VPN %s" -+ -+#: ../auth-dialog/main.c:182 -+msgid "Password:" -+msgstr "Password:" -+ -+#: ../auth-dialog/main.c:192 -+msgid "Group Password:" -+msgstr "Password di grup:" -+ -+#: ../auth-dialog/main.c:228 -+msgid "Authenticate VPN" -+msgstr "Autentiche VPN" -+ -+#: ../auth-dialog/main.c:237 -+msgid "_Group Password:" -+msgstr "Password di _grup:" -+ -+#: ../auth-dialog/main.c:487 -+#, c-format -+msgid "You need to authenticate to access the Virtual Private Network “%s”." -+msgstr "Al covente autenticâsi par acedi ae rêt privade virtuâl “%s”." -+ -+#: ../properties/nm-libreswan-editor-plugin.c:43 -+msgid "IPsec based VPN" -+msgstr "VPN basât su IPsec" -+ -+#: ../properties/nm-libreswan-editor-plugin.c:44 -+msgid "IPsec based VPN using IKEv1" -+msgstr "VPN basât su IPsec doprant IKEv1" -+ -+#: ../properties/nm-libreswan-editor-plugin.c:80 -+#: ../properties/nm-libreswan-editor-plugin.c:149 -+#, c-format -+msgid "Can’t open file “%s”: %s" -+msgstr "Impussibil vierzi il file “%s”: %s" -+ -+#: ../properties/nm-libreswan-editor-plugin.c:126 -+#, c-format -+msgid "Missing “conn” section in “%s”" -+msgstr "E mancje la sezion “conn” in “%s”" -+ -+#: ../properties/nm-libreswan-editor-plugin.c:167 -+#, c-format -+msgid "Error writing to file “%s”: %s" -+msgstr "Erôr tal scrivi sul file “%s”: %s" -+ -+#: ../src/nm-libreswan-service.c:1449 -+msgid "A password is required." -+msgstr "E covente une password." -+ -+#: ../src/nm-libreswan-service.c:1833 -+msgid "" -+"Could not process the request because the VPN connection settings were " -+"invalid." -+msgstr "" -+"Impussibil elaborâ la domande parcè che lis impostazions di conession VPN " -+"no jerin validis." -+ -+#: ../src/nm-libreswan-service.c:1847 -+msgid "Unhandled pending authentication." -+msgstr "Autenticazion vierte no gjestide." -+ -+#: ../src/nm-libreswan-service.c:1989 -+msgid "Don’t quit when VPN connection terminates" -+msgstr "No stâ jessî cuant che e termine la conession VPN" -+ -+#: ../src/nm-libreswan-service.c:1990 -+msgid "Enable verbose debug logging (may expose passwords)" -+msgstr "Abilite regjistris di debug prolìs (al podarès esponi lis password)" -+ -+#: ../src/nm-libreswan-service.c:1991 -+msgid "D-Bus name to use for this instance" -+msgstr "Non D-Bus di doprâ par cheste istance" -+ -+#: ../src/nm-libreswan-service.c:2014 -+msgid "" -+"This service provides integrated IPsec VPN capability to NetworkManager." -+msgstr "" -+"Chest servizi al furnìs a NetworkManager funzionalitâts VPN IPsec " -+"integradis." -+ -+#: ../shared/utils.c:85 -+#, c-format -+msgid "Error writing config: %s" -+msgstr "Erôr tal scrivi la configurazion: %s" -+ -+#: ../shared/nm-utils/nm-shared-utils.c:312 -+#, c-format -+msgid "object class '%s' has no property named '%s'" -+msgstr "la classe dal ogjet '%s' no à proprietâts clamadis '%s'" -+ -+#: ../shared/nm-utils/nm-shared-utils.c:319 -+#, c-format -+msgid "property '%s' of object class '%s' is not writable" -+msgstr "proprietât '%s' de classe dal ogjet '%s' no je scrivibile" -+ -+#: ../shared/nm-utils/nm-shared-utils.c:326 -+#, c-format -+msgid "" -+"construct property \"%s\" for object '%s' can't be set after construction" -+msgstr "" -+"impussibil stabilî la proprietât \"%s\" dal costrutôr pal ogjet '%s' dopo " -+"de costruzion" -+ -+#: ../shared/nm-utils/nm-shared-utils.c:334 -+#, c-format -+msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" -+msgstr "" -+"'%s::%s' nol è un non di proprietât valit; '%s' nol è un sot-gjenar GObject" -+ -+#: ../shared/nm-utils/nm-shared-utils.c:343 -+#, c-format -+msgid "unable to set property '%s' of type '%s' from value of type '%s'" -+msgstr "" -+"impussibil stabilî la proprietât '%s' di gjenar '%s' dal valôr di gjenar " -+"'%s'" -+ -+#: ../shared/nm-utils/nm-shared-utils.c:354 -+#, c-format -+msgid "" -+"value \"%s\" of type '%s' is invalid or out of range for property '%s' of " -+"type '%s'" -+msgstr "" -+"il valôr \"%s\" di gjenar '%s' nol è valit o fûr dal interval pe " -+"proprietât '%s' di gjenar '%s'" -+ -+#: ../shared/nm-utils/nm-vpn-plugin-utils.c:80 -+#, c-format -+msgid "missing plugin file \"%s\"" -+msgstr "al mancje il file plugin \"%s\"" -+ -+#: ../shared/nm-utils/nm-vpn-plugin-utils.c:86 -+#, c-format -+msgid "cannot load editor plugin: %s" -+msgstr "impussibil cjariâ il plugin editôr: %s" -+ -+#: ../shared/nm-utils/nm-vpn-plugin-utils.c:95 -+#, c-format -+msgid "cannot load factory %s from plugin: %s" -+msgstr "impussibil cjariâ la fabriche %s dal plugin: %s" -+ -+#: ../shared/nm-utils/nm-vpn-plugin-utils.c:121 -+msgid "unknown error creating editor instance" -+msgstr "erôr no cognossût tal creâ la istance dal editôr" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:1 -+msgid "General" -+msgstr "Gjenerâl" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:2 -+msgid "_Gateway:" -+msgstr "_Gateway:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:3 -+msgid "Show passwords" -+msgstr "Mostre lis password" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:4 -+msgid "_Secret:" -+msgstr "_Segret:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:5 -+msgid "_User password:" -+msgstr "Password _utent:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:6 -+msgid "G_roup name:" -+msgstr "Non g_rup:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:7 -+msgid "User name:" -+msgstr "Non utent:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:8 -+msgid "Phase2 Algorithms:" -+msgstr "Algoritmis fase2:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:9 -+msgid "Domain:" -+msgstr "Domini:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:10 -+msgid "Phase1 Algorithms:" -+msgstr "Algoritmis fase1:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:11 -+msgid "Ad_vanced" -+msgstr "A_vanzadis" -diff -Naur NetworkManager-libreswan-1.2.6-orig/po/hu.po NetworkManager-libreswan-1.2.6/po/hu.po ---- NetworkManager-libreswan-1.2.6-orig/po/hu.po 2016-10-06 08:02:29.000000000 -0400 -+++ NetworkManager-libreswan-1.2.6/po/hu.po 2018-08-21 23:09:09.651783210 -0400 -@@ -1,23 +1,23 @@ --# Hungarian translation of network-manager-libreswan --# Copyright (C) 2006, 2007, 2008, Free Software Foundation, Inc. -+# Hungarian translation for network-manager-libreswan. -+# Copyright (C) 2006, 2007, 2008, 2013, 2014, 2016, 2018 Free Software Foundation, Inc. - # This file is distributed under the same license as the network-manager-libreswan package. - # - # Gabor Kelemen , 2006, 2007, 2008, 2013, 2016. --# Balázs Úr , 2014. -+# Balázs Úr , 2014, 2018. - msgid "" - msgstr "" - "Project-Id-Version: network-manager-libreswan master\n" --"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" - "product=NetworkManager&keywords=I18N+L10N&component=VPN: libreswan\n" --"POT-Creation-Date: 2016-10-03 19:54+0000\n" --"PO-Revision-Date: 2016-10-04 12:38+0200\n" --"Last-Translator: Meskó Balázs \n" -+"POT-Creation-Date: 2017-10-31 08:58+0000\n" -+"PO-Revision-Date: 2018-01-27 10:08+0100\n" -+"Last-Translator: Balázs Úr \n" - "Language-Team: Hungarian \n" - "Language: hu\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" --"X-Generator: Poedit 1.8.8\n" -+"X-Generator: Lokalize 1.2\n" - "Plural-Forms: nplurals=2; plural=(n != 1);\n" - - #: ../appdata/network-manager-libreswan.metainfo.xml.in.h:1 -@@ -80,26 +80,26 @@ - msgstr "IPsec alapú VPN IKEv1 használatával" - - #: ../properties/nm-libreswan-editor-plugin.c:80 --#: ../properties/nm-libreswan-editor-plugin.c:149 -+#: ../properties/nm-libreswan-editor-plugin.c:158 - #, c-format - msgid "Can’t open file “%s”: %s" - msgstr "A(z) „%s” fájl nem nyitható meg: %s" - --#: ../properties/nm-libreswan-editor-plugin.c:126 -+#: ../properties/nm-libreswan-editor-plugin.c:135 - #, c-format - msgid "Missing “conn” section in “%s”" - msgstr "Hiányzik a „conn” szakasz itt: „%s”" - --#: ../properties/nm-libreswan-editor-plugin.c:167 -+#: ../properties/nm-libreswan-editor-plugin.c:176 - #, c-format - msgid "Error writing to file “%s”: %s" - msgstr "Hiba a(z) „%s” fájl írásakor: %s" - --#: ../src/nm-libreswan-service.c:1449 -+#: ../src/nm-libreswan-service.c:1452 - msgid "A password is required." - msgstr "Jelszó szükséges." - --#: ../src/nm-libreswan-service.c:1833 -+#: ../src/nm-libreswan-service.c:1836 - msgid "" - "Could not process the request because the VPN connection settings were " - "invalid." -@@ -107,25 +107,25 @@ - "A kérés feldolgozása sikertelen, mivel a VPN-kapcsolat beállításai " - "érvénytelenek." - --#: ../src/nm-libreswan-service.c:1847 -+#: ../src/nm-libreswan-service.c:1850 - msgid "Unhandled pending authentication." - msgstr "Kezeletlen várakozó hitelesítés." - --#: ../src/nm-libreswan-service.c:1989 -+#: ../src/nm-libreswan-service.c:1992 - msgid "Don’t quit when VPN connection terminates" - msgstr "Ne lépjen ki, ha a VPN-kapcsolat megszakad" - --#: ../src/nm-libreswan-service.c:1990 -+#: ../src/nm-libreswan-service.c:1993 - msgid "Enable verbose debug logging (may expose passwords)" - msgstr "" - "Részletes hibakeresési naplózás engedélyezése (jelszavak is a naplóba " - "kerülhetnek)" - --#: ../src/nm-libreswan-service.c:1991 -+#: ../src/nm-libreswan-service.c:1994 - msgid "D-Bus name to use for this instance" - msgstr "A példányhoz használandó D-Bus név" - --#: ../src/nm-libreswan-service.c:2014 -+#: ../src/nm-libreswan-service.c:2017 - msgid "" - "This service provides integrated IPsec VPN capability to NetworkManager." - msgstr "" -@@ -136,17 +136,17 @@ - msgid "Error writing config: %s" - msgstr "Hiba a beállítások írásakor: %s" - --#: ../shared/nm-utils/nm-shared-utils.c:185 -+#: ../shared/nm-utils/nm-shared-utils.c:312 - #, c-format - msgid "object class '%s' has no property named '%s'" - msgstr "a(z) „%s” objektumosztálynak nincs „%s” nevű tulajdonsága" - --#: ../shared/nm-utils/nm-shared-utils.c:192 -+#: ../shared/nm-utils/nm-shared-utils.c:319 - #, c-format - msgid "property '%s' of object class '%s' is not writable" - msgstr "„%2$s” osztály „%1$s” tulajdonsága nem írható" - --#: ../shared/nm-utils/nm-shared-utils.c:199 -+#: ../shared/nm-utils/nm-shared-utils.c:326 - #, c-format - msgid "" - "construct property \"%s\" for object '%s' can't be set after construction" -@@ -154,18 +154,18 @@ - "„%2$s” objektum „%1$s” konstuktortulajdonsága nem állítható be a létrehozás " - "után" - --#: ../shared/nm-utils/nm-shared-utils.c:207 -+#: ../shared/nm-utils/nm-shared-utils.c:334 - #, c-format - msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" - msgstr "„%s::%s” nem érvényes tulajdonságnév, „%s” nem egy GObject résztípus" - --#: ../shared/nm-utils/nm-shared-utils.c:216 -+#: ../shared/nm-utils/nm-shared-utils.c:343 - #, c-format - msgid "unable to set property '%s' of type '%s' from value of type '%s'" - msgstr "" - "nem állítható be „%2$s” típusú „%1$s” tulajdonság „%3$s” típusú értékre" - --#: ../shared/nm-utils/nm-shared-utils.c:227 -+#: ../shared/nm-utils/nm-shared-utils.c:354 - #, c-format - msgid "" - "value \"%s\" of type '%s' is invalid or out of range for property '%s' of " -@@ -234,106 +234,18 @@ - msgstr "Phase1 algoritmusok:" - - #: ../properties/nm-libreswan-dialog.ui.h:11 --msgid "Ad_vanced" --msgstr "Spe_ciális" -- --#~ msgid " " --#~ msgstr " " -- --#~ msgid "Network" --#~ msgstr "Hálózat" -- --#~ msgid "Request VPN authentication" --#~ msgstr "VPN-azonosítás kérése" -- --#~ msgid "IPsec, IKEv1, IKEv2 based VPN" --#~ msgstr "IPsec, IKEv1, IKEv2 alapú VPN" -- --#~ msgid "Saved" --#~ msgstr "Mentett" -- --#~ msgid "Always Ask" --#~ msgstr "Kérdés mindig" -- --#~ msgid "Not Required" --#~ msgstr "Nem szükséges" -- --#~ msgid "Gro_up password:" --#~ msgstr "_Csoportjelszó:" -- --#~ msgid "Optional" --#~ msgstr "Opcionális" -- --#~ msgid "IPsec Based VPN Connection Manager (libreswan)" --#~ msgstr "IPsec alapú VPN kapcsolatkezelő (libreswan)" -- --#~ msgid "Add, Remove, and Edit VPN Connections" --#~ msgstr "VPN kapcsolatok hozzáadása, szerkesztése és eltávolítása" -- --#~ msgid "_Secondary Password:" --#~ msgstr "Jelszó _még egyszer:" -- --#~ msgid "_Password:" --#~ msgstr "_Jelszó:" -+msgid "Phase1 Lifetime:" -+msgstr "Phase1 élettartam:" - --#~ msgid "Sh_ow passwords" --#~ msgstr "_Jelszavak megjelenítése" -+#: ../properties/nm-libreswan-dialog.ui.h:12 -+msgid "Phase2 Lifetime:" -+msgstr "Phase2 élettartam:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:13 -+msgid "Remote Network:" -+msgstr "Távoli hálózat:" - --#~ msgid "_Remember passwords for this session" --#~ msgstr "_Jelszavak megjegyzése erre a munkamenetre" -- --#~ msgid "_Save passwords in keyring" --#~ msgstr "Jelszavak mentése a k_ulcstartóra" -- --#~ msgid "Cisco Compatible VPN (vpnc)" --#~ msgstr "Cisco-kompatibilis VPN kliens (vpnc)" -- --#~ msgid "" --#~ "Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-" --#~ "based VPN gateways." --#~ msgstr "" --#~ "Kompatibilis számos Cisco, Juniper, Netscreen és Sonicwall IPsec-alapú " --#~ "VPN átjáróval." -- --#~ msgid "Secure (default)" --#~ msgstr "Biztonságos (alapértelmezett)" -- --#~ msgid "Weak (use with caution)" --#~ msgstr "Gyenge (óvatosan használja)" -- --#~ msgid "None (completely insecure)" --#~ msgstr "Nincs (nem biztonságos)" -- --#~ msgid "Cisco UDP (default)" --#~ msgstr "Cisco UDP (alapértelmezett)" -- --#~ msgid "NAT-T" --#~ msgstr "NAT-T" -- --#~ msgid "Disabled" --#~ msgstr "Tiltva" -- --#~ msgid "TCP tunneling not supported" --#~ msgstr "A TCP alagutazás nem támogatott" -- --#~ msgid "" --#~ "The VPN settings file '%s' specifies that VPN traffic should be tunneled " --#~ "through TCP which is currently not supported in the vpnc software.\n" --#~ "\n" --#~ "The connection can still be created, with TCP tunneling disabled, however " --#~ "it may not work as expected." --#~ msgstr "" --#~ "A(z) „%s” VPN beállítófájl alapján a VPN forgalmat TCP alagúton keresztül " --#~ "kell bonyolítani, ami jelenleg nem támogatott.\n" --#~ "\n" --#~ "A kapcsolat így is létrehozható letiltott TCP alagutazással, azonban " --#~ "lehetséges, hogy nem a várt módon fog működni." -- --#~ msgid "Disable Dead Peer Detection" --#~ msgstr "Halott partnerek felismerésének tiltása" -- --#~ msgid "Encryption method:" --#~ msgstr "Titkosítási mód:" -+#: ../properties/nm-libreswan-dialog.ui.h:14 -+msgid "Ad_vanced" -+msgstr "Spe_ciális" - --#~ msgid "NAT traversal:" --#~ msgstr "NAT bejárás:" -diff -Naur NetworkManager-libreswan-1.2.6-orig/po/id.po NetworkManager-libreswan-1.2.6/po/id.po ---- NetworkManager-libreswan-1.2.6-orig/po/id.po 2016-07-05 03:17:36.000000000 -0400 -+++ NetworkManager-libreswan-1.2.6/po/id.po 2018-08-21 23:09:09.652783256 -0400 -@@ -1,22 +1,23 @@ - # Indonesian translation for network-manager-libreswan. - # Copyright (C) 2013 network-manager-libreswan's COPYRIGHT HOLDER - # This file is distributed under the same license as the network-manager-libreswan package. --# Andika Triwidada , 2013, 2014. -+# Andika Triwidada , 2013, 2014, 2017. - # - msgid "" - msgstr "" --"Project-Id-Version: network-manager-libreswan nm-1-2\n" --"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" --"product=NetworkManager&keywords=I18N+L10N&component=VPN: Openswan\n" --"POT-Creation-Date: 2016-06-24 10:16+0000\n" --"PO-Revision-Date: 2016-07-05 00:29+0700\n" --"Last-Translator: Andika Triwidada \n" -+"Project-Id-Version: network-manager-libreswan master\n" -+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" -+"product=NetworkManager&keywords=I18N+L10N&component=VPN: libreswan\n" -+"POT-Creation-Date: 2017-11-11 17:58+0000\n" -+"PO-Revision-Date: 2017-12-17 15:16+0700\n" -+"Last-Translator: Andika Triwidada \n" - "Language-Team: Indonesian \n" - "Language: id\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" --"X-Generator: Poedit 1.8.8\n" -+"X-Generator: Poedit 2.0.5\n" -+"Plural-Forms: nplurals=1; plural=0;\n" - - #: ../appdata/network-manager-libreswan.metainfo.xml.in.h:1 - msgid "IPsec VPN client" -@@ -65,9 +66,9 @@ - - #: ../auth-dialog/main.c:487 - #, c-format --msgid "You need to authenticate to access the Virtual Private Network '%s'." -+msgid "You need to authenticate to access the Virtual Private Network “%s”." - msgstr "" --"Anda perlu mengotentikasi untuk mengakses Virtual Private Network '%s'." -+"Anda perlu mengotentikasi untuk mengakses Virtual Private Network \"%s\"." - - #: ../properties/nm-libreswan-editor-plugin.c:43 - msgid "IPsec based VPN" -@@ -78,48 +79,48 @@ - msgstr "VPN berbasis IPsec memakai IKEv1" - - #: ../properties/nm-libreswan-editor-plugin.c:80 --#: ../properties/nm-libreswan-editor-plugin.c:149 -+#: ../properties/nm-libreswan-editor-plugin.c:158 - #, c-format --msgid "Can't open file '%s': %s" --msgstr "Tak bisa membuka berkas '%s': %s" -+msgid "Can’t open file “%s”: %s" -+msgstr "Tak bisa membuka berkas \"%s\": %s" - --#: ../properties/nm-libreswan-editor-plugin.c:126 -+#: ../properties/nm-libreswan-editor-plugin.c:135 - #, c-format --msgid "Missing \"conn\" section in \"%s\"" -+msgid "Missing “conn” section in “%s”" - msgstr "Kurang seksi \"conn\" dalam \"%s\"" - --#: ../properties/nm-libreswan-editor-plugin.c:167 -+#: ../properties/nm-libreswan-editor-plugin.c:176 - #, c-format --msgid "Error writing to file '%s': %s" --msgstr "Galat saat menulis ke berkas '%s': %s" -+msgid "Error writing to file “%s”: %s" -+msgstr "Galat saat menulis ke berkas \"%s\": %s" - --#: ../src/nm-libreswan-service.c:1449 -+#: ../src/nm-libreswan-service.c:1452 - msgid "A password is required." - msgstr "Perlu sebuah sandi." - --#: ../src/nm-libreswan-service.c:1833 -+#: ../src/nm-libreswan-service.c:1836 - msgid "" - "Could not process the request because the VPN connection settings were " - "invalid." - msgstr "Tak bisa memroses permintaan karena pengaturan koneksi VPN tak valid." - --#: ../src/nm-libreswan-service.c:1847 -+#: ../src/nm-libreswan-service.c:1850 - msgid "Unhandled pending authentication." - msgstr "Otentikasi tertunda yang tak tertangani." - --#: ../src/nm-libreswan-service.c:1989 --msgid "Don't quit when VPN connection terminates" -+#: ../src/nm-libreswan-service.c:1992 -+msgid "Don’t quit when VPN connection terminates" - msgstr "Jangan keluar ketika koneksi VPN berakhir" - --#: ../src/nm-libreswan-service.c:1990 -+#: ../src/nm-libreswan-service.c:1993 - msgid "Enable verbose debug logging (may expose passwords)" - msgstr "Fungsikan log awakutu cerewet (mungkin mengungkap sandi)" - --#: ../src/nm-libreswan-service.c:1991 -+#: ../src/nm-libreswan-service.c:1994 - msgid "D-Bus name to use for this instance" - msgstr "Nama D-Bus untuk dipakai bagi instansi ini" - --#: ../src/nm-libreswan-service.c:2014 -+#: ../src/nm-libreswan-service.c:2017 - msgid "" - "This service provides integrated IPsec VPN capability to NetworkManager." - msgstr "" -@@ -130,34 +131,34 @@ - msgid "Error writing config: %s" - msgstr "Galat saat menulis konfig: %s" - --#: ../shared/nm-utils/nm-shared-utils.c:185 -+#: ../shared/nm-utils/nm-shared-utils.c:312 - #, c-format - msgid "object class '%s' has no property named '%s'" - msgstr "kelas objek '%s' tak punya properti bernama '%s'" - --#: ../shared/nm-utils/nm-shared-utils.c:192 -+#: ../shared/nm-utils/nm-shared-utils.c:319 - #, c-format - msgid "property '%s' of object class '%s' is not writable" - msgstr "properti '%s' dari kelas objek '%s' tak dapat ditulisi" - --#: ../shared/nm-utils/nm-shared-utils.c:199 -+#: ../shared/nm-utils/nm-shared-utils.c:326 - #, c-format - msgid "" - "construct property \"%s\" for object '%s' can't be set after construction" - msgstr "" - "properti construct \"%s\" untuk objek '%s' tak bisa ditata setelah konstruksi" - --#: ../shared/nm-utils/nm-shared-utils.c:207 -+#: ../shared/nm-utils/nm-shared-utils.c:334 - #, c-format - msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" - msgstr "'%s::%s' bukan nama properti yang valid; '%s' bukan subtipe GObject" - --#: ../shared/nm-utils/nm-shared-utils.c:216 -+#: ../shared/nm-utils/nm-shared-utils.c:343 - #, c-format - msgid "unable to set property '%s' of type '%s' from value of type '%s'" - msgstr "tak bisa menata properti '%s' bertipe '%s' dari nilai bertipe '%s'" - --#: ../shared/nm-utils/nm-shared-utils.c:227 -+#: ../shared/nm-utils/nm-shared-utils.c:354 - #, c-format - msgid "" - "value \"%s\" of type '%s' is invalid or out of range for property '%s' of " -@@ -186,8 +187,8 @@ - msgstr "galat tak dikenal saat membuat instansi penyunting" - - #: ../properties/nm-libreswan-dialog.ui.h:1 --msgid "General" --msgstr "Umum" -+msgid "General" -+msgstr "Umum" - - #: ../properties/nm-libreswan-dialog.ui.h:2 - msgid "_Gateway:" -@@ -226,9 +227,17 @@ - msgstr "Algoritma Fase1:" - - #: ../properties/nm-libreswan-dialog.ui.h:11 --msgid "Ad_vanced" --msgstr "Tingkat la_njut" -+msgid "Phase1 Lifetime:" -+msgstr "Umur Hidup Fase1:" - - #: ../properties/nm-libreswan-dialog.ui.h:12 --msgid " " --msgstr " " -+msgid "Phase2 Lifetime:" -+msgstr "Umur Hidup Fase2:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:13 -+msgid "Remote Network:" -+msgstr "Jaringan Jauh:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:14 -+msgid "Ad_vanced" -+msgstr "Tingkat la_njut" -diff -Naur NetworkManager-libreswan-1.2.6-orig/po/it.po NetworkManager-libreswan-1.2.6/po/it.po ---- NetworkManager-libreswan-1.2.6-orig/po/it.po 2016-05-09 15:54:25.000000000 -0400 -+++ NetworkManager-libreswan-1.2.6/po/it.po 2018-08-21 23:09:09.652783256 -0400 -@@ -1,16 +1,16 @@ - # Italian translation of NetworkManager-libreswan. --# Copyright (C) 2006, 2007, 2008, 2009, 2012, 2013, 2014, 2015, 2016 the NetworkManager-libreswan'S COPYRIGHT HOLDER -+# Copyright (C) 2006, 2007, 2008, 2009, 2012, 2013, 2014, 2015, 2016, 2017, 2018 the NetworkManager-libreswan'S COPYRIGHT HOLDER - # This file is distributed under the same license as the NetworkManager-libreswan package. - # Francesco Marletta , 2006, 2007, 2008, 2009. --# Milo Casagrande , 2012, 2013, 2014, 2015, 2016. -+# Milo Casagrande , 2012, 2013, 2014, 2015, 2016, 2017, 2018. - # - msgid "" - msgstr "" - "Project-Id-Version: network-manager-libreswan\n" --"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" --"product=NetworkManager&keywords=I18N+L10N&component=VPN: Openswan\n" --"POT-Creation-Date: 2016-04-28 14:05+0000\n" --"PO-Revision-Date: 2016-05-08 12:58+0200\n" -+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" -+"product=NetworkManager&keywords=I18N+L10N&component=VPN: libreswan\n" -+"POT-Creation-Date: 2017-10-31 08:58+0000\n" -+"PO-Revision-Date: 2018-03-08 09:28+0100\n" - "Last-Translator: Milo Casagrande \n" - "Language-Team: Italian \n" - "Language: it\n" -@@ -18,7 +18,7 @@ - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=2; plural=(n!=1);\n" --"X-Generator: Poedit 1.8.7\n" -+"X-Generator: Poedit 2.0.6\n" - - #: ../appdata/network-manager-libreswan.metainfo.xml.in.h:1 - msgid "IPsec VPN client" -@@ -45,51 +45,62 @@ - msgid "The NetworkManager Developers" - msgstr "Gli sviluppatori di NetworkManager" - --#: ../auth-dialog/main.c:174 -+#: ../auth-dialog/main.c:165 - #, c-format - msgid "Authenticate VPN %s" - msgstr "Autenticazione VPN %s" - --#: ../auth-dialog/main.c:191 -+#: ../auth-dialog/main.c:182 - msgid "Password:" - msgstr "Password:" - --#: ../auth-dialog/main.c:201 -+#: ../auth-dialog/main.c:192 - msgid "Group Password:" - msgstr "Password di gruppo:" - --#: ../auth-dialog/main.c:237 -+#: ../auth-dialog/main.c:228 - msgid "Authenticate VPN" - msgstr "Autenticazione VPN" - --#: ../auth-dialog/main.c:246 -+#: ../auth-dialog/main.c:237 - msgid "_Group Password:" - msgstr "Password di _gruppo:" - --#: ../auth-dialog/main.c:496 -+#: ../auth-dialog/main.c:487 - #, c-format --msgid "You need to authenticate to access the Virtual Private Network '%s'." -+msgid "You need to authenticate to access the Virtual Private Network “%s”." - msgstr "" --"È necessario autenticarsi per accedere alla Rete Privata Virtuale (VPN) «%s»." -+"È richiesto autenticarsi per accedere alla VPN (rete privata virtuale) «%s»." - --#: ../properties/nm-libreswan.c:64 -+#: ../properties/nm-libreswan-editor-plugin.c:43 - msgid "IPsec based VPN" - msgstr "VPN basata su IPsec" - --#: ../properties/nm-libreswan.c:65 -+#: ../properties/nm-libreswan-editor-plugin.c:44 - msgid "IPsec based VPN using IKEv1" - msgstr "VPN basata su IPsec con IKEv1" - --#: ../properties/nm-libreswan.c:596 ../properties/nm-libreswan.c:618 -+#: ../properties/nm-libreswan-editor-plugin.c:80 -+#: ../properties/nm-libreswan-editor-plugin.c:158 - #, c-format --msgid "Can't open file '%s': %s" -+msgid "Can’t open file “%s”: %s" - msgstr "Impossibile aprire il file «%s»: %s" - --#: ../src/nm-libreswan-service.c:1378 -+#: ../properties/nm-libreswan-editor-plugin.c:135 -+#, c-format -+msgid "Missing “conn” section in “%s”" -+msgstr "Manca la sezione «conn» in «%s»" -+ -+#: ../properties/nm-libreswan-editor-plugin.c:176 -+#, c-format -+msgid "Error writing to file “%s”: %s" -+msgstr "Errore nello scrivere sul file «%s»: %s" -+ -+#: ../src/nm-libreswan-service.c:1452 - msgid "A password is required." - msgstr "È richiesta una password." - --#: ../src/nm-libreswan-service.c:1776 -+#: ../src/nm-libreswan-service.c:1836 - msgid "" - "Could not process the request because the VPN connection settings were " - "invalid." -@@ -97,31 +108,94 @@ - "Impossibile elaborare la richiesta poiché le impostazioni della connessione " - "VPN non sono valide." - --#: ../src/nm-libreswan-service.c:1790 -+#: ../src/nm-libreswan-service.c:1850 - msgid "Unhandled pending authentication." - msgstr "Autenticazione pendente non gestita." - --#: ../src/nm-libreswan-service.c:1932 --msgid "Don't quit when VPN connection terminates" -+#: ../src/nm-libreswan-service.c:1992 -+msgid "Don’t quit when VPN connection terminates" - msgstr "Non esce quando la connessione VPN termina" - --#: ../src/nm-libreswan-service.c:1933 -+#: ../src/nm-libreswan-service.c:1993 - msgid "Enable verbose debug logging (may expose passwords)" - msgstr "Abilita output di debug prolisso (potrebbe esporre le password)" - --#: ../src/nm-libreswan-service.c:1934 -+#: ../src/nm-libreswan-service.c:1994 - msgid "D-Bus name to use for this instance" - msgstr "Nome D-Bus da usare per questa istanza" - --#: ../src/nm-libreswan-service.c:1957 -+#: ../src/nm-libreswan-service.c:2017 - msgid "" - "This service provides integrated IPsec VPN capability to NetworkManager." - msgstr "" - "Questo servizio fornisce funzionalità VPN IPsec integrate con NetworkManager." - -+#: ../shared/utils.c:85 -+#, c-format -+msgid "Error writing config: %s" -+msgstr "Errore nello scrivere la configurazione: %s" -+ -+#: ../shared/nm-utils/nm-shared-utils.c:312 -+#, c-format -+msgid "object class '%s' has no property named '%s'" -+msgstr "l'oggetto di classe «%s» non ha una proprietà di nome «%s»" -+ -+#: ../shared/nm-utils/nm-shared-utils.c:319 -+#, c-format -+msgid "property '%s' of object class '%s' is not writable" -+msgstr "la proprietà «%s» dell'oggetto di classe «%s» non è scrivibile" -+ -+#: ../shared/nm-utils/nm-shared-utils.c:326 -+#, c-format -+msgid "" -+"construct property \"%s\" for object '%s' can't be set after construction" -+msgstr "" -+"proprietà costruttore «%s» dell'oggetto «%s» non può essere impostata dopo " -+"l'inizializzazione" -+ -+#: ../shared/nm-utils/nm-shared-utils.c:334 -+#, c-format -+msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" -+msgstr "" -+"«%s::%s» non è un nome valido di proprietà; «%s» non un sotto-tipo GObject" -+ -+#: ../shared/nm-utils/nm-shared-utils.c:343 -+#, c-format -+msgid "unable to set property '%s' of type '%s' from value of type '%s'" -+msgstr "" -+"impossibile impostare la proprietà «%s» di tipo «%s» dal valore di tipo «%s»" -+ -+#: ../shared/nm-utils/nm-shared-utils.c:354 -+#, c-format -+msgid "" -+"value \"%s\" of type '%s' is invalid or out of range for property '%s' of " -+"type '%s'" -+msgstr "" -+"il valore «%s» di tipo «%s» non è valido o fuori dall'intervallo per la " -+"proprietà «%s» di tipo «%s»" -+ -+#: ../shared/nm-utils/nm-vpn-plugin-utils.c:80 -+#, c-format -+msgid "missing plugin file \"%s\"" -+msgstr "file di plugin «%s» mancante" -+ -+#: ../shared/nm-utils/nm-vpn-plugin-utils.c:86 -+#, c-format -+msgid "cannot load editor plugin: %s" -+msgstr "impossibile caricare l'editor del plugin: %s" -+ -+#: ../shared/nm-utils/nm-vpn-plugin-utils.c:95 -+#, c-format -+msgid "cannot load factory %s from plugin: %s" -+msgstr "impossibile caricare %s dal plugin: %s" -+ -+#: ../shared/nm-utils/nm-vpn-plugin-utils.c:121 -+msgid "unknown error creating editor instance" -+msgstr "errore sconosciuto nel create l'istanza dell'editor" -+ - #: ../properties/nm-libreswan-dialog.ui.h:1 --msgid "General" --msgstr "Generale" -+msgid "General" -+msgstr "Generale" - - #: ../properties/nm-libreswan-dialog.ui.h:2 - msgid "_Gateway:" -@@ -160,15 +234,23 @@ - msgstr "Algoritmi phase1:" - - #: ../properties/nm-libreswan-dialog.ui.h:11 --msgid "Ad_vanced" --msgstr "A_vanzate" -+msgid "Phase1 Lifetime:" -+msgstr "Durata phase1:" - - #: ../properties/nm-libreswan-dialog.ui.h:12 --msgid " " --msgstr " " -+msgid "Phase2 Lifetime:" -+msgstr "Durata phase2:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:13 -+msgid "Remote Network:" -+msgstr "Rete remota:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:14 -+msgid "Ad_vanced" -+msgstr "A_vanzate" - --#~ msgid "Network" --#~ msgstr "Rete" -+#~ msgid " " -+#~ msgstr " " - - #~ msgid "Request VPN authentication" - #~ msgstr "Richiede autenticazione VPN" -diff -Naur NetworkManager-libreswan-1.2.6-orig/po/ja.po NetworkManager-libreswan-1.2.6/po/ja.po ---- NetworkManager-libreswan-1.2.6-orig/po/ja.po 2015-11-04 09:38:50.000000000 -0500 -+++ NetworkManager-libreswan-1.2.6/po/ja.po 2018-08-21 23:09:09.653783302 -0400 -@@ -2,272 +2,238 @@ - # Copyright (C) 2006 THE NetworkManager-vpnc's COPYRIGHT HOLDER - # This file is distributed under the same license as the NetworkManager-vpnc package. - # Satoru SATOH , 2006. --# -+# kmoriguc , 2017. #zanata -+# lrintel , 2017. #zanata - msgid "" - msgstr "" --"Project-Id-Version: NetworkManager-vpnc HEAD\n" --"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=network-manager-libreswan&keywords=I18N+L10N&component=general\n" --"POT-Creation-Date: 2013-09-23 04:10+0000\n" --"PO-Revision-Date: 2013-10-03 14:18+0900\n" --"Last-Translator: Hajime Taira \n" -+"Project-Id-Version: PACKAGE VERSION\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2017-05-16 10:52+0200\n" -+"PO-Revision-Date: 2017-05-19 12:59+0000\n" -+"Last-Translator: kmoriguc \n" - "Language-Team: Japanese \n" - "Language: ja\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" -+"X-Generator: Zanata 4.1.1\n" -+"Plural-Forms: nplurals=1; plural=0\n" - --#: ../auth-dialog/main.c:188 --#, c-format --msgid "You need to authenticate to access the Virtual Private Network '%s'." --msgstr "仮想プライベートネットワーク '%s' にアクセスするには認証が必要です。" -+#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:1 -+msgid "IPsec VPN client" -+msgstr "IPsec VPN クライアント" - --#: ../auth-dialog/main.c:197 ../auth-dialog/main.c:221 --msgid "Authenticate VPN" --msgstr "VPN 認証" -+#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:2 -+msgid "Libreswan based client for IKEv1 based IPsec virtual private networks" -+msgstr "" -+"IKEv1 ベースの IPsec 仮想プライベートネットワーク向けの Libreswan ベースのク" -+"ライアント" -+ -+#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:3 -+msgid "" -+"Support for configuring IKEv1 based IPsec virtual private network " -+"connections." -+msgstr "" -+"IKEv1 ベースの IPsec 仮想プライベートネットワーク接続に関する設定のサポート" - --#: ../auth-dialog/main.c:200 -+#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:4 -+msgid "Compatible with Libreswan and Cisco IPsec VPN servers." -+msgstr "Libreswan および Cisco IPsec VPN サーバーと互換性があります。" -+ -+#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:5 -+msgid "The NetworkManager Developers" -+msgstr "NetworkManager 開発者" -+ -+#: ../auth-dialog/main.c:165 -+#, c-format -+msgid "Authenticate VPN %s" -+msgstr "VPN %s を認証" -+ -+#: ../auth-dialog/main.c:182 - msgid "Password:" - msgstr "パスワード:" - --#: ../auth-dialog/main.c:202 -+#: ../auth-dialog/main.c:192 - msgid "Group Password:" - msgstr "グループパスワード:" - --#: ../auth-dialog/main.c:223 -+#: ../auth-dialog/main.c:228 -+msgid "Authenticate VPN" -+msgstr "VPN 認証" -+ -+#: ../auth-dialog/main.c:237 - msgid "_Group Password:" - msgstr "グループパスワード(_G):" - --#: ../nm-libreswan.desktop.in.h:1 --msgid "IPsec Based VPN Connection Manager (libreswan)" --msgstr "IPsec ベースの VPN 接続マネージャー (libreswan)" -- --#: ../nm-libreswan.desktop.in.h:2 --msgid "Add, Remove, and Edit VPN Connections" --msgstr "VPN 接続を追加、削除または編集" -+#: ../auth-dialog/main.c:487 -+#, c-format -+msgid "You need to authenticate to access the Virtual Private Network '%s'." -+msgstr "仮想プライベートネットワーク '%s' にアクセスするには認証が必要です。" - --#: ../properties/nm-libreswan.c:47 -+#: ../properties/nm-libreswan-editor-plugin.c:43 - msgid "IPsec based VPN" - msgstr "IPsec ベースの VPN" - --#: ../properties/nm-libreswan.c:48 --msgid "IPsec, IKEv1, IKEv2 based VPN" --msgstr "IPsec, IKEv1, IKEv2 ベースの VPN" -- --#: ../properties/nm-libreswan.c:274 --msgid "Saved" --msgstr "保存しました" -- --#: ../properties/nm-libreswan.c:281 --msgid "Always Ask" --msgstr "毎回求める" -- --#: ../properties/nm-libreswan.c:288 --msgid "Not Required" --msgstr "不要" -- --#: ../properties/nm-libreswan-dialog.ui.h:1 --msgid " " --msgstr " " -- --#: ../properties/nm-libreswan-dialog.ui.h:2 --msgid "General" --msgstr "全般" -- --#: ../properties/nm-libreswan-dialog.ui.h:3 --msgid "Show passwords" --msgstr "パスワードを表示する" -- --#: ../properties/nm-libreswan-dialog.ui.h:4 --msgid "Gro_up password:" --msgstr "グループパスワード(_U):" -- --#: ../properties/nm-libreswan-dialog.ui.h:5 --msgid "_Gateway:" --msgstr "ゲートウェイ(_G):" -+#: ../properties/nm-libreswan-editor-plugin.c:44 -+msgid "IPsec based VPN using IKEv1" -+msgstr "IKEv1 を使った IPsec ベースの VPN" - --#: ../properties/nm-libreswan-dialog.ui.h:6 --msgid "G_roup name:" --msgstr "グループ名(_R):" -- --#: ../properties/nm-libreswan-dialog.ui.h:7 --msgid "_User password:" --msgstr "ユーザーパスワード(_U):" -- --#: ../properties/nm-libreswan-dialog.ui.h:8 --msgid "Optional" --msgstr "オプション" -+#: ../properties/nm-libreswan-editor-plugin.c:80 -+#: ../properties/nm-libreswan-editor-plugin.c:149 -+#, c-format -+msgid "Can't open file '%s': %s" -+msgstr "ファイル '%s' を開けません: %s" - --#: ../properties/nm-libreswan-dialog.ui.h:9 --msgid "User name:" --msgstr "ユーザー名:" -+#: ../properties/nm-libreswan-editor-plugin.c:126 -+#, c-format -+msgid "Missing \"conn\" section in \"%s\"" -+msgstr "\"%s\" に \"conn\" セクションがありません" - --#: ../properties/nm-libreswan-dialog.ui.h:10 --msgid "Phase1 Algorithms:" --msgstr "フェーズ1 アルゴリズム:" -+#: ../properties/nm-libreswan-editor-plugin.c:167 -+#, c-format -+msgid "Error writing to file '%s': %s" -+msgstr "ファイル '%s' への書き込みでエラー: %s" - --#: ../properties/nm-libreswan-dialog.ui.h:11 --msgid "Phase2 Algorithms:" --msgstr "フェーズ2 アルゴリズム:" -+#: ../src/nm-libreswan-service.c:1449 -+msgid "A password is required." -+msgstr "パスワードが必要です" - --#: ../properties/nm-libreswan-dialog.ui.h:12 --msgid "Domain:" --msgstr "ドメイン:" -+#: ../src/nm-libreswan-service.c:1833 -+msgid "" -+"Could not process the request because the VPN connection settings were " -+"invalid." -+msgstr "VPN 接続設定が無効のため、リクエストを処理できませんでした。" -+ -+#: ../src/nm-libreswan-service.c:1847 -+msgid "Unhandled pending authentication." -+msgstr "保留中の認証を未処理" - --#: ../src/nm-libreswan-service.c:877 -+#: ../src/nm-libreswan-service.c:1989 - msgid "Don't quit when VPN connection terminates" - msgstr "終了時に VPN 接続を切断しない" - --#: ../src/nm-libreswan-service.c:878 -+#: ../src/nm-libreswan-service.c:1990 - msgid "Enable verbose debug logging (may expose passwords)" --msgstr "詳細なデバッグログ機能を有効化する (パスワードが露出する可能性があります)" -- --#: ../src/nm-libreswan-service.c:901 --msgid "nm-libreswan-service provides integrated IPsec VPN capability to NetworkManager." --msgstr "nm-libreswan-service は NetworkManager に統合化された IPsec VPN 機能を提供します。" -- --#~ msgid "_Secondary Password:" --#~ msgstr "第二パスワード(_S):" -- --#~ msgid "Connect _anonymously" --#~ msgstr "匿名で接続(_A)" -- --#~ msgid "Connect as _user:" --#~ msgstr "ユーザで接続(_U):" -- --#~ msgid "_Remember passwords for this session" --#~ msgstr "このセッションのパスワードを記憶する(_R)" -- --#~ msgid "_Save passwords in keyring" --#~ msgstr "パスワードをキーリングに保存する(_S)" -- --#~ msgid "Compatible Cisco VPN client (vpnc)" --#~ msgstr "Cisco VPN 互換クライアント (vpnc)" -- --#~ msgid "The following vpnc VPN connection will be created:" --#~ msgstr "次の vpnc VPN 接続を作成します:" -- --#~ msgid "Name: %s" --#~ msgstr "名前: %s" -- --#~ msgid "Gateway: %s" --#~ msgstr "ゲートウェイ: %s" -- --#~ msgid "Group Name: %s" --#~ msgstr "グループ名: %s" -- --#~ msgid "Username: %s" --#~ msgstr "ユーザ名: %s" -- --#~ msgid "Domain: %s" --#~ msgstr "ドメイン: %s" -- --#~ msgid "Routes: %s" --#~ msgstr "ルート: %s" -- --#~ msgid "NAT-Keepalive packet interval: %s" --#~ msgstr "NAT-Keepalive パケット間隔: %s" -- --#~ msgid "Enable Single DES" --#~ msgstr "シングル DES を有効にする" -- --#~ msgid "Disable NAT Traversal" --#~ msgstr "NAT Traversal を無効にする" -- --#~ msgid "The connection details can be changed using the \"Edit\" button." --#~ msgstr "接続の詳細は\"編集\"ボタンで変更できます。" -- --#~ msgid "TCP tunneling not supported" --#~ msgstr "TCP トンネリングはサポートされていません" -- --#~ msgid "" --#~ "The VPN settings file '%s' specifies that VPN traffic should be tunneled through TCP which is currently not supported in the vpnc software.\n" --#~ "\n" --#~ "The connection can still be created, with TCP tunneling disabled, however it may not work as expected." --#~ msgstr "" --#~ "VPn 設定ファイル '%s' は VPN 通信が TCP を介してトンネルされるように指定していますが、今のところ vpnc はこの機能をサポートしていません。\n" --#~ "\n" --#~ "TCP トンネリングを無効にした上で接続を作成することはできますが期待どおりに動作しないかもしれません。" -- --#~ msgid "Cannot import settings" --#~ msgstr "設定をインポートできません" -- --#~ msgid "The VPN settings file '%s' does not contain valid data." --#~ msgstr "VPN 設定ファイル '%s' には適切なデータが含まれていません。" -- --#~ msgid "Select file to import" --#~ msgstr "インポートするファイルを選択" -+msgstr "" -+"詳細なデバッグログ機能を有効化する (パスワードが露出する可能性があります)" - --#~ msgid "Save as..." --#~ msgstr "別名で保存..." -+#: ../src/nm-libreswan-service.c:1991 -+msgid "D-Bus name to use for this instance" -+msgstr "このインスタンスに使用する D-Bus 名" - --#~ msgid "A file named \"%s\" already exists." --#~ msgstr "ファイル \"%s\" は既にあります。" -+#: ../src/nm-libreswan-service.c:2014 -+msgid "" -+"This service provides integrated IPsec VPN capability to NetworkManager." -+msgstr "このサービスは、統合 IPsec VPN 機能を NetworkManager に提供します。" - --#~ msgid "Do you want to replace it with the one you are saving?" --#~ msgstr "保存しようとしているファイルで上書きしますか?" -+#: ../shared/utils.c:85 -+#, c-format -+msgid "Error writing config: %s" -+msgstr "config への書き込みでエラー: %s" - --#~ msgid "Failed to export configuration" --#~ msgstr "設定のエクスポートに失敗" -+#: ../shared/nm-utils/nm-shared-utils.c:185 -+#, c-format -+msgid "object class '%s' has no property named '%s'" -+msgstr "オブジェクトクラス '%s' には '%s' という名前のプロパティーがありません" - --#~ msgid "Failed to save file %s" --#~ msgstr "ファイル %s の保存に失敗" -+#: ../shared/nm-utils/nm-shared-utils.c:192 -+#, c-format -+msgid "property '%s' of object class '%s' is not writable" -+msgstr "" -+"オブジェクトクラス '%s' のプロパティー '%s' は、書き込み可能ではありません" - --#~ msgid "example: 172.16.0.0/16 10.11.12.0/24" --#~ msgstr "例: 172.16.0.0/16 10.11.12.0/24" -+#: ../shared/nm-utils/nm-shared-utils.c:199 -+#, c-format -+msgid "" -+"construct property \"%s\" for object '%s' can't be set after construction" -+msgstr "" -+"オブジェクト '%s' のコンストラクトプロパティー \"%s\" は構築後に設定できませ" -+"ん" - --#~ msgid "Connection na_me:" --#~ msgstr "接続名(_M):" -+#: ../shared/nm-utils/nm-shared-utils.c:207 -+#, c-format -+msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" -+msgstr "" -+"'%s::%s' は有効なプロパティー名ではありません。'%s' は GObject サブタイプでは" -+"ありません" - --#~ msgid "Disable NAT _traversal" --#~ msgstr "NAT Traversal を無効にする(_T)" -+#: ../shared/nm-utils/nm-shared-utils.c:216 -+#, c-format -+msgid "unable to set property '%s' of type '%s' from value of type '%s'" -+msgstr "プロパティー '%s' (タイプ '%s') をタイプ '%s' の値から設定できません" - --#~ msgid "Enable _weak single DES encryption" --#~ msgstr "弱いシングル DES 暗号を有効にする(_W)" -+#: ../shared/nm-utils/nm-shared-utils.c:227 -+#, c-format -+msgid "" -+"value \"%s\" of type '%s' is invalid or out of range for property '%s' of " -+"type '%s'" -+msgstr "" -+"値 \"%s\" (タイプ '%s') がプロパティー '%s' (タイプ '%s') に対して無効または" -+"範囲外です" - --#~ msgid "Import _Saved Configuration..." --#~ msgstr "保存設定をインポート(_S)..." -+#: ../shared/nm-utils/nm-vpn-plugin-utils.c:80 -+#, c-format -+msgid "missing plugin file \"%s\"" -+msgstr "プラグインファイル '%s' がありません" - --#~ msgid "Interval:" --#~ msgstr "間隔:" -+#: ../shared/nm-utils/nm-vpn-plugin-utils.c:86 -+#, c-format -+msgid "cannot load editor plugin: %s" -+msgstr "エディタープラグインを読み込めません: %s" - --#~ msgid "Name used to identify the connection to the private network, e.g. \"Campus VPN\" or \"Corporate Network\"" --#~ msgstr "例えば \"キャンパス VPN\" や \"社内ネットワーク\" などといったプライベートネットワークの接続を識別するための名前です。" -+#: ../shared/nm-utils/nm-vpn-plugin-utils.c:95 -+#, c-format -+msgid "cannot load factory %s from plugin: %s" -+msgstr "プラグインからファクトリー %s を読み込めません: %s" - --#~ msgid "Override _user name" --#~ msgstr "ユーザ名を上書き指定(_U)" -+#: ../shared/nm-utils/nm-vpn-plugin-utils.c:121 -+msgid "unknown error creating editor instance" -+msgstr "エディターインスタンスの作成中に不明なエラー" - --#~ msgid "Please enter the information provided by your system administrator below. Do not enter your password here as you will be prompted when connecting." --#~ msgstr "システム管理者が提供した情報を下に入力してください。接続時にきかれるまではパスワードは入力しないでください。" -+#: ../properties/nm-libreswan-dialog.ui.h:1 -+msgid "General" -+msgstr "全般" - --#~ msgid "Please note that the file you import is not a Cisco VPN or VPNC configuration file. Ask your adminstrator for the file." --#~ msgstr "インポートしたファイルは Cisco VPN と VPNC の設定ファイルのいずれでもありません。管理者に尋ねてみて下さい。" -+#: ../properties/nm-libreswan-dialog.ui.h:2 -+msgid "_Gateway:" -+msgstr "ゲートウェイ(_G):" - --#~ msgid "Use NAT _keepalive packets" --#~ msgstr "NAT Keepalive パケットを使用(_K)" -+#: ../properties/nm-libreswan-dialog.ui.h:3 -+msgid "Show passwords" -+msgstr "パスワードを表示する" - --#~ msgid "Use _domain for authentication" --#~ msgstr "認証にドメインを使用(_D)" -+#: ../properties/nm-libreswan-dialog.ui.h:4 -+msgid "_Secret:" -+msgstr "シークレット(_S):" - --#~ msgid "_Only use VPN connection for these addresses" --#~ msgstr "これらのアドレスについてのみ VPN 接続を利用(_O)" -+#: ../properties/nm-libreswan-dialog.ui.h:5 -+msgid "_User password:" -+msgstr "ユーザーパスワード(_U):" - --#~ msgid "The VPN login failed because the user name and password were not accepted." --#~ msgstr "VPN ログインに失敗。ユーザ名、パスワードが間違っています。" -+#: ../properties/nm-libreswan-dialog.ui.h:6 -+msgid "G_roup name:" -+msgstr "グループ名(_R):" - --#~ msgid "The VPN login failed because the VPN program could not be started." --#~ msgstr "VPN ログインに失敗。VPN プログラムを起動できませんでした。" -+#: ../properties/nm-libreswan-dialog.ui.h:7 -+msgid "User name:" -+msgstr "ユーザー名:" - --#~ msgid "The VPN login failed because the VPN program could not connect to the VPN server." --#~ msgstr "VPN ログインに失敗。VPN プログラムは VPN サーバに接続できませんでした。" -+#: ../properties/nm-libreswan-dialog.ui.h:8 -+msgid "Phase2 Algorithms:" -+msgstr "フェーズ2 アルゴリズム:" - --#~ msgid "The VPN login failed because the VPN configuration options were invalid." --#~ msgstr "VPN ログインに失敗。VPN 設定オプションが間違っています。" -+#: ../properties/nm-libreswan-dialog.ui.h:9 -+msgid "Domain:" -+msgstr "ドメイン:" - --#~ msgid "The VPN login failed because the VPN program received an invalid configuration from the VPN server." --#~ msgstr "VPN ログインに失敗。VPN プログラムが VPN サーバから受け取った設定は適切なものではありません。" -+#: ../properties/nm-libreswan-dialog.ui.h:10 -+msgid "Phase1 Algorithms:" -+msgstr "フェーズ1 アルゴリズム:" - --#~ msgid "Required Information" --#~ msgstr "必須情報" -+#: ../properties/nm-libreswan-dialog.ui.h:11 -+msgid "Ad_vanced" -+msgstr "高度な(_V)" - --#~ msgid "O_ptional Information" --#~ msgstr "オプション情報(_P)" -+#: ../properties/nm-libreswan-dialog.ui.h:12 -+msgid " " -+msgstr " " -diff -Naur NetworkManager-libreswan-1.2.6-orig/po/LINGUAS NetworkManager-libreswan-1.2.6/po/LINGUAS ---- NetworkManager-libreswan-1.2.6-orig/po/LINGUAS 2016-05-09 15:54:25.000000000 -0400 -+++ NetworkManager-libreswan-1.2.6/po/LINGUAS 2018-08-21 23:09:09.647783028 -0400 -@@ -14,6 +14,7 @@ - eu - fi - fr -+fur - gl - gu - hu -diff -Naur NetworkManager-libreswan-1.2.6-orig/po/lt.po NetworkManager-libreswan-1.2.6/po/lt.po ---- NetworkManager-libreswan-1.2.6-orig/po/lt.po 2016-08-23 15:16:28.000000000 -0400 -+++ NetworkManager-libreswan-1.2.6/po/lt.po 2018-08-21 23:09:09.653783302 -0400 -@@ -3,15 +3,15 @@ - # This file is distributed under the same license as the NetworkManager package. - # Žygimantas Beručka , 2008. - # Gintautas Miliauskas , 2009. --# Aurimas Černius , 2014, 2015, 2016. -+# Aurimas Černius , 2014, 2015, 2016, 2018. - # - msgid "" - msgstr "" - "Project-Id-Version: NetworkManager-vpnc HEAD\n" --"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" --"product=NetworkManager&keywords=I18N+L10N&component=VPN: Openswan\n" --"POT-Creation-Date: 2016-07-13 11:28+0000\n" --"PO-Revision-Date: 2016-08-21 17:49+0300\n" -+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" -+"product=NetworkManager&keywords=I18N+L10N&component=VPN: libreswan\n" -+"POT-Creation-Date: 2017-10-31 08:58+0000\n" -+"PO-Revision-Date: 2018-03-26 22:38+0300\n" - "Last-Translator: Aurimas Černius \n" - "Language-Team: Lietuvių \n" - "Language: lt\n" -@@ -29,15 +29,15 @@ - #: ../appdata/network-manager-libreswan.metainfo.xml.in.h:2 - msgid "Libreswan based client for IKEv1 based IPsec virtual private networks" - msgstr "" --"Libreswan pagrindo klientas IKEv1 pagrindo IPsec virtualiems privatiems " --"tinklams" -+"Libreswan pagrįstas klientas, skirtas IKEv1 pagrįstiems IPsec virtualiems " -+"privatiems tinklams" - - #: ../appdata/network-manager-libreswan.metainfo.xml.in.h:3 - msgid "" - "Support for configuring IKEv1 based IPsec virtual private network " - "connections." - msgstr "" --"IKEv1 pagrindo IPsec virtualių privačių tinklų ryčių konfigūracijos " -+"IKEv1 pagrįstų IPsec virtualių privačių tinklų ryšių konfigūracijos " - "palaikymas." - - #: ../appdata/network-manager-libreswan.metainfo.xml.in.h:4 -@@ -51,7 +51,7 @@ - #: ../auth-dialog/main.c:165 - #, c-format - msgid "Authenticate VPN %s" --msgstr "Patvirtinti tapatybę VPN %s" -+msgstr "Nustatyti tapatybę VPN %s" - - #: ../auth-dialog/main.c:182 - msgid "Password:" -@@ -71,65 +71,63 @@ - - #: ../auth-dialog/main.c:487 - #, c-format --msgid "You need to authenticate to access the Virtual Private Network '%s'." -+msgid "You need to authenticate to access the Virtual Private Network “%s”." - msgstr "" - "Norint gauti prieigą prie Virtualiojo Privačiojo Tinklo „%s“, reikia " - "nustatyti jūsų tapatybę." - - #: ../properties/nm-libreswan-editor-plugin.c:43 - msgid "IPsec based VPN" --msgstr "IPsec pagrindo VPN" -+msgstr "IPsec pagrįstas VPN" - - #: ../properties/nm-libreswan-editor-plugin.c:44 --#| msgid "IPsec based VPN" - msgid "IPsec based VPN using IKEv1" --msgstr "IPsec pagrindo VPN naudojant IKEv1" -+msgstr "IPsec pagrįstas VPN naudojant IKEv1" - - #: ../properties/nm-libreswan-editor-plugin.c:80 --#: ../properties/nm-libreswan-editor-plugin.c:149 -+#: ../properties/nm-libreswan-editor-plugin.c:158 - #, c-format --msgid "Can't open file '%s': %s" --msgstr "Nepavyksta atverti failo \"%s\": %s" -+msgid "Can’t open file “%s”: %s" -+msgstr "Nepavyksta atverti failo „%s“: %s" - --#: ../properties/nm-libreswan-editor-plugin.c:126 -+#: ../properties/nm-libreswan-editor-plugin.c:135 - #, c-format --msgid "Missing \"conn\" section in \"%s\"" --msgstr "„%s“ trūksta „conn“ skilties" -+msgid "Missing “conn” section in “%s”" -+msgstr "„%s“ trūksta „conn“ sekcijos" - --#: ../properties/nm-libreswan-editor-plugin.c:167 -+#: ../properties/nm-libreswan-editor-plugin.c:176 - #, c-format --#| msgid "Can't open file '%s': %s" --msgid "Error writing to file '%s': %s" --msgstr "Klaida rašant į failą failą „%s“: %s" -+msgid "Error writing to file “%s”: %s" -+msgstr "Klaida rašant į failą „%s“: %s" - --#: ../src/nm-libreswan-service.c:1449 -+#: ../src/nm-libreswan-service.c:1452 - msgid "A password is required." --msgstr "Būtinas slaptažodis." -+msgstr "Reikalingas slaptažodis." - --#: ../src/nm-libreswan-service.c:1833 -+#: ../src/nm-libreswan-service.c:1836 - msgid "" - "Could not process the request because the VPN connection settings were " - "invalid." - msgstr "" - "Nepavyko apdoroti užklausos, kadangi VPN ryšio nustatymai buvo neteisingi." - --#: ../src/nm-libreswan-service.c:1847 -+#: ../src/nm-libreswan-service.c:1850 - msgid "Unhandled pending authentication." --msgstr "Neapdorotas laukiamas tapatybės patvirtinimas." -+msgstr "Neapdorotas laukiamas tapatybės nustatymas." - --#: ../src/nm-libreswan-service.c:1989 --msgid "Don't quit when VPN connection terminates" -+#: ../src/nm-libreswan-service.c:1992 -+msgid "Don’t quit when VPN connection terminates" - msgstr "Neišeiti, kai nutrūksta VPN ryšys" - --#: ../src/nm-libreswan-service.c:1990 -+#: ../src/nm-libreswan-service.c:1993 - msgid "Enable verbose debug logging (may expose passwords)" --msgstr "Įjungti išsamų derinimo žurnalą (gali parodyti slaptažodžius)" -+msgstr "Įjungti išsamų derinimo žurnalą (gali atskleisti slaptažodžius)" - --#: ../src/nm-libreswan-service.c:1991 -+#: ../src/nm-libreswan-service.c:1994 - msgid "D-Bus name to use for this instance" - msgstr "D-Bus pavadinimas, kurį naudoti šiam egzemplioriui" - --#: ../src/nm-libreswan-service.c:2014 -+#: ../src/nm-libreswan-service.c:2017 - msgid "" - "This service provides integrated IPsec VPN capability to NetworkManager." - msgstr "Ši tarnyba sutekia NetworkManager integruotą IPsec VPN galimybę." -@@ -139,17 +137,17 @@ - msgid "Error writing config: %s" - msgstr "Klaida rašant konfigūraciją: %s" - --#: ../shared/nm-utils/nm-shared-utils.c:185 -+#: ../shared/nm-utils/nm-shared-utils.c:312 - #, c-format - msgid "object class '%s' has no property named '%s'" - msgstr "objekto klasė „%s“ neturi savybės „%s“" - --#: ../shared/nm-utils/nm-shared-utils.c:192 -+#: ../shared/nm-utils/nm-shared-utils.c:319 - #, c-format - msgid "property '%s' of object class '%s' is not writable" - msgstr "savybė „%s“ objekto klasėje „%s“ nėra rašoma" - --#: ../shared/nm-utils/nm-shared-utils.c:199 -+#: ../shared/nm-utils/nm-shared-utils.c:326 - #, c-format - msgid "" - "construct property \"%s\" for object '%s' can't be set after construction" -@@ -157,23 +155,23 @@ - "konstruktoriaus savybė „%s“ objektui „%s“ negali būti nustatyta po " - "sukonstravimo" - --#: ../shared/nm-utils/nm-shared-utils.c:207 -+#: ../shared/nm-utils/nm-shared-utils.c:334 - #, c-format - msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" - msgstr "„%s::%s“ nėra tinkamas savybės pavadinimas; „%s“ nėra GObject potipis" - --#: ../shared/nm-utils/nm-shared-utils.c:216 -+#: ../shared/nm-utils/nm-shared-utils.c:343 - #, c-format - msgid "unable to set property '%s' of type '%s' from value of type '%s'" - msgstr "negalima nustatyti savybės „%s“ tipe „%s“ į „%s“ tipo vertę" - --#: ../shared/nm-utils/nm-shared-utils.c:227 -+#: ../shared/nm-utils/nm-shared-utils.c:354 - #, c-format - msgid "" - "value \"%s\" of type '%s' is invalid or out of range for property '%s' of " - "type '%s'" - msgstr "" --"vertė „%s“, kurios tipas „%s“, yra netinkamas arba už leistinų ribų savybei " -+"vertė „%s“, kurios tipas „%s“, yra netinkama arba už leistinų ribų savybei " - "„%s“ tipe „%s“" - - #: ../shared/nm-utils/nm-vpn-plugin-utils.c:80 -@@ -189,23 +187,23 @@ - #: ../shared/nm-utils/nm-vpn-plugin-utils.c:95 - #, c-format - msgid "cannot load factory %s from plugin: %s" --msgstr "nepavyksta 5kelti gamyklos %s iš įskiepio: %s" -+msgstr "nepavyksta įkelti gamyklos %s iš įskiepio: %s" - - #: ../shared/nm-utils/nm-vpn-plugin-utils.c:121 - msgid "unknown error creating editor instance" - msgstr "nežinoma klaida kuriant redaktoriaus egzempliorių" - - #: ../properties/nm-libreswan-dialog.ui.h:1 --msgid "General" --msgstr "Bendra" -+msgid "General" -+msgstr "Bendra" - - #: ../properties/nm-libreswan-dialog.ui.h:2 - msgid "_Gateway:" --msgstr "Š_liuzas:" -+msgstr "_Tinklų sietuvas:" - - #: ../properties/nm-libreswan-dialog.ui.h:3 - msgid "Show passwords" --msgstr "Rodyti slaptažodžius:" -+msgstr "Rodyti slaptažodžius" - - #: ../properties/nm-libreswan-dialog.ui.h:4 - msgid "_Secret:" -@@ -236,15 +234,26 @@ - msgstr "Pirmos fazės algoritmai:" - - #: ../properties/nm-libreswan-dialog.ui.h:11 --msgid "Ad_vanced" --msgstr "_Sudėtingesni" -+#| msgid "Phase1 Algorithms:" -+msgid "Phase1 Lifetime:" -+msgstr "Pirmos fazės ciklas:" - - #: ../properties/nm-libreswan-dialog.ui.h:12 --msgid " " --msgstr " " -+#| msgid "Phase2 Algorithms:" -+msgid "Phase2 Lifetime:" -+msgstr "Antros fazės ciklas:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:13 -+#| msgid "Network" -+msgid "Remote Network:" -+msgstr "Nutolęs tinklas:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:14 -+msgid "Ad_vanced" -+msgstr "Išplė_stiniai" - --#~ msgid "Network" --#~ msgstr "Tinklas" -+#~ msgid " " -+#~ msgstr " " - - #~ msgid "Request VPN authentication" - #~ msgstr "Prašyti VPN tapatybės patvirtinimo" -diff -Naur NetworkManager-libreswan-1.2.6-orig/po/lv.po NetworkManager-libreswan-1.2.6/po/lv.po ---- NetworkManager-libreswan-1.2.6-orig/po/lv.po 2015-11-04 09:38:50.000000000 -0500 -+++ NetworkManager-libreswan-1.2.6/po/lv.po 2018-08-21 23:09:09.654783347 -0400 -@@ -1,134 +1,282 @@ - # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER - # This file is distributed under the same license as the PACKAGE package. - # --# Rūdolfs Mazurs , 2013. -+# Rūdolfs Mazurs , 2013, 2018. - msgid "" - msgstr "" - "Project-Id-Version: \n" --"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" --"product=network-manager-libreswan&keywords=I18N+L10N&component=general\n" --"POT-Creation-Date: 2013-04-12 12:47+0000\n" --"PO-Revision-Date: 2013-04-21 23:41+0300\n" -+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=Network" -+"Manager&keywords=I18N+L10N&component=VPN: libreswan\n" -+"POT-Creation-Date: 2017-10-31 08:58+0000\n" -+"PO-Revision-Date: 2018-03-24 08:58+0200\n" - "Last-Translator: Rūdolfs Mazurs \n" - "Language-Team: Latvian \n" - "Language: lv\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" --"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " --"2);\n" --"X-Generator: Lokalize 1.4\n" -+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 :" -+" 2);\n" -+"X-Generator: Lokalize 2.0\n" -+ -+#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:1 -+msgid "IPsec VPN client" -+msgstr "IPsec VPN klients" - --#: ../auth-dialog/main.c:188 --#, c-format --msgid "You need to authenticate to access the Virtual Private Network '%s'." -+#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:2 -+msgid "Libreswan based client for IKEv1 based IPsec virtual private networks" - msgstr "" --"Jums ir jāautentificējas, lai piekļūtu virtuālajiem privātajiem tīkliem “%s”." -+"Uz Libreswan balstīts klients uz IKEv1 balstītiem IPsec virtuālajiem" -+" privātajiem tīkliem" - --#: ../auth-dialog/main.c:197 ../auth-dialog/main.c:221 --msgid "Authenticate VPN" --msgstr "Autentificēt VPN" -+#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:3 -+msgid "" -+"Support for configuring IKEv1 based IPsec virtual private network " -+"connections." -+msgstr "" -+"Atbalsts IKEv1 IPsec virtuālo privāto tīklu savienojumu konfigurēšanai." - --#: ../auth-dialog/main.c:200 -+#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:4 -+msgid "Compatible with Libreswan and Cisco IPsec VPN servers." -+msgstr "Savietojams ar Libreswan un Cisco IPsec VPN serveriem." -+ -+#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:5 -+msgid "The NetworkManager Developers" -+msgstr "NetworkManager izstrādātāji" -+ -+#: ../auth-dialog/main.c:165 -+#, c-format -+#| msgid "Authenticate VPN" -+msgid "Authenticate VPN %s" -+msgstr "Autentificēt VPN %s" -+ -+#: ../auth-dialog/main.c:182 - msgid "Password:" - msgstr "Parole:" - --#: ../auth-dialog/main.c:202 -+#: ../auth-dialog/main.c:192 - msgid "Group Password:" - msgstr "Grupas parole:" - --#: ../auth-dialog/main.c:223 -+#: ../auth-dialog/main.c:228 -+msgid "Authenticate VPN" -+msgstr "Autentificēt VPN" -+ -+#: ../auth-dialog/main.c:237 - msgid "_Group Password:" - msgstr "_Grupas parole:" - --#: ../nm-libreswan.desktop.in.h:1 --msgid "IPsec Based VPN Connection Manager (libreswan)" --msgstr "Uz IPsec balstīts VPN savienojumu pārvaldnieks (libreswan)" -- --#: ../nm-libreswan.desktop.in.h:2 --msgid "Add, Remove, and Edit VPN Connections" --msgstr "Pievienot, noņemt un rediģēt VPN savienojumus" -+#: ../auth-dialog/main.c:487 -+#, c-format -+#| msgid "You need to authenticate to access the Virtual Private Network '%s'." -+msgid "You need to authenticate to access the Virtual Private Network “%s”." -+msgstr "" -+"Jums ir jāautentificējas, lai piekļūtu virtuālajiem privātajiem tīkliem “%s”." - --#: ../properties/nm-libreswan.c:47 -+#: ../properties/nm-libreswan-editor-plugin.c:43 - msgid "IPsec based VPN" - msgstr "Uz IPsec balstīts VPN" - --#: ../properties/nm-libreswan.c:48 --msgid "IPsec, IKEv1, IKEv2 based VPN" --msgstr "IPsec, IKEv1, IKEv2 balstīts VPN" -- --#: ../properties/nm-libreswan.c:274 --msgid "Saved" --msgstr "Saglabāts" -- --#: ../properties/nm-libreswan.c:281 --msgid "Always Ask" --msgstr "Vienmēr jautāt" -- --#: ../properties/nm-libreswan.c:288 --msgid "Not Required" --msgstr "Nav nepieciešams" -+#: ../properties/nm-libreswan-editor-plugin.c:44 -+#| msgid "IPsec based VPN" -+msgid "IPsec based VPN using IKEv1" -+msgstr "Uz IPsec balstīts VPN, izmantojot IKEv1" -+ -+#: ../properties/nm-libreswan-editor-plugin.c:80 -+#: ../properties/nm-libreswan-editor-plugin.c:158 -+#, c-format -+msgid "Can’t open file “%s”: %s" -+msgstr "Nevar atvērt datni “%s”: %s" -+ -+#: ../properties/nm-libreswan-editor-plugin.c:135 -+#, c-format -+msgid "Missing “conn” section in “%s”" -+msgstr "“%s” trūkst sadaļas “conn”" -+ -+#: ../properties/nm-libreswan-editor-plugin.c:176 -+#, c-format -+msgid "Error writing to file “%s”: %s" -+msgstr "Kļūda,rakstot datnē “%s” — %s" -+ -+#: ../src/nm-libreswan-service.c:1452 -+msgid "A password is required." -+msgstr "Nepieciešama parole." -+ -+#: ../src/nm-libreswan-service.c:1836 -+msgid "" -+"Could not process the request because the VPN connection settings were " -+"invalid." -+msgstr "" -+"Neizdevās apstrādāt pieprasījumu, jo VPN savienojuma iestatījumi bija " -+"nederīgi." -+ -+#: ../src/nm-libreswan-service.c:1850 -+msgid "Unhandled pending authentication." -+msgstr "Nepastrādāta gaidoša autentifikācija." -+ -+#: ../src/nm-libreswan-service.c:1992 -+#| msgid "Don't quit when VPN connection terminates" -+msgid "Don’t quit when VPN connection terminates" -+msgstr "Neiziet, kad tiek pārtraukts VPN savienojums" -+ -+#: ../src/nm-libreswan-service.c:1993 -+msgid "Enable verbose debug logging (may expose passwords)" -+msgstr "Aktivēt detalizētu atkļūdošanas reģistrēšanu (var atklāt paroles)" -+ -+#: ../src/nm-libreswan-service.c:1994 -+msgid "D-Bus name to use for this instance" -+msgstr "D-Bus nosaukums, ko izmantot šai instancei" -+ -+#: ../src/nm-libreswan-service.c:2017 -+#| msgid "" -+#| "nm-libreswan-service provides integrated IPsec VPN capability to " -+#| "NetworkManager." -+msgid "" -+"This service provides integrated IPsec VPN capability to NetworkManager." -+msgstr "Šis pakalpojums nodrošina NetworkManager integrētu IPsec VPN iespēju." -+ -+#: ../shared/utils.c:85 -+#, c-format -+msgid "Error writing config: %s" -+msgstr "Kļūda, rakstot konfigurāciju: %s" -+ -+#: ../shared/nm-utils/nm-shared-utils.c:312 -+#, c-format -+msgid "object class '%s' has no property named '%s'" -+msgstr "objektu klasei “%s” nav īpašības ar nosaukumu “%s”" -+ -+#: ../shared/nm-utils/nm-shared-utils.c:319 -+#, c-format -+msgid "property '%s' of object class '%s' is not writable" -+msgstr "objektu klases “%2$s” īpašība “%1$s” nav rakstāma" -+ -+#: ../shared/nm-utils/nm-shared-utils.c:326 -+#, c-format -+msgid "" -+"construct property \"%s\" for object '%s' can't be set after construction" -+msgstr "" -+"objekta “%2$s” konstrukcijas īpašību “%1$s” nevar iestatīt pēc uzkonstruēšanas" -+ -+#: ../shared/nm-utils/nm-shared-utils.c:334 -+#, c-format -+msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" -+msgstr "“%s::%s” nav derīgs īpašības nosaukums; “%s” nav GObject apakštips" -+ -+#: ../shared/nm-utils/nm-shared-utils.c:343 -+#, c-format -+msgid "unable to set property '%s' of type '%s' from value of type '%s'" -+msgstr "nevar iestatīt īpašību “%s” ar tipu “%s” no tipa “%s” vērtības" -+ -+#: ../shared/nm-utils/nm-shared-utils.c:354 -+#, c-format -+msgid "" -+"value \"%s\" of type '%s' is invalid or out of range for property '%s' of " -+"type '%s'" -+msgstr "" -+"tipa “%2$s” vērtība “%1$s” nav derīga vai ir ārpus tipa “%4$s” īpašības “" -+"%3$s” apgabala" -+ -+#: ../shared/nm-utils/nm-vpn-plugin-utils.c:80 -+#, c-format -+msgid "missing plugin file \"%s\"" -+msgstr "datnei “%s” trūkst spraudņa" -+ -+#: ../shared/nm-utils/nm-vpn-plugin-utils.c:86 -+#, c-format -+msgid "cannot load editor plugin: %s" -+msgstr "nevar ielādēt redaktora spraudni: %s" -+ -+#: ../shared/nm-utils/nm-vpn-plugin-utils.c:95 -+#, c-format -+msgid "cannot load factory %s from plugin: %s" -+msgstr "nevar ielādēt ražotni %s no spraudņa: %s" -+ -+#: ../shared/nm-utils/nm-vpn-plugin-utils.c:121 -+msgid "unknown error creating editor instance" -+msgstr "nezināma kļūda, veidojot redaktora instanci" - - #: ../properties/nm-libreswan-dialog.ui.h:1 --msgid " " --msgstr " " -+#| msgid "General" -+msgid "General" -+msgstr "Vispārēji" - - #: ../properties/nm-libreswan-dialog.ui.h:2 --msgid "General" --msgstr "Vispārējs" -+msgid "_Gateway:" -+msgstr "_Vārteja:" - - #: ../properties/nm-libreswan-dialog.ui.h:3 - msgid "Show passwords" - msgstr "Rādīt paroles" - - #: ../properties/nm-libreswan-dialog.ui.h:4 --msgid "Gro_up password:" --msgstr "Gr_upas parole:" -+msgid "_Secret:" -+msgstr "No_slēpums:" - - #: ../properties/nm-libreswan-dialog.ui.h:5 --msgid "_Gateway:" --msgstr "_Vārteja:" -+msgid "_User password:" -+msgstr "_Lietotāja parole:" - - #: ../properties/nm-libreswan-dialog.ui.h:6 - msgid "G_roup name:" - msgstr "G_rupas nosaukums:" - - #: ../properties/nm-libreswan-dialog.ui.h:7 --msgid "_User password:" --msgstr "_Lietotāja parole:" -+msgid "User name:" -+msgstr "Lietotājvārds:" - - #: ../properties/nm-libreswan-dialog.ui.h:8 --msgid "Optional" --msgstr "Neobligāts" -+msgid "Phase2 Algorithms:" -+msgstr "Phase2 algoritms:" - - #: ../properties/nm-libreswan-dialog.ui.h:9 --msgid "User name:" --msgstr "Lietotājvārds:" -+msgid "Domain:" -+msgstr "Domēns:" - - #: ../properties/nm-libreswan-dialog.ui.h:10 - msgid "Phase1 Algorithms:" - msgstr "Phase1 algoritms:" - - #: ../properties/nm-libreswan-dialog.ui.h:11 --msgid "Phase2 Algorithms:" --msgstr "Phase2 algoritms:" -+#| msgid "Phase1 Algorithms:" -+msgid "Phase1 Lifetime:" -+msgstr "Phase1 dzīves ilgums:" - - #: ../properties/nm-libreswan-dialog.ui.h:12 --msgid "Domain:" --msgstr "Domēns:" -+#| msgid "Phase2 Algorithms:" -+msgid "Phase2 Lifetime:" -+msgstr "Phase2 dzīves ilgums:" - --#: ../src/nm-libreswan-service.c:877 --msgid "Don't quit when VPN connection terminates" --msgstr "Neiziet, kad tiek pārtraukts VPN savienojums" -+#: ../properties/nm-libreswan-dialog.ui.h:13 -+msgid "Remote Network:" -+msgstr "Attālināts tīkls:" - --#: ../src/nm-libreswan-service.c:878 --msgid "Enable verbose debug logging (may expose passwords)" --msgstr "Aktivēt detalizētu atkļūdošanas reģistrēšanu (var atklāt paroles)" -+#: ../properties/nm-libreswan-dialog.ui.h:14 -+msgid "Ad_vanced" -+msgstr "Pap_lašināti" - --#: ../src/nm-libreswan-service.c:901 --msgid "" --"nm-libreswan-service provides integrated IPsec VPN capability to " --"NetworkManager." --msgstr "" --"nm-libreswan-service nodrošina NetworkManager integrētu IPsec VPN iespēju." -+#~ msgid "IPsec Based VPN Connection Manager (libreswan)" -+#~ msgstr "Uz IPsec balstīts VPN savienojumu pārvaldnieks (libreswan)" -+ -+#~ msgid "Add, Remove, and Edit VPN Connections" -+#~ msgstr "Pievienot, noņemt un rediģēt VPN savienojumus" -+ -+#~ msgid "IPsec, IKEv1, IKEv2 based VPN" -+#~ msgstr "IPsec, IKEv1, IKEv2 balstīts VPN" -+ -+#~ msgid "Saved" -+#~ msgstr "Saglabāts" -+ -+#~ msgid "Always Ask" -+#~ msgstr "Vienmēr jautāt" -+ -+#~ msgid "Not Required" -+#~ msgstr "Nav nepieciešams" -+ -+#~ msgid " " -+#~ msgstr " " -+ -+#~ msgid "Gro_up password:" -+#~ msgstr "Gr_upas parole:" - -+#~ msgid "Optional" -+#~ msgstr "Neobligāts" -diff -Naur NetworkManager-libreswan-1.2.6-orig/po/nl.po NetworkManager-libreswan-1.2.6/po/nl.po ---- NetworkManager-libreswan-1.2.6-orig/po/nl.po 2016-08-23 15:16:28.000000000 -0400 -+++ NetworkManager-libreswan-1.2.6/po/nl.po 2018-08-21 23:09:09.654783347 -0400 -@@ -5,183 +5,343 @@ - # - # Tino Meinen , 2006, 2007. - # Wouter Bolsterlee , 2008. -+# Nathan Follens , 2018. - # - msgid "" - msgstr "" - "Project-Id-Version: NetworkManager-vpnc\n" --"Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2008-09-15 10:45+0200\n" --"PO-Revision-Date: 2008-09-15 10:45+0200\n" --"Last-Translator: Wouter Bolsterlee \n" -+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" -+"product=NetworkManager&keywords=I18N+L10N&component=VPN: libreswan\n" -+"POT-Creation-Date: 2017-10-31 08:58+0000\n" -+"PO-Revision-Date: 2018-03-14 23:13+0100\n" -+"Last-Translator: Nathan Follens \n" - "Language-Team: Dutch \n" - "Language: nl\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" -+"X-Generator: Poedit 2.0.6\n" - --#: ../auth-dialog/gnome-two-password-dialog.c:145 --msgid "_Secondary Password:" --msgstr "_Secondair wachtwoord:" -- --#: ../auth-dialog/gnome-two-password-dialog.c:259 --msgid "_Username:" --msgstr "_Gebruikersnaam:" -- --#: ../auth-dialog/gnome-two-password-dialog.c:261 --msgid "_Domain:" --msgstr "_Domein:" -- --#: ../auth-dialog/gnome-two-password-dialog.c:263 --msgid "_Password:" --msgstr "_Wachtwoord:" -- --#: ../auth-dialog/gnome-two-password-dialog.c:352 --msgid "Connect _anonymously" --msgstr "_Anoniem verbinden" -- --#: ../auth-dialog/gnome-two-password-dialog.c:357 --msgid "Connect as _user:" --msgstr "Verbinden met _gebruikersnaam:" -- --#: ../auth-dialog/gnome-two-password-dialog.c:466 --msgid "_Remember passwords for this session" --msgstr "W_achtwoorden voor deze sessie onthouden" -- --#: ../auth-dialog/gnome-two-password-dialog.c:468 --msgid "_Save passwords in keyring" --msgstr "Wachtwoorden in _sleutelbos opslaan" -+#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:1 -+msgid "IPsec VPN client" -+msgstr "IPsec-VPN-cliënt" -+ -+#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:2 -+msgid "Libreswan based client for IKEv1 based IPsec virtual private networks" -+msgstr "" -+"Libreswan-gebaseerde cliënt voor op IKEv1 gebaseerde IPsec-virtuele " -+"privénetwerken" -+ -+#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:3 -+msgid "" -+"Support for configuring IKEv1 based IPsec virtual private network " -+"connections." -+msgstr "" -+"Ondersteuning voor configuratie van op IKEv1 gebaseerde IPsec-" -+"virtueleprivénetwerkverbindingen." -+ -+#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:4 -+msgid "Compatible with Libreswan and Cisco IPsec VPN servers." -+msgstr "Compatibel met Libreswan- en Cisco-IPsec-VPN-servers." -+ -+#: ../appdata/network-manager-libreswan.metainfo.xml.in.h:5 -+msgid "The NetworkManager Developers" -+msgstr "De NetworkManager-ontwikkelaars" -+ -+#: ../auth-dialog/main.c:165 -+#, c-format -+msgid "Authenticate VPN %s" -+msgstr "Aanmeldingscontrole voor VPN %s" -+ -+#: ../auth-dialog/main.c:182 -+msgid "Password:" -+msgstr "Wachtwoord:" -+ -+#: ../auth-dialog/main.c:192 -+msgid "Group Password:" -+msgstr "Groepswachtwoord:" -+ -+#: ../auth-dialog/main.c:228 -+msgid "Authenticate VPN" -+msgstr "Aanmeldingscontrole voor VPN" -+ -+#: ../auth-dialog/main.c:237 -+msgid "_Group Password:" -+msgstr "_Groepswachtwoord:" - - # eigenlijk: moet er een aanmeldingscontrole worden uitgevoerd, - # maar het gaat erom dat er een wachtwoord moet worden gegeven --#: ../auth-dialog/main.c:66 -+#: ../auth-dialog/main.c:487 - #, c-format --msgid "You need to authenticate to access the Virtual Private Network '%s'." -+msgid "You need to authenticate to access the Virtual Private Network “%s”." - msgstr "" --"Om toegang te krijgen tot het Virtual Private Network ‘%s’ moet u uzelf " -+"Om toegang te krijgen tot het virtuele privénetwerk ‘%s’ moet u zich " - "aanmelden." - --#: ../auth-dialog/main.c:67 --msgid "Authenticate VPN" --msgstr "VPN aanmeldingscontrole" -+#: ../properties/nm-libreswan-editor-plugin.c:43 -+msgid "IPsec based VPN" -+msgstr "IPsec-gebaseerde VPN" -+ -+#: ../properties/nm-libreswan-editor-plugin.c:44 -+msgid "IPsec based VPN using IKEv1" -+msgstr "IPsec-gebaseerde VPN met IKEv1" - --#: ../auth-dialog/main.c:74 --msgid "_Group Password:" --msgstr "_Groepswachtwoord:" -+#: ../properties/nm-libreswan-editor-plugin.c:80 -+#: ../properties/nm-libreswan-editor-plugin.c:158 -+#, c-format -+msgid "Can’t open file “%s”: %s" -+msgstr "Kan bestand ‘%s’ niet openen: %s" -+ -+#: ../properties/nm-libreswan-editor-plugin.c:135 -+#, c-format -+msgid "Missing “conn” section in “%s”" -+msgstr "Sectie ‘conn’ ontbreekt in ‘%s’" -+ -+#: ../properties/nm-libreswan-editor-plugin.c:176 -+#, c-format -+msgid "Error writing to file “%s”: %s" -+msgstr "Fout bij het schrijven naar bestand ‘%s’: %s" -+ -+#: ../src/nm-libreswan-service.c:1452 -+msgid "A password is required." -+msgstr "Er is een wachtwoord nodig." -+ -+#: ../src/nm-libreswan-service.c:1836 -+msgid "" -+"Could not process the request because the VPN connection settings were " -+"invalid." -+msgstr "" -+"Aanmelding is mislukt wegens ongeldige verbindingsinstellingen van VPN." -+ -+#: ../src/nm-libreswan-service.c:1850 -+msgid "Unhandled pending authentication." -+msgstr "Lopende aanmeldingscontrole niet verwerkt" -+ -+#: ../src/nm-libreswan-service.c:1992 -+msgid "Don’t quit when VPN connection terminates" -+msgstr "Niet afsluiten wanneer VPN-verbinding beëindigt" -+ -+#: ../src/nm-libreswan-service.c:1993 -+msgid "Enable verbose debug logging (may expose passwords)" -+msgstr "Uitgebreide debug-logging inschakelen (kan wachtwoorden blootstellen)" - --#: ../nm-vpnc.desktop.in.h:1 --msgid "Add, Remove, and Edit VPN Connections" --msgstr "VPN-verbindingen toevoegen, verwijderen en bewerken" -- --#: ../nm-vpnc.desktop.in.h:2 --msgid "VPN Connection Manager (vpnc)" --msgstr "VPN verbindingen beheren (vpnc)" -- --#: ../properties/nm-vpnc.c:53 --msgid "Cisco Compatible VPN (vpnc)" --msgstr "Cisco-compatibele VPN-cliënt (vpnc)" -+#: ../src/nm-libreswan-service.c:1994 -+msgid "D-Bus name to use for this instance" -+msgstr "D-Bus-naam voor deze instantie" - --#: ../properties/nm-vpnc.c:54 -+#: ../src/nm-libreswan-service.c:2017 - msgid "" --"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-based " --"VPN gateways." -+"This service provides integrated IPsec VPN capability to NetworkManager." - msgstr "" --"Geschikt voor verschillende Cisco, Juniper, Netscreen en Sonicwall IPsec-" --"gebaseerde VPN-gateways." -+"Deze dienst biedt geïntegreerde IPsec-VPN-mogelijkheden aan NetworkManager." - --#: ../properties/nm-vpnc.c:282 --msgid "Secure (default)" --msgstr "Veilig (standaard)" -- --#: ../properties/nm-vpnc.c:285 --msgid "Weak (use with caution)" --msgstr "Zwak (voorzichtigheid geboden)" -- --#: ../properties/nm-vpnc.c:293 --msgid "None (completely insecure)" --msgstr "Geen (geheel onveilig)" -- --#: ../properties/nm-vpnc.c:331 --msgid "NAT-T (default)" --msgstr "NAT-T (standaard)" -- --#: ../properties/nm-vpnc.c:338 --msgid "Cisco UDP" --msgstr "Cisco UDP" -- --#: ../properties/nm-vpnc.c:345 --msgid "Disabled" --msgstr "Uitgeschakeld" -- --#: ../properties/nm-vpnc.c:809 --msgid "TCP tunneling not supported" --msgstr "TCP tunneling is niet mogelijk" -+#: ../shared/utils.c:85 -+#, c-format -+msgid "Error writing config: %s" -+msgstr "Fout bij het schrijven van configuratie: %s" -+ -+#: ../shared/nm-utils/nm-shared-utils.c:312 -+#, c-format -+msgid "object class '%s' has no property named '%s'" -+msgstr "objectklasse ‘%s’ heeft geen eigenschap met de naam ‘%s’" - --#: ../properties/nm-vpnc.c:811 -+#: ../shared/nm-utils/nm-shared-utils.c:319 -+#, c-format -+msgid "property '%s' of object class '%s' is not writable" -+msgstr "eigenschap ‘%s’ van objectklasse ‘%s’ is niet schrijfbaar" -+ -+#: ../shared/nm-utils/nm-shared-utils.c:326 - #, c-format - msgid "" --"The VPN settings file '%s' specifies that VPN traffic should be tunneled " --"through TCP which is currently not supported in the vpnc software.\n" --"\n" --"The connection can still be created, with TCP tunneling disabled, however it " --"may not work as expected." -+"construct property \"%s\" for object '%s' can't be set after construction" - msgstr "" --"Het VPN-instellingenbestand ‘%s’ geeft aan dat VPN-verkeer getunnelt moet " --"worden via TCP hetgeen momenteel nog niet mogelijk is met de vpnc-software.\n" --"\n" --"De verbinding kan evengoed worden gemaakt met TPC-tunneling uitgeschakeld, " --"maar het werkt mogelijkerwijs niet helemaal correct." -- --#: ../properties/nm-vpnc-dialog.glade.h:1 --msgid " " --msgstr " " -- --#: ../properties/nm-vpnc-dialog.glade.h:2 --msgid "General" --msgstr "Algemeen" -- --#: ../properties/nm-vpnc-dialog.glade.h:3 --msgid "Optional" --msgstr "Optioneel" -- --#: ../properties/nm-vpnc-dialog.glade.h:4 --msgid "Disable Dead Peer Detection" --msgstr "Detectie van ‘Dead peers’ uitschakelen" -+"constructeigenschap ‘%s’ voor object ‘%s’ kan niet ingesteld worden na " -+"constructie" - --#: ../properties/nm-vpnc-dialog.glade.h:5 --msgid "Domain:" --msgstr "Domein:" -+#: ../shared/nm-utils/nm-shared-utils.c:334 -+#, c-format -+msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" -+msgstr "‘%s::%s’ is geen geldige eigenschapsnaam; ‘%s’ is geen GObject-subtype" - --#: ../properties/nm-vpnc-dialog.glade.h:6 --msgid "Encryption method:" --msgstr "Versleutelingsmethode:" -+#: ../shared/nm-utils/nm-shared-utils.c:343 -+#, c-format -+msgid "unable to set property '%s' of type '%s' from value of type '%s'" -+msgstr "" -+"instellen van eigenschap ‘%s’ van type ‘%s’ van waarde van type ‘%s’ mislukt" - --#: ../properties/nm-vpnc-dialog.glade.h:7 --msgid "G_roup name:" --msgstr "G_roepsnaam:" -+#: ../shared/nm-utils/nm-shared-utils.c:354 -+#, c-format -+msgid "" -+"value \"%s\" of type '%s' is invalid or out of range for property '%s' of " -+"type '%s'" -+msgstr "" -+"waarde ‘%s’ van type ‘%s’ is ongeldig of buiten bereik voor eigenschap ‘%s’ " -+"van type ‘%s’" - --#: ../properties/nm-vpnc-dialog.glade.h:8 --msgid "Gro_up password:" --msgstr "_Groepswachtwoord:" -+#: ../shared/nm-utils/nm-vpn-plugin-utils.c:80 -+#, c-format -+msgid "missing plugin file \"%s\"" -+msgstr "plug-inbestand ‘%s’ ontbreekt" -+ -+#: ../shared/nm-utils/nm-vpn-plugin-utils.c:86 -+#, c-format -+msgid "cannot load editor plugin: %s" -+msgstr "laden van verwerkersplug-in mislukt: %s" -+ -+#: ../shared/nm-utils/nm-vpn-plugin-utils.c:95 -+#, c-format -+msgid "cannot load factory %s from plugin: %s" -+msgstr "laden van factory %s uit plug-in %s mislukt" - --#: ../properties/nm-vpnc-dialog.glade.h:9 --msgid "NAT traversal:" --msgstr "NAT-traversal:" -+#: ../shared/nm-utils/nm-vpn-plugin-utils.c:121 -+msgid "unknown error creating editor instance" -+msgstr "onbekende fout bij aanmaken van verwerkersinstantie" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:1 -+msgid "General" -+msgstr "Algemeen" - --#: ../properties/nm-vpnc-dialog.glade.h:10 -+#: ../properties/nm-libreswan-dialog.ui.h:2 -+msgid "_Gateway:" -+msgstr "_Gateway:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:3 - msgid "Show passwords" - msgstr "Wachtwoorden tonen" - --#: ../properties/nm-vpnc-dialog.glade.h:11 -+#: ../properties/nm-libreswan-dialog.ui.h:4 -+msgid "_Secret:" -+msgstr "_Geheim:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:5 -+msgid "_User password:" -+msgstr "Gebr_uikerswachtwoord:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:6 -+msgid "G_roup name:" -+msgstr "G_roepsnaam:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:7 - msgid "User name:" - msgstr "Gebruikersnaam:" - --#: ../properties/nm-vpnc-dialog.glade.h:12 --msgid "_Gateway:" --msgstr "_Gateway:" -+#: ../properties/nm-libreswan-dialog.ui.h:8 -+msgid "Phase2 Algorithms:" -+msgstr "Phase2-algoritmen:" - --#: ../properties/nm-vpnc-dialog.glade.h:13 --msgid "_User password:" --msgstr "_Gebuikerswachtwoord:" -+#: ../properties/nm-libreswan-dialog.ui.h:9 -+msgid "Domain:" -+msgstr "Domein:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:10 -+msgid "Phase1 Algorithms:" -+msgstr "Phase1-algoritmen:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:11 -+msgid "Phase1 Lifetime:" -+msgstr "Phase1-levensduur:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:12 -+msgid "Phase2 Lifetime:" -+msgstr "Phase2-levensduur:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:13 -+msgid "Remote Network:" -+msgstr "Extern netwerk" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:14 -+msgid "Ad_vanced" -+msgstr "Gea_vanceerd" -+ -+#~ msgid "_Secondary Password:" -+#~ msgstr "_Secondair wachtwoord:" -+ -+#~ msgid "_Username:" -+#~ msgstr "_Gebruikersnaam:" -+ -+#~ msgid "_Domain:" -+#~ msgstr "_Domein:" -+ -+#~ msgid "Connect _anonymously" -+#~ msgstr "_Anoniem verbinden" -+ -+#~ msgid "Connect as _user:" -+#~ msgstr "Verbinden met _gebruikersnaam:" -+ -+#~ msgid "_Remember passwords for this session" -+#~ msgstr "W_achtwoorden voor deze sessie onthouden" -+ -+#~ msgid "_Save passwords in keyring" -+#~ msgstr "Wachtwoorden in _sleutelbos opslaan" -+ -+#~ msgid "Add, Remove, and Edit VPN Connections" -+#~ msgstr "VPN-verbindingen toevoegen, verwijderen en bewerken" -+ -+#~ msgid "VPN Connection Manager (vpnc)" -+#~ msgstr "VPN verbindingen beheren (vpnc)" -+ -+#~ msgid "Cisco Compatible VPN (vpnc)" -+#~ msgstr "Cisco-compatibele VPN-cliënt (vpnc)" -+ -+#~ msgid "" -+#~ "Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-" -+#~ "based VPN gateways." -+#~ msgstr "" -+#~ "Geschikt voor verschillende Cisco, Juniper, Netscreen en Sonicwall IPsec-" -+#~ "gebaseerde VPN-gateways." -+ -+#~ msgid "Secure (default)" -+#~ msgstr "Veilig (standaard)" -+ -+#~ msgid "Weak (use with caution)" -+#~ msgstr "Zwak (voorzichtigheid geboden)" -+ -+#~ msgid "None (completely insecure)" -+#~ msgstr "Geen (geheel onveilig)" -+ -+#~ msgid "NAT-T (default)" -+#~ msgstr "NAT-T (standaard)" -+ -+#~ msgid "Cisco UDP" -+#~ msgstr "Cisco UDP" -+ -+#~ msgid "Disabled" -+#~ msgstr "Uitgeschakeld" -+ -+#~ msgid "TCP tunneling not supported" -+#~ msgstr "TCP tunneling is niet mogelijk" -+ -+#~ msgid "" -+#~ "The VPN settings file '%s' specifies that VPN traffic should be tunneled " -+#~ "through TCP which is currently not supported in the vpnc software.\n" -+#~ "\n" -+#~ "The connection can still be created, with TCP tunneling disabled, however " -+#~ "it may not work as expected." -+#~ msgstr "" -+#~ "Het VPN-instellingenbestand ‘%s’ geeft aan dat VPN-verkeer getunnelt moet " -+#~ "worden via TCP hetgeen momenteel nog niet mogelijk is met de vpnc-" -+#~ "software.\n" -+#~ "\n" -+#~ "De verbinding kan evengoed worden gemaakt met TPC-tunneling " -+#~ "uitgeschakeld, maar het werkt mogelijkerwijs niet helemaal correct." -+ -+#~ msgid " " -+#~ msgstr " " -+ -+#~ msgid "Optional" -+#~ msgstr "Optioneel" -+ -+#~ msgid "Disable Dead Peer Detection" -+#~ msgstr "Detectie van ‘Dead peers’ uitschakelen" -+ -+#~ msgid "Encryption method:" -+#~ msgstr "Versleutelingsmethode:" -+ -+#~ msgid "Gro_up password:" -+#~ msgstr "_Groepswachtwoord:" -+ -+#~ msgid "NAT traversal:" -+#~ msgstr "NAT-traversal:" - - #~ msgid "The following vpnc VPN connection will be created:" - #~ msgstr "De volgende vpnc VPN-verbinding zal worden aangemaakt:" -@@ -273,9 +433,6 @@ - #~ "Merk op dat het bestand dat u importeert geen Cisco VPN of VPNC " - #~ "configuratiebestand is. Vraag uw systeembeheerder om het bestand." - --#~ msgid "Use _domain for authentication" --#~ msgstr "_Domein gebruiken voor aanmeldingscontrole" -- - #~ msgid "_Import Saved Configuration..." - #~ msgstr "_Opgeslagen configuratie importeren..." - -@@ -301,12 +458,6 @@ - #~ "kon maken met de VPN-server." - - #~ msgid "" --#~ "The VPN login failed because the VPN configuration options were invalid." --#~ msgstr "" --#~ "Aanmelding bij het VPN is mislukt omdat de VPN-configuratieopties " --#~ "ongeldig waren." -- --#~ msgid "" - #~ "The VPN login failed because the VPN program received an invalid " - #~ "configuration from the VPN server." - #~ msgstr "" -diff -Naur NetworkManager-libreswan-1.2.6-orig/po/pl.po NetworkManager-libreswan-1.2.6/po/pl.po ---- NetworkManager-libreswan-1.2.6-orig/po/pl.po 2016-10-06 08:02:29.000000000 -0400 -+++ NetworkManager-libreswan-1.2.6/po/pl.po 2018-08-21 23:09:09.655783393 -0400 -@@ -1,16 +1,16 @@ --# Polish translation for network-manager-libreswan. --# Copyright © 2008-2016 the network-manager-libreswan authors. --# This file is distributed under the same license as the network-manager-libreswan package. -+# Polish translation for NetworkManager-libreswan. -+# Copyright © 2008-2018 the NetworkManager-libreswan authors. -+# This file is distributed under the same license as the NetworkManager-libreswan package. - # Tomasz Dominikowski , 2008-2009. --# Piotr Drąg , 2011-2016. --# Aviary.pl , 2008-2016. -+# Piotr Drąg , 2011-2018. -+# Aviary.pl , 2008-2018. - # - msgid "" - msgstr "" --"Project-Id-Version: network-manager-libreswan\n" -+"Project-Id-Version: NetworkManager-libreswan\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2016-10-03 21:52+0200\n" --"PO-Revision-Date: 2016-10-03 21:53+0200\n" -+"POT-Creation-Date: 2018-08-12 19:47+0200\n" -+"PO-Revision-Date: 2018-08-12 19:48+0200\n" - "Last-Translator: Piotr Drąg \n" - "Language-Team: Polish \n" - "Language: pl\n" -@@ -79,30 +79,30 @@ - msgstr "VPN oparte na IPsec" - - #: ../properties/nm-libreswan-editor-plugin.c:44 --msgid "IPsec based VPN using IKEv1" --msgstr "VPN oparte na IPsec, używające IKEv1" -+msgid "IPsec based VPN for remote clients" -+msgstr "VPN oparte na IPsec dla zdalnych klientów" - - #: ../properties/nm-libreswan-editor-plugin.c:80 --#: ../properties/nm-libreswan-editor-plugin.c:149 -+#: ../properties/nm-libreswan-editor-plugin.c:158 - #, c-format - msgid "Can’t open file “%s”: %s" - msgstr "Nie można otworzyć pliku „%s”: %s" - --#: ../properties/nm-libreswan-editor-plugin.c:126 -+#: ../properties/nm-libreswan-editor-plugin.c:135 - #, c-format - msgid "Missing “conn” section in “%s”" - msgstr "Brak sekcji „conn” w „%s”" - --#: ../properties/nm-libreswan-editor-plugin.c:167 -+#: ../properties/nm-libreswan-editor-plugin.c:176 - #, c-format - msgid "Error writing to file “%s”: %s" - msgstr "Błąd podczas zapisywania do pliku „%s”: %s" - --#: ../src/nm-libreswan-service.c:1449 -+#: ../src/nm-libreswan-service.c:1463 - msgid "A password is required." - msgstr "Wymagane jest hasło." - --#: ../src/nm-libreswan-service.c:1833 -+#: ../src/nm-libreswan-service.c:1873 - msgid "" - "Could not process the request because the VPN connection settings were " - "invalid." -@@ -110,23 +110,23 @@ - "Nie można przetworzyć żądania, ponieważ ustawienia połączenia VPN są " - "nieprawidłowe." - --#: ../src/nm-libreswan-service.c:1847 -+#: ../src/nm-libreswan-service.c:1887 - msgid "Unhandled pending authentication." - msgstr "Nieobsłużone oczekujące uwierzytelnienie." - --#: ../src/nm-libreswan-service.c:1989 -+#: ../src/nm-libreswan-service.c:2029 - msgid "Don’t quit when VPN connection terminates" - msgstr "Nie kończy działania, kiedy połączenie VPN jest kończone" - --#: ../src/nm-libreswan-service.c:1990 -+#: ../src/nm-libreswan-service.c:2030 - msgid "Enable verbose debug logging (may expose passwords)" - msgstr "Włącza więcej komunikatów debugowania (może wyjawić hasła)" - --#: ../src/nm-libreswan-service.c:1991 -+#: ../src/nm-libreswan-service.c:2031 - msgid "D-Bus name to use for this instance" - msgstr "Nazwa D-Bus dla tego wystąpienia" - --#: ../src/nm-libreswan-service.c:2014 -+#: ../src/nm-libreswan-service.c:2054 - msgid "" - "This service provides integrated IPsec VPN capability to NetworkManager." - msgstr "" -@@ -138,17 +138,17 @@ - msgid "Error writing config: %s" - msgstr "Błąd podczas zapisywania konfiguracji: %s" - --#: ../shared/nm-utils/nm-shared-utils.c:185 -+#: ../shared/nm-utils/nm-shared-utils.c:312 - #, c-format - msgid "object class '%s' has no property named '%s'" - msgstr "klasa obiektów „%s” nie ma właściwości o nazwie „%s”" - --#: ../shared/nm-utils/nm-shared-utils.c:192 -+#: ../shared/nm-utils/nm-shared-utils.c:319 - #, c-format - msgid "property '%s' of object class '%s' is not writable" - msgstr "właściwość „%s” klasy obiektów „%s” nie jest zapisywalna" - --#: ../shared/nm-utils/nm-shared-utils.c:199 -+#: ../shared/nm-utils/nm-shared-utils.c:326 - #, c-format - msgid "" - "construct property \"%s\" for object '%s' can't be set after construction" -@@ -156,19 +156,19 @@ - "właściwość konstruktu „%s” dla obiektu „%s” nie może zostać ustawiona po " - "konstrukcji" - --#: ../shared/nm-utils/nm-shared-utils.c:207 -+#: ../shared/nm-utils/nm-shared-utils.c:334 - #, c-format - msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" - msgstr "" - "„%s::%s” nie jest prawidłową nazwą właściwości; „%s” nie jest podtypem " - "GObject" - --#: ../shared/nm-utils/nm-shared-utils.c:216 -+#: ../shared/nm-utils/nm-shared-utils.c:343 - #, c-format - msgid "unable to set property '%s' of type '%s' from value of type '%s'" - msgstr "nie można ustawić właściwości „%s” typu „%s” z wartości typu „%s”" - --#: ../shared/nm-utils/nm-shared-utils.c:227 -+#: ../shared/nm-utils/nm-shared-utils.c:354 - #, c-format - msgid "" - "value \"%s\" of type '%s' is invalid or out of range for property '%s' of " -@@ -197,45 +197,81 @@ - msgstr "nieznany błąd podczas tworzenia wystąpienia edytora" - - #: ../properties/nm-libreswan-dialog.ui.h:1 --msgid "General" --msgstr "Ogólne" -+msgid "IKEv1 (XAUTH)" -+msgstr "IKEv1 (XAUTH)" - - #: ../properties/nm-libreswan-dialog.ui.h:2 --msgid "_Gateway:" --msgstr "_Brama:" -+msgid "IKEv2 (Certificate)" -+msgstr "IKEv2 (certyfikat)" - - #: ../properties/nm-libreswan-dialog.ui.h:3 --msgid "Show passwords" --msgstr "Wyświetlanie haseł" -+msgid "General" -+msgstr "Ogólne" - - #: ../properties/nm-libreswan-dialog.ui.h:4 --msgid "_Secret:" --msgstr "_Hasło:" -+msgid "_Gateway:" -+msgstr "_Brama:" - - #: ../properties/nm-libreswan-dialog.ui.h:5 --msgid "_User password:" --msgstr "Hasło _użytkownika:" -+msgid "Authentication" -+msgstr "Uwierzytelnianie" - - #: ../properties/nm-libreswan-dialog.ui.h:6 --msgid "G_roup name:" --msgstr "Nazwa g_rupy:" -+msgid "Type:" -+msgstr "Typ:" - - #: ../properties/nm-libreswan-dialog.ui.h:7 - msgid "User name:" - msgstr "Nazwa użytkownika:" - - #: ../properties/nm-libreswan-dialog.ui.h:8 --msgid "Phase2 Algorithms:" --msgstr "Algorytmy fazy drugiej:" -+msgid "_User password:" -+msgstr "Hasło _użytkownika:" - - #: ../properties/nm-libreswan-dialog.ui.h:9 --msgid "Domain:" --msgstr "Domena:" -+msgid "G_roup name:" -+msgstr "Nazwa g_rupy:" - - #: ../properties/nm-libreswan-dialog.ui.h:10 -+msgid "_Secret:" -+msgstr "_Hasło:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:11 -+msgid "Show passwords" -+msgstr "Wyświetlanie haseł" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:12 -+msgid "_Certificate name:" -+msgstr "_Nazwa certyfikatu:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:13 -+msgid "_Remote ID:" -+msgstr "_Zdalny identyfikator:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:14 - msgid "Phase1 Algorithms:" - msgstr "Algorytmy fazy pierwszej:" - --#: ../properties/nm-libreswan-dialog.ui.h:11 -+#: ../properties/nm-libreswan-dialog.ui.h:15 -+msgid "Phase2 Algorithms:" -+msgstr "Algorytmy fazy drugiej:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:16 -+msgid "Domain:" -+msgstr "Domena:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:17 -+msgid "Phase1 Lifetime:" -+msgstr "Czas trwania fazy pierwszej:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:18 -+msgid "Phase2 Lifetime:" -+msgstr "Czas trwania fazy drugiej:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:19 -+msgid "Remote Network:" -+msgstr "Zdalna sieć:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:20 - msgid "Ad_vanced" - msgstr "Zaa_wansowane" -diff -Naur NetworkManager-libreswan-1.2.6-orig/po/pt_BR.po NetworkManager-libreswan-1.2.6/po/pt_BR.po ---- NetworkManager-libreswan-1.2.6-orig/po/pt_BR.po 2016-06-27 12:26:10.000000000 -0400 -+++ NetworkManager-libreswan-1.2.6/po/pt_BR.po 2018-08-21 23:09:09.655783393 -0400 -@@ -1,19 +1,19 @@ - # Brazilian Portuguese translation of NetworkManager-vpnc. --# Copyright (C) 2013 Free Software Foundation, Inc. -+# Copyright (C) 2018 Free Software Foundation, Inc. - # This file is distributed under the same license as the NetworkManager-vpnc package. - # Raphael Higino , 2007. - # Luiz Armesto , 2007. - # Fábio Nogueira - # Henrique P Machado , 2008 - # Enrico Nicoletto , 2013. --# Rafael Fontenelle , 2016. -+# Rafael Fontenelle , 2016-2018. - msgid "" - msgstr "" - "Project-Id-Version: NetworkManager-vpnc\n" --"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=Network" --"Manager&keywords=I18N+L10N&component=VPN: Openswan\n" --"POT-Creation-Date: 2016-06-24 10:16+0000\n" --"PO-Revision-Date: 2016-06-25 20:03-0200\n" -+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=Networ" -+"kManager&keywords=I18N+L10N&component=VPN: libreswan\n" -+"POT-Creation-Date: 2017-10-31 08:58+0000\n" -+"PO-Revision-Date: 2018-01-13 11:42-0200\n" - "Last-Translator: Rafael Fontenelle \n" - "Language-Team: Brazilian Portuguese \n" - "Language: pt_BR\n" -@@ -21,7 +21,7 @@ - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=2; plural=(n > 1);\n" --"X-Generator: Virtaal 0.7.1\n" -+"X-Generator: Virtaal 1.0.0-beta1\n" - "X-Project-Style: gnome\n" - - #: ../appdata/network-manager-libreswan.metainfo.xml.in.h:1 -@@ -31,7 +31,7 @@ - #: ../appdata/network-manager-libreswan.metainfo.xml.in.h:2 - msgid "Libreswan based client for IKEv1 based IPsec virtual private networks" - msgstr "" --"Cliente baseado em Libreswan para redes privadas virtuais IPSec baseadas em " -+"Cliente baseado em Libreswan para redes privadas virtuais IPsec baseadas em " - "IKEv1" - - #: ../appdata/network-manager-libreswan.metainfo.xml.in.h:3 -@@ -73,9 +73,9 @@ - - #: ../auth-dialog/main.c:487 - #, c-format --msgid "You need to authenticate to access the Virtual Private Network '%s'." -+msgid "You need to authenticate to access the Virtual Private Network “%s”." - msgstr "" --"Você precisa se autenticar para acessar a Rede Privada Virtual (VPN) \"%s\"." -+"Você precisa se autenticar para acessar a Rede Privada Virtual (VPN) “%s”." - - #: ../properties/nm-libreswan-editor-plugin.c:43 - msgid "IPsec based VPN" -@@ -86,27 +86,26 @@ - msgstr "VPN baseada em IPsec usando IKEv1" - - #: ../properties/nm-libreswan-editor-plugin.c:80 --#: ../properties/nm-libreswan-editor-plugin.c:149 -+#: ../properties/nm-libreswan-editor-plugin.c:158 - #, c-format --msgid "Can't open file '%s': %s" --msgstr "Não foi possível abrir o arquivo \"%s\": %s" -+msgid "Can’t open file “%s”: %s" -+msgstr "Não foi possível abrir o arquivo “%s”: %s" - --#: ../properties/nm-libreswan-editor-plugin.c:126 -+#: ../properties/nm-libreswan-editor-plugin.c:135 - #, c-format --msgid "Missing \"conn\" section in \"%s\"" --msgstr "Faltando seção \"conn\" em \"%s\"" -+msgid "Missing “conn” section in “%s”" -+msgstr "Faltando seção “conn” em “%s”" - --#: ../properties/nm-libreswan-editor-plugin.c:167 -+#: ../properties/nm-libreswan-editor-plugin.c:176 - #, c-format --#| msgid "Can't open file '%s': %s" --msgid "Error writing to file '%s': %s" --msgstr "Erro ao gravar o arquivo \"%s\": %s" -+msgid "Error writing to file “%s”: %s" -+msgstr "Erro ao gravar o arquivo “%s”: %s" - --#: ../src/nm-libreswan-service.c:1449 -+#: ../src/nm-libreswan-service.c:1452 - msgid "A password is required." - msgstr "A senha é necessária." - --#: ../src/nm-libreswan-service.c:1833 -+#: ../src/nm-libreswan-service.c:1836 - msgid "" - "Could not process the request because the VPN connection settings were " - "invalid." -@@ -114,23 +113,23 @@ - "Não é possível processar a requisição pelo fato da configuração conexão da " - "VPN eram inválidas." - --#: ../src/nm-libreswan-service.c:1847 -+#: ../src/nm-libreswan-service.c:1850 - msgid "Unhandled pending authentication." - msgstr "Autenticação pendente não lidada." - --#: ../src/nm-libreswan-service.c:1989 --msgid "Don't quit when VPN connection terminates" -+#: ../src/nm-libreswan-service.c:1992 -+msgid "Don’t quit when VPN connection terminates" - msgstr "Não sair quando a conexão VPN terminar" - --#: ../src/nm-libreswan-service.c:1990 -+#: ../src/nm-libreswan-service.c:1993 - msgid "Enable verbose debug logging (may expose passwords)" - msgstr "Ativar registro de depuração detalhado (pode expor senhas)" - --#: ../src/nm-libreswan-service.c:1991 -+#: ../src/nm-libreswan-service.c:1994 - msgid "D-Bus name to use for this instance" - msgstr "Nome D-Bus a ser usado para esta instância" - --#: ../src/nm-libreswan-service.c:2014 -+#: ../src/nm-libreswan-service.c:2017 - msgid "" - "This service provides integrated IPsec VPN capability to NetworkManager." - msgstr "" -@@ -142,51 +141,51 @@ - msgid "Error writing config: %s" - msgstr "Erro ao gravar a configuração: %s" - --#: ../shared/nm-utils/nm-shared-utils.c:185 -+#: ../shared/nm-utils/nm-shared-utils.c:312 - #, c-format - msgid "object class '%s' has no property named '%s'" --msgstr "a classe de objeto \"%s\" não possui uma propriedade chamada \"%s\"" -+msgstr "a classe de objeto “%s” não possui uma propriedade chamada “%s”" - --#: ../shared/nm-utils/nm-shared-utils.c:192 -+#: ../shared/nm-utils/nm-shared-utils.c:319 - #, c-format - msgid "property '%s' of object class '%s' is not writable" --msgstr "a propriedade \"%s\" da classe de objeto \"%s\" não pode ser escrita" -+msgstr "a propriedade “%s” da classe de objeto “%s” não pode ser escrita" - --#: ../shared/nm-utils/nm-shared-utils.c:199 -+#: ../shared/nm-utils/nm-shared-utils.c:326 - #, c-format - msgid "" - "construct property \"%s\" for object '%s' can't be set after construction" - msgstr "" --"propriedade de construtor \"%s\" para objeto \"%s\" não pode ser definido " --"após construção" -+"propriedade de construtor “%s” para objeto “%s” não pode ser definido após " -+"construção" - --#: ../shared/nm-utils/nm-shared-utils.c:207 -+#: ../shared/nm-utils/nm-shared-utils.c:334 - #, c-format - msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" - msgstr "" --"\"%s::%s\" não é um nome de propriedade válido; \"%s\" não é um subtipo de " -+"“%s::%s” não é um nome de propriedade válido; “%s” não é um subtipo de " - "GObject" - --#: ../shared/nm-utils/nm-shared-utils.c:216 -+#: ../shared/nm-utils/nm-shared-utils.c:343 - #, c-format - msgid "unable to set property '%s' of type '%s' from value of type '%s'" - msgstr "" --"não foi possível definir a propriedade \"%s\" de tipo \"%s\" a partir do " --"valor de tipo \"%s\"" -+"não foi possível definir a propriedade “%s” de tipo “%s” a partir do valor " -+"de tipo “%s”" - --#: ../shared/nm-utils/nm-shared-utils.c:227 -+#: ../shared/nm-utils/nm-shared-utils.c:354 - #, c-format - msgid "" - "value \"%s\" of type '%s' is invalid or out of range for property '%s' of " - "type '%s'" - msgstr "" --"o valor \"%s\" de tipo \"%s\" é inválido ou fora do intervalo da propriedade " --"\"%s\" de tipo \"%s\"" -+"o valor “%s” de tipo “%s” é inválido ou fora do intervalo da propriedade " -+"“%s” de tipo “%s”" - - #: ../shared/nm-utils/nm-vpn-plugin-utils.c:80 - #, c-format - msgid "missing plugin file \"%s\"" --msgstr "faltando arquivo de plug-in \"%s\"" -+msgstr "faltando arquivo de plug-in “%s”" - - #: ../shared/nm-utils/nm-vpn-plugin-utils.c:86 - #, c-format -@@ -203,8 +202,8 @@ - msgstr "erro desconhecido ao criar instância de editor" - - #: ../properties/nm-libreswan-dialog.ui.h:1 --msgid "General" --msgstr "Geral" -+msgid "General" -+msgstr "Geral" - - #: ../properties/nm-libreswan-dialog.ui.h:2 - msgid "_Gateway:" -@@ -243,15 +242,26 @@ - msgstr "Algoritmos da fase 1:" - - #: ../properties/nm-libreswan-dialog.ui.h:11 --msgid "Ad_vanced" --msgstr "A_vançado" -+#| msgid "Phase1 Algorithms:" -+msgid "Phase1 Lifetime:" -+msgstr "Tempo de vida da fase 1:" - - #: ../properties/nm-libreswan-dialog.ui.h:12 --msgid " " --msgstr " " -+#| msgid "Phase2 Algorithms:" -+msgid "Phase2 Lifetime:" -+msgstr "Tempo de vida da fase 2:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:13 -+#| msgid "Network" -+msgid "Remote Network:" -+msgstr "Rede remota:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:14 -+msgid "Ad_vanced" -+msgstr "A_vançado" - --#~ msgid "Network" --#~ msgstr "Rede" -+#~ msgid " " -+#~ msgstr " " - - #~ msgid "Request VPN authentication" - #~ msgstr "Solicitar autenticação de VPN" -diff -Naur NetworkManager-libreswan-1.2.6-orig/po/sr@latin.po NetworkManager-libreswan-1.2.6/po/sr@latin.po ---- NetworkManager-libreswan-1.2.6-orig/po/sr@latin.po 2016-09-07 12:13:04.000000000 -0400 -+++ NetworkManager-libreswan-1.2.6/po/sr@latin.po 2018-08-21 23:09:09.656783438 -0400 -@@ -1,15 +1,15 @@ - # Serbian translation for network-manager-libreswan. --# Courtesy of Prevod.org team (http://prevod.org/) -- 2013—2016. --# Copyright (C) 2013 network-manager-libreswan's COPYRIGHT HOLDER -+# Courtesy of Prevod.org team (http://prevod.org/) -- 2013—2018. -+# Copyright © 2013 network-manager-libreswan's COPYRIGHT HOLDER - # This file is distributed under the same license as the network-manager-libreswan package. --# Miroslav Nikolić , 2013—2016. -+# Miroslav Nikolić , 2013—2018. - msgid "" - msgstr "" - "Project-Id-Version: network-manager-libreswan master\n" --"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=Network" --"Manager&keywords=I18N+L10N&component=VPN: Openswan\n" --"POT-Creation-Date: 2016-07-13 11:28+0000\n" --"PO-Revision-Date: 2016-08-26 06:04+0200\n" -+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=Networ" -+"kManager&keywords=I18N+L10N&component=VPN: libreswan\n" -+"POT-Creation-Date: 2017-10-31 08:58+0000\n" -+"PO-Revision-Date: 2018-02-24 19:47+0200\n" - "Last-Translator: Miroslav Nikolić \n" - "Language-Team: srpski \n" - "Language: sr\n" -@@ -69,7 +69,7 @@ - - #: ../auth-dialog/main.c:487 - #, c-format --msgid "You need to authenticate to access the Virtual Private Network '%s'." -+msgid "You need to authenticate to access the Virtual Private Network “%s”." - msgstr "" - "Morate da potvrdite identitet da biste mogli da pristupite virtuelnoj " - "privatnoj mreži „%s“." -@@ -83,49 +83,48 @@ - msgstr "VPN zasnovan na IPsec-u koristeći IKEv1" - - #: ../properties/nm-libreswan-editor-plugin.c:80 --#: ../properties/nm-libreswan-editor-plugin.c:149 -+#: ../properties/nm-libreswan-editor-plugin.c:158 - #, c-format --msgid "Can't open file '%s': %s" -+msgid "Can’t open file “%s”: %s" - msgstr "Ne mogu da otvorim datoteku „%s“: %s" - --#: ../properties/nm-libreswan-editor-plugin.c:126 -+#: ../properties/nm-libreswan-editor-plugin.c:135 - #, c-format --msgid "Missing \"conn\" section in \"%s\"" -+msgid "Missing “conn” section in “%s”" - msgstr "Nedostaje odeljak „conn“ u „%s“" - --#: ../properties/nm-libreswan-editor-plugin.c:167 -+#: ../properties/nm-libreswan-editor-plugin.c:176 - #, c-format --#| msgid "Can't open file '%s': %s" --msgid "Error writing to file '%s': %s" -+msgid "Error writing to file “%s”: %s" - msgstr "Greška pisanja u datoteku „%s“: %s" - --#: ../src/nm-libreswan-service.c:1449 -+#: ../src/nm-libreswan-service.c:1452 - msgid "A password is required." - msgstr "Potrebna je lozinka." - --#: ../src/nm-libreswan-service.c:1833 -+#: ../src/nm-libreswan-service.c:1836 - msgid "" - "Could not process the request because the VPN connection settings were " - "invalid." - msgstr "Ne mogu da obradim zahtev zato što su podešavanja VPN veze neispravna." - --#: ../src/nm-libreswan-service.c:1847 -+#: ../src/nm-libreswan-service.c:1850 - msgid "Unhandled pending authentication." - msgstr "Zakazano potvrđivanje identiteta nije ispravno." - --#: ../src/nm-libreswan-service.c:1989 --msgid "Don't quit when VPN connection terminates" -+#: ../src/nm-libreswan-service.c:1992 -+msgid "Don’t quit when VPN connection terminates" - msgstr "Ne prekida kada se završi VPN veza" - --#: ../src/nm-libreswan-service.c:1990 -+#: ../src/nm-libreswan-service.c:1993 - msgid "Enable verbose debug logging (may expose passwords)" - msgstr "Uključuje opširno zapisivanje pročišćavanja (može da izloži lozinke)" - --#: ../src/nm-libreswan-service.c:1991 -+#: ../src/nm-libreswan-service.c:1994 - msgid "D-Bus name to use for this instance" - msgstr "Naziv D-sabirnice koji se koristi za ovaj primerak" - --#: ../src/nm-libreswan-service.c:2014 -+#: ../src/nm-libreswan-service.c:2017 - msgid "" - "This service provides integrated IPsec VPN capability to NetworkManager." - msgstr "Ova usluga obezbeđuje Upravniku mreže objedinjenu IPsec VPN mogućnost." -@@ -135,33 +134,33 @@ - msgid "Error writing config: %s" - msgstr "Greška pisanja podešavanja: %s" - --#: ../shared/nm-utils/nm-shared-utils.c:185 -+#: ../shared/nm-utils/nm-shared-utils.c:312 - #, c-format - msgid "object class '%s' has no property named '%s'" - msgstr "klasa objekta „%s“ nema svojstvo sa nazivom „%s“" - --#: ../shared/nm-utils/nm-shared-utils.c:192 -+#: ../shared/nm-utils/nm-shared-utils.c:319 - #, c-format - msgid "property '%s' of object class '%s' is not writable" - msgstr "svojstvo „%s“ klase objekta „%s“ nije upisivo" - --#: ../shared/nm-utils/nm-shared-utils.c:199 -+#: ../shared/nm-utils/nm-shared-utils.c:326 - #, c-format - msgid "" - "construct property \"%s\" for object '%s' can't be set after construction" - msgstr "svojstvo tvorbe „%s“ za objekat „%s“ se ne može postaviti nakon tvorbe" - --#: ../shared/nm-utils/nm-shared-utils.c:207 -+#: ../shared/nm-utils/nm-shared-utils.c:334 - #, c-format - msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" - msgstr "„%s::%s“ nije ispravan naziv svojstva; „%s“ nije podvrsta Gobjekta" - --#: ../shared/nm-utils/nm-shared-utils.c:216 -+#: ../shared/nm-utils/nm-shared-utils.c:343 - #, c-format - msgid "unable to set property '%s' of type '%s' from value of type '%s'" - msgstr "ne mogu da postavim svojstvo „%s“ vrste „%s“ iz vrednosti vrste „%s“" - --#: ../shared/nm-utils/nm-shared-utils.c:227 -+#: ../shared/nm-utils/nm-shared-utils.c:354 - #, c-format - msgid "" - "value \"%s\" of type '%s' is invalid or out of range for property '%s' of " -@@ -190,8 +189,8 @@ - msgstr "nepoznata greška prilikom stvaranja primerka uređivača" - - #: ../properties/nm-libreswan-dialog.ui.h:1 --msgid "General" --msgstr "Opšte" -+msgid "General" -+msgstr "Opšte" - - #: ../properties/nm-libreswan-dialog.ui.h:2 - msgid "_Gateway:" -@@ -230,15 +229,26 @@ - msgstr "Algoritmi faze 1:" - - #: ../properties/nm-libreswan-dialog.ui.h:11 --msgid "Ad_vanced" --msgstr "_Napredno" -+#| msgid "Phase1 Algorithms:" -+msgid "Phase1 Lifetime:" -+msgstr "Vreme trajanja faze 1:" - - #: ../properties/nm-libreswan-dialog.ui.h:12 --msgid " " --msgstr " " -+#| msgid "Phase2 Algorithms:" -+msgid "Phase2 Lifetime:" -+msgstr "Vreme trajanja faze 2:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:13 -+#| msgid "Network" -+msgid "Remote Network:" -+msgstr "Udaljena mreža:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:14 -+msgid "Ad_vanced" -+msgstr "_Napredno" - --#~ msgid "Network" --#~ msgstr "Mreža" -+#~ msgid " " -+#~ msgstr " " - - #~ msgid "Request VPN authentication" - #~ msgstr "Zahtevaj VPN potvrđivanje identiteta" -diff -Naur NetworkManager-libreswan-1.2.6-orig/po/sr.po NetworkManager-libreswan-1.2.6/po/sr.po ---- NetworkManager-libreswan-1.2.6-orig/po/sr.po 2016-09-07 12:13:04.000000000 -0400 -+++ NetworkManager-libreswan-1.2.6/po/sr.po 2018-08-21 23:09:09.656783438 -0400 -@@ -1,15 +1,15 @@ - # Serbian translation for network-manager-libreswan. --# Courtesy of Prevod.org team (http://prevod.org/) -- 2013—2016. --# Copyright (C) 2013 network-manager-libreswan's COPYRIGHT HOLDER -+# Courtesy of Prevod.org team (http://prevod.org/) -- 2013—2018. -+# Copyright © 2013 network-manager-libreswan's COPYRIGHT HOLDER - # This file is distributed under the same license as the network-manager-libreswan package. --# Мирослав Николић , 2013—2016. -+# Мирослав Николић , 2013—2018. - msgid "" - msgstr "" - "Project-Id-Version: network-manager-libreswan master\n" --"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=Network" --"Manager&keywords=I18N+L10N&component=VPN: Openswan\n" --"POT-Creation-Date: 2016-07-13 11:28+0000\n" --"PO-Revision-Date: 2016-08-26 06:04+0200\n" -+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=Networ" -+"kManager&keywords=I18N+L10N&component=VPN: libreswan\n" -+"POT-Creation-Date: 2017-10-31 08:58+0000\n" -+"PO-Revision-Date: 2018-02-24 19:47+0200\n" - "Last-Translator: Мирослав Николић \n" - "Language-Team: српски \n" - "Language: sr\n" -@@ -69,7 +69,7 @@ - - #: ../auth-dialog/main.c:487 - #, c-format --msgid "You need to authenticate to access the Virtual Private Network '%s'." -+msgid "You need to authenticate to access the Virtual Private Network “%s”." - msgstr "" - "Морате да потврдите идентитет да бисте могли да приступите виртуелној " - "приватној мрежи „%s“." -@@ -83,49 +83,48 @@ - msgstr "ВПН заснован на ИПсец-у користећи ИКЕв1" - - #: ../properties/nm-libreswan-editor-plugin.c:80 --#: ../properties/nm-libreswan-editor-plugin.c:149 -+#: ../properties/nm-libreswan-editor-plugin.c:158 - #, c-format --msgid "Can't open file '%s': %s" -+msgid "Can’t open file “%s”: %s" - msgstr "Не могу да отворим датотеку „%s“: %s" - --#: ../properties/nm-libreswan-editor-plugin.c:126 -+#: ../properties/nm-libreswan-editor-plugin.c:135 - #, c-format --msgid "Missing \"conn\" section in \"%s\"" -+msgid "Missing “conn” section in “%s”" - msgstr "Недостаје одељак „conn“ у „%s“" - --#: ../properties/nm-libreswan-editor-plugin.c:167 -+#: ../properties/nm-libreswan-editor-plugin.c:176 - #, c-format --#| msgid "Can't open file '%s': %s" --msgid "Error writing to file '%s': %s" -+msgid "Error writing to file “%s”: %s" - msgstr "Грешка писања у датотеку „%s“: %s" - --#: ../src/nm-libreswan-service.c:1449 -+#: ../src/nm-libreswan-service.c:1452 - msgid "A password is required." - msgstr "Потребна је лозинка." - --#: ../src/nm-libreswan-service.c:1833 -+#: ../src/nm-libreswan-service.c:1836 - msgid "" - "Could not process the request because the VPN connection settings were " - "invalid." - msgstr "Не могу да обрадим захтев зато што су подешавања ВПН везе неисправна." - --#: ../src/nm-libreswan-service.c:1847 -+#: ../src/nm-libreswan-service.c:1850 - msgid "Unhandled pending authentication." - msgstr "Заказано потврђивање идентитета није исправно." - --#: ../src/nm-libreswan-service.c:1989 --msgid "Don't quit when VPN connection terminates" -+#: ../src/nm-libreswan-service.c:1992 -+msgid "Don’t quit when VPN connection terminates" - msgstr "Не прекида када се заврши ВПН веза" - --#: ../src/nm-libreswan-service.c:1990 -+#: ../src/nm-libreswan-service.c:1993 - msgid "Enable verbose debug logging (may expose passwords)" - msgstr "Укључује опширно записивање прочишћавања (може да изложи лозинке)" - --#: ../src/nm-libreswan-service.c:1991 -+#: ../src/nm-libreswan-service.c:1994 - msgid "D-Bus name to use for this instance" - msgstr "Назив Д-сабирнице који се користи за овај примерак" - --#: ../src/nm-libreswan-service.c:2014 -+#: ../src/nm-libreswan-service.c:2017 - msgid "" - "This service provides integrated IPsec VPN capability to NetworkManager." - msgstr "Ова услуга обезбеђује Управнику мреже обједињену ИПсец ВПН могућност." -@@ -135,33 +134,33 @@ - msgid "Error writing config: %s" - msgstr "Грешка писања подешавања: %s" - --#: ../shared/nm-utils/nm-shared-utils.c:185 -+#: ../shared/nm-utils/nm-shared-utils.c:312 - #, c-format - msgid "object class '%s' has no property named '%s'" - msgstr "класа објекта „%s“ нема својство са називом „%s“" - --#: ../shared/nm-utils/nm-shared-utils.c:192 -+#: ../shared/nm-utils/nm-shared-utils.c:319 - #, c-format - msgid "property '%s' of object class '%s' is not writable" - msgstr "својство „%s“ класе објекта „%s“ није уписиво" - --#: ../shared/nm-utils/nm-shared-utils.c:199 -+#: ../shared/nm-utils/nm-shared-utils.c:326 - #, c-format - msgid "" - "construct property \"%s\" for object '%s' can't be set after construction" - msgstr "својство творбе „%s“ за објекат „%s“ се не може поставити након творбе" - --#: ../shared/nm-utils/nm-shared-utils.c:207 -+#: ../shared/nm-utils/nm-shared-utils.c:334 - #, c-format - msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" - msgstr "„%s::%s“ није исправан назив својства; „%s“ није подврста Гобјекта" - --#: ../shared/nm-utils/nm-shared-utils.c:216 -+#: ../shared/nm-utils/nm-shared-utils.c:343 - #, c-format - msgid "unable to set property '%s' of type '%s' from value of type '%s'" - msgstr "не могу да поставим својство „%s“ врсте „%s“ из вредности врсте „%s“" - --#: ../shared/nm-utils/nm-shared-utils.c:227 -+#: ../shared/nm-utils/nm-shared-utils.c:354 - #, c-format - msgid "" - "value \"%s\" of type '%s' is invalid or out of range for property '%s' of " -@@ -190,8 +189,8 @@ - msgstr "непозната грешка приликом стварања примерка уређивача" - - #: ../properties/nm-libreswan-dialog.ui.h:1 --msgid "General" --msgstr "Опште" -+msgid "General" -+msgstr "Опште" - - #: ../properties/nm-libreswan-dialog.ui.h:2 - msgid "_Gateway:" -@@ -230,15 +229,26 @@ - msgstr "Алгоритми фазе 1:" - - #: ../properties/nm-libreswan-dialog.ui.h:11 --msgid "Ad_vanced" --msgstr "_Напредно" -+#| msgid "Phase1 Algorithms:" -+msgid "Phase1 Lifetime:" -+msgstr "Време трајања фазе 1:" - - #: ../properties/nm-libreswan-dialog.ui.h:12 --msgid " " --msgstr " " -+#| msgid "Phase2 Algorithms:" -+msgid "Phase2 Lifetime:" -+msgstr "Време трајања фазе 2:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:13 -+#| msgid "Network" -+msgid "Remote Network:" -+msgstr "Удаљена мрежа:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:14 -+msgid "Ad_vanced" -+msgstr "_Напредно" - --#~ msgid "Network" --#~ msgstr "Мрежа" -+#~ msgid " " -+#~ msgstr " " - - #~ msgid "Request VPN authentication" - #~ msgstr "Захтевај ВПН потврђивање идентитета" -diff -Naur NetworkManager-libreswan-1.2.6-orig/po/sv.po NetworkManager-libreswan-1.2.6/po/sv.po ---- NetworkManager-libreswan-1.2.6-orig/po/sv.po 2017-01-04 04:48:44.000000000 -0500 -+++ NetworkManager-libreswan-1.2.6/po/sv.po 2018-08-21 23:09:09.657783484 -0400 -@@ -1,23 +1,25 @@ - # Swedish messages for NetworkManager-vpnc. --# Copyright © 2004-2016 Free Software Foundation, Inc. -+# Copyright © 2004-2018 Free Software Foundation, Inc. - # Daniel Nylander , 2006, 2007, 2008. - # Christian Rose , 2004, 2005, 2006. - # Josef Andersson , 2014. -+# Anders Jonsson , 2018. -+# - msgid "" - msgstr "" - "Project-Id-Version: NetworkManager-vpnc\n" --"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" - "product=NetworkManager&keywords=I18N+L10N&component=VPN: libreswan\n" --"POT-Creation-Date: 2016-10-13 14:30+0000\n" --"PO-Revision-Date: 2017-01-03 00:06+0100\n" --"Last-Translator: Josef Andersson \n" -+"POT-Creation-Date: 2017-10-31 08:58+0000\n" -+"PO-Revision-Date: 2018-03-12 00:18+0100\n" -+"Last-Translator: Anders Jonsson \n" - "Language-Team: Swedish \n" - "Language: sv\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=2; plural=(n != 1);\n" --"X-Generator: Poedit 1.8.11\n" -+"X-Generator: Poedit 2.0.6\n" - "X-Project-Style: gnome\n" - - #: ../appdata/network-manager-libreswan.metainfo.xml.in.h:1 -@@ -81,26 +83,26 @@ - msgstr "IPsec-baserad VPN som använder IKEv1" - - #: ../properties/nm-libreswan-editor-plugin.c:80 --#: ../properties/nm-libreswan-editor-plugin.c:149 -+#: ../properties/nm-libreswan-editor-plugin.c:158 - #, c-format - msgid "Can’t open file “%s”: %s" - msgstr "Kan inte öppna filen ”%s”: %s" - --#: ../properties/nm-libreswan-editor-plugin.c:126 -+#: ../properties/nm-libreswan-editor-plugin.c:135 - #, c-format - msgid "Missing “conn” section in “%s”" - msgstr "Saknar avsnittet ”conn” i ”%s”" - --#: ../properties/nm-libreswan-editor-plugin.c:167 -+#: ../properties/nm-libreswan-editor-plugin.c:176 - #, c-format - msgid "Error writing to file “%s”: %s" - msgstr "Fel vid skrivning till filen ”%s”: %s" - --#: ../src/nm-libreswan-service.c:1449 -+#: ../src/nm-libreswan-service.c:1452 - msgid "A password is required." - msgstr "Ett lösenord krävs." - --#: ../src/nm-libreswan-service.c:1833 -+#: ../src/nm-libreswan-service.c:1836 - msgid "" - "Could not process the request because the VPN connection settings were " - "invalid." -@@ -108,23 +110,23 @@ - "Kunde inte bearbeta begäran eftersom VPN-anslutningsalternativen var " - "ogiltiga." - --#: ../src/nm-libreswan-service.c:1847 -+#: ../src/nm-libreswan-service.c:1850 - msgid "Unhandled pending authentication." - msgstr "Ohanterad väntande autentisering." - --#: ../src/nm-libreswan-service.c:1989 -+#: ../src/nm-libreswan-service.c:1992 - msgid "Don’t quit when VPN connection terminates" - msgstr "Avsluta inte när VPN-anslutningen termineras" - --#: ../src/nm-libreswan-service.c:1990 -+#: ../src/nm-libreswan-service.c:1993 - msgid "Enable verbose debug logging (may expose passwords)" - msgstr "Aktivera utförlig loggning (kan avslöja lösenord)" - --#: ../src/nm-libreswan-service.c:1991 -+#: ../src/nm-libreswan-service.c:1994 - msgid "D-Bus name to use for this instance" - msgstr "D-Bus-namn att använda för denna instans" - --#: ../src/nm-libreswan-service.c:2014 -+#: ../src/nm-libreswan-service.c:2017 - msgid "" - "This service provides integrated IPsec VPN capability to NetworkManager." - msgstr "" -@@ -136,17 +138,17 @@ - msgid "Error writing config: %s" - msgstr "Fel vid skrivning av konfiguration: %s" - --#: ../shared/nm-utils/nm-shared-utils.c:185 -+#: ../shared/nm-utils/nm-shared-utils.c:312 - #, c-format - msgid "object class '%s' has no property named '%s'" - msgstr "objektklassen ”%s” har ingen egenskap med namn ”%s”" - --#: ../shared/nm-utils/nm-shared-utils.c:192 -+#: ../shared/nm-utils/nm-shared-utils.c:319 - #, c-format - msgid "property '%s' of object class '%s' is not writable" - msgstr "egenskapen ”%s” för objektklassen ”%s” är skrivskyddad" - --#: ../shared/nm-utils/nm-shared-utils.c:199 -+#: ../shared/nm-utils/nm-shared-utils.c:326 - #, c-format - msgid "" - "construct property \"%s\" for object '%s' can't be set after construction" -@@ -154,19 +156,19 @@ - "konstruktoregenskapen ”%s” för objektet ”%s” kan inte anges efter " - "konstruktion" - --#: ../shared/nm-utils/nm-shared-utils.c:207 -+#: ../shared/nm-utils/nm-shared-utils.c:334 - #, c-format - msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" - msgstr "" - "”%s::%s'” är inte ett giltigt egenskapsnamn; ”%s” är inte en GObject-undertyp" - --#: ../shared/nm-utils/nm-shared-utils.c:216 -+#: ../shared/nm-utils/nm-shared-utils.c:343 - #, c-format - msgid "unable to set property '%s' of type '%s' from value of type '%s'" - msgstr "" - "kunde inte ange egenskapen ”%s” för typen ”%s” från värdet av typen ”%s”" - --#: ../shared/nm-utils/nm-shared-utils.c:227 -+#: ../shared/nm-utils/nm-shared-utils.c:354 - #, c-format - msgid "" - "value \"%s\" of type '%s' is invalid or out of range for property '%s' of " -@@ -235,12 +237,21 @@ - msgstr "Phase1-algoritmer:" - - #: ../properties/nm-libreswan-dialog.ui.h:11 -+msgid "Phase1 Lifetime:" -+msgstr "Phase1-livslängd:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:12 -+msgid "Phase2 Lifetime:" -+msgstr "Phase2-livslängd:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:13 -+msgid "Remote Network:" -+msgstr "Fjärrnätverk:" -+ -+#: ../properties/nm-libreswan-dialog.ui.h:14 - msgid "Ad_vanced" - msgstr "Av_ancerad" - --#~ msgid "Network" --#~ msgstr "Nätverk" -- - #~ msgid "Request VPN authentication" - #~ msgstr "Begär VPN-autentisering" - -diff -Naur NetworkManager-libreswan-1.2.6-orig/properties/Makefile.am NetworkManager-libreswan-1.2.6/properties/Makefile.am ---- NetworkManager-libreswan-1.2.6-orig/properties/Makefile.am 2016-09-07 12:58:07.000000000 -0400 -+++ NetworkManager-libreswan-1.2.6/properties/Makefile.am 1969-12-31 19:00:00.000000000 -0500 -@@ -1,108 +0,0 @@ --plugindir = $(libdir)/NetworkManager --plugin_LTLIBRARIES = libnm-vpn-plugin-libreswan.la --if WITH_GNOME --plugin_LTLIBRARIES += libnm-vpn-plugin-libreswan-editor.la --if WITH_LIBNM_GLIB --plugin_LTLIBRARIES += libnm-libreswan-properties.la --endif --endif -- --plugin_sources = \ -- nm-libreswan-editor-plugin.c \ -- nm-libreswan-editor-plugin.h -- --editor_sources = \ -- nm-libreswan-editor.c \ -- nm-libreswan-editor.h -- --uidir = $(datadir)/gnome-vpn-properties/libreswan --if WITH_GNOME --ui_DATA = nm-libreswan-dialog.ui --endif -- --common_CFLAGS = \ -- $(GLIB_CFLAGS) \ -- -I"$(top_srcdir)/shared/" \ -- -DICONDIR=\""$(datadir)/pixmaps"\" \ -- -DUIDIR=\""$(uidir)"\" \ -- -DLOCALEDIR=\"$(datadir)/locale\" -- --############################################################################### -- --libnm_vpn_plugin_libreswan_la_CFLAGS = \ -- -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_BASE \ -- -DNM_PLUGIN_DIR=\"$(NM_PLUGIN_DIR)\" \ -- $(common_CFLAGS) \ -- $(LIBNM_CFLAGS) -- --libnm_vpn_plugin_libreswan_la_SOURCES = \ -- $(top_srcdir)/shared/utils.c \ -- $(top_srcdir)/shared/utils.h \ -- $(top_srcdir)/shared/nm-utils/nm-vpn-plugin-utils.c \ -- $(top_srcdir)/shared/nm-utils/nm-vpn-plugin-utils.h \ -- $(plugin_sources) -- --libnm_vpn_plugin_libreswan_la_LIBADD = \ -- $(LIBNM_LIBS) \ -- $(DL_LIBS) \ -- $(NULL) -- --libnm_vpn_plugin_libreswan_la_LDFLAGS = \ -- -avoid-version \ -- -Wl,--version-script="$(srcdir)/libnm-vpn-plugin-libreswan.ver" -- --############################################################################### -- --libnm_vpn_plugin_libreswan_editor_la_CFLAGS = \ -- -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_EDITOR \ -- $(common_CFLAGS) \ -- $(GTK_CFLAGS) \ -- $(LIBNM_CFLAGS) \ -- $(LIBNMA_CFLAGS) -- --libnm_vpn_plugin_libreswan_editor_la_SOURCES = \ -- $(editor_sources) -- --libnm_vpn_plugin_libreswan_editor_la_LIBADD = \ -- $(GTK_LIBS) \ -- $(LIBNM_LIBS) \ -- $(LIBNMA_LIBS) -- --libnm_vpn_plugin_libreswan_editor_la_LDFLAGS = \ -- -avoid-version \ -- -Wl,--version-script="$(srcdir)/libnm-vpn-plugin-libreswan-editor.ver" -- --############################################################################### -- --libnm_libreswan_properties_la_CFLAGS = \ -- -DNM_VPN_OLD \ -- -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ -- $(common_CFLAGS) \ -- $(GTK_CFLAGS) \ -- $(LIBNM_GLIB_CFLAGS) \ -- $(LIBNM_GTK_CFLAGS) -- --libnm_libreswan_properties_la_SOURCES = \ -- $(top_srcdir)/shared/utils.c \ -- $(top_srcdir)/shared/utils.h \ -- $(plugin_sources) \ -- $(editor_sources) -- --libnm_libreswan_properties_la_LIBADD = \ -- $(GTK_LIBS) \ -- $(LIBNM_GLIB_LIBS) \ -- $(LIBNM_GTK_LIBS) -- --libnm_libreswan_properties_la_LDFLAGS = \ -- -avoid-version \ -- -Wl,--version-script="$(srcdir)/libnm-libreswan-properties.ver" -- --############################################################################### -- --CLEANFILES = *.bak *~ -- --EXTRA_DIST = \ -- libnm-libreswan-properties.ver \ -- libnm-vpn-plugin-libreswan.ver \ -- libnm-vpn-plugin-libreswan-editor.ver \ -- nm-libreswan-dialog.ui -diff -Naur NetworkManager-libreswan-1.2.6-orig/properties/nm-libreswan-dialog.ui NetworkManager-libreswan-1.2.6/properties/nm-libreswan-dialog.ui ---- NetworkManager-libreswan-1.2.6-orig/properties/nm-libreswan-dialog.ui 2016-10-06 08:02:29.000000000 -0400 -+++ NetworkManager-libreswan-1.2.6/properties/nm-libreswan-dialog.ui 2018-08-21 23:09:09.658783529 -0400 -@@ -1,7 +1,21 @@ - -- -+ - - -+ -+ -+ -+ -+ -+ -+ -+ IKEv1 (XAUTH) -+ -+ -+ IKEv2 (Certificate) -+ -+ -+ - - True - False -@@ -9,13 +23,13 @@ - vertical - 16 - -- -+ - True - False - vertical - 6 - -- -+ - True - False - General -@@ -31,7 +45,7 @@ - - - -- -+ - True - False - 12 -@@ -40,7 +54,7 @@ - 6 - 16 - -- -+ - True - False - _Gateway: -@@ -54,51 +68,128 @@ - - - -- -- Show passwords -- False -+ - True - True -- False -- 0 -- True -+ end -+ True - - - 1 -- 5 -+ 0 - - -+ -+ -+ False -+ True -+ 1 -+ -+ -+ -+ -+ False -+ True -+ 0 -+ -+ -+ -+ -+ True -+ False -+ vertical -+ 6 -+ -+ -+ True -+ False -+ Authentication -+ 0 -+ -+ -+ -+ -+ -+ False -+ False -+ 0 -+ -+ -+ -+ -+ True -+ False -+ 12 -+ 12 -+ vertical -+ 6 -+ 16 - -- -+ - True -- True -+ False -+ Type: -+ 0 -+ -+ -+ 0 -+ 0 -+ -+ -+ -+ -+ True -+ False - True -- False -+ liststore_authtype -+ -+ -+ -+ 0 -+ -+ - - - 1 -- 4 -+ 0 - - - -- -+ - True - False -- _Secret: -+ True -+ User name: - True -+ user_entry - 0 - - - 0 -- 4 -+ 1 -+ -+ -+ -+ -+ True -+ True -+ True -+ True -+ ● -+ -+ -+ 1 -+ 1 - - - -- -+ - True - False -+ True - _User password: - True -+ user_password_entry - 0 - - -@@ -110,6 +201,7 @@ - - True - True -+ True - True - False - -@@ -119,11 +211,13 @@ - - - -- -+ - True - False -+ True - G_roup name: - True -+ group_entry - 0 - - -@@ -135,6 +229,7 @@ - - True - True -+ True - True - - -@@ -143,39 +238,101 @@ - - - -- -+ - True - False -- User name: -+ True -+ _Secret: -+ True -+ group_password_entry - 0 - - - 0 -- 1 -+ 4 - - - -- -+ - True - True -+ True - True -- ● -+ False - - - 1 -- 1 -+ 4 - - - -- -+ -+ Show passwords -+ False - True - True -- end -+ False -+ True -+ 0.5 -+ True -+ -+ -+ 1 -+ 5 -+ -+ -+ -+ -+ True -+ False -+ True -+ _Certificate name: -+ True -+ cert_entry -+ 0 -+ -+ -+ 0 -+ 6 -+ -+ -+ -+ -+ True -+ True -+ True - True - - - 1 -- 0 -+ 6 -+ -+ -+ -+ -+ True -+ False -+ True -+ _Remote ID: -+ True -+ remoteid_entry -+ 0 -+ -+ -+ 0 -+ 7 -+ -+ -+ -+ -+ True -+ True -+ True -+ True -+ -+ -+ 1 -+ 7 - - - -@@ -192,7 +349,7 @@ - - False - False -- 0 -+ 1 - - - -@@ -202,7 +359,7 @@ - True - True - -- -+ - True - False - 12 -@@ -211,10 +368,38 @@ - 6 - 16 - -- -+ -+ True -+ False -+ Phase1 Algorithms: -+ True -+ phase1_entry -+ 0 -+ -+ -+ 0 -+ 0 -+ -+ -+ -+ -+ True -+ True -+ True -+ ● -+ -+ -+ 1 -+ 0 -+ -+ -+ -+ - True - False - Phase2 Algorithms: -+ True -+ phase2_entry - 0 - - -@@ -223,10 +408,24 @@ - - - -- -+ -+ True -+ True -+ True -+ ● -+ -+ -+ 1 -+ 1 -+ -+ -+ -+ - True - False - Domain: -+ True -+ domain_entry - 0 - - -@@ -235,7 +434,7 @@ - - - -- -+ - True - True - True -@@ -243,49 +442,86 @@ - - - 1 -- 0 -+ 2 - - - -- -+ -+ True -+ False -+ Phase1 Lifetime: -+ True -+ phase1_lifetime_entry -+ 0 -+ -+ -+ 0 -+ 3 -+ -+ -+ -+ - True - True -- True -- ● - - - 1 -- 1 -+ 3 - - - -- -+ -+ True -+ False -+ Phase2 Lifetime: -+ True -+ phase2_lifetime_entry -+ True -+ 0 -+ -+ -+ 0 -+ 4 -+ -+ -+ -+ - True - True -- True -- ● - - - 1 -- 2 -+ 4 - - - -- -+ - True - False -- Phase1 Algorithms: -+ Remote Network: -+ True -+ remote_network_entry - 0 - - - 0 -- 0 -+ 5 -+ -+ -+ -+ -+ True -+ True -+ -+ -+ 1 -+ 5 - - - - - -- -+ - True - False - Ad_vanced -@@ -297,30 +533,19 @@ - - False - False -- 1 -+ 2 - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - -diff -Naur NetworkManager-libreswan-1.2.6-orig/properties/nm-libreswan-editor.c NetworkManager-libreswan-1.2.6/properties/nm-libreswan-editor.c ---- NetworkManager-libreswan-1.2.6-orig/properties/nm-libreswan-editor.c 2016-06-24 06:16:16.000000000 -0400 -+++ NetworkManager-libreswan-1.2.6/properties/nm-libreswan-editor.c 2018-08-21 23:09:09.659783575 -0400 -@@ -56,6 +56,8 @@ - GtkSizeGroup *group; - } LibreswanEditorPrivate; - -+#define TYPE_IKEV1_XAUTH 0 -+#define TYPE_IKEV2_CERT 1 - - static gboolean - check_validity (LibreswanEditor *self, GError **error) -@@ -63,6 +65,7 @@ - LibreswanEditorPrivate *priv = LIBRESWAN_EDITOR_GET_PRIVATE (self); - GtkWidget *widget; - char *str; -+ int contype; - - widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "gateway_entry")); - str = (char *) gtk_entry_get_text (GTK_ENTRY (widget)); -@@ -74,6 +77,21 @@ - return FALSE; - } - -+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "type_combo")); -+ contype = gtk_combo_box_get_active (GTK_COMBO_BOX (widget)); -+ -+ if (contype == TYPE_IKEV2_CERT) { -+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "cert_entry")); -+ str = (char *) gtk_entry_get_text (GTK_ENTRY (widget)); -+ if (!str || !strlen (str) || strstr (str, " ") || strstr (str, "\t")) { -+ g_set_error (error, -+ NMV_EDITOR_PLUGIN_ERROR, -+ NMV_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY, -+ NM_LIBRESWAN_LEFTCERT); -+ return FALSE; -+ } -+ } -+ - return TRUE; - } - -@@ -84,6 +102,44 @@ - } - - static void -+contype_combo_changed_cb (GtkWidget *combo, gpointer user_data) -+{ -+ LibreswanEditor *self = LIBRESWAN_EDITOR (user_data); -+ LibreswanEditorPrivate *priv = LIBRESWAN_EDITOR_GET_PRIVATE (self); -+ int contype; -+ const char *ikev1_widgets[] = { "user_label" , "user_entry", -+ "user_password_label", "user_password_entry", -+ "group_label", "group_entry", -+ "group_password_label", "group_password_entry", -+ "show_passwords_checkbutton", -+ NULL }; -+ const char *ikev2_widgets[] = { "cert_label", "cert_entry", -+ "remoteid_label", "remoteid_entry", -+ NULL }; -+ const char **widget_show; -+ const char **widget_hide; -+ -+ contype = gtk_combo_box_get_active (GTK_COMBO_BOX (combo)); -+ -+ switch (contype) { -+ case TYPE_IKEV2_CERT: -+ widget_show = ikev2_widgets; -+ widget_hide = ikev1_widgets; -+ break; -+ case TYPE_IKEV1_XAUTH: -+ default: -+ widget_show = ikev1_widgets; -+ widget_hide = ikev2_widgets; -+ break; -+ } -+ while (*widget_show) -+ gtk_widget_show (GTK_WIDGET (gtk_builder_get_object (priv->builder, *widget_show++))); -+ while (*widget_hide) -+ gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (priv->builder, *widget_hide++))); -+ -+} -+ -+static void - setup_password_widget (LibreswanEditor *self, - const char *entry_name, - NMSettingVpn *s_vpn, -@@ -126,8 +182,8 @@ - - static void - password_storage_changed_cb (GObject *entry, -- GParamSpec *pspec, -- gpointer user_data) -+ GParamSpec *pspec, -+ gpointer user_data) - { - LibreswanEditor *self = LIBRESWAN_EDITOR (user_data); - -@@ -165,7 +221,7 @@ - g_assert (entry); - - nma_utils_setup_password_storage (entry, 0, (NMSetting *) s_vpn, secret_key, -- TRUE, FALSE); -+ TRUE, FALSE); - - /* If there's no password and no flags in the setting, - * initialize flags as "always-ask". -@@ -176,12 +232,13 @@ - flags = nm_setting_vpn_get_data_item (s_vpn, type_key); - } - value = gtk_entry_get_text (GTK_ENTRY (entry)); -- if ((!value || !*value) && !flags) -+ if ((!value || !*value) && !flags) { - nma_utils_update_password_storage (entry, NM_SETTING_SECRET_FLAG_NOT_SAVED, -- (NMSetting *) s_vpn, secret_key); -+ (NMSetting *) s_vpn, secret_key); -+ } - - g_signal_connect (entry, "notify::secondary-icon-name", -- G_CALLBACK (password_storage_changed_cb), self); -+ G_CALLBACK (password_storage_changed_cb), self); - } - - static gboolean -@@ -194,6 +251,8 @@ - NMSettingVpn *s_vpn = NULL; - GtkWidget *widget; - const char *value = NULL; -+ const char *ikev2 = NM_LIBRESWAN_IKEV2_NO; -+ int contype = TYPE_IKEV1_XAUTH; - - s_vpn = nm_connection_get_setting_vpn (connection); - -@@ -204,17 +263,34 @@ - gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget)); - if (s_vpn) { - value = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_RIGHT); -- if (value && strlen (value)) -+ if (value && *value) - gtk_entry_set_text (GTK_ENTRY (widget), value); - } - g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self); - -+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "type_combo")); -+ g_return_val_if_fail (widget != NULL, FALSE); -+ gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget)); -+ if (s_vpn) { -+ ikev2 = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_IKEV2); -+ if (NM_IN_STRSET (ikev2, -+ NM_LIBRESWAN_IKEV2_YES, -+ NM_LIBRESWAN_IKEV2_PROPOSE, -+ NM_LIBRESWAN_IKEV2_INSIST)) { -+ contype = TYPE_IKEV2_CERT; -+ } else -+ contype = TYPE_IKEV1_XAUTH; -+ } -+ g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (contype_combo_changed_cb), self); -+ gtk_combo_box_set_active (GTK_COMBO_BOX (widget), contype); -+ g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self); -+ - widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "group_entry")); - g_return_val_if_fail (widget != NULL, FALSE); - gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget)); - if (s_vpn) { - value = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_LEFTID); -- if (value && strlen (value)) -+ if (value && *value) - gtk_entry_set_text (GTK_ENTRY (widget), value); - } - g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self); -@@ -249,7 +325,27 @@ - gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget)); - if (s_vpn) { - value = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_LEFTXAUTHUSER); -- if (value && strlen (value)) -+ if (value && *value) -+ gtk_entry_set_text (GTK_ENTRY (widget), value); -+ } -+ g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self); -+ -+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "cert_entry")); -+ g_return_val_if_fail (widget != NULL, FALSE); -+ gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget)); -+ if (s_vpn) { -+ value = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_LEFTCERT); -+ if (value && *value) -+ gtk_entry_set_text (GTK_ENTRY (widget), value); -+ } -+ g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self); -+ -+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "remoteid_entry")); -+ g_return_val_if_fail (widget != NULL, FALSE); -+ gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget)); -+ if (s_vpn) { -+ value = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_RIGHTID); -+ if (value && *value) - gtk_entry_set_text (GTK_ENTRY (widget), value); - } - g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self); -@@ -260,7 +356,7 @@ - gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget)); - if (s_vpn) { - value = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_IKE); -- if (value && strlen (value)) -+ if (value && *value) - gtk_entry_set_text (GTK_ENTRY (widget), value); - } - g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self); -@@ -271,17 +367,43 @@ - gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget)); - if (s_vpn) { - value = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_ESP); -- if (value && strlen (value)) -+ if (value && *value) - gtk_entry_set_text (GTK_ENTRY (widget), value); - } - g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self); - -+ /* Phase 1 Lifetime: IKE */ -+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, -+ "phase1_lifetime_entry")); -+ g_return_val_if_fail (widget != NULL, FALSE); -+ gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget)); -+ if (s_vpn) { -+ value = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_IKELIFETIME); -+ if (value && *value) -+ gtk_entry_set_text (GTK_ENTRY (widget), value); -+ } -+ g_signal_connect (G_OBJECT (widget), "changed", -+ G_CALLBACK (stuff_changed_cb), self); -+ -+ /* Phase 2 Lifetime: SA */ -+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, -+ "phase2_lifetime_entry")); -+ g_return_val_if_fail (widget != NULL, FALSE); -+ gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget)); -+ if (s_vpn) { -+ value = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_SALIFETIME); -+ if (value && *value) -+ gtk_entry_set_text (GTK_ENTRY (widget), value); -+ } -+ g_signal_connect (G_OBJECT (widget), "changed", -+ G_CALLBACK (stuff_changed_cb), self); -+ - widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "domain_entry")); - g_return_val_if_fail (widget != NULL, FALSE); - gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget)); - if (s_vpn) { - value = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_DOMAIN); -- if (value && strlen (value)) -+ if (value && *value) - gtk_entry_set_text (GTK_ENTRY (widget), value); - } - g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self); -@@ -292,6 +414,20 @@ - (GCallback) show_toggled_cb, - self); - -+ /* Remote Network */ -+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, -+ "remote_network_entry")); -+ g_return_val_if_fail (widget != NULL, FALSE); -+ gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget)); -+ if (s_vpn) { -+ value = nm_setting_vpn_get_data_item (s_vpn, -+ NM_LIBRESWAN_REMOTENETWORK); -+ if (value && *value) -+ gtk_entry_set_text (GTK_ENTRY (widget), value); -+ } -+ g_signal_connect (G_OBJECT (widget), "changed", -+ G_CALLBACK (stuff_changed_cb), self); -+ - return TRUE; - } - -@@ -324,7 +460,7 @@ - case NM_SETTING_SECRET_FLAG_NONE: - case NM_SETTING_SECRET_FLAG_AGENT_OWNED: - password = gtk_entry_get_text (GTK_ENTRY (entry)); -- if (password && strlen (password)) -+ if (password && *password) - nm_setting_vpn_add_secret (s_vpn, secret_key, password); - data_val = NM_LIBRESWAN_PW_TYPE_SAVE; - break; -@@ -352,6 +488,7 @@ - NMSettingVpn *s_vpn; - GtkWidget *widget; - char *str; -+ int contype; - - if (!check_validity (self, error)) - return FALSE; -@@ -362,49 +499,102 @@ - /* Gateway */ - widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "gateway_entry")); - str = (char *) gtk_entry_get_text (GTK_ENTRY (widget)); -- if (str && strlen (str)) -+ if (str && *str) - nm_setting_vpn_add_data_item (s_vpn, NM_LIBRESWAN_RIGHT, str); - -- /* Group name */ -- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "group_entry")); -- str = (char *) gtk_entry_get_text (GTK_ENTRY (widget)); -- if (str && strlen (str)) -- nm_setting_vpn_add_data_item (s_vpn, NM_LIBRESWAN_LEFTID, str); -+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "type_combo")); -+ contype = gtk_combo_box_get_active (GTK_COMBO_BOX (widget)); -+ switch (contype) { -+ case TYPE_IKEV2_CERT: -+ nm_setting_vpn_add_data_item (s_vpn, NM_LIBRESWAN_IKEV2, NM_LIBRESWAN_IKEV2_INSIST); -+ -+ /* Certificate name */ -+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "cert_entry")); -+ str = (char *) gtk_entry_get_text (GTK_ENTRY (widget)); -+ if (str && *str) -+ nm_setting_vpn_add_data_item (s_vpn, NM_LIBRESWAN_LEFTCERT, str); -+ -+ /* Remote ID */ -+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "remoteid_entry")); -+ str = (char *) gtk_entry_get_text (GTK_ENTRY (widget)); -+ if (str && *str) -+ nm_setting_vpn_add_data_item (s_vpn, NM_LIBRESWAN_RIGHTID, str); -+ -+ /* For now just enforce retrieving the local id from the certificate. -+ * We will allow to change this when we will refactore the "advanced" -+ * section and will expose the "leftid" parameter there. -+ */ -+ nm_setting_vpn_add_data_item (s_vpn, NM_LIBRESWAN_LEFTID, "%fromcert"); - -- /* User name*/ -- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "user_entry")); -- str = (char *) gtk_entry_get_text (GTK_ENTRY (widget)); -- if (str && strlen (str)) -- nm_setting_vpn_add_data_item (s_vpn, NM_LIBRESWAN_LEFTXAUTHUSER, str); -+ break; -+ -+ case TYPE_IKEV1_XAUTH: -+ /* Group name */ -+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "group_entry")); -+ str = (char *) gtk_entry_get_text (GTK_ENTRY (widget)); -+ if (str && *str) -+ nm_setting_vpn_add_data_item (s_vpn, NM_LIBRESWAN_LEFTID, str); -+ -+ /* User name*/ -+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "user_entry")); -+ str = (char *) gtk_entry_get_text (GTK_ENTRY (widget)); -+ if (str && *str) -+ nm_setting_vpn_add_data_item (s_vpn, NM_LIBRESWAN_LEFTXAUTHUSER, str); -+ -+ save_one_password (s_vpn, -+ priv->builder, -+ "user_password_entry", -+ NM_LIBRESWAN_XAUTH_PASSWORD, -+ NM_LIBRESWAN_XAUTH_PASSWORD_INPUT_MODES); -+ save_one_password (s_vpn, -+ priv->builder, -+ "group_password_entry", -+ NM_LIBRESWAN_PSK_VALUE, -+ NM_LIBRESWAN_PSK_INPUT_MODES); -+ break; -+ default: -+ g_assert_not_reached (); -+ break; -+ } - - /* Phase 1 Algorithms: ike */ - widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "phase1_entry")); - str = (char *) gtk_entry_get_text (GTK_ENTRY (widget)); -- if (str && strlen (str)) -+ if (str && *str) - nm_setting_vpn_add_data_item (s_vpn, NM_LIBRESWAN_IKE, str); - - /* Phase 2 Algorithms: esp */ - widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "phase2_entry")); - str = (char *) gtk_entry_get_text (GTK_ENTRY (widget)); -- if (str && strlen (str)) -+ if (str && *str) - nm_setting_vpn_add_data_item (s_vpn, NM_LIBRESWAN_ESP, str); - -+ /* Phase 1 Lifetime: ike */ -+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, -+ "phase1_lifetime_entry")); -+ str = (char *) gtk_entry_get_text (GTK_ENTRY (widget)); -+ if (str && *str) -+ nm_setting_vpn_add_data_item (s_vpn, NM_LIBRESWAN_IKELIFETIME, str); -+ -+ /* Phase 2 Lifetime: sa */ -+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, -+ "phase2_lifetime_entry")); -+ str = (char *) gtk_entry_get_text (GTK_ENTRY (widget)); -+ if (str && *str) -+ nm_setting_vpn_add_data_item (s_vpn, NM_LIBRESWAN_SALIFETIME, str); -+ - /* Domain entry */ - widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "domain_entry")); - str = (char *) gtk_entry_get_text (GTK_ENTRY (widget)); -- if (str && strlen (str)) -+ if (str && *str) - nm_setting_vpn_add_data_item (s_vpn, NM_LIBRESWAN_DOMAIN, str); - -- save_one_password (s_vpn, -- priv->builder, -- "user_password_entry", -- NM_LIBRESWAN_XAUTH_PASSWORD, -- NM_LIBRESWAN_XAUTH_PASSWORD_INPUT_MODES); -- save_one_password (s_vpn, -- priv->builder, -- "group_password_entry", -- NM_LIBRESWAN_PSK_VALUE, -- NM_LIBRESWAN_PSK_INPUT_MODES); -+ /* Remote Network */ -+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, -+ "remote_network_entry")); -+ str = (char *) gtk_entry_get_text (GTK_ENTRY (widget)); -+ if (str && *str) -+ nm_setting_vpn_add_data_item (s_vpn, NM_LIBRESWAN_REMOTENETWORK, str); - - nm_connection_add_setting (connection, NM_SETTING (s_vpn)); - return TRUE; -diff -Naur NetworkManager-libreswan-1.2.6-orig/properties/nm-libreswan-editor-plugin.c NetworkManager-libreswan-1.2.6/properties/nm-libreswan-editor-plugin.c ---- NetworkManager-libreswan-1.2.6-orig/properties/nm-libreswan-editor-plugin.c 2016-10-06 08:02:29.000000000 -0400 -+++ NetworkManager-libreswan-1.2.6/properties/nm-libreswan-editor-plugin.c 2018-08-21 23:09:09.658783529 -0400 -@@ -41,7 +41,7 @@ - #endif - - #define LIBRESWAN_PLUGIN_NAME _("IPsec based VPN") --#define LIBRESWAN_PLUGIN_DESC _("IPsec based VPN using IKEv1") -+#define LIBRESWAN_PLUGIN_DESC _("IPsec based VPN for remote clients") - - /*****************************************************************************/ - -@@ -113,6 +113,15 @@ - nm_setting_vpn_add_data_item (s_vpn, NM_LIBRESWAN_ESP, &str[4]); - else if (g_str_has_prefix (str, "cisco-unity=yes")) - nm_setting_vpn_add_data_item (s_vpn, NM_LIBRESWAN_VENDOR, "Cisco"); -+ else if (g_str_has_prefix (str, "ikelifetime=")) -+ nm_setting_vpn_add_data_item (s_vpn, NM_LIBRESWAN_IKELIFETIME, -+ &str[12]); -+ else if (g_str_has_prefix (str, "salifetime=")) -+ nm_setting_vpn_add_data_item (s_vpn, NM_LIBRESWAN_SALIFETIME, -+ &str[11]); -+ else if (g_str_has_prefix (str, "rightsubnet=")) -+ nm_setting_vpn_add_data_item (s_vpn, NM_LIBRESWAN_REMOTENETWORK, -+ &str[12]); - else { - /* unknown tokens are silently ignored. */ - } -diff -Naur NetworkManager-libreswan-1.2.6-orig/README NetworkManager-libreswan-1.2.6/README ---- NetworkManager-libreswan-1.2.6-orig/README 2015-11-04 09:38:50.000000000 -0500 -+++ NetworkManager-libreswan-1.2.6/README 2018-08-21 23:09:09.645782937 -0400 -@@ -0,0 +1,4 @@ -+Libreswan VPN client plugin for NetworkManager -+ -+Support for configuring IKEv1 based IPsec virtual private network connections. -+Compatible with Libreswan and Cisco IPsec VPN servers. -diff -Naur NetworkManager-libreswan-1.2.6-orig/shared/Makefile.am NetworkManager-libreswan-1.2.6/shared/Makefile.am ---- NetworkManager-libreswan-1.2.6-orig/shared/Makefile.am 2016-06-24 06:16:16.000000000 -0400 -+++ NetworkManager-libreswan-1.2.6/shared/Makefile.am 1969-12-31 19:00:00.000000000 -0500 -@@ -1,15 +0,0 @@ --EXTRA_DIST = \ -- README \ -- nm-utils/gsystem-local-alloc.h \ -- nm-utils/nm-glib.h \ -- nm-utils/nm-macros-internal.h \ -- nm-utils/nm-shared-utils.c \ -- nm-utils/nm-shared-utils.h \ -- nm-utils/nm-vpn-plugin-utils.c \ -- nm-utils/nm-vpn-plugin-utils.h \ -- nm-utils/nm-vpn-plugin-macros.h \ -- nm-default.h \ -- nm-service-defines.h \ -- utils.c \ -- utils.h \ -- $(NULL) -diff -Naur NetworkManager-libreswan-1.2.6-orig/shared/nm-service-defines.h NetworkManager-libreswan-1.2.6/shared/nm-service-defines.h ---- NetworkManager-libreswan-1.2.6-orig/shared/nm-service-defines.h 2016-06-24 06:16:16.000000000 -0400 -+++ NetworkManager-libreswan-1.2.6/shared/nm-service-defines.h 2018-08-21 23:09:09.659783575 -0400 -@@ -34,20 +34,39 @@ - - #define NM_LIBRESWAN_HELPER_PATH LIBEXECDIR"/nm-libreswan-service-helper" - --#define NM_LIBRESWAN_RIGHT "right" --#define NM_LIBRESWAN_LEFTID "leftid" --#define NM_LIBRESWAN_PSK_VALUE "pskvalue" --#define NM_LIBRESWAN_PSK_INPUT_MODES "pskinputmodes" --#define NM_LIBRESWAN_LEFTXAUTHUSER "leftxauthusername" --#define NM_LIBRESWAN_XAUTH_PASSWORD "xauthpassword" -+#define NM_LIBRESWAN_RIGHT "right" -+#define NM_LIBRESWAN_RIGHTID "rightid" -+#define NM_LIBRESWAN_RIGHTRSASIGKEY "rightrsasigkey" -+#define NM_LIBRESWAN_LEFT "left" -+#define NM_LIBRESWAN_LEFTID "leftid" -+#define NM_LIBRESWAN_LEFTRSASIGKEY "leftrsasigkey" -+#define NM_LIBRESWAN_LEFTCERT "leftcert" -+#define NM_LIBRESWAN_PSK_VALUE "pskvalue" -+#define NM_LIBRESWAN_PSK_INPUT_MODES "pskinputmodes" -+#define NM_LIBRESWAN_LEFTXAUTHUSER "leftxauthusername" -+#define NM_LIBRESWAN_XAUTH_PASSWORD "xauthpassword" - #define NM_LIBRESWAN_XAUTH_PASSWORD_INPUT_MODES "xauthpasswordinputmodes" --#define NM_LIBRESWAN_DOMAIN "Domain" --#define NM_LIBRESWAN_DHGROUP "dhgroup" --#define NM_LIBRESWAN_PFSGROUP "pfsgroup" --#define NM_LIBRESWAN_DPDTIMEOUT "dpdtimeout" --#define NM_LIBRESWAN_IKE "ike" --#define NM_LIBRESWAN_ESP "esp" --#define NM_LIBRESWAN_VENDOR "vendor" -+#define NM_LIBRESWAN_DOMAIN "Domain" -+#define NM_LIBRESWAN_DHGROUP "dhgroup" -+#define NM_LIBRESWAN_PFSGROUP "pfsgroup" -+#define NM_LIBRESWAN_DPDTIMEOUT "dpdtimeout" -+#define NM_LIBRESWAN_IKE "ike" -+#define NM_LIBRESWAN_ESP "esp" -+#define NM_LIBRESWAN_IKELIFETIME "ikelifetime" -+#define NM_LIBRESWAN_SALIFETIME "salifetime" -+#define NM_LIBRESWAN_VENDOR "vendor" -+#define NM_LIBRESWAN_REMOTENETWORK "rightsubnet" -+#define NM_LIBRESWAN_IKEV2 "ikev2" -+#define NM_LIBRESWAN_NARROWING "narrowing" -+#define NM_LIBRESWAN_REKEY "rekey" -+#define NM_LIBRESWAN_FRAGMENTATION "fragmentation" -+#define NM_LIBRESWAN_MOBIKE "mobike" -+ -+#define NM_LIBRESWAN_IKEV2_NO "no" -+#define NM_LIBRESWAN_IKEV2_NEVER "never" -+#define NM_LIBRESWAN_IKEV2_YES "yes" -+#define NM_LIBRESWAN_IKEV2_PROPOSE "propose" -+#define NM_LIBRESWAN_IKEV2_INSIST "insist" - - #define NM_LIBRESWAN_PW_TYPE_SAVE "save" - #define NM_LIBRESWAN_PW_TYPE_ASK "ask" -diff -Naur NetworkManager-libreswan-1.2.6-orig/shared/nm-utils/nm-glib.h NetworkManager-libreswan-1.2.6/shared/nm-utils/nm-glib.h ---- NetworkManager-libreswan-1.2.6-orig/shared/nm-utils/nm-glib.h 2017-01-24 08:49:36.000000000 -0500 -+++ NetworkManager-libreswan-1.2.6/shared/nm-utils/nm-glib.h 2018-08-21 23:09:09.660783621 -0400 -@@ -134,17 +134,20 @@ - - /* Rumtime check for glib version. First do a compile time check which - * (if satisfied) shortcuts the runtime check. */ --#define nm_glib_check_version(major, minor, micro) \ -- ( GLIB_CHECK_VERSION ((major), (minor), (micro)) \ -- || ( ( glib_major_version > (major)) \ -- || ( glib_major_version == (major) \ -- && glib_minor_version > (minor)) \ -- || ( glib_major_version == (major) \ -- && glib_minor_version == (minor) \ -- && glib_micro_version >= (micro)))) -+static inline gboolean -+nm_glib_check_version (guint major, guint minor, guint micro) -+{ -+ return GLIB_CHECK_VERSION (major, minor, micro) -+ || ( ( glib_major_version > major) -+ || ( glib_major_version == major -+ && glib_minor_version > minor) -+ || ( glib_major_version == major -+ && glib_minor_version == minor -+ && glib_micro_version < micro)); -+} - - /* g_test_skip() is only available since glib 2.38. Add a compatibility wrapper. */ --inline static void -+static inline void - __nmtst_g_test_skip (const gchar *msg) - { - #if GLIB_CHECK_VERSION (2, 38, 0) -@@ -159,7 +162,7 @@ - - - /* g_test_add_data_func_full() is only available since glib 2.34. Add a compatibility wrapper. */ --inline static void -+static inline void - __g_test_add_data_func_full (const char *testpath, - gpointer test_data, - GTestDataFunc test_func, -@@ -275,7 +278,7 @@ - - - #if !GLIB_CHECK_VERSION (2, 40, 0) --inline static gboolean -+static inline gboolean - _g_key_file_save_to_file (GKeyFile *key_file, - const gchar *filename, - GError **error) -diff -Naur NetworkManager-libreswan-1.2.6-orig/shared/nm-utils/nm-macros-internal.h NetworkManager-libreswan-1.2.6/shared/nm-utils/nm-macros-internal.h ---- NetworkManager-libreswan-1.2.6-orig/shared/nm-utils/nm-macros-internal.h 2017-01-24 08:49:36.000000000 -0500 -+++ NetworkManager-libreswan-1.2.6/shared/nm-utils/nm-macros-internal.h 2018-08-21 23:09:09.660783621 -0400 -@@ -341,6 +341,40 @@ - - /*****************************************************************************/ - -+/* NM_CACHED_QUARK() returns the GQuark for @string, but caches -+ * it in a static variable to speed up future lookups. -+ * -+ * @string must be a string literal. -+ */ -+#define NM_CACHED_QUARK(string) \ -+ ({ \ -+ static GQuark _nm_cached_quark = 0; \ -+ \ -+ (G_LIKELY (_nm_cached_quark != 0) \ -+ ? _nm_cached_quark \ -+ : (_nm_cached_quark = g_quark_from_static_string (""string""))); \ -+ }) -+ -+/* NM_CACHED_QUARK_FCN() is essentially the same as G_DEFINE_QUARK -+ * with two differences: -+ * - @string must be a quited string-literal -+ * - @fcn must be the full function name, while G_DEFINE_QUARK() appends -+ * "_quark" to the function name. -+ * Both properties of G_DEFINE_QUARK() are non favorable, because you can no -+ * longer grep for string/fcn -- unless you are aware that you are searching -+ * for G_DEFINE_QUARK() and omit quotes / append _quark(). With NM_CACHED_QUARK_FCN(), -+ * ctags/cscope can locate the use of @fcn (though it doesn't recognize that -+ * NM_CACHED_QUARK_FCN() defines it). -+ */ -+#define NM_CACHED_QUARK_FCN(string, fcn) \ -+GQuark \ -+fcn (void) \ -+{ \ -+ return NM_CACHED_QUARK (string); \ -+} -+ -+/*****************************************************************************/ -+ - #define nm_streq(s1, s2) (strcmp (s1, s2) == 0) - #define nm_streq0(s1, s2) (g_strcmp0 (s1, s2) == 0) - -@@ -743,32 +777,29 @@ - /*****************************************************************************/ - - /* if @str is NULL, return "(null)". Otherwise, allocate a buffer using -- * alloca() of size @bufsize and fill it with @str. @str will be quoted with -- * single quote, and in case @str is too long, the final quote will be '^'. */ --#define nm_strquote_a(bufsize, str) \ -+ * alloca() of and fill it with @str. @str will be quoted with double quote. -+ * If @str is longer then @trunc_at, the string is truncated and the closing -+ * quote is instead '^' to indicate truncation. -+ * -+ * Thus, the maximum stack allocated buffer will be @trunc_at+3. */ -+#define nm_strquote_a(trunc_at, str) \ - ({ \ -- G_STATIC_ASSERT ((bufsize) >= 6); \ -- const gsize _BUFSIZE = (bufsize); \ -- const char *const _s = (str); \ -- char *_r; \ -- gsize _l; \ -- gboolean _truncated; \ -- \ -- nm_assert (_BUFSIZE >= 6); \ -- \ -- if (_s) { \ -- _l = strlen (_s) + 3; \ -- if ((_truncated = (_BUFSIZE < _l))) \ -- _l = _BUFSIZE; \ -- \ -- _r = g_alloca (_l); \ -- _r[0] = '\''; \ -- memcpy (&_r[1], _s, _l - 3); \ -- _r[_l - 2] = _truncated ? '^' : '\''; \ -- _r[_l - 1] = '\0'; \ -- } else \ -- _r = "(null)"; \ -- _r; \ -+ const char *const _str = (str); \ -+ \ -+ (_str \ -+ ? ({ \ -+ const gsize _trunc_at = (trunc_at); \ -+ const gsize _strlen_trunc = NM_MIN (strlen (_str), _trunc_at); \ -+ char *_buf; \ -+ \ -+ _buf = g_alloca (_strlen_trunc + 3); \ -+ _buf[0] = '"'; \ -+ memcpy (&_buf[1], _str, _strlen_trunc); \ -+ _buf[_strlen_trunc + 1] = _str[_strlen_trunc] ? '^' : '"'; \ -+ _buf[_strlen_trunc + 2] = '\0'; \ -+ _buf; \ -+ }) \ -+ : "(null)"); \ - }) - - #define nm_sprintf_buf(buf, format, ...) ({ \ -@@ -788,12 +819,12 @@ - ({ \ - char *_buf; \ - int _buf_len; \ -+ typeof (n_elements) _n_elements = (n_elements); \ - \ -- G_STATIC_ASSERT (sizeof (char[MAX ((n_elements), 1)]) == (n_elements)); \ -- _buf = g_alloca (n_elements); \ -- _buf_len = g_snprintf (_buf, (n_elements), \ -+ _buf = g_alloca (_n_elements); \ -+ _buf_len = g_snprintf (_buf, _n_elements, \ - ""format"", ##__VA_ARGS__); \ -- nm_assert (_buf_len < (n_elements)); \ -+ nm_assert (_buf_len < _n_elements); \ - _buf; \ - }) - -diff -Naur NetworkManager-libreswan-1.2.6-orig/shared/nm-utils/nm-shared-utils.c NetworkManager-libreswan-1.2.6/shared/nm-utils/nm-shared-utils.c ---- NetworkManager-libreswan-1.2.6-orig/shared/nm-utils/nm-shared-utils.c 2017-01-24 08:49:36.000000000 -0500 -+++ NetworkManager-libreswan-1.2.6/shared/nm-utils/nm-shared-utils.c 2018-08-21 23:09:09.660783621 -0400 -@@ -158,6 +158,54 @@ - - /*****************************************************************************/ - -+/** -+ * nm_utils_strv_find_first: -+ * @list: the strv list to search -+ * @len: the length of the list, or a negative value if @list is %NULL terminated. -+ * @needle: the value to search for. The search is done using strcmp(). -+ * -+ * Searches @list for @needle and returns the index of the first match (based -+ * on strcmp()). -+ * -+ * For convenience, @list has type 'char**' instead of 'const char **'. -+ * -+ * Returns: index of first occurrence or -1 if @needle is not found in @list. -+ */ -+gssize -+nm_utils_strv_find_first (char **list, gssize len, const char *needle) -+{ -+ gssize i; -+ -+ if (len > 0) { -+ g_return_val_if_fail (list, -1); -+ -+ if (!needle) { -+ /* if we search a list with known length, %NULL is a valid @needle. */ -+ for (i = 0; i < len; i++) { -+ if (!list[i]) -+ return i; -+ } -+ } else { -+ for (i = 0; i < len; i++) { -+ if (list[i] && !strcmp (needle, list[i])) -+ return i; -+ } -+ } -+ } else if (len < 0) { -+ g_return_val_if_fail (needle, -1); -+ -+ if (list) { -+ for (i = 0; list[i]; i++) { -+ if (strcmp (needle, list[i]) == 0) -+ return i; -+ } -+ } -+ } -+ return -1; -+} -+ -+/*****************************************************************************/ -+ - gint - _nm_utils_ascii_str_to_bool (const char *str, - gint default_value) -@@ -192,7 +240,7 @@ - - /*****************************************************************************/ - --G_DEFINE_QUARK (nm-utils-error-quark, nm_utils_error) -+NM_CACHED_QUARK_FCN ("nm-utils-error-quark", nm_utils_error_quark) - - void - nm_utils_error_set_cancelled (GError **error, -diff -Naur NetworkManager-libreswan-1.2.6-orig/shared/nm-utils/nm-shared-utils.h NetworkManager-libreswan-1.2.6/shared/nm-utils/nm-shared-utils.h ---- NetworkManager-libreswan-1.2.6-orig/shared/nm-utils/nm-shared-utils.h 2017-01-24 08:49:36.000000000 -0500 -+++ NetworkManager-libreswan-1.2.6/shared/nm-utils/nm-shared-utils.h 2018-08-21 23:09:09.661783666 -0400 -@@ -43,6 +43,10 @@ - - /*****************************************************************************/ - -+gssize nm_utils_strv_find_first (char **list, gssize len, const char *needle); -+ -+/*****************************************************************************/ -+ - gint64 _nm_utils_ascii_str_to_int64 (const char *str, guint base, gint64 min, gint64 max, gint64 fallback); - - gint _nm_utils_ascii_str_to_bool (const char *str, -diff -Naur NetworkManager-libreswan-1.2.6-orig/shared/utils.c NetworkManager-libreswan-1.2.6/shared/utils.c ---- NetworkManager-libreswan-1.2.6-orig/shared/utils.c 2016-06-25 05:06:36.000000000 -0400 -+++ NetworkManager-libreswan-1.2.6/shared/utils.c 2018-08-21 23:09:09.661783666 -0400 -@@ -101,7 +101,22 @@ - const char *default_username; - const char *phase1_alg_str; - const char *phase2_alg_str; -+ const char *phase1_lifetime_str; -+ const char *phase2_lifetime_str; -+ const char *left; - const char *leftid; -+ const char *leftcert; -+ const char *leftrsasigkey; -+ const char *rightrsasigkey; -+ const char *remote_network; -+ const char *ikev2 = NULL; -+ const char *rightid; -+ const char *narrowing; -+ const char *rekey; -+ const char *fragmentation; -+ const char *mobike; -+ gboolean is_ikev2 = FALSE; -+ gboolean xauth_enabled = TRUE; - - g_return_val_if_fail (fd > 0, FALSE); - g_return_val_if_fail (NM_IS_CONNECTION (connection), FALSE); -@@ -111,6 +126,17 @@ - s_vpn = nm_connection_get_setting_vpn (connection); - g_return_val_if_fail (NM_IS_SETTING_VPN (s_vpn), FALSE); - -+ is_ikev2 = nm_libreswan_utils_setting_is_ikev2 (s_vpn, &ikev2); -+ /* When IKEv1 is in place, we enforce XAUTH */ -+ xauth_enabled = !is_ikev2; -+ /* When using IKEv1 (default in our plugin), we should ensure that we make -+ * it explicit to Libreswan (which defaults to IKEv2): when crypto algorithms -+ * are not specified ("esp" & "ike") Libreswan will use system-wide crypto -+ * policies based on the IKE version in place. -+ */ -+ if (!ikev2) -+ ikev2 = NM_LIBRESWAN_IKEV2_NEVER; -+ - leftid = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_LEFTID); - - #define WRITE_CHECK_NEWLINE(fd, new_line, debug_write_fcn, error, ...) \ -@@ -122,51 +148,132 @@ - - WRITE_CHECK (fd, debug_write_fcn, error, "conn %s", con_name); - if (leftid) { -- WRITE_CHECK (fd, debug_write_fcn, error, " aggrmode=yes"); -- WRITE_CHECK (fd, debug_write_fcn, error, " leftid=@%s", leftid); -+ if (xauth_enabled) -+ WRITE_CHECK (fd, debug_write_fcn, error, " aggrmode=yes"); -+ WRITE_CHECK (fd, debug_write_fcn, error, -+ " leftid=%s%s", -+ xauth_enabled ? "@" : "", -+ leftid); -+ } -+ -+ leftrsasigkey = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_LEFTRSASIGKEY); -+ rightrsasigkey = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_RIGHTRSASIGKEY); -+ leftcert = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_LEFTCERT); -+ if (leftcert && strlen (leftcert)) { -+ WRITE_CHECK (fd, debug_write_fcn, error, " leftcert=%s", leftcert); -+ if (!leftrsasigkey) -+ leftrsasigkey = "%cert"; -+ if (!rightrsasigkey) -+ rightrsasigkey = "%cert"; -+ } -+ if (leftrsasigkey && strlen (leftrsasigkey)) -+ WRITE_CHECK (fd, debug_write_fcn, error, " leftrsasigkey=%s", leftrsasigkey); -+ if (rightrsasigkey && strlen (rightrsasigkey)) -+ WRITE_CHECK (fd, debug_write_fcn, error, " rightrsasigkey=%s", rightrsasigkey); -+ if ( !(leftrsasigkey && strlen (leftrsasigkey)) -+ && !(rightrsasigkey && strlen (rightrsasigkey))) { -+ WRITE_CHECK (fd, debug_write_fcn, error, " authby=secret"); - } -- WRITE_CHECK (fd, debug_write_fcn, error, " authby=secret"); -- WRITE_CHECK (fd, debug_write_fcn, error, " left=%%defaultroute"); -- WRITE_CHECK (fd, debug_write_fcn, error, " leftxauthclient=yes"); -- WRITE_CHECK (fd, debug_write_fcn, error, " leftmodecfgclient=yes"); - -+ left = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_LEFT); -+ if (left && strlen (left)) -+ WRITE_CHECK (fd, debug_write_fcn, error, " left=%s", left); -+ else -+ WRITE_CHECK (fd, debug_write_fcn, error, " left=%%defaultroute"); -+ -+ WRITE_CHECK (fd, debug_write_fcn, error, " leftmodecfgclient=yes"); - if (leftupdown_script) - WRITE_CHECK (fd, debug_write_fcn, error, " leftupdown=%s", leftupdown_script); - -- default_username = nm_setting_vpn_get_user_name (s_vpn); -- props_username = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_LEFTXAUTHUSER); -- if (props_username && strlen (props_username)) -- WRITE_CHECK (fd, debug_write_fcn, error, " leftxauthusername=%s", props_username); -- else if (default_username && strlen (default_username)) -- WRITE_CHECK (fd, debug_write_fcn, error, " leftxauthusername=%s", default_username); -- - WRITE_CHECK (fd, debug_write_fcn, error, " right=%s", nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_RIGHT)); -- WRITE_CHECK (fd, debug_write_fcn, error, " remote_peer_type=cisco"); -- WRITE_CHECK (fd, debug_write_fcn, error, " rightxauthserver=yes"); -+ rightid = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_RIGHTID); -+ if (rightid && strlen (rightid)) -+ WRITE_CHECK (fd, debug_write_fcn, error, " rightid=%s", rightid); - WRITE_CHECK (fd, debug_write_fcn, error, " rightmodecfgserver=yes"); - WRITE_CHECK (fd, debug_write_fcn, error, " modecfgpull=yes"); -- WRITE_CHECK (fd, debug_write_fcn, error, " rightsubnet=0.0.0.0/0"); - -- phase1_alg_str = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_IKE); -- if (!phase1_alg_str || !strlen (phase1_alg_str)) -- WRITE_CHECK (fd, debug_write_fcn, error, " ike=aes-sha1"); -+ remote_network = nm_setting_vpn_get_data_item (s_vpn, -+ NM_LIBRESWAN_REMOTENETWORK); -+ if (!remote_network || !strlen (remote_network)) -+ WRITE_CHECK (fd, debug_write_fcn, error, " rightsubnet=0.0.0.0/0"); - else -+ WRITE_CHECK (fd, debug_write_fcn, error, " rightsubnet=%s", -+ remote_network); -+ if (xauth_enabled) { -+ WRITE_CHECK (fd, debug_write_fcn, error, " leftxauthclient=yes"); -+ -+ default_username = nm_setting_vpn_get_user_name (s_vpn); -+ props_username = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_LEFTXAUTHUSER); -+ if (props_username && strlen (props_username)) -+ WRITE_CHECK (fd, debug_write_fcn, error, " leftxauthusername=%s", props_username); -+ else if (default_username && strlen (default_username)) -+ WRITE_CHECK (fd, debug_write_fcn, error, " leftxauthusername=%s", default_username); -+ -+ WRITE_CHECK (fd, debug_write_fcn, error, " remote_peer_type=cisco"); -+ WRITE_CHECK (fd, debug_write_fcn, error, " rightxauthserver=yes"); -+ } -+ -+ -+ phase1_alg_str = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_IKE); -+ /* When the crypto is unspecified, let Libreswan use many sets of crypto -+ * proposals (just leave the property unset). An exception should be made -+ * for IKEv1 connections in aggressive mode: there the DH group in the crypto -+ * phase1 proposal must be just one; moreover no more than 4 proposal may be -+ * specified. So, when IKEv1 aggressive mode ('leftid' specified) is configured -+ * force the best proposal that should be accepted by all obsolete VPN SW/HW -+ * acting as a remote access VPN server. -+ */ -+ if (phase1_alg_str && strlen (phase1_alg_str)) - WRITE_CHECK (fd, debug_write_fcn, error, " ike=%s", phase1_alg_str); -+ else if (xauth_enabled && leftid) -+ WRITE_CHECK (fd, debug_write_fcn, error, " ike=aes256-sha1;modp1536"); - - phase2_alg_str = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_ESP); -- if (!phase2_alg_str || !strlen (phase2_alg_str)) -- WRITE_CHECK (fd, debug_write_fcn, error, " esp=aes-sha1;modp1024"); -- else -- WRITE_CHECK (fd, debug_write_fcn, error, " esp=%s", phase2_alg_str); -- -- WRITE_CHECK (fd, debug_write_fcn, error, " rekey=yes"); -- WRITE_CHECK (fd, debug_write_fcn, error, " salifetime=24h"); -- WRITE_CHECK (fd, debug_write_fcn, error, " ikelifetime=24h"); -- WRITE_CHECK (fd, debug_write_fcn, error, " keyingtries=1"); -+ if (phase2_alg_str && strlen (phase2_alg_str)) -+ WRITE_CHECK (fd, debug_write_fcn, error, " phase2alg=%s", phase2_alg_str); -+ else if (xauth_enabled && leftid) -+ WRITE_CHECK (fd, debug_write_fcn, error, " phase2alg=aes256-sha1"); -+ -+ phase1_lifetime_str = nm_setting_vpn_get_data_item (s_vpn, -+ NM_LIBRESWAN_IKELIFETIME); -+ if (phase1_lifetime_str && strlen (phase1_lifetime_str)) -+ WRITE_CHECK (fd, debug_write_fcn, error, " ikelifetime=%s", phase1_lifetime_str); -+ else if (!is_ikev2) -+ WRITE_CHECK (fd, debug_write_fcn, error, " ikelifetime=24h"); -+ -+ phase2_lifetime_str = nm_setting_vpn_get_data_item (s_vpn, -+ NM_LIBRESWAN_SALIFETIME); -+ if (phase2_lifetime_str && strlen (phase2_lifetime_str)) -+ WRITE_CHECK (fd, debug_write_fcn, error, " salifetime=%s", phase2_lifetime_str); -+ else if (!is_ikev2) -+ WRITE_CHECK (fd, debug_write_fcn, error, " salifetime=24h"); -+ -+ rekey = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_REKEY); -+ if (!rekey || !strlen (rekey)) { -+ WRITE_CHECK (fd, debug_write_fcn, error, " rekey=yes"); -+ WRITE_CHECK (fd, debug_write_fcn, error, " keyingtries=1"); -+ } else -+ WRITE_CHECK (fd, debug_write_fcn, error, " rekey=%s", rekey); - - if (!openswan && g_strcmp0 (nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_VENDOR), "Cisco") == 0) - WRITE_CHECK (fd, debug_write_fcn, error, " cisco-unity=yes"); - -+ WRITE_CHECK (fd, debug_write_fcn, error, " ikev2=%s", ikev2); -+ -+ narrowing = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_NARROWING); -+ if (narrowing && strlen (narrowing)) -+ WRITE_CHECK (fd, debug_write_fcn, error, " narrowing=%s", narrowing); -+ -+ fragmentation = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_FRAGMENTATION); -+ if (fragmentation && strlen (fragmentation)) -+ WRITE_CHECK (fd, debug_write_fcn, error, " fragmentation=%s", fragmentation); -+ -+ mobike = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_MOBIKE); -+ if (mobike && strlen (mobike)) -+ WRITE_CHECK (fd, debug_write_fcn, error, " mobike=%s", mobike); -+ -+ WRITE_CHECK (fd, debug_write_fcn, error, " nm-configured=yes"); -+ - WRITE_CHECK_NEWLINE (fd, trailing_newline, debug_write_fcn, error, " auto=add"); - - return TRUE; -diff -Naur NetworkManager-libreswan-1.2.6-orig/shared/utils.h NetworkManager-libreswan-1.2.6/shared/utils.h ---- NetworkManager-libreswan-1.2.6-orig/shared/utils.h 2016-06-24 06:16:16.000000000 -0400 -+++ NetworkManager-libreswan-1.2.6/shared/utils.h 2018-08-21 23:09:09.661783666 -0400 -@@ -45,4 +45,19 @@ - NMDebugWriteFcn debug_write_fcn, - GError **error); - -+static inline gboolean -+nm_libreswan_utils_setting_is_ikev2 (NMSettingVpn *s_vpn, const char **out_ikev2) -+{ -+ const char *ikev2; -+ -+ ikev2 = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_IKEV2); -+ if (ikev2 && strlen (ikev2) && out_ikev2) -+ *out_ikev2 = ikev2; -+ -+ return NM_IN_STRSET (ikev2, -+ NM_LIBRESWAN_IKEV2_PROPOSE, -+ NM_LIBRESWAN_IKEV2_YES, -+ NM_LIBRESWAN_IKEV2_INSIST); -+} -+ - #endif /* __UTILS_H__ */ -diff -Naur NetworkManager-libreswan-1.2.6-orig/src/Makefile.am NetworkManager-libreswan-1.2.6/src/Makefile.am ---- NetworkManager-libreswan-1.2.6-orig/src/Makefile.am 2016-06-24 06:16:16.000000000 -0400 -+++ NetworkManager-libreswan-1.2.6/src/Makefile.am 1969-12-31 19:00:00.000000000 -0500 -@@ -1,86 +0,0 @@ --libexec_PROGRAMS = \ -- nm-libreswan-service \ -- nm-libreswan-service-helper -- --AM_CPPFLAGS = \ -- $(GLIB_CFLAGS) \ -- $(LIBNM_CFLAGS) \ -- $(LIBNL_CFLAGS) \ -- -DBINDIR=\"$(bindir)\" \ -- -DPREFIX=\""$(prefix)"\" \ -- -DLIBDIR=\""$(libdir)"\" \ -- -DLIBEXECDIR=\""$(libexecdir)"\" \ -- -DLOCALSTATEDIR=\""$(localstatedir)"\" \ -- -DDATADIR=\"$(datadir)\" \ -- -DNM_LIBRESWAN_LOCALEDIR=\"$(datadir)/locale\" \ -- -I"$(top_srcdir)/shared/" -- --shared_sources = \ -- $(top_srcdir)/shared/nm-utils/nm-shared-utils.c \ -- $(top_srcdir)/shared/nm-utils/nm-shared-utils.h \ -- $(top_srcdir)/shared/utils.c \ -- $(top_srcdir)/shared/utils.h \ -- $(top_srcdir)/shared/nm-service-defines.h \ -- $(NULL) -- --############################################################################### -- --# D-Bus stuff --noinst_LTLIBRARIES = libnm-libreswan-helper-service-dbus.la -- --nodist_libnm_libreswan_helper_service_dbus_la_SOURCES = \ -- nm-libreswan-helper-service-dbus.c \ -- nm-libreswan-helper-service-dbus.h -- --libnm_libreswan_helper_service_dbus_la_CPPFLAGS = $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(AM_CPPFLAGS)) -- --nm-libreswan-helper-service-dbus.h: $(top_srcdir)/src/nm-libreswan-helper-service.xml -- $(AM_V_GEN) gdbus-codegen \ -- --generate-c-code $(basename $@) \ -- --c-namespace NMDBus \ -- --interface-prefix org.freedesktop.NetworkManager \ -- $< -- --nm-libreswan-helper-service-dbus.c: -- @true -- --############################################################################### -- --nm_libreswan_service_SOURCES = \ -- $(shared_sources) \ -- nm-libreswan-service.c -- --nm_libreswan_service_LDADD = \ -- $(GLIB_LIBS) \ -- $(LIBNM_LIBS) \ -- $(LIBNL_LIBS) \ -- libnm-libreswan-helper-service-dbus.la \ -- -lutil -- --############################################################################### -- --nm_libreswan_service_helper_SOURCES = \ -- $(shared_sources) \ -- nm-libreswan-service-helper.c -- --nm_libreswan_service_helper_LDADD = \ -- $(LIBNM_LIBS) \ -- libnm-libreswan-helper-service-dbus.la -- --############################################################################### -- --noinst_PROGRAMS = show-xfrm -- --show_xfrm_SOURCES = show-xfrm.c -- --show_xfrm_LDADD = \ -- $(LIBNL_LIBS) \ -- $(GLIB_LIBS) -- --############################################################################### -- --BUILT_SOURCES = nm-libreswan-helper-service-dbus.h nm-libreswan-helper-service-dbus.c -- --CLEANFILES = *~ $(BUILT_SOURCES) -- --EXTRA_DIST = nm-libreswan-helper-service.xml -diff -Naur NetworkManager-libreswan-1.2.6-orig/src/nm-libreswan-service.c NetworkManager-libreswan-1.2.6/src/nm-libreswan-service.c ---- NetworkManager-libreswan-1.2.6-orig/src/nm-libreswan-service.c 2016-10-06 08:02:29.000000000 -0400 -+++ NetworkManager-libreswan-1.2.6/src/nm-libreswan-service.c 2018-08-21 23:09:09.662783712 -0400 -@@ -79,15 +79,15 @@ - } gl/*obal*/; - - typedef enum { -- CONNECT_STEP_FIRST, -- CONNECT_STEP_CHECK_RUNNING, -- CONNECT_STEP_STACK_INIT, -- CONNECT_STEP_CHECK_NSS, -- CONNECT_STEP_IPSEC_START, -- CONNECT_STEP_WAIT_READY, -- CONNECT_STEP_CONFIG_ADD, -- CONNECT_STEP_CONNECT, -- CONNECT_STEP_LAST -+ CONNECT_STEP_FIRST, -+ CONNECT_STEP_CHECK_RUNNING, -+ CONNECT_STEP_STACK_INIT, -+ CONNECT_STEP_CHECK_NSS, -+ CONNECT_STEP_IPSEC_START, -+ CONNECT_STEP_WAIT_READY, -+ CONNECT_STEP_CONFIG_ADD, -+ CONNECT_STEP_CONNECT, -+ CONNECT_STEP_LAST - } ConnectStep; - - typedef struct { -@@ -107,6 +107,7 @@ - gboolean interactive; - gboolean pending_auth; - gboolean managed; -+ gboolean xauth_enabled; - - GPid pid; - guint watch_id; -@@ -248,27 +249,40 @@ - - static ValidProperty valid_properties[] = { - { NM_LIBRESWAN_RIGHT, G_TYPE_STRING, 0, 0 }, -+ { NM_LIBRESWAN_RIGHTID, G_TYPE_STRING, 0, 0 }, -+ { NM_LIBRESWAN_RIGHTRSASIGKEY, G_TYPE_STRING, 0, 0 }, -+ { NM_LIBRESWAN_LEFT, G_TYPE_STRING, 0, 0 }, - { NM_LIBRESWAN_LEFTID, G_TYPE_STRING, 0, 0 }, - { NM_LIBRESWAN_LEFTXAUTHUSER, G_TYPE_STRING, 0, 0 }, -+ { NM_LIBRESWAN_LEFTRSASIGKEY, G_TYPE_STRING, 0, 0 }, -+ { NM_LIBRESWAN_LEFTCERT, G_TYPE_STRING, 0, 0 }, - { NM_LIBRESWAN_DOMAIN, G_TYPE_STRING, 0, 0 }, - { NM_LIBRESWAN_DHGROUP, G_TYPE_STRING, 0, 0 }, - { NM_LIBRESWAN_PFSGROUP, G_TYPE_STRING, 0, 0 }, - { NM_LIBRESWAN_DPDTIMEOUT, G_TYPE_INT, 0, 86400 }, - { NM_LIBRESWAN_IKE, G_TYPE_STRING, 0, 0 }, - { NM_LIBRESWAN_ESP, G_TYPE_STRING, 0, 0 }, -+ { NM_LIBRESWAN_IKELIFETIME, G_TYPE_STRING, 0, 0 }, -+ { NM_LIBRESWAN_SALIFETIME, G_TYPE_STRING, 0, 0 }, - { NM_LIBRESWAN_VENDOR, G_TYPE_STRING, 0, 0 }, -+ { NM_LIBRESWAN_REMOTENETWORK, G_TYPE_STRING, 0, 0 }, -+ { NM_LIBRESWAN_IKEV2, G_TYPE_STRING, 0, 0 }, -+ { NM_LIBRESWAN_NARROWING, G_TYPE_STRING, 0, 0 }, -+ { NM_LIBRESWAN_REKEY, G_TYPE_STRING, 0, 0 }, -+ { NM_LIBRESWAN_FRAGMENTATION, G_TYPE_STRING, 0, 0 }, -+ { NM_LIBRESWAN_MOBIKE, G_TYPE_STRING, 0, 0 }, - /* Ignored option for internal use */ - { NM_LIBRESWAN_PSK_INPUT_MODES, G_TYPE_NONE, 0, 0 }, - { NM_LIBRESWAN_XAUTH_PASSWORD_INPUT_MODES, G_TYPE_NONE, 0, 0 }, - { NM_LIBRESWAN_PSK_VALUE "-flags", G_TYPE_STRING, 0, 0 }, - { NM_LIBRESWAN_XAUTH_PASSWORD "-flags", G_TYPE_STRING, 0, 0 }, -- { NULL, G_TYPE_NONE, 0, 0 } -+ { NULL, G_TYPE_NONE, 0, 0 } - }; - - static ValidProperty valid_secrets[] = { - { NM_LIBRESWAN_PSK_VALUE, G_TYPE_STRING, 0, 0 }, - { NM_LIBRESWAN_XAUTH_PASSWORD, G_TYPE_STRING, 0, 0 }, -- { NULL, G_TYPE_NONE, 0, 0 } -+ { NULL, G_TYPE_NONE, 0, 0 } - }; - - typedef struct ValidateInfo { -@@ -483,25 +497,25 @@ - priv->retry_id = 0; - } - -- if (priv->io_id) { -- g_source_remove (priv->io_id); -- priv->io_id = 0; -- } -- g_clear_pointer (&priv->channel, g_io_channel_unref); -+ if (priv->xauth_enabled) { -+ if (priv->io_id) { -+ g_source_remove (priv->io_id); -+ priv->io_id = 0; -+ } -+ g_clear_pointer (&priv->channel, g_io_channel_unref); - -- if (priv->io_buf) { -- g_string_free (priv->io_buf, TRUE); -- priv->io_buf = NULL; -+ if (priv->io_buf) { -+ g_string_free (priv->io_buf, TRUE); -+ priv->io_buf = NULL; -+ } -+ if (priv->password) { -+ memset (priv->password, 0, strlen (priv->password)); -+ g_free (priv->password); -+ priv->password = NULL; -+ } - } -- - pipe_cleanup (&priv->out); - pipe_cleanup (&priv->err); -- -- if (priv->password) { -- memset (priv->password, 0, strlen (priv->password)); -- g_free (priv->password); -- priv->password = NULL; -- } - } - - static void -@@ -969,7 +983,7 @@ - * specific subnets to be routed over the VPN (eg, CISCO_SPLIT_INC). - * This is what we need to automatically determine 'never-default' behavior. - * Instead, we have to inspect the kernel's SAD (Security Assocation Database) -- * for IPSec-secured routes pointing to the VPN gateway. -+ * for IPsec-secured routes pointing to the VPN gateway. - */ - - typedef struct { -@@ -1552,8 +1566,8 @@ - - switch (priv->connect_step) { - case CONNECT_STEP_FIRST: -- /* fall through */ - priv->connect_step++; -+ /* fallthrough */ - - case CONNECT_STEP_CHECK_RUNNING: - if (!do_spawn (self, &priv->pid, NULL, NULL, error, priv->ipsec_path, "auto", "--status", NULL)) -@@ -1575,8 +1589,8 @@ - priv->watch_id = g_child_watch_add (priv->pid, child_watch_cb, self); - return success; - } -- /* fall through */ - priv->connect_step++; -+ /* fallthrough */ - - case CONNECT_STEP_CHECK_NSS: - /* Start the IPsec service */ -@@ -1587,8 +1601,8 @@ - priv->watch_id = g_child_watch_add (priv->pid, child_watch_cb, self); - return success; - } -- /* fall through */ - priv->connect_step++; -+ /* fallthrough */ - - case CONNECT_STEP_IPSEC_START: - /* Start the IPsec service */ -@@ -1651,18 +1665,23 @@ - } - case CONNECT_STEP_CONNECT: - g_assert (uuid); -- if (!spawn_pty (self, &up_stdout, &up_stderr, &up_pty, &priv->pid, error, -- priv->ipsec_path, "auto", "--up", uuid, NULL)) -+ -+ if (!spawn_pty (self, &up_stdout, &up_stderr, -+ priv->xauth_enabled ? &up_pty : NULL, -+ &priv->pid, error, -+ priv->ipsec_path, "auto", "--up", uuid, NULL)) { - return FALSE; -+ } - priv->watch_id = g_child_watch_add (priv->pid, child_watch_cb, self); - -- /* Wait for the password request */ -- priv->io_buf = g_string_sized_new (128); -- priv->channel = g_io_channel_unix_new (up_pty); -- g_io_channel_set_encoding (priv->channel, NULL, NULL); -- g_io_channel_set_buffered (priv->channel, FALSE); -- priv->io_id = g_io_add_watch (priv->channel, G_IO_IN | G_IO_ERR | G_IO_HUP, io_cb, self); -- -+ if (priv->xauth_enabled) { -+ /* Wait for the password request */ -+ priv->io_buf = g_string_sized_new (128); -+ priv->channel = g_io_channel_unix_new (up_pty); -+ g_io_channel_set_encoding (priv->channel, NULL, NULL); -+ g_io_channel_set_buffered (priv->channel, FALSE); -+ priv->io_id = g_io_add_watch (priv->channel, G_IO_IN | G_IO_ERR | G_IO_HUP, io_cb, self); -+ } - pipe_init (&priv->out, up_stdout, "OUT"); - pipe_init (&priv->err, up_stderr, "ERR"); - return TRUE; -@@ -1738,7 +1757,11 @@ - return FALSE; - } - -- priv->password = g_strdup (nm_setting_vpn_get_secret (s_vpn, NM_LIBRESWAN_XAUTH_PASSWORD)); -+ /* XAUTH is not part of the IKEv2 standard and we always enforce it in IKEv1 */ -+ priv->xauth_enabled = !nm_libreswan_utils_setting_is_ikev2 (s_vpn, NULL); -+ -+ if (priv->xauth_enabled) -+ priv->password = g_strdup (nm_setting_vpn_get_secret (s_vpn, NM_LIBRESWAN_XAUTH_PASSWORD)); - - /* Write the IPsec secret (group password); *SWAN always requires this and - * doesn't ask for it interactively. -@@ -1781,6 +1804,9 @@ - GError **error) - { - NMSettingVpn *s_vpn; -+ const char *leftcert; -+ const char *leftrsasigkey; -+ const char *rightrsasigkey; - const char *pw_type; - - g_return_val_if_fail (NM_IS_VPN_SERVICE_PLUGIN (plugin), FALSE); -@@ -1795,6 +1821,17 @@ - return FALSE; - } - -+ /* When leftcert is specified, rsasigkey are assumed to be '%cert' */ -+ leftcert = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_LEFTCERT); -+ if (leftcert) -+ goto xauth_check; -+ -+ /* If authentication is done through rsasigkeys, only the public keys are required */ -+ leftrsasigkey = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_LEFTRSASIGKEY); -+ rightrsasigkey = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_RIGHTRSASIGKEY); -+ if (leftrsasigkey && rightrsasigkey) -+ goto xauth_check; -+ - pw_type = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_PSK_INPUT_MODES); - if (!pw_type || strcmp (pw_type, NM_LIBRESWAN_PW_TYPE_UNUSED)) { - if (!nm_setting_vpn_get_secret (s_vpn, NM_LIBRESWAN_PSK_VALUE)) { -@@ -1803,11 +1840,14 @@ - } - } - -- pw_type = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_XAUTH_PASSWORD_INPUT_MODES); -- if (!pw_type || strcmp (pw_type, NM_LIBRESWAN_PW_TYPE_UNUSED)) { -- if (!nm_setting_vpn_get_secret (s_vpn, NM_LIBRESWAN_XAUTH_PASSWORD)) { -- *setting_name = NM_SETTING_VPN_SETTING_NAME; -- return TRUE; -+xauth_check: -+ if (!nm_libreswan_utils_setting_is_ikev2 (s_vpn, NULL)) { -+ pw_type = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_XAUTH_PASSWORD_INPUT_MODES); -+ if (!pw_type || strcmp (pw_type, NM_LIBRESWAN_PW_TYPE_UNUSED)) { -+ if (!nm_setting_vpn_get_secret (s_vpn, NM_LIBRESWAN_XAUTH_PASSWORD)) { -+ *setting_name = NM_SETTING_VPN_SETTING_NAME; -+ return TRUE; -+ } - } - } - diff --git a/NetworkManager-libreswan.spec b/NetworkManager-libreswan.spec index b0b03a8..34b7968 100644 --- a/NetworkManager-libreswan.spec +++ b/NetworkManager-libreswan.spec @@ -1,23 +1,28 @@ %if 0%{?fedora} < 28 && 0%{?rhel} < 8 %bcond_without libnm_glib %else -# Disable the legacy version by default %bcond_with libnm_glib %endif -%global nm_version 1:1.2.0 -%global nma_version 1.2.0 +%global real_version 1.2.10 +%global rpm_version 1.2.10 +%global release_version 1 + +%global real_version_major %(printf '%s' '%{real_version}' | sed -n 's/^\\([1-9][0-9]*\\.[1-9][0-9]*\\)\\.[1-9][0-9]*$/\\1/p') + +%global nm_version 1:1.2.0 +%global nma_version 1.2.0 + Summary: NetworkManager VPN plug-in for IPsec VPN Name: NetworkManager-libreswan -Version: 1.2.6 -Release: 2%{?dist} +Version: %{rpm_version} +Release: %{release_version}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base -Source0: https://download.gnome.org/sources/NetworkManager-libreswan/1.2/%{name}-%{version}.tar.xz - -Patch1: NetworkManager-libreswan-1.2.6-ikev2.patch +Source0: https://download.gnome.org/sources/NetworkManager-libreswan/%{real_version_major}/%{name}-%{real_version}.tar.xz +Patch1: 0001-po-import-translations-from-Red-Hat-translators.patch BuildRequires: gcc BuildRequires: gtk3-devel @@ -44,10 +49,12 @@ Obsoletes: NetworkManager-openswan < %{version}-%{release} %global __provides_exclude ^(%{_privatelibs})$ %global __requires_exclude ^(%{_privatelibs})$ + %description This package contains software for integrating the libreswan VPN software with NetworkManager and the GNOME desktop + %package -n NetworkManager-libreswan-gnome Summary: NetworkManager VPN plugin for libreswan - GNOME files Group: System Environment/Base @@ -62,9 +69,10 @@ Obsoletes: NetworkManager-openswan-gnome < %{version}-%{release} This package contains software for integrating VPN capabilities with the libreswan server with NetworkManager (GNOME files). + %prep -%setup -q -%patch1 -p1 +%autosetup -p1 -n "%{name}-%{real_version}" + %build %configure \ @@ -76,27 +84,33 @@ the libreswan server with NetworkManager (GNOME files). --with-dist-version=%{version}-%{release} make %{?_smp_mflags} + %install make install DESTDIR=%{buildroot} rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %find_lang %{name} + %post update-desktop-database &> /dev/null || : + %postun update-desktop-database &> /dev/null || : + %files -f %{name}.lang %{_libdir}/NetworkManager/libnm-vpn-plugin-libreswan.so %{_sysconfdir}/dbus-1/system.d/nm-libreswan-service.conf %{_prefix}/lib/NetworkManager/VPN/nm-libreswan-service.name %{_libexecdir}/nm-libreswan-service %{_libexecdir}/nm-libreswan-service-helper +%{_mandir}/man5/nm-settings-libreswan.5.gz %doc AUTHORS ChangeLog NEWS %license COPYING + %files -n NetworkManager-libreswan-gnome %{_libexecdir}/nm-libreswan-auth-dialog %{_libdir}/NetworkManager/libnm-vpn-plugin-libreswan-editor.so @@ -109,7 +123,12 @@ update-desktop-database &> /dev/null || : %{_sysconfdir}/NetworkManager/VPN/nm-libreswan-service.name %endif + %changelog +* Thu Oct 18 2018 Francesco Giudici - 1.2.10-1 +- Updated to 1.2.10 +- Import latest translations from upstream + * Wed Aug 22 2018 Paul Wouters - 1.2.6-1 - Updated to 1.2.6 - Upstream patches for IKEv2 support diff --git a/sources b/sources index faf5a21..55c5f00 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (NetworkManager-libreswan-1.2.6.tar.xz) = 385b7e7cfc0720be1eae0a3c7e080efd17eb6f243d069ba881b97c9638fc3bb951b3c8f1c9b44422fe81a2dc9fc85b675f977284111aeaa6304ad31750f62798 +SHA512 (NetworkManager-libreswan-1.2.10.tar.xz) = 90eef90e0ecbe8b8e7b927b49e996b042231ea25495f46b2413dd11a597f170f23668d0a3900f82c84e377dacc15f7589a48b5f28c7d6ee3580b7bbd8f61060d