Hello community, here is the log from the commit of package NetworkManager-pptp for openSUSE:Factory checked in at 2012-01-09 11:15:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/NetworkManager-pptp (Old) and /work/SRC/openSUSE:Factory/.NetworkManager-pptp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "NetworkManager-pptp", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/NetworkManager-pptp/NetworkManager-pptp.changes 2011-10-02 09:45:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.NetworkManager-pptp.new/NetworkManager-pptp.changes 2012-01-09 11:16:07.000000000 +0100 @@ -1,0 +2,15 @@ +Sat Nov 12 19:18:37 UTC 2011 - [email protected] + +- Update to version 0.9.2.0: + + Updated translations. +- Pass --disable-more-warnings to configure to allow building with + gtk+ 3.3. +- Really enable parallel build: fix typo smp_flags => smp_mflags. + +------------------------------------------------------------------- +Tue Nov 1 09:19:50 UTC 2011 - [email protected] + +- Update to version 0.9.1.95: + + Updated translations. + +------------------------------------------------------------------- Old: ---- NetworkManager-pptp-0.9.0.tar.bz2 New: ---- NetworkManager-pptp-0.9.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager-pptp.spec ++++++ --- /var/tmp/diff_new_pack.qhBRBe/_old 2012-01-09 11:16:08.000000000 +0100 +++ /var/tmp/diff_new_pack.qhBRBe/_new 2012-01-09 11:16:08.000000000 +0100 @@ -20,9 +20,10 @@ Name: NetworkManager-pptp %define pppd_plugin_dir %(rpm -ql ppp | grep -m1 pppd/[0-9]*) Summary: NetworkManager VPN support for PPTP -Version: 0.9.0 +Version: 0.9.2.0 Release: 1 # 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. License: GPLv2+ Group: Productivity/Networking/System Url: http://www.gnome.org/projects/NetworkManager @@ -66,8 +67,9 @@ %build %configure\ --disable-static \ - --with-pppd-plugin-dir=%{pppd_plugin_dir} -%__make %{?_smp_flags} + --with-pppd-plugin-dir=%{pppd_plugin_dir} \ + --disable-more-warnings +%__make %{?_smp_mflags} %install %makeinstall ++++++ NetworkManager-pptp-0.9.0.tar.bz2 -> NetworkManager-pptp-0.9.2.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-pptp-0.9.0/NEWS new/NetworkManager-pptp-0.9.2.0/NEWS --- old/NetworkManager-pptp-0.9.0/NEWS 2011-08-23 01:16:15.000000000 +0200 +++ new/NetworkManager-pptp-0.9.2.0/NEWS 2011-10-28 21:28:43.000000000 +0200 @@ -0,0 +1,44 @@ +======================================================= +network-manager-pptp-0.9.2 +Overview of changes since network-manager-pptp-0.9.0 +======================================================= + +This is a new stable release of network-manager-pptp. Notable changes include: + +* Updated translations + + +======================================================= +network-manager-pptp-0.9.0 +Overview of changes since network-manager-pptp-0.8.x +======================================================= + +This is a new stable release of network-manager-pptp. Notable changes include: + +* Updated for NM 0.9 simplified configuration and secrets handling + + +======================================================= +network-manager-pptp-0.8.4 +Overview of changes since network-manager-pptp-0.8.2 +======================================================= + +This is a new stable release of network-manager-pptp. Notable changes include: + +* Updated translations +* Convert to GtkBuilder; glade is no longer a build requirement +* Desensitize MPPE-dependent options if MPPE is not selected +* Better handling of VPN server pools with one DNS name but multiple IP addresses + + +======================================================= +network-manager-pptp-0.8.2 +Overview of changes since network-manager-pptp-0.8.1 +======================================================= + +This is a new stable release of network-manager-pptp. Notable changes include: + +* Updated translations +* Better debugging options +* Updated for ppp 2.4.5 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-pptp-0.9.0/aclocal.m4 new/NetworkManager-pptp-0.9.2.0/aclocal.m4 --- old/NetworkManager-pptp-0.9.0/aclocal.m4 2011-08-23 05:08:07.000000000 +0200 +++ new/NetworkManager-pptp-0.9.2.0/aclocal.m4 2011-11-10 04:20:58.000000000 +0100 @@ -260,6 +260,10 @@ [CATOBJEXT=.mo DATADIRNAME=lib]) ;; + *-*-openbsd*) + CATOBJEXT=.mo + DATADIRNAME=share + ;; *) CATOBJEXT=.mo DATADIRNAME=lib diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-pptp-0.9.0/configure new/NetworkManager-pptp-0.9.2.0/configure --- old/NetworkManager-pptp-0.9.0/configure 2011-08-23 05:08:09.000000000 +0200 +++ new/NetworkManager-pptp-0.9.2.0/configure 2011-11-10 04:20:59.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for NetworkManager-pptp 0.9.0. +# Generated by GNU Autoconf 2.68 for NetworkManager-pptp 0.9.2.0. # # Report bugs to <[email protected]>. # @@ -709,8 +709,8 @@ # Identity of this package. PACKAGE_NAME='NetworkManager-pptp' PACKAGE_TARNAME='NetworkManager-pptp' -PACKAGE_VERSION='0.9.0' -PACKAGE_STRING='NetworkManager-pptp 0.9.0' +PACKAGE_VERSION='0.9.2.0' +PACKAGE_STRING='NetworkManager-pptp 0.9.2.0' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1504,7 +1504,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 0.9.0 to adapt to many kinds of systems. +\`configure' configures NetworkManager-pptp 0.9.2.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1575,7 +1575,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of NetworkManager-pptp 0.9.0:";; + short | recursive ) echo "Configuration of NetworkManager-pptp 0.9.2.0:";; esac cat <<\_ACEOF @@ -1705,7 +1705,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -NetworkManager-pptp configure 0.9.0 +NetworkManager-pptp configure 0.9.2.0 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2128,7 +2128,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 0.9.0, which was +It was created by NetworkManager-pptp $as_me 0.9.2.0, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2943,7 +2943,7 @@ # Define the identity of the package. PACKAGE='NetworkManager-pptp' - VERSION='0.9.0' + VERSION='0.9.2.0' cat >>confdefs.h <<_ACEOF @@ -12228,6 +12228,10 @@ fi ;; + *-*-openbsd*) + CATOBJEXT=.mo + DATADIRNAME=share + ;; *) CATOBJEXT=.mo DATADIRNAME=lib @@ -12664,21 +12668,21 @@ pkg_cv_NM_CFLAGS="$NM_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager >= 0.8.998 - libnm-util >= 0.8.998 - libnm-glib >= 0.8.998 - libnm-glib-vpn >= 0.8.998\""; } >&5 - ($PKG_CONFIG --exists --print-errors "NetworkManager >= 0.8.998 - libnm-util >= 0.8.998 - libnm-glib >= 0.8.998 - libnm-glib-vpn >= 0.8.998") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager >= 0.9.2 + libnm-util >= 0.9.2 + libnm-glib >= 0.9.2 + libnm-glib-vpn >= 0.9.2\""; } >&5 + ($PKG_CONFIG --exists --print-errors "NetworkManager >= 0.9.2 + libnm-util >= 0.9.2 + libnm-glib >= 0.9.2 + libnm-glib-vpn >= 0.9.2") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_NM_CFLAGS=`$PKG_CONFIG --cflags "NetworkManager >= 0.8.998 - libnm-util >= 0.8.998 - libnm-glib >= 0.8.998 - libnm-glib-vpn >= 0.8.998" 2>/dev/null` + pkg_cv_NM_CFLAGS=`$PKG_CONFIG --cflags "NetworkManager >= 0.9.2 + libnm-util >= 0.9.2 + libnm-glib >= 0.9.2 + libnm-glib-vpn >= 0.9.2" 2>/dev/null` else pkg_failed=yes fi @@ -12689,21 +12693,21 @@ pkg_cv_NM_LIBS="$NM_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager >= 0.8.998 - libnm-util >= 0.8.998 - libnm-glib >= 0.8.998 - libnm-glib-vpn >= 0.8.998\""; } >&5 - ($PKG_CONFIG --exists --print-errors "NetworkManager >= 0.8.998 - libnm-util >= 0.8.998 - libnm-glib >= 0.8.998 - libnm-glib-vpn >= 0.8.998") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager >= 0.9.2 + libnm-util >= 0.9.2 + libnm-glib >= 0.9.2 + libnm-glib-vpn >= 0.9.2\""; } >&5 + ($PKG_CONFIG --exists --print-errors "NetworkManager >= 0.9.2 + libnm-util >= 0.9.2 + libnm-glib >= 0.9.2 + libnm-glib-vpn >= 0.9.2") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_NM_LIBS=`$PKG_CONFIG --libs "NetworkManager >= 0.8.998 - libnm-util >= 0.8.998 - libnm-glib >= 0.8.998 - libnm-glib-vpn >= 0.8.998" 2>/dev/null` + pkg_cv_NM_LIBS=`$PKG_CONFIG --libs "NetworkManager >= 0.9.2 + libnm-util >= 0.9.2 + libnm-glib >= 0.9.2 + libnm-glib-vpn >= 0.9.2" 2>/dev/null` else pkg_failed=yes fi @@ -12723,23 +12727,23 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - NM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "NetworkManager >= 0.8.998 - libnm-util >= 0.8.998 - libnm-glib >= 0.8.998 - libnm-glib-vpn >= 0.8.998" 2>&1` + NM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "NetworkManager >= 0.9.2 + libnm-util >= 0.9.2 + libnm-glib >= 0.9.2 + libnm-glib-vpn >= 0.9.2" 2>&1` else - NM_PKG_ERRORS=`$PKG_CONFIG --print-errors "NetworkManager >= 0.8.998 - libnm-util >= 0.8.998 - libnm-glib >= 0.8.998 - libnm-glib-vpn >= 0.8.998" 2>&1` + NM_PKG_ERRORS=`$PKG_CONFIG --print-errors "NetworkManager >= 0.9.2 + libnm-util >= 0.9.2 + libnm-glib >= 0.9.2 + libnm-glib-vpn >= 0.9.2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$NM_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (NetworkManager >= 0.8.998 - libnm-util >= 0.8.998 - libnm-glib >= 0.8.998 - libnm-glib-vpn >= 0.8.998) were not met: + as_fn_error $? "Package requirements (NetworkManager >= 0.9.2 + libnm-util >= 0.9.2 + libnm-glib >= 0.9.2 + libnm-glib-vpn >= 0.9.2) were not met: $NM_PKG_ERRORS @@ -13942,7 +13946,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 0.9.0, which was +This file was extended by NetworkManager-pptp $as_me 0.9.2.0, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14008,7 +14012,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 0.9.0 +NetworkManager-pptp config.status 0.9.2.0 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-pptp-0.9.0/configure.ac new/NetworkManager-pptp-0.9.2.0/configure.ac --- old/NetworkManager-pptp-0.9.0/configure.ac 2011-08-23 05:06:55.000000000 +0200 +++ new/NetworkManager-pptp-0.9.2.0/configure.ac 2011-11-10 04:20:52.000000000 +0100 @@ -1,6 +1,6 @@ AC_PREREQ(2.59) -AC_INIT(NetworkManager-pptp, 0.9.0, [email protected], NetworkManager-pptp) +AC_INIT(NetworkManager-pptp, 0.9.2.0, [email protected], NetworkManager-pptp) AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2 subdir-objects]) AM_MAINTAINER_MODE @@ -70,10 +70,10 @@ AC_SUBST(DBUS_GLIB_LIBS) PKG_CHECK_MODULES(NM, - NetworkManager >= 0.8.998 - libnm-util >= 0.8.998 - libnm-glib >= 0.8.998 - libnm-glib-vpn >= 0.8.998) + NetworkManager >= 0.9.2 + libnm-util >= 0.9.2 + libnm-glib >= 0.9.2 + libnm-glib-vpn >= 0.9.2) AC_SUBST(NM_CFLAGS) AC_SUBST(NM_LIBS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-pptp-0.9.0/po/LINGUAS new/NetworkManager-pptp-0.9.2.0/po/LINGUAS --- old/NetworkManager-pptp-0.9.0/po/LINGUAS 2011-08-23 01:16:15.000000000 +0200 +++ new/NetworkManager-pptp-0.9.2.0/po/LINGUAS 2011-09-08 16:58:55.000000000 +0200 @@ -10,7 +10,6 @@ cs da de -dz el en_GB es diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-pptp-0.9.0/po/cs.po new/NetworkManager-pptp-0.9.2.0/po/cs.po --- old/NetworkManager-pptp-0.9.0/po/cs.po 2011-08-23 01:16:15.000000000 +0200 +++ new/NetworkManager-pptp-0.9.2.0/po/cs.po 2011-09-08 16:58:55.000000000 +0200 @@ -10,59 +10,40 @@ msgstr "" "Project-Id-Version: NetworkManager-pptp\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&keywords=I18N+L10N&component=VPN: pptp\n" -"POT-Creation-Date: 2011-03-31 19:59+0000\n" -"PO-Revision-Date: 2011-04-02 16:50+0100\n" +"POT-Creation-Date: 2011-07-18 17:35+0000\n" +"PO-Revision-Date: 2011-09-05 08:08+0100\n" "Last-Translator: Zdeněk Hataš <[email protected]>\n" "Language-Team: Czech <[email protected]>\n" "MIME-Version: 1.0\n" -"Language: cs\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Poedit-Language: Czech\n" "X-Poedit-Country: CZECH REPUBLIC\n" -#: ../auth-dialog/gnome-two-password-dialog.c:129 -msgid "_Secondary Password:" -msgstr "_Sekundární heslo:" - -#: ../auth-dialog/gnome-two-password-dialog.c:243 -msgid "_Username:" -msgstr "_Uživatelské jméno:" - -#: ../auth-dialog/gnome-two-password-dialog.c:245 -msgid "_Domain:" -msgstr "_Doména:" - -#: ../auth-dialog/gnome-two-password-dialog.c:247 +#: ../auth-dialog/vpn-password-dialog.c:95 msgid "_Password:" msgstr "_Heslo:" -#: ../auth-dialog/gnome-two-password-dialog.c:342 -msgid "Connect _anonymously" -msgstr "Připojit _anonymně" - -#: ../auth-dialog/gnome-two-password-dialog.c:347 -msgid "Connect as _user:" -msgstr "Připojit jako _uživatel:" - -#: ../auth-dialog/gnome-two-password-dialog.c:452 -msgid "_Remember passwords for this session" -msgstr "_Zapamatovat heslo pro toto sezení" - -#: ../auth-dialog/gnome-two-password-dialog.c:454 -msgid "_Save passwords in keyring" -msgstr "_Uložit hesla do klíčenky" +#: ../auth-dialog/vpn-password-dialog.c:97 +msgid "_Secondary Password:" +msgstr "_Sekundární heslo:" + +#: ../auth-dialog/vpn-password-dialog.c:239 +#| msgid "Show password" +msgid "Sh_ow passwords" +msgstr "Z_obrazit hesla" #. Otherwise, we have no saved password, or the password flags indicated #. * that the password should never be saved. #. -#: ../auth-dialog/main.c:92 +#: ../auth-dialog/main.c:127 #, c-format msgid "You need to authenticate to access the Virtual Private Network '%s'." msgstr "Pro přístup k virtuální privátní síti „%s“ musíte provést autentizaci." -#: ../auth-dialog/main.c:93 +#: ../auth-dialog/main.c:128 msgid "Authenticate VPN" msgstr "Autentizovat VPN" @@ -194,11 +175,11 @@ msgid "_Security:" msgstr "_Bezpečnost:" -#: ../properties/nm-pptp.c:50 +#: ../properties/nm-pptp.c:49 msgid "Point-to-Point Tunneling Protocol (PPTP)" msgstr "Point-to-Point Tunneling Protocol (PPTP)" -#: ../properties/nm-pptp.c:51 +#: ../properties/nm-pptp.c:50 msgid "Compatible with Microsoft and other PPTP VPN servers." msgstr "Kompatibilní s PPTP VPN servery od Microsoftu a ostatních." @@ -306,5 +287,4 @@ #: ../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 poskytuje podporu PPTP VPN (kompatibilní s impelentací Microsoft a ostatními) integrovanou v aplikaci NetworkManager." - +msgstr "nm-pptp-service poskytuje podporu PPTP VPN (kompatibilní s impelentací Microsoft a ostatními) integrovanou v aplikaci NetworkManager." \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-pptp-0.9.0/po/dz.po new/NetworkManager-pptp-0.9.2.0/po/dz.po --- old/NetworkManager-pptp-0.9.0/po/dz.po 2009-04-20 13:09:49.000000000 +0200 +++ new/NetworkManager-pptp-0.9.2.0/po/dz.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,206 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-03-20 03:31+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <[email protected]>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:147 -msgid "_Secondary Password:" -msgstr "" - -#: ../auth-dialog/gnome-two-password-dialog.c:268 -msgid "_Username:" -msgstr "" - -#: ../auth-dialog/gnome-two-password-dialog.c:270 -msgid "_Domain:" -msgstr "" - -#: ../auth-dialog/gnome-two-password-dialog.c:272 -msgid "_Password:" -msgstr "" - -#: ../auth-dialog/gnome-two-password-dialog.c:355 -msgid "Connect _anonymously" -msgstr "" - -#: ../auth-dialog/gnome-two-password-dialog.c:360 -msgid "Connect as _user:" -msgstr "" - -#: ../auth-dialog/gnome-two-password-dialog.c:466 -msgid "_Remember password for this session" -msgstr "" - -#: ../auth-dialog/gnome-two-password-dialog.c:468 -msgid "_Save password in keyring" -msgstr "" - -#: ../auth-dialog/main.c:161 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "" - -#: ../auth-dialog/main.c:162 -msgid "Authenticate PPTP VPN" -msgstr "" - -#: ../nm-pptp.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "" - -#: ../nm-pptp.desktop.in.h:2 -msgid "VPN Connection Manager (PPTP)" -msgstr "" - -#: ../properties/nm-pptp.c:79 -msgid "PPTP Client" -msgstr "" - -#: ../properties/nm-pptp.c:387 -msgid "The following PPTP connection will be created:" -msgstr "" - -#: ../properties/nm-pptp.c:389 -#, c-format -msgid "Name: %s" -msgstr "" - -#: ../properties/nm-pptp.c:392 -#, c-format -msgid "Remote: %s" -msgstr "" - -#: ../properties/nm-pptp.c:395 -#, c-format -msgid "Username: %s" -msgstr "" - -#: ../properties/nm-pptp.c:399 -#, c-format -msgid "Routes: %s" -msgstr "" - -#: ../properties/nm-pptp.c:403 -#, c-format -msgid "Use MPPC Compression: %s" -msgstr "" - -#: ../properties/nm-pptp.c:403 ../properties/nm-pptp.c:405 -msgid "Yes" -msgstr "" - -#: ../properties/nm-pptp.c:403 ../properties/nm-pptp.c:405 -msgid "No" -msgstr "" - -#: ../properties/nm-pptp.c:405 -#, c-format -msgid "Use MPPE Encryption: %s" -msgstr "" - -#: ../properties/nm-pptp.c:408 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "" - -#: ../properties/nm-pptp.c:484 -msgid "Cannot import settings" -msgstr "" - -#: ../properties/nm-pptp.c:486 -#, c-format -msgid "The VPN settings file '%s' does not contain valid data." -msgstr "" - -#: ../properties/nm-pptp.c:504 -msgid "Select file to import" -msgstr "" - -#. printf ("in impl_export\n"); -#: ../properties/nm-pptp.c:626 -msgid "Save as..." -msgstr "" - -#: ../properties/nm-pptp.c:656 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "" - -#: ../properties/nm-pptp.c:659 -msgid "Do you want to replace it with the one you are saving?" -msgstr "" - -#: ../properties/nm-pptp-dialog.glade.h:1 -msgid "<b>Connection Name</b>" -msgstr "" - -#: ../properties/nm-pptp-dialog.glade.h:2 -msgid "<b>Required Information</b>" -msgstr "" - -#: ../properties/nm-pptp-dialog.glade.h:3 -msgid "<i>example: 172.16.0.0/16 10.11.12.0/24</i>" -msgstr "" - -#: ../properties/nm-pptp-dialog.glade.h:4 -msgid "MS CHAP-v1/v2" -msgstr "" - -#: ../properties/nm-pptp-dialog.glade.h:5 -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-pptp-dialog.glade.h:6 -msgid "Require MPPE encryption" -msgstr "" - -#: ../properties/nm-pptp-dialog.glade.h:7 -msgid "Use MPPC compression" -msgstr "" - -#: ../properties/nm-pptp-dialog.glade.h:8 -msgid "Username:" -msgstr "" - -#: ../properties/nm-pptp-dialog.glade.h:9 -msgid "" -"Your password must be defined \n" -"in /etc/ppp/chap-secrets" -msgstr "" - -#: ../properties/nm-pptp-dialog.glade.h:11 -msgid "_Gateway:" -msgstr "" - -#: ../properties/nm-pptp-dialog.glade.h:12 -msgid "_Import Saved Configuration..." -msgstr "" - -#: ../properties/nm-pptp-dialog.glade.h:13 -msgid "" -"_Name used to identify the connection to the private network, e.g. \"Campus " -"VPN\" or \"Corporate Network\"" -msgstr "" - -#: ../properties/nm-pptp-dialog.glade.h:14 -msgid "_Only use VPN connection for these addresses" -msgstr "" - -#. No sophisticated error message for now -#: ../src/nm-pptp-service.c:126 -msgid "VPN Connection failed" -msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-pptp-0.9.0/po/es.po new/NetworkManager-pptp-0.9.2.0/po/es.po --- old/NetworkManager-pptp-0.9.0/po/es.po 2011-08-23 01:16:15.000000000 +0200 +++ new/NetworkManager-pptp-0.9.2.0/po/es.po 2011-11-09 18:54:27.000000000 +0100 @@ -12,8 +12,8 @@ "Project-Id-Version: NetworkManager-pptp\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"; "product=NetworkManager&keywords=I18N+L10N&component=VPN: pptp\n" -"POT-Creation-Date: 2011-07-18 17:35+0000\n" -"PO-Revision-Date: 2011-07-19 11:02+0200\n" +"POT-Creation-Date: 2011-11-07 15:35+0000\n" +"PO-Revision-Date: 2011-11-08 12:27+0100\n" "Last-Translator: Daniel Mustieles <[email protected]>\n" "Language-Team: Español <[email protected]>\n" "MIME-Version: 1.0\n" @@ -31,7 +31,6 @@ msgstr "Contraseña _secundaria:" #: ../auth-dialog/vpn-password-dialog.c:239 -#| msgid "Show password" msgid "Sh_ow passwords" msgstr "M_ostrar contraseñas" @@ -189,6 +188,18 @@ msgid "Compatible with Microsoft and other PPTP VPN servers." msgstr "Compatible con servidores PPTP VPN de Microsoft y otros." +#: ../properties/nm-pptp.c:317 +msgid "Saved" +msgstr "Guardado" + +#: ../properties/nm-pptp.c:325 +msgid "Always Ask" +msgstr "Preguntar siempre" + +#: ../properties/nm-pptp.c:330 +msgid "Not Required" +msgstr "No requerido" + #: ../src/nm-pptp-service.c:160 #, c-format msgid "couldn't convert PPTP VPN gateway IP address '%s' (%d)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-pptp-0.9.0/po/gl.po new/NetworkManager-pptp-0.9.2.0/po/gl.po --- old/NetworkManager-pptp-0.9.0/po/gl.po 2011-08-23 01:16:15.000000000 +0200 +++ new/NetworkManager-pptp-0.9.2.0/po/gl.po 2011-10-28 21:28:30.000000000 +0200 @@ -6,14 +6,15 @@ # Mancomún - Centro de Referencia e Servizos de Software Libre <[email protected]>, 2009. # Francisco Diéguez <[email protected]>, 2010. # Fran Diéguez <[email protected]>, 2011. +# Xosé M. Lamas <[email protected]>, 2011. # msgid "" msgstr "" "Project-Id-Version: gl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-09 21:05+0200\n" +"POT-Creation-Date: 2011-09-22 00:56+0200\n" "PO-Revision-Date: 2011-04-09 21:11+0200\n" -"Last-Translator: Fran Diéguez <[email protected]>\n" +"Last-Translator: Xosé M. Lamas <[email protected]>\n" "Language-Team: Galician <[email protected]>\n" "Language: gl\n" "MIME-Version: 1.0\n" @@ -21,47 +22,27 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../auth-dialog/gnome-two-password-dialog.c:129 -msgid "_Secondary Password:" -msgstr "Contrasinal _secundario:" - -#: ../auth-dialog/gnome-two-password-dialog.c:243 -msgid "_Username:" -msgstr "Nome de _usuario:" - -#: ../auth-dialog/gnome-two-password-dialog.c:245 -msgid "_Domain:" -msgstr "_Dominio:" - -#: ../auth-dialog/gnome-two-password-dialog.c:247 +#: ../auth-dialog/vpn-password-dialog.c:95 msgid "_Password:" msgstr "_Contrasinal:" -#: ../auth-dialog/gnome-two-password-dialog.c:342 -msgid "Connect _anonymously" -msgstr "Conectarse _anonimamente" - -#: ../auth-dialog/gnome-two-password-dialog.c:347 -msgid "Connect as _user:" -msgstr "Conectarse como _usuario:" - -#: ../auth-dialog/gnome-two-password-dialog.c:452 -msgid "_Remember passwords for this session" -msgstr "_Lembrar os contrasinais para esta sesión" - -#: ../auth-dialog/gnome-two-password-dialog.c:454 -msgid "_Save passwords in keyring" -msgstr "_Gardar os contrasinais no anel de chaves" +#: ../auth-dialog/vpn-password-dialog.c:97 +msgid "_Secondary Password:" +msgstr "Contrasinal _secundario:" + +#: ../auth-dialog/vpn-password-dialog.c:239 +msgid "Sh_ow passwords" +msgstr "M_ostrar os contrasinais" #. Otherwise, we have no saved password, or the password flags indicated #. * that the password should never be saved. #. -#: ../auth-dialog/main.c:92 +#: ../auth-dialog/main.c:127 #, c-format msgid "You need to authenticate to access the Virtual Private Network '%s'." msgstr "Precisa autenticarse para acceder á rede privada virtual (VPN) '%s'." -#: ../auth-dialog/main.c:93 +#: ../auth-dialog/main.c:128 msgid "Authenticate VPN" msgstr "Autenticar VPN" @@ -199,11 +180,11 @@ msgid "_Security:" msgstr "_Seguridade:" -#: ../properties/nm-pptp.c:50 +#: ../properties/nm-pptp.c:49 msgid "Point-to-Point Tunneling Protocol (PPTP)" msgstr "Protocolo de Túnel Punto a Punto (PPTP)" -#: ../properties/nm-pptp.c:51 +#: ../properties/nm-pptp.c:50 msgid "Compatible with Microsoft and other PPTP VPN servers." msgstr "Compatíbel con Microsoft e outros servidores VPN PPTP." @@ -322,3 +303,21 @@ msgstr "" "nm-pptp-service fornece a capacidade de integrar VPN PPTP (compatíbel con " "Microsoft e outras implementacións) con NetworkManager." + +#~ msgid "_Username:" +#~ msgstr "Nome de _usuario:" + +#~ msgid "_Domain:" +#~ msgstr "_Dominio:" + +#~ msgid "Connect _anonymously" +#~ msgstr "Conectarse _anonimamente" + +#~ msgid "Connect as _user:" +#~ msgstr "Conectarse como _usuario:" + +#~ msgid "_Remember passwords for this session" +#~ msgstr "_Lembrar os contrasinais para esta sesión" + +#~ msgid "_Save passwords in keyring" +#~ msgstr "_Gardar os contrasinais no anel de chaves" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-pptp-0.9.0/po/hu.po new/NetworkManager-pptp-0.9.2.0/po/hu.po --- old/NetworkManager-pptp-0.9.0/po/hu.po 2011-08-23 01:16:15.000000000 +0200 +++ new/NetworkManager-pptp-0.9.2.0/po/hu.po 2011-10-28 21:28:30.000000000 +0200 @@ -8,58 +8,38 @@ msgstr "" "Project-Id-Version: network-manager-pptp master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-10 17:21+0200\n" -"PO-Revision-Date: 2011-04-03 11:23+0200\n" -"Last-Translator: Mate Ory <orymate at ubuntu dot com>\n" +"POT-Creation-Date: 2011-09-21 16:10+0200\n" +"PO-Revision-Date: 2011-09-09 22:47+0100\n" +"Last-Translator: Balázs Úr <[email protected]>\n" "Language-Team: Hungarian <gnome at fsf dot hu>\n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: VIM - Vi IMproved 7.3\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../auth-dialog/gnome-two-password-dialog.c:129 -msgid "_Secondary Password:" -msgstr "Jelszó _még egyszer:" - -#: ../auth-dialog/gnome-two-password-dialog.c:243 -msgid "_Username:" -msgstr "_Felhasználónév:" - -#: ../auth-dialog/gnome-two-password-dialog.c:245 -msgid "_Domain:" -msgstr "_Tartomány:" - -#: ../auth-dialog/gnome-two-password-dialog.c:247 +#: ../auth-dialog/vpn-password-dialog.c:95 msgid "_Password:" msgstr "_Jelszó:" -#: ../auth-dialog/gnome-two-password-dialog.c:342 -msgid "Connect _anonymously" -msgstr "Kapcsolódás _névtelenül" - -#: ../auth-dialog/gnome-two-password-dialog.c:347 -msgid "Connect as _user:" -msgstr "Csatlakozás _mint:" - -#: ../auth-dialog/gnome-two-password-dialog.c:452 -msgid "_Remember passwords for this session" -msgstr "Jelszó meg_jegyzése erre a munkamenetre" - -#: ../auth-dialog/gnome-two-password-dialog.c:454 -msgid "_Save passwords in keyring" -msgstr "Jelszavak mentése a k_ulcstartóra" +#: ../auth-dialog/vpn-password-dialog.c:97 +msgid "_Secondary Password:" +msgstr "Jelszó _még egyszer:" + +#: ../auth-dialog/vpn-password-dialog.c:239 +msgid "Sh_ow passwords" +msgstr "Je_lszavak megjelenítése" #. Otherwise, we have no saved password, or the password flags indicated #. * that the password should never be saved. #. -#: ../auth-dialog/main.c:92 +#: ../auth-dialog/main.c:127 #, c-format msgid "You need to authenticate to access the Virtual Private Network '%s'." msgstr "Azonosítania kell magát a(z) „%s” virtuális magánhálózat eléréséhez." -#: ../auth-dialog/main.c:93 +#: ../auth-dialog/main.c:128 msgid "Authenticate VPN" msgstr "VPN-hitelesítés" @@ -197,11 +177,11 @@ msgid "_Security:" msgstr "Bi_ztonság:" -#: ../properties/nm-pptp.c:50 +#: ../properties/nm-pptp.c:49 msgid "Point-to-Point Tunneling Protocol (PPTP)" msgstr "Ponttól pontig alagutazási protokoll (PPTP)" -#: ../properties/nm-pptp.c:51 +#: ../properties/nm-pptp.c:50 msgid "Compatible with Microsoft and other PPTP VPN servers." msgstr "Kompatibilis a Microsoft és más PPTP VPN-kiszolgálókkal." @@ -317,3 +297,21 @@ msgstr "" "Az nm-pptp-service integrált PPTP VPN-támogatást nyújt a Hálózatkezelőhöz, " "amely kompatibilis a Microsoft és mások megvalósításaival." + +#~ msgid "_Username:" +#~ msgstr "_Felhasználónév:" + +#~ msgid "_Domain:" +#~ msgstr "_Tartomány:" + +#~ msgid "Connect _anonymously" +#~ msgstr "Kapcsolódás _névtelenül" + +#~ msgid "Connect as _user:" +#~ msgstr "Csatlakozás _mint:" + +#~ msgid "_Remember passwords for this session" +#~ msgstr "Jelszó meg_jegyzése erre a munkamenetre" + +#~ msgid "_Save passwords in keyring" +#~ msgstr "Jelszavak mentése a k_ulcstartóra" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-pptp-0.9.0/po/lv.po new/NetworkManager-pptp-0.9.2.0/po/lv.po --- old/NetworkManager-pptp-0.9.0/po/lv.po 2011-08-23 01:16:15.000000000 +0200 +++ new/NetworkManager-pptp-0.9.2.0/po/lv.po 2011-10-28 21:28:30.000000000 +0200 @@ -8,59 +8,41 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."; "cgi?product=NetworkManager&keywords=I18N+L10N&component=VPN: pptp\n" -"POT-Creation-Date: 2011-04-02 13:26+0000\n" -"PO-Revision-Date: 2011-04-18 22:52+0300\n" +"POT-Creation-Date: 2011-07-18 17:35+0000\n" +"PO-Revision-Date: 2011-09-16 12:25+0300\n" "Last-Translator: Rūdofls Mazurs <[email protected]>\n" "Language-Team: Latvian <[email protected]>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.1\n" +"X-Generator: Lokalize 1.2\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " "2);\n" +"Language: lv\n" -#: ../auth-dialog/gnome-two-password-dialog.c:129 -msgid "_Secondary Password:" -msgstr "_Sekundārā parole:" - -#: ../auth-dialog/gnome-two-password-dialog.c:243 -msgid "_Username:" -msgstr "_Lietotājvārds:" - -#: ../auth-dialog/gnome-two-password-dialog.c:245 -msgid "_Domain:" -msgstr "_Domēns:" - -#: ../auth-dialog/gnome-two-password-dialog.c:247 +#: ../auth-dialog/vpn-password-dialog.c:95 msgid "_Password:" msgstr "_Parole:" -#: ../auth-dialog/gnome-two-password-dialog.c:342 -msgid "Connect _anonymously" -msgstr "Savienoties _anonīmi" - -#: ../auth-dialog/gnome-two-password-dialog.c:347 -msgid "Connect as _user:" -msgstr "Savienoties kā _lietotājam:" - -#: ../auth-dialog/gnome-two-password-dialog.c:452 -msgid "_Remember passwords for this session" -msgstr "Atce_rēties paroli šai sesijai" - -#: ../auth-dialog/gnome-two-password-dialog.c:454 -msgid "_Save passwords in keyring" -msgstr "_Saglabāt paroli atslēgu saišķī" +#: ../auth-dialog/vpn-password-dialog.c:97 +msgid "_Secondary Password:" +msgstr "_Sekundārā parole:" + +#: ../auth-dialog/vpn-password-dialog.c:239 +#| msgid "Show password" +msgid "Sh_ow passwords" +msgstr "Rādīt par_oles" #. Otherwise, we have no saved password, or the password flags indicated #. * that the password should never be saved. #. -#: ../auth-dialog/main.c:92 +#: ../auth-dialog/main.c:127 #, c-format msgid "You need to authenticate to access the Virtual Private Network '%s'." msgstr "" "Jums vajag autentificēties, lai piekļūtu virtuālajam privātajam tīklam '%s'." -#: ../auth-dialog/main.c:93 +#: ../auth-dialog/main.c:128 msgid "Authenticate VPN" msgstr "Autentificēt VPN" @@ -198,11 +180,11 @@ msgid "_Security:" msgstr "_Drošība:" -#: ../properties/nm-pptp.c:50 +#: ../properties/nm-pptp.c:49 msgid "Point-to-Point Tunneling Protocol (PPTP)" msgstr "Divp_unktu tunelēšanas protokols (PPTP)" -#: ../properties/nm-pptp.c:51 +#: ../properties/nm-pptp.c:50 msgid "Compatible with Microsoft and other PPTP VPN servers." msgstr "Savietojams ar Microsoft un citiem PPTP VPN serveriem." @@ -297,7 +279,6 @@ msgstr "Nevarēja atrast pppd bināro failu." #: ../src/nm-pptp-service.c:1112 -#| msgid "Missing VPN gateway." msgid "Invalid or missing PPTP gateway." msgstr "Nederīga vai neesoša PPTP vārteja." @@ -317,5 +298,23 @@ "nm-pptp-service nodrošina NetworkManager integrētu PPTP VPN iespēju " "(savietojams ar Microsoft un citu realizācijām)." +#~ msgid "_Username:" +#~ msgstr "_Lietotājvārds:" + +#~ msgid "_Domain:" +#~ msgstr "_Domēns:" + +#~ msgid "Connect _anonymously" +#~ msgstr "Savienoties _anonīmi" + +#~ msgid "Connect as _user:" +#~ msgstr "Savienoties kā _lietotājam:" + +#~ msgid "_Remember passwords for this session" +#~ msgstr "Atce_rēties paroli šai sesijai" + +#~ msgid "_Save passwords in keyring" +#~ msgstr "_Saglabāt paroli atslēgu saišķī" + #~ msgid "Could not start pppd plugin helper service." #~ msgstr "Nevarēja palaist pppd spraudņa palīdzības servisu." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-pptp-0.9.0/po/pl.po new/NetworkManager-pptp-0.9.2.0/po/pl.po --- old/NetworkManager-pptp-0.9.0/po/pl.po 2011-08-23 01:16:15.000000000 +0200 +++ new/NetworkManager-pptp-0.9.2.0/po/pl.po 2011-11-09 18:54:27.000000000 +0100 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: network-manager-pptp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-11 21:46+0200\n" -"PO-Revision-Date: 2011-08-11 21:47+0200\n" +"POT-Creation-Date: 2011-11-07 22:25+0100\n" +"PO-Revision-Date: 2011-11-07 22:26+0100\n" "Last-Translator: Piotr Drąg <[email protected]>\n" "Language-Team: Polish <[email protected]>\n" "Language: pl\n" @@ -189,6 +189,18 @@ msgid "Compatible with Microsoft and other PPTP VPN servers." msgstr "Zgodny z serwerami firmy Microsoft i innymi serwerami VPN PPTP." +#: ../properties/nm-pptp.c:317 +msgid "Saved" +msgstr "Zapisano" + +#: ../properties/nm-pptp.c:325 +msgid "Always Ask" +msgstr "Pytanie za każdym razem" + +#: ../properties/nm-pptp.c:330 +msgid "Not Required" +msgstr "Nie jest wymagane" + #: ../src/nm-pptp-service.c:160 #, c-format msgid "couldn't convert PPTP VPN gateway IP address '%s' (%d)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-pptp-0.9.0/po/sv.po new/NetworkManager-pptp-0.9.2.0/po/sv.po --- old/NetworkManager-pptp-0.9.0/po/sv.po 2011-08-23 01:16:16.000000000 +0200 +++ new/NetworkManager-pptp-0.9.2.0/po/sv.po 2011-10-28 21:28:30.000000000 +0200 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: NetworkManager-pptp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-09 10:36+0200\n" -"PO-Revision-Date: 2011-04-09 10:42+0100\n" +"POT-Creation-Date: 2011-10-07 11:45+0200\n" +"PO-Revision-Date: 2011-10-07 11:45+0100\n" "Last-Translator: Daniel Nylander <[email protected]>\n" "Language-Team: Swedish <[email protected]>\n" "Language: sv\n" @@ -19,47 +19,27 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../auth-dialog/gnome-two-password-dialog.c:129 -msgid "_Secondary Password:" -msgstr "_Sekundärt lösenord:" - -#: ../auth-dialog/gnome-two-password-dialog.c:243 -msgid "_Username:" -msgstr "_Användarnamn:" - -#: ../auth-dialog/gnome-two-password-dialog.c:245 -msgid "_Domain:" -msgstr "_Domän:" - -#: ../auth-dialog/gnome-two-password-dialog.c:247 +#: ../auth-dialog/vpn-password-dialog.c:95 msgid "_Password:" msgstr "_Lösenord:" -#: ../auth-dialog/gnome-two-password-dialog.c:342 -msgid "Connect _anonymously" -msgstr "Anslut anon_ymt" - -#: ../auth-dialog/gnome-two-password-dialog.c:347 -msgid "Connect as _user:" -msgstr "Anslut som _användare:" - -#: ../auth-dialog/gnome-two-password-dialog.c:452 -msgid "_Remember passwords for this session" -msgstr "_Kom ihåg lösenord för denna session" - -#: ../auth-dialog/gnome-two-password-dialog.c:454 -msgid "_Save passwords in keyring" -msgstr "_Spara lösenord i nyckelring" +#: ../auth-dialog/vpn-password-dialog.c:97 +msgid "_Secondary Password:" +msgstr "_Sekundärt lösenord:" + +#: ../auth-dialog/vpn-password-dialog.c:239 +msgid "Sh_ow passwords" +msgstr "Vi_sa lösenord" #. Otherwise, we have no saved password, or the password flags indicated #. * that the password should never be saved. #. -#: ../auth-dialog/main.c:92 +#: ../auth-dialog/main.c:127 #, c-format msgid "You need to authenticate to access the Virtual Private Network '%s'." msgstr "Du måsta autentisera dig för att komma åt det virtuella privata nätverket \"%s\"." -#: ../auth-dialog/main.c:93 +#: ../auth-dialog/main.c:128 msgid "Authenticate VPN" msgstr "Autentisera VPN" @@ -191,11 +171,11 @@ msgid "_Security:" msgstr "_Säkerhet:" -#: ../properties/nm-pptp.c:50 +#: ../properties/nm-pptp.c:49 msgid "Point-to-Point Tunneling Protocol (PPTP)" msgstr "Point-to-Point Tunneling Protocol (PPTP)" -#: ../properties/nm-pptp.c:51 +#: ../properties/nm-pptp.c:50 msgid "Compatible with Microsoft and other PPTP VPN servers." msgstr "Kompatibel med Microsoft och andra PPTP VPN-servrar." @@ -305,6 +285,18 @@ msgid "nm-pptp-service provides integrated PPTP VPN capability (compatible with Microsoft and other implementations) to NetworkManager." msgstr "nm-pptp-service tillhandahåller integrerade PPTP VPN-förmågor (kompatibla med Microsoft och andra implementationer) till Nätverkshanterare." +#~ msgid "_Username:" +#~ msgstr "_Användarnamn:" +#~ msgid "_Domain:" +#~ msgstr "_Domän:" +#~ msgid "Connect _anonymously" +#~ msgstr "Anslut anon_ymt" +#~ msgid "Connect as _user:" +#~ msgstr "Anslut som _användare:" +#~ msgid "_Remember passwords for this session" +#~ msgstr "_Kom ihåg lösenord för denna session" +#~ msgid "_Save passwords in keyring" +#~ msgstr "_Spara lösenord i nyckelring" #~ msgid "gtk-cancel" #~ msgstr "Avbryt" #~ msgid "gtk-ok" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-pptp-0.9.0/properties/nm-pptp-dialog.ui new/NetworkManager-pptp-0.9.2.0/properties/nm-pptp-dialog.ui --- old/NetworkManager-pptp-0.9.0/properties/nm-pptp-dialog.ui 2011-03-31 20:43:47.000000000 +0200 +++ new/NetworkManager-pptp-0.9.2.0/properties/nm-pptp-dialog.ui 2011-11-09 18:54:27.000000000 +0100 @@ -12,6 +12,17 @@ </row> </data> </object> + <object class="GtkListStore" id="model2"> + <columns> + <!-- column-name gchararray --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0"> </col> + </row> + </data> + </object> <object class="GtkVBox" id="pptp-vbox"> <property name="visible">True</property> <property name="border_width">12</property> @@ -150,6 +161,25 @@ </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="right_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + </packing> + </child> + <child> <object class="GtkEntry" id="user_password_entry"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -269,7 +299,6 @@ <property name="icon_name">stock-preferences</property> <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> <property name="skip_pager_hint">True</property> - <property name="has_separator">False</property> <child internal-child="vbox"> <object class="GtkVBox" id="dialog-vbox3"> <property name="visible">True</property> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-pptp-0.9.0/properties/nm-pptp.c new/NetworkManager-pptp-0.9.2.0/properties/nm-pptp.c --- old/NetworkManager-pptp-0.9.0/properties/nm-pptp.c 2011-08-23 01:16:16.000000000 +0200 +++ new/NetworkManager-pptp-0.9.2.0/properties/nm-pptp.c 2011-11-09 18:54:27.000000000 +0100 @@ -50,6 +50,9 @@ #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); @@ -210,6 +213,37 @@ } static void +setup_password_widget (PptpPluginUiWidget *self, + const char *entry_name, + NMSettingVPN *s_vpn, + const char *secret_name, + 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); + + 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); +} + +static void show_toggled_cb (GtkCheckButton *button, PptpPluginUiWidget *self) { PptpPluginUiWidgetPrivate *priv = PPTP_PLUGIN_UI_WIDGET_GET_PRIVATE (self); @@ -223,6 +257,90 @@ gtk_entry_set_visibility (GTK_ENTRY (widget), visible); } +static void +pw_type_combo_changed_cb (GtkWidget *combo, 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); +} + +static void +init_one_pw_combo (PptpPluginUiWidget *self, + NMSettingVPN *s_vpn, + const char *combo_name, + 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; + 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; + + store = gtk_list_store_new (1, G_TYPE_STRING); + if (s_vpn) + nm_setting_get_secret_flags (NM_SETTING (s_vpn), secret_key, &pw_flags, NULL); + + 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); +} + static gboolean init_plugin_ui (PptpPluginUiWidget *self, NMConnection *connection, GError **error) { @@ -230,7 +348,6 @@ NMSettingVPN *s_vpn; GtkWidget *widget; const char *value; - NMSettingSecretFlags pw_flags = NM_SETTING_SECRET_FLAG_NONE; s_vpn = (NMSettingVPN *) nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN); @@ -278,23 +395,20 @@ (GCallback) show_toggled_cb, self); - widget = (GtkWidget *) gtk_builder_get_object (priv->builder, "user_password_entry"); - g_assert (widget); - gtk_size_group_add_widget (priv->group, widget); - if (s_vpn) { - value = nm_setting_vpn_get_secret (s_vpn, NM_PPTP_KEY_PASSWORD); - if (value) - gtk_entry_set_text (GTK_ENTRY (widget), value); - - /* Default to agent-owned for new connections */ - if (priv->new_connection) - pw_flags = NM_SETTING_SECRET_FLAG_AGENT_OWNED; - else - nm_setting_get_secret_flags (NM_SETTING (s_vpn), NM_PPTP_KEY_PASSWORD, &pw_flags, NULL); - - g_object_set_data (G_OBJECT (widget), "flags", GUINT_TO_POINTER (pw_flags)); - } - g_signal_connect (widget, "changed", G_CALLBACK (stuff_changed_cb), self); + /* Fill the VPN passwords *before* initializing the PW type combo, since + * knowing if there is a password when initializing the type combo is helpful. + */ + setup_password_widget (self, + "user_password_entry", + s_vpn, + 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"); return TRUE; } @@ -316,6 +430,43 @@ nm_setting_vpn_add_data_item (s_vpn, (const char *) key, (const char *) data); } +static void +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; + const char *password; + GtkWidget *entry; + GtkWidget *combo; + + /* Grab original password flags */ + entry = GTK_WIDGET (gtk_builder_get_object (builder, entry_name)); + flags = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (entry), "flags")); + + /* 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: + 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; + } + + /* Set new secret flags */ + nm_setting_set_secret_flags (NM_SETTING (s_vpn), secret_key, flags, NULL); +} + static gboolean update_connection (NMVpnPluginUiWidgetInterface *iface, NMConnection *connection, @@ -327,7 +478,6 @@ GtkWidget *widget; const char *str; gboolean valid = FALSE; - NMSettingSecretFlags pw_flags; if (!check_validity (self, error)) return FALSE; @@ -347,15 +497,12 @@ if (str && strlen (str)) nm_setting_vpn_add_data_item (s_vpn, NM_PPTP_KEY_USER, str); - /* User password */ - widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "user_password_entry")); - str = gtk_entry_get_text (GTK_ENTRY (widget)); - if (str && strlen (str)) - nm_setting_vpn_add_secret (s_vpn, NM_PPTP_KEY_PASSWORD, str); - - /* And password flags */ - pw_flags = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (widget), "flags")); - nm_setting_set_secret_flags (NM_SETTING (s_vpn), NM_PPTP_KEY_PASSWORD, pw_flags, NULL); + /* User password and flags */ + save_password_and_flags (s_vpn, + priv->builder, + "user_password_entry", + "user_pass_type_combo", + NM_PPTP_KEY_PASSWORD); /* Domain */ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "domain_entry")); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
