Hello community,
here is the log from the commit of package NetworkManager-pptp for
openSUSE:Factory checked in at 2015-09-08 17:37:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/NetworkManager-pptp (Old)
and /work/SRC/openSUSE:Factory/.NetworkManager-pptp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "NetworkManager-pptp"
Changes:
--------
--- /work/SRC/openSUSE:Factory/NetworkManager-pptp/NetworkManager-pptp.changes
2015-07-05 17:59:52.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.NetworkManager-pptp.new/NetworkManager-pptp.changes
2015-09-08 17:38:12.000000000 +0200
@@ -1,0 +2,8 @@
+Tue Sep 1 10:38:10 UTC 2015 - si...@simotek.net
+
+- Update to version 1.0.6:
+ + Enhanced the GUI to support agent-owned and always-ask
+ passwords.
+ + Updated translations.
+
+-------------------------------------------------------------------
Old:
----
NetworkManager-pptp-1.0.2.tar.xz
New:
----
NetworkManager-pptp-1.0.6.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager-pptp.spec ++++++
--- /var/tmp/diff_new_pack.q7XC5x/_old 2015-09-08 17:38:13.000000000 +0200
+++ /var/tmp/diff_new_pack.q7XC5x/_new 2015-09-08 17:38:13.000000000 +0200
@@ -21,7 +21,7 @@
Summary: NetworkManager VPN support for PPTP
License: GPL-2.0+
Group: Productivity/Networking/System
-Version: 1.0.2
+Version: 1.0.6
Release: 0
# FIXME .desktop icons are currently disabled (on purpose) in the NM tarballs.
They will re-appear later on (when nmce supports --import)
# FIXME: --disable-more-warnings should be dropped from configure when
possible. Added with 0.9.2.0 for Gtk+ 3.3 build.
@@ -37,7 +37,7 @@
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(libnm-glib) >= 0.9.10
BuildRequires: pkgconfig(libnm-glib-vpn) >= 0.9.10
-BuildRequires: pkgconfig(libnm-gtk) >= 0.9.10
+BuildRequires: pkgconfig(libnm-gtk) >= 1.0.5
BuildRequires: pkgconfig(libnm-util) >= 0.9.10
BuildRequires: pkgconfig(libsecret-unstable)
Requires: %{name}-frontend = %{version}
++++++ NetworkManager-pptp-1.0.2.tar.xz -> NetworkManager-pptp-1.0.6.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NetworkManager-pptp-1.0.2/NEWS
new/NetworkManager-pptp-1.0.6/NEWS
--- old/NetworkManager-pptp-1.0.2/NEWS 2015-05-05 13:58:36.000000000 +0200
+++ new/NetworkManager-pptp-1.0.6/NEWS 2015-08-27 18:46:59.000000000 +0200
@@ -1,4 +1,15 @@
=======================================================
+network-manager-pptp-1.0.4
+Overview of changes since network-manager-pptp-1.0.2
+=======================================================
+
+This is a new stable release of network-manager-pptp. Notable changes include:
+
+* Enhanced the GUI to support agent-owned and always-ask passwords
+* Added Occitan translation
+
+
+=======================================================
network-manager-pptp-1.0.2
Overview of changes since network-manager-pptp-1.0
=======================================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NetworkManager-pptp-1.0.2/configure
new/NetworkManager-pptp-1.0.6/configure
--- old/NetworkManager-pptp-1.0.2/configure 2015-05-05 13:58:59.000000000
+0200
+++ new/NetworkManager-pptp-1.0.6/configure 2015-08-27 18:47:25.000000000
+0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for NetworkManager-pptp 1.0.2.
+# Generated by GNU Autoconf 2.69 for NetworkManager-pptp 1.0.6.
#
# Report bugs to <d...@redhat.com>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='NetworkManager-pptp'
PACKAGE_TARNAME='NetworkManager-pptp'
-PACKAGE_VERSION='1.0.2'
-PACKAGE_STRING='NetworkManager-pptp 1.0.2'
+PACKAGE_VERSION='1.0.6'
+PACKAGE_STRING='NetworkManager-pptp 1.0.6'
PACKAGE_BUGREPORT='d...@redhat.com'
PACKAGE_URL=''
@@ -1401,7 +1401,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures NetworkManager-pptp 1.0.2 to adapt to many kinds of
systems.
+\`configure' configures NetworkManager-pptp 1.0.6 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1472,7 +1472,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of NetworkManager-pptp 1.0.2:";;
+ short | recursive ) echo "Configuration of NetworkManager-pptp 1.0.6:";;
esac
cat <<\_ACEOF
@@ -1609,7 +1609,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-NetworkManager-pptp configure 1.0.2
+NetworkManager-pptp configure 1.0.6
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2032,7 +2032,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by NetworkManager-pptp $as_me 1.0.2, which was
+It was created by NetworkManager-pptp $as_me 1.0.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2895,7 +2895,7 @@
# Define the identity of the package.
PACKAGE='NetworkManager-pptp'
- VERSION='1.0.2'
+ VERSION='1.0.6'
cat >>confdefs.h <<_ACEOF
@@ -13789,12 +13789,12 @@
pkg_cv_NMGTK_CFLAGS="$NMGTK_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"libnm-gtk >= 0.9.10\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libnm-gtk >= 0.9.10") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"libnm-gtk >= 1.0.5\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libnm-gtk >= 1.0.5") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_NMGTK_CFLAGS=`$PKG_CONFIG --cflags "libnm-gtk >= 0.9.10" 2>/dev/null`
+ pkg_cv_NMGTK_CFLAGS=`$PKG_CONFIG --cflags "libnm-gtk >= 1.0.5" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -13806,12 +13806,12 @@
pkg_cv_NMGTK_LIBS="$NMGTK_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"libnm-gtk >= 0.9.10\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libnm-gtk >= 0.9.10") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"libnm-gtk >= 1.0.5\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libnm-gtk >= 1.0.5") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_NMGTK_LIBS=`$PKG_CONFIG --libs "libnm-gtk >= 0.9.10" 2>/dev/null`
+ pkg_cv_NMGTK_LIBS=`$PKG_CONFIG --libs "libnm-gtk >= 1.0.5" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -13832,14 +13832,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- NMGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "libnm-gtk >= 0.9.10" 2>&1`
+ NMGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "libnm-gtk >= 1.0.5" 2>&1`
else
- NMGTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"libnm-gtk >= 0.9.10" 2>&1`
+ NMGTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"libnm-gtk >= 1.0.5" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$NMGTK_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (libnm-gtk >= 0.9.10) were not met:
+ as_fn_error $? "Package requirements (libnm-gtk >= 1.0.5) were not met:
$NMGTK_PKG_ERRORS
@@ -14586,7 +14586,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by NetworkManager-pptp $as_me 1.0.2, which was
+This file was extended by NetworkManager-pptp $as_me 1.0.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14652,7 +14652,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-NetworkManager-pptp config.status 1.0.2
+NetworkManager-pptp config.status 1.0.6
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NetworkManager-pptp-1.0.2/configure.ac
new/NetworkManager-pptp-1.0.6/configure.ac
--- old/NetworkManager-pptp-1.0.2/configure.ac 2015-05-05 13:58:45.000000000
+0200
+++ new/NetworkManager-pptp-1.0.6/configure.ac 2015-08-27 18:47:10.000000000
+0200
@@ -1,6 +1,6 @@
AC_PREREQ(2.59)
-AC_INIT(NetworkManager-pptp, 1.0.2, d...@redhat.com, NetworkManager-pptp)
+AC_INIT(NetworkManager-pptp, 1.0.6, d...@redhat.com, NetworkManager-pptp)
AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2 subdir-objects])
AM_MAINTAINER_MODE
@@ -84,7 +84,7 @@
AC_SUBST(GTK_LIBS)
GTK_CFLAGS="$GTK_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4"
- PKG_CHECK_MODULES(NMGTK, libnm-gtk >= 0.9.10)
+ PKG_CHECK_MODULES(NMGTK, libnm-gtk >= 1.0.5)
AC_SUBST(NMGTK_CFLAGS)
AC_SUBST(NMGTK_LIBS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NetworkManager-pptp-1.0.2/po/LINGUAS
new/NetworkManager-pptp-1.0.6/po/LINGUAS
--- old/NetworkManager-pptp-1.0.2/po/LINGUAS 2015-04-27 15:53:18.000000000
+0200
+++ new/NetworkManager-pptp-1.0.6/po/LINGUAS 2015-08-21 12:58:56.000000000
+0200
@@ -36,6 +36,7 @@
mr
nb
nl
+oc
pa
pl
pt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NetworkManager-pptp-1.0.2/po/oc.po
new/NetworkManager-pptp-1.0.6/po/oc.po
--- old/NetworkManager-pptp-1.0.2/po/oc.po 1970-01-01 01:00:00.000000000
+0100
+++ new/NetworkManager-pptp-1.0.6/po/oc.po 2015-08-21 12:58:56.000000000
+0200
@@ -0,0 +1,402 @@
+# Occitan (post 1500) translation for network-manager-pptp
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the network-manager-pptp
package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: network-manager-pptp\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2015-01-27 16:04+0000\n"
+"PO-Revision-Date: 2012-09-14 05:46+0000\n"
+"Last-Translator: Cédric VALMARY (Tot en òc) <cvalm...@yahoo.fr>\n"
+"Language-Team: Occitan (post 1500) <o...@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2015-05-20 17:00+0000\n"
+"X-Generator: Launchpad (build 17508)\n"
+
+#. Otherwise, we have no saved password, or the password flags indicated
+#. * that the password should never be saved.
+#.
+#: ../auth-dialog/main.c:155
+#, c-format
+msgid "You need to authenticate to access the Virtual Private Network '%s'."
+msgstr ""
+"Vos cal vos autentificar per accedir a la ret privada virtuala (VPN) « %s »."
+
+#: ../auth-dialog/main.c:164 ../auth-dialog/main.c:184
+msgid "Authenticate VPN"
+msgstr "Autentificar lo VPN"
+
+#: ../auth-dialog/main.c:166 ../properties/nm-pptp-dialog.ui.h:43
+msgid "Password:"
+msgstr "Senhal :"
+
+#: ../nm-pptp.desktop.in.h:1
+msgid "PPTP VPN Connection Manager"
+msgstr "Gestionari de connexion VPN PPTP"
+
+#: ../nm-pptp.desktop.in.h:2
+msgid "Add, Remove, and Edit PPTP VPN Connections"
+msgstr "Apondre, suprimir e modificar de connexions VPN PPTP"
+
+#: ../properties/advanced-dialog.c:185
+msgid "All Available (Default)"
+msgstr "Segon la disponibilitat (per defaut)"
+
+#: ../properties/advanced-dialog.c:189
+msgid "128-bit (most secure)"
+msgstr "128-bit (lo mai securizat)"
+
+#: ../properties/advanced-dialog.c:198
+msgid "40-bit (less secure)"
+msgstr "40-bit (lo mens securizat)"
+
+#: ../properties/advanced-dialog.c:302
+msgid "PAP"
+msgstr "PAP"
+
+#: ../properties/advanced-dialog.c:315
+msgid "CHAP"
+msgstr "CHAP"
+
+#: ../properties/advanced-dialog.c:327
+msgid "MSCHAP"
+msgstr "MSCHAP"
+
+#: ../properties/advanced-dialog.c:339
+msgid "MSCHAPv2"
+msgstr "MSCHAPv2"
+
+#: ../properties/advanced-dialog.c:352
+msgid "EAP"
+msgstr "EAP"
+
+#: ../properties/nm-pptp-dialog.ui.h:1
+msgid "Default"
+msgstr "Per defaut"
+
+#: ../properties/nm-pptp-dialog.ui.h:33
+msgid "<b>General</b>"
+msgstr "<b>General</b>"
+
+#: ../properties/nm-pptp-dialog.ui.h:34
+msgid ""
+"PPTP server IP or name.\n"
+"config: the first parameter of pptp"
+msgstr ""
+"Nom o adreça IP del servidor PPTP.\n"
+"configuracion : lo primièr paramètre de pptp"
+
+#: ../properties/nm-pptp-dialog.ui.h:36
+msgid "_Gateway:"
+msgstr "_Palanca :"
+
+#: ../properties/nm-pptp-dialog.ui.h:37
+msgid "<b>Optional</b>"
+msgstr "<b>Opcional</b>"
+
+#: ../properties/nm-pptp-dialog.ui.h:38
+msgid ""
+"Append the domain name <domain> to the local host name for authentication "
+"purposes.\n"
+"config: domain <domain>"
+msgstr ""
+"Apond lo nom de domeni <domeni> al nom d'òste local per se poder "
+"autentificar.\n"
+"configuracion : domain <domeni>"
+
+#: ../properties/nm-pptp-dialog.ui.h:40
+msgid "NT Domain:"
+msgstr "Domeni NT :"
+
+#: ../properties/nm-pptp-dialog.ui.h:41
+msgid "Show password"
+msgstr "Afichar lo senhal"
+
+#: ../properties/nm-pptp-dialog.ui.h:42
+msgid "Password passed to PPTP when prompted for it."
+msgstr "Senhal transmés a PPTP quand aqueste es demandat."
+
+#: ../properties/nm-pptp-dialog.ui.h:44
+msgid ""
+"Set the name used for authenticating the local system to the peer to "
+"<name>.\n"
+"config: user <name>"
+msgstr ""
+"Definís lo nom utilizat per autentificar lo sistèma local per la "
+"comunicacion amb <nom>.\n"
+"configuracion : user <nom>"
+
+#: ../properties/nm-pptp-dialog.ui.h:46
+msgid "User name:"
+msgstr "Nom d'utilizaire :"
+
+#: ../properties/nm-pptp-dialog.ui.h:47
+msgid "Ad_vanced..."
+msgstr "A_vançat..."
+
+#: ../properties/nm-pptp-dialog.ui.h:2
+msgid "PPTP Advanced Options"
+msgstr "Opcions avançada PPTP"
+
+#: ../properties/nm-pptp-dialog.ui.h:3
+msgid "<b>Authentication</b>"
+msgstr "<b>Autentificacion</b>"
+
+#: ../properties/nm-pptp-dialog.ui.h:4
+msgid "Allow the following authentication methods:"
+msgstr "Permetre los metòdes d'autentificacion seguentas :"
+
+#: ../properties/nm-pptp-dialog.ui.h:5
+msgid ""
+"Allow/disable authentication methods.\n"
+"config: refuse-pap, refuse-chap, refuse-mschap, refuse-mschap-v2, refuse-eap"
+msgstr ""
+"Autoriza/desactiva los metòdes d'autentificacion.\n"
+"configuracion : refuse-pap, refuse-chap, refuse-mschap, refuse-mschap-v2, "
+"refuse-eap"
+
+#: ../properties/nm-pptp-dialog.ui.h:7
+msgid "<b>Security and Compression</b>"
+msgstr "<b>Seguretat e compression</b>"
+
+#: ../properties/nm-pptp-dialog.ui.h:8
+msgid "Use _Point-to-Point encryption (MPPE)"
+msgstr "Utilizar lo chiframent _Point-to-Point (MPPE)"
+
+#: ../properties/nm-pptp-dialog.ui.h:9
+msgid ""
+"Note: MPPE encryption is only available with MSCHAP authentication methods. "
+"To enable this checkbox, select one or more of the MSCHAP authentication "
+"methods: MSCHAP or MSCHAPv2."
+msgstr ""
+"Nòta : lo chiframent MPPE es pas disponible qu'amb los metòdes "
+"d'autentificacion MSCHAP. Per activar aquesta casa de marcar, seleccionatz "
+"al mens un dels metòdes d'autentificacion MSCHAP : MSCHAP o MSCHAPv2."
+
+#: ../properties/nm-pptp-dialog.ui.h:10
+msgid "_Security:"
+msgstr "_Seguretat :"
+
+#: ../properties/nm-pptp-dialog.ui.h:11
+msgid ""
+"Require the use of MPPE, with 40/128-bit encryption or all.\n"
+"config: require-mppe, require-mppe-128 or require-mppe-40"
+msgstr ""
+"Necessita l'utilizacion de MPPE, amb lo chiframent sus 40 o 128 bits o los "
+"dos.\n"
+"configuracion : require-mppe, require-mppe-128 o require-mppe-40"
+
+#: ../properties/nm-pptp-dialog.ui.h:13
+msgid "Allow st_ateful encryption"
+msgstr "Permetre lo _chiframent amb estat"
+
+#: ../properties/nm-pptp-dialog.ui.h:14
+msgid ""
+"Allow MPPE to use stateful mode. Stateless mode is still attempted first.\n"
+"config: mppe-stateful (when checked)"
+msgstr ""
+"Permet a MPPE d'utilizar lo mòde amb estat. Lo mòde sens estat es totjorn "
+"temptat en primièr.\n"
+"configuracion : mppe-stateful (se marcat)"
+
+#: ../properties/nm-pptp-dialog.ui.h:16
+msgid "Allow _BSD data compression"
+msgstr "Permetre la compression de donadas _BSD"
+
+#: ../properties/nm-pptp-dialog.ui.h:17
+msgid ""
+"Allow/disable BSD-Compress compression.\n"
+"config: nobsdcomp (when unchecked)"
+msgstr ""
+"Autoriza/desactiva la compression BSD-Compress.\n"
+"configuracion : nobsdcomp (se desmarcat)"
+
+#: ../properties/nm-pptp-dialog.ui.h:19
+msgid "Allow _Deflate data compression"
+msgstr "Permetre la compression de donadas « _Deflate »"
+
+#: ../properties/nm-pptp-dialog.ui.h:20
+msgid ""
+"Allow/disable Deflate compression.\n"
+"config: nodeflate (when unchecked)"
+msgstr ""
+"Autoriza/desactiva la compression Deflate.\n"
+"configuracion : nodeflate (se desmarcat)"
+
+#: ../properties/nm-pptp-dialog.ui.h:22
+msgid "Use TCP _header compression"
+msgstr "Utilizar la compression de las _entèstas TCP"
+
+#: ../properties/nm-pptp-dialog.ui.h:23
+msgid ""
+"Allow/disable Van Jacobson style TCP/IP header compression in both the "
+"transmit and the receive directions.\n"
+"config: novj (when unchecked)"
+msgstr ""
+"Autoriza/desactiva la compression d'entèsta TCP/IP d'estil Van Jacobson a "
+"l'encòp en transmission e en recepcion.\n"
+"configuracion : novj (se desmarcat)"
+
+#: ../properties/nm-pptp-dialog.ui.h:25
+msgid "<b>Echo</b>"
+msgstr "<b>Resson</b>"
+
+#: ../properties/nm-pptp-dialog.ui.h:26
+msgid "Send PPP _echo packets"
+msgstr "Mandar los pa_quets de resson PPP"
+
+#: ../properties/nm-pptp-dialog.ui.h:27
+msgid ""
+"Send LCP echo-requests to find out whether peer is alive.\n"
+"config: lcp-echo-failure and lcp-echo-interval"
+msgstr ""
+"Manda las requèstas-resson LCP per tal de saber se lo client es actiu.\n"
+"configuracion : lcp-echo-failure e lcp-echo-interval"
+
+#: ../properties/nm-pptp.c:47
+msgid "Point-to-Point Tunneling Protocol (PPTP)"
+msgstr "Protocòl de tunèl Point-to-Point (PPTP)"
+
+#: ../properties/nm-pptp.c:48
+msgid "Compatible with Microsoft and other PPTP VPN servers."
+msgstr "Compatible amb Microsoft e d'autres servidors VPN PPTP."
+
+#: ../properties/nm-pptp.c:315
+msgid "Saved"
+msgstr "Enregistrat"
+
+#: ../properties/nm-pptp.c:323
+msgid "Always Ask"
+msgstr "Demandar totjorn"
+
+#: ../properties/nm-pptp.c:328
+msgid "Not Required"
+msgstr "Pas requesit"
+
+#: ../src/nm-pptp-service.c:161
+#, c-format
+msgid "couldn't convert PPTP VPN gateway IP address '%s' (%d)"
+msgstr ""
+"impossible de convertir l'adreça IP « %s » (%d) de la palanca VPN PPTP"
+
+#: ../src/nm-pptp-service.c:179
+#, c-format
+msgid "couldn't look up PPTP VPN gateway IP address '%s' (%d)"
+msgstr ""
+"impossible de consultar l'adreça IP « %s » (%d) de la palanca VPN PPTP"
+
+#: ../src/nm-pptp-service.c:203
+#, c-format
+msgid "no usable addresses returned for PPTP VPN gateway '%s'"
+msgstr "Cap d'adreça utilizabla pas obtenguda per la palanca VPN PPTP « %s »"
+
+#: ../src/nm-pptp-service.c:214
+#, c-format
+msgid "no usable addresses returned for PPTP VPN gateway '%s' (%d)"
+msgstr ""
+"Cap d'adreça utilizabla pas obtenguda per la palanca VPN PPTP « %s » (%d)"
+
+#: ../src/nm-pptp-service.c:241
+msgid "Could not find secrets (connection invalid, no vpn setting)."
+msgstr ""
+"Impossible de trobar las infos secretas (connexion pas valida, pas de "
+"paramètres VPN)."
+
+#: ../src/nm-pptp-service.c:253
+msgid "Invalid VPN username."
+msgstr "Nom d'utilizaire VPN invalid."
+
+#: ../src/nm-pptp-service.c:262
+msgid "Missing VPN username."
+msgstr "Nom d'utilizaire VPN mancant."
+
+#: ../src/nm-pptp-service.c:272
+msgid "Missing or invalid VPN password."
+msgstr "Senhal VPN mancant o invalid."
+
+#: ../src/nm-pptp-service.c:430
+msgid "No cached credentials."
+msgstr "Pas de donadas d'autentificacion en escondedor."
+
+#: ../src/nm-pptp-service.c:577
+#, c-format
+msgid "invalid gateway '%s'"
+msgstr "palanca « %s » invalida"
+
+#: ../src/nm-pptp-service.c:591
+#, c-format
+msgid "invalid integer property '%s'"
+msgstr "proprietat nombre entièr « %s » invalida"
+
+#: ../src/nm-pptp-service.c:601
+#, c-format
+msgid "invalid boolean property '%s' (not yes or no)"
+msgstr "proprietat booleana « %s » invalida (ni òc, ni non)"
+
+#: ../src/nm-pptp-service.c:608
+#, c-format
+msgid "unhandled property '%s' type %s"
+msgstr "proprietat « %s » de tipe « %s » pas gerida"
+
+#: ../src/nm-pptp-service.c:619
+#, c-format
+msgid "property '%s' invalid or not supported"
+msgstr "proprietat « %s » invalida o pas presa en carga"
+
+#: ../src/nm-pptp-service.c:637
+msgid "No VPN configuration options."
+msgstr "Pas d'opcions de configuracion VPN."
+
+#: ../src/nm-pptp-service.c:657
+#, c-format
+msgid "Missing required option '%s'."
+msgstr "Opcion obligatòria « %s » mancanta."
+
+#: ../src/nm-pptp-service.c:677
+msgid "No VPN secrets!"
+msgstr "Pas d'infos secretas VPN !"
+
+#: ../src/nm-pptp-service.c:835
+msgid "Could not find pptp client binary."
+msgstr "Impossible de trobar lo client binari pptp."
+
+#: ../src/nm-pptp-service.c:848
+msgid "Missing VPN gateway."
+msgstr "Palanca VPN mancanta."
+
+#: ../src/nm-pptp-service.c:1009
+msgid "Could not find the pppd binary."
+msgstr "Impossible de trobar lo binari pppd."
+
+#: ../src/nm-pptp-service.c:1139
+msgid "Invalid or missing PPTP gateway."
+msgstr "Palanca PPTP invalida o absenta."
+
+#: ../src/nm-pptp-service.c:1320
+msgid "Don't quit when VPN connection terminates"
+msgstr "Quitar pas quend la connexion VPN s'acaba"
+
+#: ../src/nm-pptp-service.c:1321
+msgid "Enable verbose debug logging (may expose passwords)"
+msgstr "Activar lo desbugatge verbós (de senhals pòdon aparéisser)"
+
+#: ../src/nm-pptp-service.c:1344
+msgid ""
+"nm-pptp-service provides integrated PPTP VPN capability (compatible with "
+"Microsoft and other implementations) to NetworkManager."
+msgstr ""
+"nm-pptp-service ofrís de foncions de VPN PPTP integradas a NetworkManager "
+"(compatible amb Microsoft e d'autras implementacions)."
+
+#~ msgid "_Password:"
+#~ msgstr "Se_nhal :"
+
+#~ msgid "_Secondary Password:"
+#~ msgstr "Senhal _segondari :"
+
+#~ msgid "Sh_ow passwords"
+#~ msgstr "A_fichar lo senhal"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NetworkManager-pptp-1.0.2/po/ru.po
new/NetworkManager-pptp-1.0.6/po/ru.po
--- old/NetworkManager-pptp-1.0.2/po/ru.po 2014-09-01 16:07:49.000000000
+0200
+++ new/NetworkManager-pptp-1.0.6/po/ru.po 2015-08-27 18:46:06.000000000
+0200
@@ -5,48 +5,38 @@
# Leonid Kanter <l...@asplinux.ru>, 2007, 2008.
# Артём Попов <art...@gmail.com>, 2009.
# Yuri Kozlov <yu...@komyakino.ru>, 2010, 2011.
+# Stas Solovey <whats...@tut.by>, 2015.
+#
msgid ""
msgstr ""
"Project-Id-Version: ru\n"
-"Report-Msgid-Bugs-To:
http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&keywords=I18N+L10N&component=VPN:
pptp\n"
-"POT-Creation-Date: 2012-04-13 12:37+0000\n"
-"PO-Revision-Date: 2012-12-22 11:30+0300\n"
-"Last-Translator: Yuri Myasoedov <omert...@yandex.ru>\n"
-"Language-Team: Russian <gnome-...@gnome.org>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=NetworkManager&keywords=I18N+L10N&component=VPN: pptp\n"
+"POT-Creation-Date: 2015-07-09 11:30+0000\n"
+"PO-Revision-Date: 2015-07-27 23:19+0300\n"
+"Last-Translator: Stas Solovey <whats...@tut.by>\n"
+"Language-Team: Русский <gnome-...@gnome.org>\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"
-"X-Generator: Lokalize 1.0\n"
-
-#: ../auth-dialog/vpn-password-dialog.c:95
-msgid "_Password:"
-msgstr "_Пароль:"
-
-#: ../auth-dialog/vpn-password-dialog.c:97
-msgid "_Secondary Password:"
-msgstr "_Вторичный пароль:"
-
-#: ../auth-dialog/vpn-password-dialog.c:239
-#| msgid "Show password"
-msgid "Sh_ow passwords"
-msgstr "По_казать пароли"
+"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: Gtranslator 2.91.7\n"
#. Otherwise, we have no saved password, or the password flags indicated
#. * that the password should never be saved.
#.
-#: ../auth-dialog/main.c:145
+#: ../auth-dialog/main.c:155
#, c-format
msgid "You need to authenticate to access the Virtual Private Network '%s'."
msgstr "Необходима аутентификация для доступа к виртуальной частной сети «%s»."
-#: ../auth-dialog/main.c:154
-#: ../auth-dialog/main.c:174
+#: ../auth-dialog/main.c:164 ../auth-dialog/main.c:184
msgid "Authenticate VPN"
msgstr "Аутентификация VPN"
-#: ../auth-dialog/main.c:156
-#: ../properties/nm-pptp-dialog.ui.h:12
+#: ../auth-dialog/main.c:166 ../properties/nm-pptp-dialog.ui.h:39
msgid "Password:"
msgstr "Пароль:"
@@ -58,35 +48,35 @@
msgid "Add, Remove, and Edit PPTP VPN Connections"
msgstr "Добавить, удалить или изменить подключения PPTP VPN"
-#: ../properties/advanced-dialog.c:187
+#: ../properties/advanced-dialog.c:184
msgid "All Available (Default)"
msgstr "Любое доступное (по умолчанию)"
-#: ../properties/advanced-dialog.c:191
+#: ../properties/advanced-dialog.c:188
msgid "128-bit (most secure)"
msgstr "128 бит (самое защищённое)"
-#: ../properties/advanced-dialog.c:200
+#: ../properties/advanced-dialog.c:197
msgid "40-bit (less secure)"
msgstr "40 бит (менее защищённое)"
-#: ../properties/advanced-dialog.c:309
+#: ../properties/advanced-dialog.c:301
msgid "PAP"
msgstr "PAP"
-#: ../properties/advanced-dialog.c:322
+#: ../properties/advanced-dialog.c:314
msgid "CHAP"
msgstr "CHAP"
-#: ../properties/advanced-dialog.c:334
+#: ../properties/advanced-dialog.c:326
msgid "MSCHAP"
msgstr "MSCHAP"
-#: ../properties/advanced-dialog.c:346
+#: ../properties/advanced-dialog.c:338
msgid "MSCHAPv2"
msgstr "MSCHAPv2"
-#: ../properties/advanced-dialog.c:359
+#: ../properties/advanced-dialog.c:351
msgid "EAP"
msgstr "EAP"
@@ -95,73 +85,18 @@
msgstr "По умолчанию"
#: ../properties/nm-pptp-dialog.ui.h:2
-msgid "<b>General</b>"
-msgstr "<b>Общие</b>"
-
-#: ../properties/nm-pptp-dialog.ui.h:3
-msgid ""
-"PPTP server IP or name.\n"
-"config: the first parameter of pptp"
-msgstr ""
-"IP-адрес или имя PPTP-сервера.\n"
-"config: первый параметр pptp"
-
-#: ../properties/nm-pptp-dialog.ui.h:5
-msgid "_Gateway:"
-msgstr "_Шлюз:"
-
-#: ../properties/nm-pptp-dialog.ui.h:6
-msgid "<b>Optional</b>"
-msgstr "<b>Дополнительные</b>"
-
-#: ../properties/nm-pptp-dialog.ui.h:7
-msgid ""
-"Append the domain name <domain> to the local host name for authentication
purposes.\n"
-"config: domain <domain>"
-msgstr ""
-"Добавить имя домена <domain> к имени локального узла для аутентификации.\n"
-"config: domain <domain>"
-
-#: ../properties/nm-pptp-dialog.ui.h:9
-msgid "NT Domain:"
-msgstr "NT-домен:"
-
-#: ../properties/nm-pptp-dialog.ui.h:10
-msgid "Show password"
-msgstr "Показать пароль"
-
-#: ../properties/nm-pptp-dialog.ui.h:11
-msgid "Password passed to PPTP when prompted for it."
-msgstr "Пароль, передаваемый PPTP по запросу."
-
-#: ../properties/nm-pptp-dialog.ui.h:13
-#, fuzzy
-msgid ""
-"Set the name used for authenticating the local system to the peer to
<name>.\n"
-"config: user <name>"
-msgstr "Установить имя, используемое для аутентификации локальной системы"
-
-#: ../properties/nm-pptp-dialog.ui.h:15
-msgid "User name:"
-msgstr "Имя пользователя:"
-
-#: ../properties/nm-pptp-dialog.ui.h:16
-msgid "Ad_vanced..."
-msgstr "_Дополнительно..."
-
-#: ../properties/nm-pptp-dialog.ui.h:17
msgid "PPTP Advanced Options"
msgstr "Дополнительные параметры PPTP"
-#: ../properties/nm-pptp-dialog.ui.h:18
+#: ../properties/nm-pptp-dialog.ui.h:3
msgid "<b>Authentication</b>"
msgstr "<b>Аутентификация</b>"
-#: ../properties/nm-pptp-dialog.ui.h:19
+#: ../properties/nm-pptp-dialog.ui.h:4
msgid "Allow the following authentication methods:"
msgstr "Разрешить следующие методы аутентификации:"
-#: ../properties/nm-pptp-dialog.ui.h:20
+#: ../properties/nm-pptp-dialog.ui.h:5
msgid ""
"Allow/disable authentication methods.\n"
"config: refuse-pap, refuse-chap, refuse-mschap, refuse-mschap-v2, refuse-eap"
@@ -169,23 +104,29 @@
"Разрешить/запретить методы аутентификации.\n"
"config: refuse-pap, refuse-chap, refuse-mschap, refuse-mschap-v2, refuse-eap"
-#: ../properties/nm-pptp-dialog.ui.h:22
+#: ../properties/nm-pptp-dialog.ui.h:7
msgid "<b>Security and Compression</b>"
msgstr "<b>Шифрование и сжатие</b>"
-#: ../properties/nm-pptp-dialog.ui.h:23
+#: ../properties/nm-pptp-dialog.ui.h:8
msgid "Use _Point-to-Point encryption (MPPE)"
msgstr "Использовать шифрование _MPPE"
-#: ../properties/nm-pptp-dialog.ui.h:24
-msgid "Note: MPPE encryption is only available with MSCHAP authentication
methods. To enable this checkbox, select one or more of the MSCHAP
authentication methods: MSCHAP or MSCHAPv2."
-msgstr "Замечание: Шифрование MPPE доступно только с методами аутентификации
MSCHAP. Чтобы включить данный пункт, выберите один или более методов
аутентификации MSCHAP: MSCHAP или MSCHAPv2."
+#: ../properties/nm-pptp-dialog.ui.h:9
+msgid ""
+"Note: MPPE encryption is only available with MSCHAP authentication methods. "
+"To enable this checkbox, select one or more of the MSCHAP authentication "
+"methods: MSCHAP or MSCHAPv2."
+msgstr ""
+"Замечание: Шифрование MPPE доступно только с методами аутентификации MSCHAP. "
+"Чтобы включить данный пункт, выберите один или более методов аутентификации "
+"MSCHAP: MSCHAP или MSCHAPv2."
-#: ../properties/nm-pptp-dialog.ui.h:25
+#: ../properties/nm-pptp-dialog.ui.h:10
msgid "_Security:"
msgstr "_Шифрование:"
-#: ../properties/nm-pptp-dialog.ui.h:26
+#: ../properties/nm-pptp-dialog.ui.h:11
msgid ""
"Require the use of MPPE, with 40/128-bit encryption or all.\n"
"config: require-mppe, require-mppe-128 or require-mppe-40"
@@ -193,23 +134,24 @@
"Требуется использовать MPPE с 40- или 128-битным шифрованием.\n"
"config: require-mppe, require-mppe-128 или require-mppe-40"
-#: ../properties/nm-pptp-dialog.ui.h:28
+#: ../properties/nm-pptp-dialog.ui.h:13
msgid "Allow st_ateful encryption"
msgstr "Включить _Stateful Encryption"
-#: ../properties/nm-pptp-dialog.ui.h:29
+#: ../properties/nm-pptp-dialog.ui.h:14
msgid ""
"Allow MPPE to use stateful mode. Stateless mode is still attempted first.\n"
"config: mppe-stateful (when checked)"
msgstr ""
-"Разрешить MPPE использовать контекстный (stateful) режим. Сначала
производится попытка использовать простой (stateless) режим.\n"
+"Разрешить MPPE использовать контекстный (stateful) режим. Сначала "
+"производится попытка использовать простой (stateless) режим.\n"
"config: mppe-stateful (если не выбрано)"
-#: ../properties/nm-pptp-dialog.ui.h:31
+#: ../properties/nm-pptp-dialog.ui.h:16
msgid "Allow _BSD data compression"
msgstr "Использовать для данных сжатие _BSD"
-#: ../properties/nm-pptp-dialog.ui.h:32
+#: ../properties/nm-pptp-dialog.ui.h:17
msgid ""
"Allow/disable BSD-Compress compression.\n"
"config: nobsdcomp (when unchecked)"
@@ -217,11 +159,11 @@
"Разрешить/запретить сжатие BSD-Compress.\n"
"config: nobsdcomp (если не выбрано)"
-#: ../properties/nm-pptp-dialog.ui.h:34
+#: ../properties/nm-pptp-dialog.ui.h:19
msgid "Allow _Deflate data compression"
msgstr "Использовать для данных сжатие _Deflate"
-#: ../properties/nm-pptp-dialog.ui.h:35
+#: ../properties/nm-pptp-dialog.ui.h:20
msgid ""
"Allow/disable Deflate compression.\n"
"config: nodeflate (when unchecked)"
@@ -229,27 +171,29 @@
"Разрешить/запретить сжатие Deflate.\n"
"config: nodeflate (если не выбрано)"
-#: ../properties/nm-pptp-dialog.ui.h:37
+#: ../properties/nm-pptp-dialog.ui.h:22
msgid "Use TCP _header compression"
msgstr "Использовать сжатие _заголовков TCP"
-#: ../properties/nm-pptp-dialog.ui.h:38
+#: ../properties/nm-pptp-dialog.ui.h:23
msgid ""
-"Allow/disable Van Jacobson style TCP/IP header compression in both the
transmit and the receive directions.\n"
+"Allow/disable Van Jacobson style TCP/IP header compression in both the "
+"transmit and the receive directions.\n"
"config: novj (when unchecked)"
msgstr ""
-"Разрешить/запретить сжатие заголовков TCP/IP по методу Ван Якобсона в
направлениях передачи и приёма.\n"
+"Разрешить/запретить сжатие заголовков TCP/IP по методу Ван Якобсона в "
+"направлениях передачи и приёма.\n"
"config: novj (если не выбрано)"
-#: ../properties/nm-pptp-dialog.ui.h:40
+#: ../properties/nm-pptp-dialog.ui.h:25
msgid "<b>Echo</b>"
msgstr "<b>Эхо</b>"
-#: ../properties/nm-pptp-dialog.ui.h:41
+#: ../properties/nm-pptp-dialog.ui.h:26
msgid "Send PPP _echo packets"
msgstr "Посылать _эхо-пакеты PPP"
-#: ../properties/nm-pptp-dialog.ui.h:42
+#: ../properties/nm-pptp-dialog.ui.h:27
msgid ""
"Send LCP echo-requests to find out whether peer is alive.\n"
"config: lcp-echo-failure and lcp-echo-interval"
@@ -257,146 +201,180 @@
"Посылать эхо-запросы LCP, чтобы проверить состояние узла.\n"
"config: lcp-echo-failure и lcp-echo-interval"
-#: ../properties/nm-pptp.c:49
+#: ../properties/nm-pptp-dialog.ui.h:29
+msgid "<b>General</b>"
+msgstr "<b>Общие</b>"
+
+#: ../properties/nm-pptp-dialog.ui.h:30
+msgid ""
+"PPTP server IP or name.\n"
+"config: the first parameter of pptp"
+msgstr ""
+"IP-адрес или имя PPTP-сервера.\n"
+"config: первый параметр pptp"
+
+#: ../properties/nm-pptp-dialog.ui.h:32
+msgid "_Gateway:"
+msgstr "_Шлюз:"
+
+#: ../properties/nm-pptp-dialog.ui.h:33
+msgid "<b>Optional</b>"
+msgstr "<b>Дополнительные</b>"
+
+#: ../properties/nm-pptp-dialog.ui.h:34
+msgid ""
+"Append the domain name <domain> to the local host name for authentication "
+"purposes.\n"
+"config: domain <domain>"
+msgstr ""
+"Добавить имя домена <domain> к имени локального узла для аутентификации.\n"
+"config: domain <domain>"
+
+#: ../properties/nm-pptp-dialog.ui.h:36
+msgid "NT Domain:"
+msgstr "NT-домен:"
+
+#: ../properties/nm-pptp-dialog.ui.h:37
+msgid "Show password"
+msgstr "Показать пароль"
+
+#: ../properties/nm-pptp-dialog.ui.h:38
+msgid "Password passed to PPTP when prompted for it."
+msgstr "Пароль, передаваемый PPTP по запросу."
+
+#: ../properties/nm-pptp-dialog.ui.h:40
+msgid ""
+"Set the name used for authenticating the local system to the peer to "
+"<name>.\n"
+"config: user <name>"
+msgstr ""
+"Установить имя, используемое для аутентификации локальной системы к узлу "
+"<name>.\n"
+"config: имя пользователя <name>"
+
+#: ../properties/nm-pptp-dialog.ui.h:42
+msgid "User name:"
+msgstr "Имя пользователя:"
+
+#: ../properties/nm-pptp-dialog.ui.h:43
+msgid "Ad_vanced..."
+msgstr "_Дополнительно…"
+
+#: ../properties/nm-pptp.c:50
msgid "Point-to-Point Tunneling Protocol (PPTP)"
msgstr "Point-to-Point Tunneling Protocol (PPTP)"
-#: ../properties/nm-pptp.c:50
+#: ../properties/nm-pptp.c:51
msgid "Compatible with Microsoft and other PPTP VPN servers."
msgstr "Совместим с серверами Microsoft и другими серверами PPTP VPN."
-#: ../properties/nm-pptp.c:317
-msgid "Saved"
-msgstr "Сохранённый"
-
-#: ../properties/nm-pptp.c:325
-msgid "Always Ask"
-msgstr "Всегда спрашивать"
-
-#: ../properties/nm-pptp.c:330
-msgid "Not Required"
-msgstr "Не требуется"
-
-#: ../src/nm-pptp-service.c:160
+#: ../src/nm-pptp-service.c:161
#, c-format
msgid "couldn't convert PPTP VPN gateway IP address '%s' (%d)"
msgstr "не удалось преобразовать IP-адрес шлюза PPTP VPN «%s» (%d)"
-#: ../src/nm-pptp-service.c:178
+#: ../src/nm-pptp-service.c:179
#, c-format
msgid "couldn't look up PPTP VPN gateway IP address '%s' (%d)"
msgstr "не удалось найти IP-адрес шлюза PPTP VPN «%s» (%d)"
-#: ../src/nm-pptp-service.c:202
+#: ../src/nm-pptp-service.c:203
#, c-format
msgid "no usable addresses returned for PPTP VPN gateway '%s'"
msgstr "не получен приемлемый IP-адрес шлюза PPTP VPN «%s»"
-#: ../src/nm-pptp-service.c:213
+#: ../src/nm-pptp-service.c:214
#, c-format
msgid "no usable addresses returned for PPTP VPN gateway '%s' (%d)"
msgstr "не получен приемлемый IP-адрес шлюза PPTP VPN «%s» (%d)"
-#: ../src/nm-pptp-service.c:240
+#: ../src/nm-pptp-service.c:241
msgid "Could not find secrets (connection invalid, no vpn setting)."
-msgstr "Не удалось найти секретные ключи (некорректное подключение, не
настроен vpn)."
+msgstr ""
+"Не удалось найти секретные ключи (некорректное подключение, не настроен vpn)."
-#: ../src/nm-pptp-service.c:252
+#: ../src/nm-pptp-service.c:253
msgid "Invalid VPN username."
-msgstr "Некорректное имя пользователя VPN."
+msgstr "Неверное имя пользователя VPN."
-#: ../src/nm-pptp-service.c:261
+#: ../src/nm-pptp-service.c:262
msgid "Missing VPN username."
-msgstr "Отсутствует имени пользователя VPN."
+msgstr "Отсутствует имя пользователя VPN."
-#: ../src/nm-pptp-service.c:271
+#: ../src/nm-pptp-service.c:272
msgid "Missing or invalid VPN password."
-msgstr "Отсутствует и некорректный пароль VPN."
+msgstr "Пароль VPN отсутствует или неверный."
-#: ../src/nm-pptp-service.c:429
+#: ../src/nm-pptp-service.c:430
msgid "No cached credentials."
-msgstr "Нет учётных данных (credentials) в кэше."
+msgstr "Нет учётных данных в кэше."
-#: ../src/nm-pptp-service.c:575
+#: ../src/nm-pptp-service.c:576
#, c-format
msgid "invalid gateway '%s'"
-msgstr "некорректный шлюз «%s»"
+msgstr "неверный шлюз «%s»"
-#: ../src/nm-pptp-service.c:589
+#: ../src/nm-pptp-service.c:590
#, c-format
msgid "invalid integer property '%s'"
-msgstr "«%s» некорректно для целочисленного свойства"
+msgstr "«%s» неверно для целочисленного свойства"
-#: ../src/nm-pptp-service.c:599
+#: ../src/nm-pptp-service.c:600
#, c-format
msgid "invalid boolean property '%s' (not yes or no)"
-msgstr "«%s» некорректно для логического свойства (не «да» или «нет»)"
+msgstr "«%s» неверно для логического свойства (не «да» или «нет»)"
-#: ../src/nm-pptp-service.c:606
+#: ../src/nm-pptp-service.c:607
#, c-format
msgid "unhandled property '%s' type %s"
msgstr "свойство «%s» имеет необрабатываемый тип %s"
-#: ../src/nm-pptp-service.c:617
+#: ../src/nm-pptp-service.c:618
#, c-format
msgid "property '%s' invalid or not supported"
-msgstr "свойство «%s» некорректно или не поддерживается"
+msgstr "свойство «%s» неверно или не поддерживается"
-#: ../src/nm-pptp-service.c:635
+#: ../src/nm-pptp-service.c:636
msgid "No VPN configuration options."
msgstr "Нет параметров настройки VPN."
-#: ../src/nm-pptp-service.c:655
+#: ../src/nm-pptp-service.c:656
#, c-format
msgid "Missing required option '%s'."
msgstr "Отсутствует требуемый параметр «%s»."
-#: ../src/nm-pptp-service.c:675
+#: ../src/nm-pptp-service.c:676
msgid "No VPN secrets!"
msgstr "Нет VPN-ключей!"
-#: ../src/nm-pptp-service.c:816
+#: ../src/nm-pptp-service.c:817
msgid "Could not find pptp client binary."
msgstr "Не удалось найти исполняемый файл клиента pptp."
-#: ../src/nm-pptp-service.c:829
+#: ../src/nm-pptp-service.c:830
msgid "Missing VPN gateway."
msgstr "Отсутствует шлюз VPN."
-#: ../src/nm-pptp-service.c:982
+#: ../src/nm-pptp-service.c:983
msgid "Could not find the pppd binary."
msgstr "Не удалось найти исполняемый файл pppd."
-#: ../src/nm-pptp-service.c:1112
+#: ../src/nm-pptp-service.c:1113
msgid "Invalid or missing PPTP gateway."
-msgstr "Шлюз PPTP отсутствует или некорректен."
+msgstr "Шлюз PPTP отсутствует или неверный."
-#: ../src/nm-pptp-service.c:1311
+#: ../src/nm-pptp-service.c:1292
msgid "Don't quit when VPN connection terminates"
msgstr "Не завершать работу при отключении VPN"
-#: ../src/nm-pptp-service.c:1312
+#: ../src/nm-pptp-service.c:1293
msgid "Enable verbose debug logging (may expose passwords)"
msgstr "Включить подробный режим отладки (могут отображаться пароли)"
-#: ../src/nm-pptp-service.c:1326
-msgid "nm-pptp-service provides integrated PPTP VPN capability (compatible
with Microsoft and other implementations) to NetworkManager."
-msgstr "nm-pptp-service позволяет использовать PPTP VPN (совместимые с
Microsoft и другими реализациями) в NetworkManager."
-
-#~ msgid "_Username:"
-#~ msgstr "П_ользователь:"
-
-#~ msgid "_Domain:"
-#~ msgstr "_Домен:"
-
-#~ msgid "Connect _anonymously"
-#~ msgstr "Подключиться _анонимно"
-
-#~ msgid "Connect as _user:"
-#~ msgstr "Подключиться как _пользователь:"
-
-#~ msgid "_Remember passwords for this session"
-#~ msgstr "_Запомнить пароль для этого сеанса"
-
-#~ msgid "_Save passwords in keyring"
-#~ msgstr "_Сохранить пароль на брелоке"
+#: ../src/nm-pptp-service.c:1316
+msgid ""
+"nm-pptp-service provides integrated PPTP VPN capability (compatible with "
+"Microsoft and other implementations) to NetworkManager."
+msgstr ""
+"nm-pptp-service позволяет использовать PPTP VPN (совместимые с Microsoft и "
+"другими реализациями) в NetworkManager."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NetworkManager-pptp-1.0.2/properties/Makefile.am
new/NetworkManager-pptp-1.0.6/properties/Makefile.am
--- old/NetworkManager-pptp-1.0.2/properties/Makefile.am 2015-04-29
17:46:07.000000000 +0200
+++ new/NetworkManager-pptp-1.0.6/properties/Makefile.am 2015-08-27
18:46:00.000000000 +0200
@@ -18,6 +18,7 @@
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
$(NM_CFLAGS) \
+ $(NMGTK_CFLAGS) \
-DICONDIR=\""$(datadir)/pixmaps"\" \
-DUIDIR=\""$(uidir)"\" \
-DLOCALEDIR=\""$(datadir)/locale"\" \
@@ -26,7 +27,8 @@
libnm_pptp_properties_la_LIBADD = \
$(GTK_LIBS) \
- $(NM_LIBS)
+ $(NM_LIBS) \
+ $(NMGTK_LIBS)
libnm_pptp_properties_la_LDFLAGS = \
-avoid-version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NetworkManager-pptp-1.0.2/properties/Makefile.in
new/NetworkManager-pptp-1.0.6/properties/Makefile.in
--- old/NetworkManager-pptp-1.0.2/properties/Makefile.in 2015-05-05
13:59:00.000000000 +0200
+++ new/NetworkManager-pptp-1.0.6/properties/Makefile.in 2015-08-27
18:47:25.000000000 +0200
@@ -134,7 +134,7 @@
LTLIBRARIES = $(plugin_LTLIBRARIES)
am__DEPENDENCIES_1 =
libnm_pptp_properties_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_libnm_pptp_properties_la_OBJECTS = \
libnm_pptp_properties_la-nm-pptp.lo \
libnm_pptp_properties_la-advanced-dialog.lo \
@@ -391,6 +391,7 @@
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
$(NM_CFLAGS) \
+ $(NMGTK_CFLAGS) \
-DICONDIR=\""$(datadir)/pixmaps"\" \
-DUIDIR=\""$(uidir)"\" \
-DLOCALEDIR=\""$(datadir)/locale"\" \
@@ -399,7 +400,8 @@
libnm_pptp_properties_la_LIBADD = \
$(GTK_LIBS) \
- $(NM_LIBS)
+ $(NM_LIBS) \
+ $(NMGTK_LIBS)
libnm_pptp_properties_la_LDFLAGS = \
-avoid-version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/NetworkManager-pptp-1.0.2/properties/nm-pptp-dialog.ui
new/NetworkManager-pptp-1.0.6/properties/nm-pptp-dialog.ui
--- old/NetworkManager-pptp-1.0.2/properties/nm-pptp-dialog.ui 2015-04-29
17:46:07.000000000 +0200
+++ new/NetworkManager-pptp-1.0.6/properties/nm-pptp-dialog.ui 2015-08-27
18:46:00.000000000 +0200
@@ -608,23 +608,6 @@
</packing>
</child>
<child>
- <object class="GtkComboBox" id="user_pass_type_combo">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="model">model2</property>
- <child>
- <object class="GtkCellRendererText" id="renderer2"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
<object class="GtkEntry" id="user_password_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -689,15 +672,6 @@
<property name="top_attach">2</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
</child>
</object>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NetworkManager-pptp-1.0.2/properties/nm-pptp.c
new/NetworkManager-pptp-1.0.6/properties/nm-pptp.c
--- old/NetworkManager-pptp-1.0.2/properties/nm-pptp.c 2015-04-29
17:46:07.000000000 +0200
+++ new/NetworkManager-pptp-1.0.6/properties/nm-pptp.c 2015-08-27
18:46:00.000000000 +0200
@@ -40,6 +40,7 @@
#include <nm-setting-vpn.h>
#include <nm-setting-connection.h>
#include <nm-setting-ip4-config.h>
+#include <nm-ui-utils.h>
#include "src/nm-pptp-service.h"
#include "nm-pptp.h"
@@ -50,10 +51,6 @@
#define PPTP_PLUGIN_DESC _("Compatible with Microsoft and other PPTP VPN
servers.")
#define PPTP_PLUGIN_SERVICE NM_DBUS_SERVICE_PPTP
-#define PW_TYPE_SAVE 0
-#define PW_TYPE_ASK 1
-#define PW_TYPE_UNUSED 2
-
typedef void (*ChangedCallback) (GtkWidget *widget, gpointer user_data);
/************** plugin class **************/
@@ -220,14 +217,9 @@
gboolean new_connection)
{
PptpPluginUiWidgetPrivate *priv = PPTP_PLUGIN_UI_WIDGET_GET_PRIVATE
(self);
- NMSettingSecretFlags secret_flags = NM_SETTING_SECRET_FLAG_NONE;
GtkWidget *widget;
const char *value;
- /* Default to agent-owned for new connections */
- if (new_connection)
- secret_flags = NM_SETTING_SECRET_FLAG_AGENT_OWNED;
-
widget = (GtkWidget *) gtk_builder_get_object (priv->builder,
entry_name);
g_assert (widget);
gtk_size_group_add_widget (priv->group, widget);
@@ -235,10 +227,7 @@
if (s_vpn) {
value = nm_setting_vpn_get_secret (s_vpn, secret_name);
gtk_entry_set_text (GTK_ENTRY (widget), value ? value : "");
- nm_setting_get_secret_flags (NM_SETTING (s_vpn), secret_name,
&secret_flags, NULL);
}
- secret_flags &= ~(NM_SETTING_SECRET_FLAG_NOT_SAVED |
NM_SETTING_SECRET_FLAG_NOT_REQUIRED);
- g_object_set_data (G_OBJECT (widget), "flags", GUINT_TO_POINTER
(secret_flags));
g_signal_connect (widget, "changed", G_CALLBACK (stuff_changed_cb),
self);
}
@@ -258,87 +247,47 @@
}
static void
-pw_type_combo_changed_cb (GtkWidget *combo, gpointer user_data)
+password_storage_changed_cb (GObject *entry,
+ GParamSpec *pspec,
+ gpointer user_data)
{
PptpPluginUiWidget *self = PPTP_PLUGIN_UI_WIDGET (user_data);
- PptpPluginUiWidgetPrivate *priv = PPTP_PLUGIN_UI_WIDGET_GET_PRIVATE
(self);
- GtkWidget *entry;
- entry = GTK_WIDGET (gtk_builder_get_object (priv->builder,
"user_password_entry"));
- g_assert (entry);
-
- /* If the user chose "Not required", desensitize and clear the correct
- * password entry.
- */
- switch (gtk_combo_box_get_active (GTK_COMBO_BOX (combo))) {
- case PW_TYPE_ASK:
- case PW_TYPE_UNUSED:
- gtk_entry_set_text (GTK_ENTRY (entry), "");
- gtk_widget_set_sensitive (entry, FALSE);
- break;
- default:
- gtk_widget_set_sensitive (entry, TRUE);
- break;
- }
-
- stuff_changed_cb (combo, self);
+ stuff_changed_cb (NULL, self);
}
static void
-init_one_pw_combo (PptpPluginUiWidget *self,
- NMSettingVPN *s_vpn,
- const char *combo_name,
- const char *secret_key,
- const char *entry_name)
+init_password_icon (PptpPluginUiWidget *self,
+ NMSettingVPN *s_vpn,
+ const char *secret_key,
+ const char *entry_name)
{
PptpPluginUiWidgetPrivate *priv = PPTP_PLUGIN_UI_WIDGET_GET_PRIVATE
(self);
- int active = -1;
- GtkWidget *widget;
- GtkListStore *store;
- GtkTreeIter iter;
+ GtkWidget *entry;
const char *value = NULL;
- guint32 default_idx = 1;
NMSettingSecretFlags pw_flags = NM_SETTING_SECRET_FLAG_NONE;
/* If there's already a password and the password type can't be found in
* the VPN settings, default to saving it. Otherwise, always ask for
it.
*/
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
entry_name));
- g_assert (widget);
- value = gtk_entry_get_text (GTK_ENTRY (widget));
- if (value && strlen (value))
- default_idx = 0;
+ entry = GTK_WIDGET (gtk_builder_get_object (priv->builder, entry_name));
+ g_assert (entry);
- store = gtk_list_store_new (1, G_TYPE_STRING);
+ nma_utils_setup_password_storage (entry, 0, (NMSetting *) s_vpn,
secret_key,
+ TRUE, FALSE);
+
+ /* If there's no password and no flags in the setting,
+ * initialize flags as "always-ask".
+ */
if (s_vpn)
nm_setting_get_secret_flags (NM_SETTING (s_vpn), secret_key,
&pw_flags, NULL);
+ value = gtk_entry_get_text (GTK_ENTRY (entry));
+ if ((!value || !*value) && (pw_flags == NM_SETTING_SECRET_FLAG_NONE))
+ nma_utils_update_password_storage (entry,
NM_SETTING_SECRET_FLAG_NOT_SAVED,
+ (NMSetting *) s_vpn,
secret_key);
- gtk_list_store_append (store, &iter);
- gtk_list_store_set (store, &iter, 0, _("Saved"), -1);
- if ( (active < 0)
- && !(pw_flags & NM_SETTING_SECRET_FLAG_NOT_SAVED)
- && !(pw_flags & NM_SETTING_SECRET_FLAG_NOT_REQUIRED)) {
- active = PW_TYPE_SAVE;
- }
-
- gtk_list_store_append (store, &iter);
- gtk_list_store_set (store, &iter, 0, _("Always Ask"), -1);
- if ((active < 0) && (pw_flags & NM_SETTING_SECRET_FLAG_NOT_SAVED))
- active = PW_TYPE_ASK;
-
- gtk_list_store_append (store, &iter);
- gtk_list_store_set (store, &iter, 0, _("Not Required"), -1);
- if ((active < 0) && (pw_flags & NM_SETTING_SECRET_FLAG_NOT_REQUIRED))
- active = PW_TYPE_UNUSED;
-
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
combo_name));
- g_assert (widget);
- gtk_combo_box_set_model (GTK_COMBO_BOX (widget), GTK_TREE_MODEL
(store));
- g_object_unref (store);
- gtk_combo_box_set_active (GTK_COMBO_BOX (widget), active < 0 ?
default_idx : active);
-
- pw_type_combo_changed_cb (widget, self);
- g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK
(pw_type_combo_changed_cb), self);
+ g_signal_connect (entry, "notify::secondary-icon-name",
+ G_CALLBACK (password_storage_changed_cb), self);
}
static gboolean
@@ -404,11 +353,10 @@
NM_PPTP_KEY_PASSWORD,
priv->new_connection);
- init_one_pw_combo (self,
- s_vpn,
- "user_pass_type_combo",
- NM_PPTP_KEY_PASSWORD,
- "user_password_entry");
+ init_password_icon (self,
+ s_vpn,
+ NM_PPTP_KEY_PASSWORD,
+ "user_password_entry");
return TRUE;
}
@@ -434,32 +382,25 @@
save_password_and_flags (NMSettingVPN *s_vpn,
GtkBuilder *builder,
const char *entry_name,
- const char *combo_name,
const char *secret_key)
{
- NMSettingSecretFlags flags = NM_SETTING_SECRET_FLAG_NONE;
+ NMSettingSecretFlags flags;
const char *password;
GtkWidget *entry;
- GtkWidget *combo;
- /* Grab original password flags */
+ /* Get secret flags */
entry = GTK_WIDGET (gtk_builder_get_object (builder, entry_name));
- flags = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (entry),
"flags"));
+ flags = nma_utils_menu_to_secret_flags (entry);
- /* And set new ones based on the type combo */
- combo = GTK_WIDGET (gtk_builder_get_object (builder, combo_name));
- switch (gtk_combo_box_get_active (GTK_COMBO_BOX (combo))) {
- case PW_TYPE_SAVE:
+ /* Save password and convert flags to legacy data items */
+ switch (flags) {
+ 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))
nm_setting_vpn_add_secret (s_vpn, secret_key, password);
break;
- case PW_TYPE_UNUSED:
- flags |= NM_SETTING_SECRET_FLAG_NOT_REQUIRED;
- break;
- case PW_TYPE_ASK:
default:
- flags |= NM_SETTING_SECRET_FLAG_NOT_SAVED;
break;
}
@@ -501,7 +442,6 @@
save_password_and_flags (s_vpn,
priv->builder,
"user_password_entry",
- "user_pass_type_combo",
NM_PPTP_KEY_PASSWORD);
/* Domain */
@@ -599,6 +539,12 @@
{
PptpPluginUiWidget *plugin = PPTP_PLUGIN_UI_WIDGET (object);
PptpPluginUiWidgetPrivate *priv = PPTP_PLUGIN_UI_WIDGET_GET_PRIVATE
(plugin);
+ GtkWidget *widget;
+
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
"user_password_entry"));
+ g_signal_handlers_disconnect_by_func (G_OBJECT (widget),
+ (GCallback)
password_storage_changed_cb,
+ plugin);
if (priv->group)
g_object_unref (priv->group);
