diff -Nru network-manager-pptp-0.9.2.0/auth-dialog/main.c network-manager-pptp-0.9.4.0/auth-dialog/main.c --- network-manager-pptp-0.9.2.0/auth-dialog/main.c 2011-08-26 16:46:21.000000000 +0000 +++ network-manager-pptp-0.9.4.0/auth-dialog/main.c 2012-03-19 15:57:32.000000000 +0000 @@ -43,6 +43,8 @@ #define KEYRING_SN_TAG "setting-name" #define KEYRING_SK_TAG "setting-key" +#define UI_KEYFILE_GROUP "VPN Plugin UI" + static char * keyring_lookup_secret (const char *uuid, const char *secret_name) { @@ -72,11 +74,43 @@ return secret; } +static void +keyfile_add_entry_info (GKeyFile *keyfile, + const gchar *key, + const gchar *value, + const gchar *label, + gboolean is_secret, + gboolean should_ask) +{ + g_key_file_set_string (keyfile, key, "Value", value); + g_key_file_set_string (keyfile, key, "Label", label); + g_key_file_set_boolean (keyfile, key, "IsSecret", is_secret); + g_key_file_set_boolean (keyfile, key, "ShouldAsk", should_ask); +} + +static void +keyfile_print_stdout (GKeyFile *keyfile) +{ + gchar *data; + gsize length; + + data = g_key_file_to_data (keyfile, &length, NULL); + + fputs (data, stdout); + + g_free (data); +} + +#if !GLIB_CHECK_VERSION(2,32,0) +#define g_key_file_unref g_key_file_free +#endif + static gboolean get_secrets (const char *vpn_uuid, const char *vpn_name, gboolean retry, gboolean allow_interaction, + gboolean external_ui_mode, const char *in_pw, char **out_pw, NMSettingSecretFlags pw_flags) @@ -105,28 +139,39 @@ return TRUE; } - if (!retry) { - /* Don't ask the user if we don't need a new password (ie, !retry), + /* Otherwise, we have no saved password, or the password flags indicated + * that the password should never be saved. + */ + prompt = g_strdup_printf (_("You need to authenticate to access the Virtual Private Network '%s'."), vpn_name); + + if (external_ui_mode) { + GKeyFile *keyfile; + + keyfile = g_key_file_new (); + + g_key_file_set_integer (keyfile, UI_KEYFILE_GROUP, "Version", 2); + g_key_file_set_string (keyfile, UI_KEYFILE_GROUP, "Description", prompt); + g_key_file_set_string (keyfile, UI_KEYFILE_GROUP, "Title", _("Authenticate VPN")); + + keyfile_add_entry_info (keyfile, NM_PPTP_KEY_PASSWORD, pw ? pw : "", _("Password:"), TRUE, allow_interaction); + + keyfile_print_stdout (keyfile); + g_key_file_unref (keyfile); + goto out; + } else if ( allow_interaction == FALSE + || (!retry && pw && !(pw_flags & NM_SETTING_SECRET_FLAG_NOT_SAVED))) { + /* If interaction isn't allowed, just return existing secrets. + * Also, don't ask the user if we don't need a new password (ie, !retry), * we have an existing PW, and the password is saved. */ - if (pw && !(pw_flags & NM_SETTING_SECRET_FLAG_NOT_SAVED)) { - *out_pw = pw; - return TRUE; - } - } - /* If interaction isn't allowed, just return existing secrets */ - if (allow_interaction == FALSE) { *out_pw = pw; + g_free (prompt); return TRUE; } - /* Otherwise, we have no saved password, or the password flags indicated - * that the password should never be saved. - */ - prompt = g_strdup_printf (_("You need to authenticate to access the Virtual Private Network '%s'."), vpn_name); + dialog = (VpnPasswordDialog *) vpn_password_dialog_new (_("Authenticate VPN"), prompt, NULL); - g_free (prompt); vpn_password_dialog_set_show_password_secondary (dialog, FALSE); @@ -146,6 +191,9 @@ gtk_widget_hide (GTK_WIDGET (dialog)); gtk_widget_destroy (GTK_WIDGET (dialog)); + out: + g_free (prompt); + return TRUE; } @@ -177,7 +225,7 @@ int main (int argc, char *argv[]) { - gboolean retry = FALSE, allow_interaction = FALSE; + gboolean retry = FALSE, allow_interaction = FALSE, external_ui_mode = FALSE; char *vpn_name = NULL, *vpn_uuid = NULL, *vpn_service = NULL, *password = NULL; GHashTable *data = NULL, *secrets = NULL; NMSettingSecretFlags pw_flags = NM_SETTING_SECRET_FLAG_NONE; @@ -188,6 +236,7 @@ { "name", 'n', 0, G_OPTION_ARG_STRING, &vpn_name, "Name of VPN connection", NULL}, { "service", 's', 0, G_OPTION_ARG_STRING, &vpn_service, "VPN service type", NULL}, { "allow-interaction", 'i', 0, G_OPTION_ARG_NONE, &allow_interaction, "Allow user interaction", NULL}, + { "external-ui-mode", 0, 0, G_OPTION_ARG_NONE, &external_ui_mode, "External UI mode", NULL}, { NULL } }; @@ -220,25 +269,26 @@ nm_vpn_plugin_utils_get_secret_flags (secrets, NM_PPTP_KEY_PASSWORD, &pw_flags); - if (!get_secrets (vpn_uuid, vpn_name, retry, allow_interaction, + if (!get_secrets (vpn_uuid, vpn_name, retry, allow_interaction, external_ui_mode, g_hash_table_lookup (secrets, NM_PPTP_KEY_PASSWORD), &password, pw_flags)) return 1; - /* dump the passwords to stdout */ - if (password) - printf ("%s\n%s\n", NM_PPTP_KEY_PASSWORD, password); - printf ("\n\n"); + if (!external_ui_mode) { + /* dump the passwords to stdout */ + if (password) + printf ("%s\n%s\n", NM_PPTP_KEY_PASSWORD, password); + printf ("\n\n"); - if (password) gnome_keyring_memory_free (password); - /* for good measure, flush stdout since Kansas is going Bye-Bye */ - fflush (stdout); + /* for good measure, flush stdout since Kansas is going Bye-Bye */ + fflush (stdout); - /* Wait for quit signal */ - wait_for_quit (); + /* Wait for quit signal */ + wait_for_quit (); + } if (data) g_hash_table_unref (data); diff -Nru network-manager-pptp-0.9.2.0/auth-dialog/vpn-password-dialog.c network-manager-pptp-0.9.4.0/auth-dialog/vpn-password-dialog.c --- network-manager-pptp-0.9.2.0/auth-dialog/vpn-password-dialog.c 2011-08-26 16:46:21.000000000 +0000 +++ network-manager-pptp-0.9.4.0/auth-dialog/vpn-password-dialog.c 2011-12-13 00:37:59.000000000 +0000 @@ -281,6 +281,7 @@ message_label = GTK_LABEL (gtk_label_new (message)); gtk_label_set_justify (message_label, GTK_JUSTIFY_LEFT); gtk_label_set_line_wrap (message_label, TRUE); + gtk_label_set_max_width_chars (message_label, 35); gtk_size_group_add_widget (priv->group, GTK_WIDGET (message_label)); gtk_box_pack_start (GTK_BOX (main_vbox), GTK_WIDGET (message_label), FALSE, FALSE, 0); gtk_size_group_add_widget (priv->group, priv->table_alignment); diff -Nru network-manager-pptp-0.9.2.0/configure network-manager-pptp-0.9.4.0/configure --- network-manager-pptp-0.9.2.0/configure 2011-11-10 03:20:59.000000000 +0000 +++ network-manager-pptp-0.9.4.0/configure 2012-03-23 21:29:39.000000000 +0000 @@ -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.2.0. +# Generated by GNU Autoconf 2.68 for NetworkManager-pptp 0.9.4.0. # # Report bugs to . # @@ -709,8 +709,8 @@ # Identity of this package. PACKAGE_NAME='NetworkManager-pptp' PACKAGE_TARNAME='NetworkManager-pptp' -PACKAGE_VERSION='0.9.2.0' -PACKAGE_STRING='NetworkManager-pptp 0.9.2.0' +PACKAGE_VERSION='0.9.4.0' +PACKAGE_STRING='NetworkManager-pptp 0.9.4.0' PACKAGE_BUGREPORT='dcbw@redhat.com' 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.2.0 to adapt to many kinds of systems. +\`configure' configures NetworkManager-pptp 0.9.4.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.2.0:";; + short | recursive ) echo "Configuration of NetworkManager-pptp 0.9.4.0:";; esac cat <<\_ACEOF @@ -1593,7 +1593,7 @@ optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) --disable-nls do not use Native Language Support - --enable-more-warnings Maximum compiler warnings + --enable-more-warnings Possible values: no/yes/error Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1705,7 +1705,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -NetworkManager-pptp configure 0.9.2.0 +NetworkManager-pptp configure 0.9.4.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.2.0, which was +It was created by NetworkManager-pptp $as_me 0.9.4.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.2.0' + VERSION='0.9.4.0' cat >>confdefs.h <<_ACEOF @@ -12668,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.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 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager >= 0.9.4 + libnm-util >= 0.9.4 + libnm-glib >= 0.9.4 + libnm-glib-vpn >= 0.9.4\""; } >&5 + ($PKG_CONFIG --exists --print-errors "NetworkManager >= 0.9.4 + libnm-util >= 0.9.4 + libnm-glib >= 0.9.4 + libnm-glib-vpn >= 0.9.4") 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.9.2 - libnm-util >= 0.9.2 - libnm-glib >= 0.9.2 - libnm-glib-vpn >= 0.9.2" 2>/dev/null` + pkg_cv_NM_CFLAGS=`$PKG_CONFIG --cflags "NetworkManager >= 0.9.4 + libnm-util >= 0.9.4 + libnm-glib >= 0.9.4 + libnm-glib-vpn >= 0.9.4" 2>/dev/null` else pkg_failed=yes fi @@ -12693,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.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 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager >= 0.9.4 + libnm-util >= 0.9.4 + libnm-glib >= 0.9.4 + libnm-glib-vpn >= 0.9.4\""; } >&5 + ($PKG_CONFIG --exists --print-errors "NetworkManager >= 0.9.4 + libnm-util >= 0.9.4 + libnm-glib >= 0.9.4 + libnm-glib-vpn >= 0.9.4") 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.9.2 - libnm-util >= 0.9.2 - libnm-glib >= 0.9.2 - libnm-glib-vpn >= 0.9.2" 2>/dev/null` + pkg_cv_NM_LIBS=`$PKG_CONFIG --libs "NetworkManager >= 0.9.4 + libnm-util >= 0.9.4 + libnm-glib >= 0.9.4 + libnm-glib-vpn >= 0.9.4" 2>/dev/null` else pkg_failed=yes fi @@ -12727,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.9.2 - libnm-util >= 0.9.2 - libnm-glib >= 0.9.2 - libnm-glib-vpn >= 0.9.2" 2>&1` + NM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "NetworkManager >= 0.9.4 + libnm-util >= 0.9.4 + libnm-glib >= 0.9.4 + libnm-glib-vpn >= 0.9.4" 2>&1` else - 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` + NM_PKG_ERRORS=`$PKG_CONFIG --print-errors "NetworkManager >= 0.9.4 + libnm-util >= 0.9.4 + libnm-glib >= 0.9.4 + libnm-glib-vpn >= 0.9.4" 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.9.2 - libnm-util >= 0.9.2 - libnm-glib >= 0.9.2 - libnm-glib-vpn >= 0.9.2) were not met: + as_fn_error $? "Package requirements (NetworkManager >= 0.9.4 + libnm-util >= 0.9.4 + libnm-glib >= 0.9.4 + libnm-glib-vpn >= 0.9.4) were not met: $NM_PKG_ERRORS @@ -13332,7 +13332,7 @@ if test "${enable_more_warnings+set}" = set; then : enableval=$enable_more_warnings; set_more_warnings="$enableval" else - set_more_warnings=yes + set_more_warnings=error fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for more warnings" >&5 @@ -13340,7 +13340,7 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - CFLAGS="-Wall -Werror -std=gnu89 $CFLAGS" + CFLAGS="-Wall -std=gnu89 $CFLAGS" for option in -Wshadow -Wmissing-declarations -Wmissing-prototypes \ -Wdeclaration-after-statement -Wstrict-prototypes \ @@ -13376,6 +13376,9 @@ unset SAVE_CFLAGS done unset option + if test "x$set_more_warnings" = xerror; then + CFLAGS="$CFLAGS -Werror" + fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -13946,7 +13949,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.2.0, which was +This file was extended by NetworkManager-pptp $as_me 0.9.4.0, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14012,7 +14015,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.2.0 +NetworkManager-pptp config.status 0.9.4.0 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -Nru network-manager-pptp-0.9.2.0/configure.ac network-manager-pptp-0.9.4.0/configure.ac --- network-manager-pptp-0.9.2.0/configure.ac 2011-11-10 03:20:52.000000000 +0000 +++ network-manager-pptp-0.9.4.0/configure.ac 2012-03-23 21:29:33.000000000 +0000 @@ -1,6 +1,6 @@ AC_PREREQ(2.59) -AC_INIT(NetworkManager-pptp, 0.9.2.0, dcbw@redhat.com, NetworkManager-pptp) +AC_INIT(NetworkManager-pptp, 0.9.4.0, dcbw@redhat.com, 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.9.2 - libnm-util >= 0.9.2 - libnm-glib >= 0.9.2 - libnm-glib-vpn >= 0.9.2) + NetworkManager >= 0.9.4 + libnm-util >= 0.9.4 + libnm-glib >= 0.9.4 + libnm-glib-vpn >= 0.9.4) AC_SUBST(NM_CFLAGS) AC_SUBST(NM_LIBS) diff -Nru network-manager-pptp-0.9.2.0/debian/changelog network-manager-pptp-0.9.4.0/debian/changelog --- network-manager-pptp-0.9.2.0/debian/changelog 2012-04-05 20:04:22.000000000 +0000 +++ network-manager-pptp-0.9.4.0/debian/changelog 2012-04-09 18:37:33.000000000 +0000 @@ -1,3 +1,14 @@ +network-manager-pptp (0.9.4.0-0ubuntu1) precise; urgency=low + + * New upstream release. (LP: #977330) + * debian/control: + - Bump Build-Depends for libnm-*-dev and network-manager-dev to (>= 0.9.4). + - Drop Build-Depends on libgconf2-dev. + - Bump Standards-Version to 3.9.3. + * debian/copyright: update to use machine readable copyright format 1.0. + + -- Mathieu Trudel-Lapierre Mon, 09 Apr 2012 14:12:53 -0400 + network-manager-pptp (0.9.2.0-1ubuntu2) precise; urgency=low * debian/patches/lp960685_auth_methods_dialog_sizing.patch: set a default diff -Nru network-manager-pptp-0.9.2.0/debian/control network-manager-pptp-0.9.4.0/debian/control --- network-manager-pptp-0.9.2.0/debian/control 2012-02-15 17:22:08.000000000 +0000 +++ network-manager-pptp-0.9.4.0/debian/control 2012-04-09 18:37:33.000000000 +0000 @@ -7,18 +7,17 @@ Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.16.1~), - network-manager-dev (>= 0.9.2), - libnm-util-dev (>= 0.9.2), - libnm-glib-dev (>= 0.9.2), - libnm-glib-vpn-dev (>= 0.9.2), + network-manager-dev (>= 0.9.4), + libnm-util-dev (>= 0.9.4), + libnm-glib-dev (>= 0.9.4), + libnm-glib-vpn-dev (>= 0.9.4), ppp-dev (>= 2.4.5), intltool, libdbus-glib-1-dev (>= 0.74), libgnome-keyring-dev, libgtk-3-dev (>= 3.0), - libgconf2-dev, libglib2.0-dev -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Homepage: http://www.gnome.org/projects/NetworkManager/ Package: network-manager-pptp diff -Nru network-manager-pptp-0.9.2.0/debian/copyright network-manager-pptp-0.9.4.0/debian/copyright --- network-manager-pptp-0.9.2.0/debian/copyright 2012-02-15 16:24:03.000000000 +0000 +++ network-manager-pptp-0.9.4.0/debian/copyright 2012-04-09 18:37:33.000000000 +0000 @@ -1,63 +1,49 @@ -This package was debianized by Craig Box on -Sun, 6 Aug 2006 19:30:11 +1200. - -It was downloaded from -http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/ - - -auth-dialog/gnome-two-password-dialog.[ch] - -Copyright: - - Copyright (C) 1999, 2000 Eazel, Inc. - Copyright (C) 2005, Red Hat, Inc. - -License: - - The Gnome Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The Gnome Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 51 Franklin St, Fifth - Floor, Boston, MA 02110-1301, USA. - -On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/LGPL-2'. - - - -All other files are licensed as following - -Copyright: - - Copyright (C) 2004 - 2008 Red Hat, Inc. - Copyright (C) 2008 Dan Williams - Copyright (C) 2007 - 2008 Novell, Inc. - -License: - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - -On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL-2'. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: NetworkManager-pptp +Source: http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/ + +Files: * +Copyright: 2008 - 2011 Red Hat, Inc. + 2007 - 2008 Novell, Inc. + 2008 Dan Williams +License: GPL-2+ + +Files: auth-dialog/vpn-password-dialog.* +Copyright: 1999, 2000 Eazel, Inc. + 2011 Red Hat, Inc. +License: LGPL-2+ + +License: GPL-2+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see + . + On Debian systems, the complete text of the GNU General Public + License version 2 can be found in "/usr/share/common-licenses/GPL-2". + +License: LGPL-2+ + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU Lesser General + Public License can be found in "/usr/share/common-licenses/LGPL-2". diff -Nru network-manager-pptp-0.9.2.0/m4/compiler_warnings.m4 network-manager-pptp-0.9.4.0/m4/compiler_warnings.m4 --- network-manager-pptp-0.9.2.0/m4/compiler_warnings.m4 2011-03-31 18:43:46.000000000 +0000 +++ network-manager-pptp-0.9.4.0/m4/compiler_warnings.m4 2012-03-02 20:11:03.000000000 +0000 @@ -1,11 +1,11 @@ AC_DEFUN([NM_COMPILER_WARNINGS], [AC_ARG_ENABLE(more-warnings, - AS_HELP_STRING([--enable-more-warnings], [Maximum compiler warnings]), - set_more_warnings="$enableval",set_more_warnings=yes) -AC_MSG_CHECKING(for more warnings, including -Werror) + AS_HELP_STRING([--enable-more-warnings], [Possible values: no/yes/error]), + set_more_warnings="$enableval",set_more_warnings=error) +AC_MSG_CHECKING(for more warnings) if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then AC_MSG_RESULT(yes) - CFLAGS="-Wall -Werror -std=gnu89 $CFLAGS" + CFLAGS="-Wall -std=gnu89 $CFLAGS" for option in -Wshadow -Wmissing-declarations -Wmissing-prototypes \ -Wdeclaration-after-statement -Wstrict-prototypes \ @@ -25,6 +25,9 @@ unset SAVE_CFLAGS done unset option + if test "x$set_more_warnings" = xerror; then + CFLAGS="$CFLAGS -Werror" + fi else AC_MSG_RESULT(no) fi diff -Nru network-manager-pptp-0.9.2.0/Makefile.am network-manager-pptp-0.9.4.0/Makefile.am --- network-manager-pptp-0.9.2.0/Makefile.am 2011-08-26 16:46:21.000000000 +0000 +++ network-manager-pptp-0.9.4.0/Makefile.am 2012-03-02 20:11:03.000000000 +0000 @@ -29,6 +29,8 @@ nm-pptp-service.name: $(srcdir)/nm-pptp-service.name.in sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' $< >$@ +DISTCHECK_CONFIGURE_FLAGS = --enable-more-warnings=yes + EXTRA_DIST = nm-pptp-service.name.in \ $(dbusservice_DATA) \ $(desktopfile) \ diff -Nru network-manager-pptp-0.9.2.0/Makefile.in network-manager-pptp-0.9.4.0/Makefile.in --- network-manager-pptp-0.9.2.0/Makefile.in 2011-11-10 03:21:00.000000000 +0000 +++ network-manager-pptp-0.9.4.0/Makefile.in 2012-03-23 21:29:40.000000000 +0000 @@ -291,6 +291,7 @@ nmvpnservice_DATA = nm-pptp-service.name desktopfile = nm-pptp.desktop.in iconfile = gnome-mime-application-x-pptp-settings.png +DISTCHECK_CONFIGURE_FLAGS = --enable-more-warnings=yes EXTRA_DIST = nm-pptp-service.name.in \ $(dbusservice_DATA) \ $(desktopfile) \ diff -Nru network-manager-pptp-0.9.2.0/NEWS network-manager-pptp-0.9.4.0/NEWS --- network-manager-pptp-0.9.2.0/NEWS 2011-10-28 19:28:43.000000000 +0000 +++ network-manager-pptp-0.9.4.0/NEWS 2012-03-02 17:04:17.000000000 +0000 @@ -1,4 +1,17 @@ ======================================================= +network-manager-pptp-0.9.4 +Overview of changes since network-manager-pptp-0.9.2 +======================================================= + +This is a new stable release of network-manager-pptp. Notable changes include: + +* Updated translations +* Support for "external UI mode" for DE-native dialogs (ie, GNOME Shell and others) +* Fix issues with password dialog width on recent GTK+ versions +* Config dialog tooltips now refer to corresponding ppp/pptp config options + + +======================================================= network-manager-pptp-0.9.2 Overview of changes since network-manager-pptp-0.9.0 ======================================================= diff -Nru network-manager-pptp-0.9.2.0/nm-pptp-service.name.in network-manager-pptp-0.9.4.0/nm-pptp-service.name.in --- network-manager-pptp-0.9.2.0/nm-pptp-service.name.in 2009-04-20 11:09:49.000000000 +0000 +++ network-manager-pptp-0.9.4.0/nm-pptp-service.name.in 2012-03-02 17:01:37.000000000 +0000 @@ -6,3 +6,4 @@ [GNOME] auth-dialog=nm-pptp-auth-dialog properties=libnm-pptp-properties +supports-external-ui-mode=true diff -Nru network-manager-pptp-0.9.2.0/po/cs.po network-manager-pptp-0.9.4.0/po/cs.po --- network-manager-pptp-0.9.2.0/po/cs.po 2011-09-08 14:58:55.000000000 +0000 +++ network-manager-pptp-0.9.4.0/po/cs.po 2011-12-13 00:37:59.000000000 +0000 @@ -4,14 +4,14 @@ # # Jakub Friedl , 2006. # Jiří Eischmann , 2008. -# Zdeněk Hataš , 2009, 2010. +# Zdeněk Hataš , 2009, 2010, 2011. # msgid "" 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-07-18 17:35+0000\n" -"PO-Revision-Date: 2011-09-05 08:08+0100\n" +"POT-Creation-Date: 2011-11-07 15:35+0000\n" +"PO-Revision-Date: 2011-11-22 10:49+0100\n" "Last-Translator: Zdeněk Hataš \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" @@ -31,7 +31,6 @@ msgstr "_Sekundární heslo:" #: ../auth-dialog/vpn-password-dialog.c:239 -#| msgid "Show password" msgid "Sh_ow passwords" msgstr "Z_obrazit hesla" @@ -183,6 +182,18 @@ msgid "Compatible with Microsoft and other PPTP VPN servers." msgstr "Kompatibilní s PPTP VPN servery od Microsoftu a ostatních." +#: ../properties/nm-pptp.c:317 +msgid "Saved" +msgstr "Uloženo" + +#: ../properties/nm-pptp.c:325 +msgid "Always Ask" +msgstr "Vždy se ptát" + +#: ../properties/nm-pptp.c:330 +msgid "Not Required" +msgstr "Není vyžadováno" + #: ../src/nm-pptp-service.c:160 #, c-format msgid "couldn't convert PPTP VPN gateway IP address '%s' (%d)" diff -Nru network-manager-pptp-0.9.2.0/po/de.po network-manager-pptp-0.9.4.0/po/de.po --- network-manager-pptp-0.9.2.0/po/de.po 2011-08-26 16:46:21.000000000 +0000 +++ network-manager-pptp-0.9.4.0/po/de.po 2011-12-13 00:37:59.000000000 +0000 @@ -1,18 +1,18 @@ -# German translation of NetwokrManager. +# German translation of networkmanager-pptp. # Copyright (C) 2005 Dan Williams # This file is distributed under the same license as the NetworkManager package. # Thomas Gier , 2007. # Hauke Mehrtens , 2008. -# Mario Blättermann , 2009, 2011. +# Mario Blättermann , 2009, 2011. # msgid "" msgstr "" "Project-Id-Version: network-manager-pptp master\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-30 21:16+0100\n" -"Last-Translator: Mario Blättermann \n" +"POT-Creation-Date: 2011-11-07 15:35+0000\n" +"PO-Revision-Date: 2011-11-18 20:21+0100\n" +"Last-Translator: Mario Blättermann \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -188,6 +188,18 @@ msgid "Compatible with Microsoft and other PPTP VPN servers." msgstr "Kompatibel mit Microsofts und anderen PPTP VPN-Servern." +#: ../properties/nm-pptp.c:317 +msgid "Saved" +msgstr "Gespeichert" + +#: ../properties/nm-pptp.c:325 +msgid "Always Ask" +msgstr "Immer fragen" + +#: ../properties/nm-pptp.c:330 +msgid "Not Required" +msgstr "Nicht notwendig" + #: ../src/nm-pptp-service.c:160 #, c-format msgid "couldn't convert PPTP VPN gateway IP address '%s' (%d)" diff -Nru network-manager-pptp-0.9.2.0/po/eo.po network-manager-pptp-0.9.4.0/po/eo.po --- network-manager-pptp-0.9.2.0/po/eo.po 1970-01-01 00:00:00.000000000 +0000 +++ network-manager-pptp-0.9.4.0/po/eo.po 2011-12-13 00:37:59.000000000 +0000 @@ -0,0 +1,301 @@ +# Esperanto translation for network-manager-pptp. +# Copyright (C) 2011 Free Software Foundation, Inc. +# This file is distributed under the same license as the network-manager-pptp package. +# Kristjan SCHMIDT , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: network-manager-pptp master\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-11-18 19:25+0000\n" +"PO-Revision-Date: 2011-11-21 18:13+0100\n" +"Last-Translator: Kristjan SCHMIDT \n" +"Language-Team: Esperanto \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bits\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" + +#: ../auth-dialog/vpn-password-dialog.c:95 +msgid "_Password:" +msgstr "_Pasvorto:" + +#: ../auth-dialog/vpn-password-dialog.c:97 +msgid "_Secondary Password:" +msgstr "_Duaranga pasvorto:" + +#: ../auth-dialog/vpn-password-dialog.c:239 +msgid "Sh_ow passwords" +msgstr "M_ontri pasvortojn" + +#. Otherwise, we have no saved password, or the password flags indicated +#. * that the password should never be saved. +#. +#: ../auth-dialog/main.c:127 +#, c-format +msgid "You need to authenticate to access the Virtual Private Network '%s'." +msgstr "" + +#: ../auth-dialog/main.c:128 +msgid "Authenticate VPN" +msgstr "" + +#: ../nm-pptp.desktop.in.h:1 +msgid "Add, Remove, and Edit PPTP VPN Connections" +msgstr "" + +#: ../nm-pptp.desktop.in.h:2 +msgid "PPTP VPN Connection Manager" +msgstr "" + +#: ../properties/advanced-dialog.c:187 +msgid "All Available (Default)" +msgstr "" + +#: ../properties/advanced-dialog.c:191 +msgid "128-bit (most secure)" +msgstr "" + +#: ../properties/advanced-dialog.c:200 +msgid "40-bit (less secure)" +msgstr "" + +#: ../properties/advanced-dialog.c:309 +msgid "PAP" +msgstr "PAP" + +#: ../properties/advanced-dialog.c:322 +msgid "CHAP" +msgstr "CHAP" + +#: ../properties/advanced-dialog.c:334 +msgid "MSCHAP" +msgstr "MSCHAP" + +#: ../properties/advanced-dialog.c:346 +msgid "MSCHAPv2" +msgstr "MSCHAPv2" + +#: ../properties/advanced-dialog.c:359 +msgid "EAP" +msgstr "EAP" + +#: ../properties/nm-pptp-dialog.ui.h:1 +msgid "Authentication" +msgstr "Aŭtentokontrolo" + +#: ../properties/nm-pptp-dialog.ui.h:2 +msgid "Echo" +msgstr "" + +#: ../properties/nm-pptp-dialog.ui.h:3 +msgid "General" +msgstr "Ĝenerale" + +#: ../properties/nm-pptp-dialog.ui.h:4 +msgid "Optional" +msgstr "" + +#: ../properties/nm-pptp-dialog.ui.h:5 +msgid "Security and Compression" +msgstr "" + +#: ../properties/nm-pptp-dialog.ui.h:6 +msgid "Ad_vanced..." +msgstr "Al_tnivele..." + +#: ../properties/nm-pptp-dialog.ui.h:7 +msgid "Allow _BSD data compression" +msgstr "" + +#: ../properties/nm-pptp-dialog.ui.h:8 +msgid "Allow _Deflate data compression" +msgstr "" + +#: ../properties/nm-pptp-dialog.ui.h:9 +msgid "Allow st_ateful encryption" +msgstr "" + +#: ../properties/nm-pptp-dialog.ui.h:10 +msgid "Allow the following authentication methods:" +msgstr "" + +#: ../properties/nm-pptp-dialog.ui.h:11 +msgid "Default" +msgstr "Defaŭlte" + +#: ../properties/nm-pptp-dialog.ui.h:12 +msgid "NT Domain:" +msgstr "" + +#: ../properties/nm-pptp-dialog.ui.h:13 +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 "" + +#: ../properties/nm-pptp-dialog.ui.h:14 +msgid "PPTP Advanced Options" +msgstr "" + +#: ../properties/nm-pptp-dialog.ui.h:15 +msgid "Password:" +msgstr "Pasvorto:" + +#: ../properties/nm-pptp-dialog.ui.h:16 +msgid "Send PPP _echo packets" +msgstr "Sendi _eĥajn PPP-pakaĵojn" + +#: ../properties/nm-pptp-dialog.ui.h:17 +msgid "Show password" +msgstr "Montri pasvorton" + +#: ../properties/nm-pptp-dialog.ui.h:18 +msgid "Use TCP _header compression" +msgstr "Apliki densigon de TCP-_kapoj" + +#: ../properties/nm-pptp-dialog.ui.h:19 +msgid "Use _Point-to-Point encryption (MPPE)" +msgstr "Uzi _punkt-al-punktan ĉifradon (MPPE)" + +#: ../properties/nm-pptp-dialog.ui.h:20 +msgid "User name:" +msgstr "Uzantonomo:" + +#: ../properties/nm-pptp-dialog.ui.h:21 +msgid "_Gateway:" +msgstr "" + +#: ../properties/nm-pptp-dialog.ui.h:22 +msgid "_Security:" +msgstr "_Sekureco:" + +#: ../properties/nm-pptp.c:49 +msgid "Point-to-Point Tunneling Protocol (PPTP)" +msgstr "" + +#: ../properties/nm-pptp.c:50 +msgid "Compatible with Microsoft and other PPTP VPN servers." +msgstr "" + +#: ../properties/nm-pptp.c:317 +msgid "Saved" +msgstr "Konservite" + +#: ../properties/nm-pptp.c:325 +msgid "Always Ask" +msgstr "Demandi ĉiam" + +#: ../properties/nm-pptp.c:330 +msgid "Not Required" +msgstr "Nebezonate" + +#: ../src/nm-pptp-service.c:160 +#, c-format +msgid "couldn't convert PPTP VPN gateway IP address '%s' (%d)" +msgstr "" + +#: ../src/nm-pptp-service.c:178 +#, c-format +msgid "couldn't look up PPTP VPN gateway IP address '%s' (%d)" +msgstr "" + +#: ../src/nm-pptp-service.c:202 +#, c-format +msgid "no usable addresses returned for PPTP VPN gateway '%s'" +msgstr "" + +#: ../src/nm-pptp-service.c:213 +#, c-format +msgid "no usable addresses returned for PPTP VPN gateway '%s' (%d)" +msgstr "" + +#: ../src/nm-pptp-service.c:240 +msgid "Could not find secrets (connection invalid, no vpn setting)." +msgstr "" + +#: ../src/nm-pptp-service.c:252 +msgid "Invalid VPN username." +msgstr "" + +#: ../src/nm-pptp-service.c:261 +msgid "Missing VPN username." +msgstr "" + +#: ../src/nm-pptp-service.c:271 +msgid "Missing or invalid VPN password." +msgstr "" + +#: ../src/nm-pptp-service.c:429 +msgid "No cached credentials." +msgstr "" + +#: ../src/nm-pptp-service.c:575 +#, c-format +msgid "invalid gateway '%s'" +msgstr "" + +#: ../src/nm-pptp-service.c:589 +#, c-format +msgid "invalid integer property '%s'" +msgstr "" + +#: ../src/nm-pptp-service.c:599 +#, c-format +msgid "invalid boolean property '%s' (not yes or no)" +msgstr "" + +#: ../src/nm-pptp-service.c:606 +#, c-format +msgid "unhandled property '%s' type %s" +msgstr "" + +#: ../src/nm-pptp-service.c:617 +#, c-format +msgid "property '%s' invalid or not supported" +msgstr "" + +#: ../src/nm-pptp-service.c:635 +msgid "No VPN configuration options." +msgstr "" + +#: ../src/nm-pptp-service.c:655 +#, c-format +msgid "Missing required option '%s'." +msgstr "" + +#: ../src/nm-pptp-service.c:675 +msgid "No VPN secrets!" +msgstr "" + +#: ../src/nm-pptp-service.c:816 +msgid "Could not find pptp client binary." +msgstr "" + +#: ../src/nm-pptp-service.c:829 +msgid "Missing VPN gateway." +msgstr "" + +#: ../src/nm-pptp-service.c:982 +msgid "Could not find the pppd binary." +msgstr "" + +#: ../src/nm-pptp-service.c:1112 +msgid "Invalid or missing PPTP gateway." +msgstr "" + +#: ../src/nm-pptp-service.c:1311 +msgid "Don't quit when VPN connection terminates" +msgstr "" + +#: ../src/nm-pptp-service.c:1312 +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 "" diff -Nru network-manager-pptp-0.9.2.0/po/es.po network-manager-pptp-0.9.4.0/po/es.po --- network-manager-pptp-0.9.2.0/po/es.po 2011-11-09 17:54:27.000000000 +0000 +++ network-manager-pptp-0.9.4.0/po/es.po 2012-02-07 21:09:08.000000000 +0000 @@ -5,15 +5,15 @@ # # Francisco Javier F. Serrador , 2006. # Jorge González , 2007, 2009, 2011. -# Daniel Mustieles , 2011. +# Daniel Mustieles , 2011, 2012. # msgid "" 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-11-07 15:35+0000\n" -"PO-Revision-Date: 2011-11-08 12:27+0100\n" +"POT-Creation-Date: 2012-02-01 14:41+0000\n" +"PO-Revision-Date: 2012-02-05 19:24+0100\n" "Last-Translator: Daniel Mustieles \n" "Language-Team: Español \n" "MIME-Version: 1.0\n" @@ -111,30 +111,77 @@ msgstr "A_vanzado..." #: ../properties/nm-pptp-dialog.ui.h:7 +msgid "" +"Allow MPPE to use stateful mode. Stateless mode is still attempted first." +" config: mppe-stateful (when checked)" +msgstr "" +"Permitir a MPPE usar el modo con estado. El modo sin estado se sigue " +"intentando primero. opción: mppe-stateful (desmarcada)" + +#: ../properties/nm-pptp-dialog.ui.h:8 msgid "Allow _BSD data compression" msgstr "Permitir compresión de datos _BSD" -#: ../properties/nm-pptp-dialog.ui.h:8 +#: ../properties/nm-pptp-dialog.ui.h:9 msgid "Allow _Deflate data compression" msgstr "Permitir compresión de datos _Deflate" -#: ../properties/nm-pptp-dialog.ui.h:9 +#: ../properties/nm-pptp-dialog.ui.h:10 msgid "Allow st_ateful encryption" msgstr "Permitir cifrado de est_ado completo" -#: ../properties/nm-pptp-dialog.ui.h:10 +#: ../properties/nm-pptp-dialog.ui.h:11 msgid "Allow the following authentication methods:" msgstr "Permitir los siguientes métodos de autenticación:" -#: ../properties/nm-pptp-dialog.ui.h:11 +#: ../properties/nm-pptp-dialog.ui.h:12 +msgid "" +"Allow/disable BSD-Compress compression. config: nobsdcomp (when " +"unchecked)" +msgstr "" +"Permitir/desactivar compresión «BSD-Compress». opción: nobsdcomp " +"(desmarcada)" + +#: ../properties/nm-pptp-dialog.ui.h:13 +msgid "" +"Allow/disable Deflate compression. config: nodeflate (when unchecked)" +msgstr "" +"Permitir/desactivar la compresión por desinflado. opción: nodeflate " +"(desmarcada)" + +#: ../properties/nm-pptp-dialog.ui.h:14 +msgid "" +"Allow/disable Van Jacobson style TCP/IP header compression in both the " +"transmit and the receive directions. config: novj (when unchecked)" +msgstr "" +"Permitir/desactivar compresión de cabeceras TCP/IP estilo Van Jacobson al " +"enviar y recibir. opción: novj (desmarcada)" + +#: ../properties/nm-pptp-dialog.ui.h:15 +msgid "" +"Allow/disable authentication methods. config: refuse-pap, refuse-chap, " +"refuse-mschap, refuse-mschap-v2, refuse-eap" +msgstr "" +"Permitir/desactivar métodos de autenticación. opción: refuse-pap, refuse-" +"chap, refuse-mschap, refuse-mschap-v2, refuse-eap" + +#: ../properties/nm-pptp-dialog.ui.h:16 +msgid "" +"Append the domain name to the local host name for authentication " +"purposes. config: domain " +msgstr "" +"Añadir el nombre del dominio al nombre local del equipo por " +"motivos de autenticación. opción: domain " + +#: ../properties/nm-pptp-dialog.ui.h:17 msgid "Default" msgstr "Predeterminado" -#: ../properties/nm-pptp-dialog.ui.h:12 +#: ../properties/nm-pptp-dialog.ui.h:18 msgid "NT Domain:" msgstr "Dominio de red:" -#: ../properties/nm-pptp-dialog.ui.h:13 +#: ../properties/nm-pptp-dialog.ui.h:19 msgid "" "Note: MPPE encryption is only available with MSCHAP authentication methods. " "To enable this checkbox, select one or more of the MSCHAP authentication " @@ -144,39 +191,71 @@ "MSCHAP. Para activar esta casilla de selección seleccione uno o más métodos " "de autenticación MSCHAP: MSCHAP o MSCHAPv2." -#: ../properties/nm-pptp-dialog.ui.h:14 +#: ../properties/nm-pptp-dialog.ui.h:20 msgid "PPTP Advanced Options" msgstr "Opciones avanzadas de PPTP" -#: ../properties/nm-pptp-dialog.ui.h:15 +#: ../properties/nm-pptp-dialog.ui.h:21 +msgid "PPTP server IP or name. config: the first parameter of pptp" +msgstr "Nombre o IP del servidor PPTP. opción: the first parameter of pptp" + +#: ../properties/nm-pptp-dialog.ui.h:22 +msgid "Password passed to PPTP when prompted for it." +msgstr "Contraseña pasada a PPTP al solicitarla." + +#: ../properties/nm-pptp-dialog.ui.h:23 msgid "Password:" msgstr "Contraseña:" -#: ../properties/nm-pptp-dialog.ui.h:16 +#: ../properties/nm-pptp-dialog.ui.h:24 +msgid "" +"Require the use of MPPE, with 40/128-bit encryption or all. config: " +"require-mppe, require-mppe-128 or require-mppe-40" +msgstr "" +"Requerir el uso de MPPE, con cifrado de 40/128 bits para todo. opción: " +"require-mppe, require-mppe-128 o require-mppe-40" + +#: ../properties/nm-pptp-dialog.ui.h:25 +msgid "" +"Send LCP echo-requests to find out whether peer is alive. config: lcp-" +"echo-failure and lcp-echo-interval" +msgstr "" +"Enviar solicitudes de eco LCP para averiguar si el par está vivo. " +"opción: lcp-echo-failure y lcp-echo-interval" + +#: ../properties/nm-pptp-dialog.ui.h:26 msgid "Send PPP _echo packets" msgstr "Mandar paquetes _eco PPP" -#: ../properties/nm-pptp-dialog.ui.h:17 +#: ../properties/nm-pptp-dialog.ui.h:27 +msgid "" +"Set the name used for authenticating the local system to the peer to ." +" config: user " +msgstr "" +"Establecer el nombre usado para autenticar el equipo local en el par a " +". opción: user " + +#: ../properties/nm-pptp-dialog.ui.h:28 msgid "Show password" msgstr "Mostrar contraseña" -#: ../properties/nm-pptp-dialog.ui.h:18 +#: ../properties/nm-pptp-dialog.ui.h:29 msgid "Use TCP _header compression" msgstr "Usar compresión de _cabeceras TCP" -#: ../properties/nm-pptp-dialog.ui.h:19 +#: ../properties/nm-pptp-dialog.ui.h:30 msgid "Use _Point-to-Point encryption (MPPE)" msgstr "Usar cifrado pun_to a punto (MPPE)" -#: ../properties/nm-pptp-dialog.ui.h:20 +#: ../properties/nm-pptp-dialog.ui.h:31 msgid "User name:" msgstr "Usuario:" -#: ../properties/nm-pptp-dialog.ui.h:21 +#: ../properties/nm-pptp-dialog.ui.h:32 msgid "_Gateway:" msgstr "_Pasarela:" -#: ../properties/nm-pptp-dialog.ui.h:22 +#: ../properties/nm-pptp-dialog.ui.h:33 msgid "_Security:" msgstr "_Seguridad:" @@ -218,7 +297,8 @@ #: ../src/nm-pptp-service.c:213 #, c-format msgid "no usable addresses returned for PPTP VPN gateway '%s' (%d)" -msgstr "la puerta de enlace VPN PPTP devolvió una dirección no usable «%s» (%d)" +msgstr "" +"la puerta de enlace VPN PPTP devolvió una dirección no usable «%s» (%d)" #: ../src/nm-pptp-service.c:240 msgid "Could not find secrets (connection invalid, no vpn setting)." diff -Nru network-manager-pptp-0.9.2.0/po/ja.po network-manager-pptp-0.9.4.0/po/ja.po --- network-manager-pptp-0.9.2.0/po/ja.po 2011-08-26 16:46:21.000000000 +0000 +++ network-manager-pptp-0.9.4.0/po/ja.po 2012-02-07 21:09:08.000000000 +0000 @@ -11,56 +11,38 @@ "Project-Id-Version: NetworkManager-pptp master\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-24 09:29+0000\n" -"PO-Revision-Date: 2011-04-25 02:53+0900\n" -"Last-Translator: Hajime Taira \n" +"POT-Creation-Date: 2011-12-14 21:28+0000\n" +"PO-Revision-Date: 2012-01-01 19:56+0900\n" +"Last-Translator: Jiro Matsuzawa \n" "Language-Team: Japanese \n" -"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ja\n" -#: ../auth-dialog/gnome-two-password-dialog.c:129 -msgid "_Secondary Password:" -msgstr "第二パスワード(_S):" - -#: ../auth-dialog/gnome-two-password-dialog.c:243 -msgid "_Username:" -msgstr "ユーザ名(_U):" - -#: ../auth-dialog/gnome-two-password-dialog.c:245 -msgid "_Domain:" -msgstr "ドメイン(_D):" - -#: ../auth-dialog/gnome-two-password-dialog.c:247 +#: ../auth-dialog/vpn-password-dialog.c:95 msgid "_Password:" msgstr "パスワード(_P):" -#: ../auth-dialog/gnome-two-password-dialog.c:342 -msgid "Connect _anonymously" -msgstr "匿名で接続(_A)" - -#: ../auth-dialog/gnome-two-password-dialog.c:347 -msgid "Connect as _user:" -msgstr "ユーザで接続(_U):" - -#: ../auth-dialog/gnome-two-password-dialog.c:452 -msgid "_Remember passwords for this session" -msgstr "このセッションのパスワードを記憶する(_R)" - -#: ../auth-dialog/gnome-two-password-dialog.c:454 -msgid "_Save passwords in keyring" -msgstr "パスワードをキーリングに保存する(_S)" +#: ../auth-dialog/vpn-password-dialog.c:97 +msgid "_Secondary Password:" +msgstr "第二パスワード(_S):" + +#: ../auth-dialog/vpn-password-dialog.c:239 +#, fuzzy +#| msgid "Show password" +msgid "Sh_ow passwords" +msgstr "パスワードを表示します。" #. 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 "仮想プライベートネットワーク %s にアクセスするには認証が必要です。" -#: ../auth-dialog/main.c:93 +#: ../auth-dialog/main.c:128 msgid "Authenticate VPN" msgstr "認証 VPN" @@ -70,7 +52,7 @@ #: ../nm-pptp.desktop.in.h:2 msgid "PPTP VPN Connection Manager" -msgstr "PPTP VPN 接続マネージャ" +msgstr "PPTP VPN 接続マネージャー" #: ../properties/advanced-dialog.c:187 msgid "All Available (Default)" @@ -180,7 +162,7 @@ #: ../properties/nm-pptp-dialog.ui.h:18 msgid "Use TCP _header compression" -msgstr "TCP ヘッダ圧縮を使用する(_H)" +msgstr "TCP ヘッダー圧縮を使用する(_H)" #: ../properties/nm-pptp-dialog.ui.h:19 msgid "Use _Point-to-Point encryption (MPPE)" @@ -188,7 +170,7 @@ #: ../properties/nm-pptp-dialog.ui.h:20 msgid "User name:" -msgstr "ユーザ名:" +msgstr "ユーザー名:" #: ../properties/nm-pptp-dialog.ui.h:21 msgid "_Gateway:" @@ -198,13 +180,25 @@ msgid "_Security:" msgstr "セキュリティ(_S):" -#: ../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 "Microsoft と、その他の PPTP VPN サーバとの互換性" +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 #, c-format @@ -236,11 +230,11 @@ #: ../src/nm-pptp-service.c:252 msgid "Invalid VPN username." -msgstr "無効な VPN ユーザ名です。" +msgstr "無効な VPN ユーザー名です。" #: ../src/nm-pptp-service.c:261 msgid "Missing VPN username." -msgstr "VPN ユーザ名がありません。" +msgstr "VPN ユーザー名がありません。" #: ../src/nm-pptp-service.c:271 msgid "Missing or invalid VPN password." @@ -258,22 +252,23 @@ #: ../src/nm-pptp-service.c:589 #, c-format msgid "invalid integer property '%s'" -msgstr "数値型パラメータ %s が無効な数値です。" +msgstr "数値型パラメーター %s が無効な数値です。" #: ../src/nm-pptp-service.c:599 #, c-format msgid "invalid boolean property '%s' (not yes or no)" -msgstr "ブーリアン型パラメータ %s が無効な値です。(値はyes、noではありません)" +msgstr "" +"ブーリアン型パラメーター %s が無効な値です。(値はyes、noではありません)" #: ../src/nm-pptp-service.c:606 #, c-format msgid "unhandled property '%s' type %s" -msgstr "対処できない %s 型パラメータの %s" +msgstr "対処できない %s 型パラメーターの %s" #: ../src/nm-pptp-service.c:617 #, c-format msgid "property '%s' invalid or not supported" -msgstr "パラメータ %s は無効かサポートされていません。" +msgstr "パラメーター %s は無効かサポートされていません。" #: ../src/nm-pptp-service.c:635 msgid "No VPN configuration options." @@ -320,6 +315,24 @@ "nm-pptp-service は NetworkManager に対して PPTP VPN 互換性 (Microsoft とその" "他の実装との互換性) を提供します。" +#~ msgid "_Username:" +#~ msgstr "ユーザ名(_U):" + +#~ msgid "_Domain:" +#~ msgstr "ドメイン(_D):" + +#~ msgid "Connect _anonymously" +#~ msgstr "匿名で接続(_A)" + +#~ msgid "Connect as _user:" +#~ msgstr "ユーザで接続(_U):" + +#~ msgid "_Remember passwords for this session" +#~ msgstr "このセッションのパスワードを記憶する(_R)" + +#~ msgid "_Save passwords in keyring" +#~ msgstr "パスワードをキーリングに保存する(_S)" + #~ msgid "Authentication Type:" #~ msgstr "認証タイプ:" diff -Nru network-manager-pptp-0.9.2.0/po/LINGUAS network-manager-pptp-0.9.4.0/po/LINGUAS --- network-manager-pptp-0.9.2.0/po/LINGUAS 2011-09-08 14:58:55.000000000 +0000 +++ network-manager-pptp-0.9.4.0/po/LINGUAS 2012-03-16 16:34:48.000000000 +0000 @@ -12,6 +12,7 @@ de el en_GB +eo es et eu @@ -41,6 +42,8 @@ ro ru sl +sr +sr@latin sv ta te diff -Nru network-manager-pptp-0.9.2.0/po/lv.po network-manager-pptp-0.9.4.0/po/lv.po --- network-manager-pptp-0.9.2.0/po/lv.po 2011-10-28 19:28:30.000000000 +0000 +++ network-manager-pptp-0.9.4.0/po/lv.po 2012-03-19 15:53:06.000000000 +0000 @@ -2,15 +2,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Rūdolfs Mazurs , 2010. -# Rūdofls Mazurs , 2011. +# Rūdofls Mazurs , 2011, 2012. msgid "" msgstr "" "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-07-18 17:35+0000\n" -"PO-Revision-Date: 2011-09-16 12:25+0300\n" -"Last-Translator: Rūdofls Mazurs \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-02-01 14:41+0000\n" +"PO-Revision-Date: 2012-03-15 21:49+0200\n" +"Last-Translator: Rūdolfs Mazurs \n" "Language-Team: Latvian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,7 +29,6 @@ msgstr "_Sekundārā parole:" #: ../auth-dialog/vpn-password-dialog.c:239 -#| msgid "Show password" msgid "Sh_ow passwords" msgstr "Rādīt par_oles" @@ -111,30 +110,70 @@ msgstr "_Paplašināti..." #: ../properties/nm-pptp-dialog.ui.h:7 +msgid "" +"Allow MPPE to use stateful mode. Stateless mode is still attempted first." +" config: mppe-stateful (when checked)" +msgstr "" +"Ļaut MPPE izmantot stāvokļa saglabāšanas režīmu. Tāpat vispirms tiks " +"mēģināts bezstāvokļa zežīms. config: mppe-stateful (kad atzīmēts)" + +#: ../properties/nm-pptp-dialog.ui.h:8 msgid "Allow _BSD data compression" msgstr "Atļaut _BSD datu kompresiju" -#: ../properties/nm-pptp-dialog.ui.h:8 +#: ../properties/nm-pptp-dialog.ui.h:9 msgid "Allow _Deflate data compression" msgstr "Atļaut _Deflate datu kompresiju" -#: ../properties/nm-pptp-dialog.ui.h:9 +#: ../properties/nm-pptp-dialog.ui.h:10 msgid "Allow st_ateful encryption" msgstr "Atļaut st_ateful kompresiju" -#: ../properties/nm-pptp-dialog.ui.h:10 +#: ../properties/nm-pptp-dialog.ui.h:11 msgid "Allow the following authentication methods:" msgstr "Atļaut sekojošās autentifikācijas metodes:" -#: ../properties/nm-pptp-dialog.ui.h:11 +#: ../properties/nm-pptp-dialog.ui.h:12 +msgid "" +"Allow/disable BSD-Compress compression. config: nobsdcomp (when " +"unchecked)" +msgstr "" +"Ļaut/dekativēt BSD-Compress saspiešanu. config: nobsdcomp (kad " +"nav atzīmēts)" + +#: ../properties/nm-pptp-dialog.ui.h:13 +msgid "" +"Allow/disable Deflate compression. config: nodeflate (when unchecked)" +msgstr "" +"Ļaut/deaktivēt Deflate saspiešanu. config: nodeflate (kad nav atzīmēts)" + +#: ../properties/nm-pptp-dialog.ui.h:14 +msgid "" +"Allow/disable Van Jacobson style TCP/IP header compression in both the " +"transmit and the receive directions. config: novj (when unchecked)" +msgstr "" + +#: ../properties/nm-pptp-dialog.ui.h:15 +msgid "" +"Allow/disable authentication methods. config: refuse-pap, refuse-chap, " +"refuse-mschap, refuse-mschap-v2, refuse-eap" +msgstr "" + +#: ../properties/nm-pptp-dialog.ui.h:16 +msgid "" +"Append the domain name to the local host name for authentication " +"purposes. config: domain " +msgstr "" + +#: ../properties/nm-pptp-dialog.ui.h:17 msgid "Default" msgstr "Noklusēts" -#: ../properties/nm-pptp-dialog.ui.h:12 +#: ../properties/nm-pptp-dialog.ui.h:18 msgid "NT Domain:" msgstr "NT domēns:" -#: ../properties/nm-pptp-dialog.ui.h:13 +#: ../properties/nm-pptp-dialog.ui.h:19 msgid "" "Note: MPPE encryption is only available with MSCHAP authentication methods. " "To enable this checkbox, select one or more of the MSCHAP authentication " @@ -144,39 +183,65 @@ "metodēm. Lai ieslēgtu šo rūtiņu, izvēlieties vienu vai vairākas MSCHAP " "autentifikācijas metodes: MSCHAP vai MSCHAPv2." -#: ../properties/nm-pptp-dialog.ui.h:14 +#: ../properties/nm-pptp-dialog.ui.h:20 msgid "PPTP Advanced Options" msgstr "PPTP paplašinātas opcijas" -#: ../properties/nm-pptp-dialog.ui.h:15 +#: ../properties/nm-pptp-dialog.ui.h:21 +msgid "PPTP server IP or name. config: the first parameter of pptp" +msgstr "" + +#: ../properties/nm-pptp-dialog.ui.h:22 +msgid "Password passed to PPTP when prompted for it." +msgstr "" + +#: ../properties/nm-pptp-dialog.ui.h:23 msgid "Password:" msgstr "Parole:" -#: ../properties/nm-pptp-dialog.ui.h:16 +#: ../properties/nm-pptp-dialog.ui.h:24 +msgid "" +"Require the use of MPPE, with 40/128-bit encryption or all. config: " +"require-mppe, require-mppe-128 or require-mppe-40" +msgstr "" + +#: ../properties/nm-pptp-dialog.ui.h:25 +msgid "" +"Send LCP echo-requests to find out whether peer is alive. config: lcp-" +"echo-failure and lcp-echo-interval" +msgstr "" + +#: ../properties/nm-pptp-dialog.ui.h:26 msgid "Send PPP _echo packets" msgstr "Sūtīt PPP _atbalss paketi" -#: ../properties/nm-pptp-dialog.ui.h:17 +#: ../properties/nm-pptp-dialog.ui.h:27 +msgid "" +"Set the name used for authenticating the local system to the peer to ." +" config: user " +msgstr "" + +#: ../properties/nm-pptp-dialog.ui.h:28 msgid "Show password" msgstr "Rādīt paroli" -#: ../properties/nm-pptp-dialog.ui.h:18 +#: ../properties/nm-pptp-dialog.ui.h:29 msgid "Use TCP _header compression" msgstr "Izmantot TCP _galvenes kompresiju" -#: ../properties/nm-pptp-dialog.ui.h:19 +#: ../properties/nm-pptp-dialog.ui.h:30 msgid "Use _Point-to-Point encryption (MPPE)" msgstr "Izmantot divp_unktu šifrēšanu (MPPE)" -#: ../properties/nm-pptp-dialog.ui.h:20 +#: ../properties/nm-pptp-dialog.ui.h:31 msgid "User name:" msgstr "Lietotāja vārds:" -#: ../properties/nm-pptp-dialog.ui.h:21 +#: ../properties/nm-pptp-dialog.ui.h:32 msgid "_Gateway:" msgstr "_Vārteja:" -#: ../properties/nm-pptp-dialog.ui.h:22 +#: ../properties/nm-pptp-dialog.ui.h:33 msgid "_Security:" msgstr "_Drošība:" @@ -188,6 +253,18 @@ msgid "Compatible with Microsoft and other PPTP VPN servers." msgstr "Savietojams ar Microsoft un citiem PPTP VPN serveriem." +#: ../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 #, c-format msgid "couldn't convert PPTP VPN gateway IP address '%s' (%d)" diff -Nru network-manager-pptp-0.9.2.0/po/nb.po network-manager-pptp-0.9.4.0/po/nb.po --- network-manager-pptp-0.9.2.0/po/nb.po 2011-08-26 16:46:21.000000000 +0000 +++ network-manager-pptp-0.9.4.0/po/nb.po 2012-02-07 21:09:08.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: network-manager-pptp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-19 13:23+0200\n" -"PO-Revision-Date: 2011-07-19 13:25+0200\n" +"POT-Creation-Date: 2011-12-14 22:27+0100\n" +"PO-Revision-Date: 2011-12-14 22:28+0100\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian Bokmål \n" "Language: \n" @@ -182,6 +182,18 @@ msgid "Compatible with Microsoft and other PPTP VPN servers." msgstr "Kompatibel med Microsofts og andres VPN-tjenere basert på PPTP." +#: ../properties/nm-pptp.c:317 +msgid "Saved" +msgstr "Lagret" + +#: ../properties/nm-pptp.c:325 +msgid "Always Ask" +msgstr "Alltid spør" + +#: ../properties/nm-pptp.c:330 +msgid "Not Required" +msgstr "Ikke krevet" + #: ../src/nm-pptp-service.c:160 #, c-format msgid "couldn't convert PPTP VPN gateway IP address '%s' (%d)" @@ -220,7 +232,7 @@ #: ../src/nm-pptp-service.c:429 msgid "No cached credentials." -msgstr "" +msgstr "Ingen mellomlagret påloggingsinformasjon." #: ../src/nm-pptp-service.c:575 #, c-format @@ -262,7 +274,7 @@ #: ../src/nm-pptp-service.c:816 msgid "Could not find pptp client binary." -msgstr "" +msgstr "Kunne ikke finne kjørbar fil for pptp-klient." #: ../src/nm-pptp-service.c:829 msgid "Missing VPN gateway." @@ -278,7 +290,7 @@ #: ../src/nm-pptp-service.c:1311 msgid "Don't quit when VPN connection terminates" -msgstr "" +msgstr "Ikke avslutt når VPN-forbindelsen termineres" #: ../src/nm-pptp-service.c:1312 msgid "Enable verbose debug logging (may expose passwords)" diff -Nru network-manager-pptp-0.9.2.0/po/pl.po network-manager-pptp-0.9.4.0/po/pl.po --- network-manager-pptp-0.9.2.0/po/pl.po 2011-11-09 17:54:27.000000000 +0000 +++ network-manager-pptp-0.9.4.0/po/pl.po 2012-03-19 15:53:06.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: network-manager-pptp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-07 22:25+0100\n" -"PO-Revision-Date: 2011-11-07 22:26+0100\n" +"POT-Creation-Date: 2012-03-16 22:16+0100\n" +"PO-Revision-Date: 2012-03-16 22:17+0100\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "Language: pl\n" @@ -36,25 +36,29 @@ #. Otherwise, we have no saved password, or the password flags indicated #. * that the password should never be saved. #. -#: ../auth-dialog/main.c:127 +#: ../auth-dialog/main.c:145 #, c-format msgid "You need to authenticate to access the Virtual Private Network '%s'." msgstr "" "Aby uzyskać dostęp do wirtualnej sieci prywatnej \"%s\", należy się " "uwierzytelnić." -#: ../auth-dialog/main.c:128 +#: ../auth-dialog/main.c:154 ../auth-dialog/main.c:174 msgid "Authenticate VPN" msgstr "Uwierzytelnianie VPN" -#: ../nm-pptp.desktop.in.h:1 -msgid "Add, Remove, and Edit PPTP VPN Connections" -msgstr "Dodawanie, usuwanie i modyfikowanie połączeń PPTP VPN" +#: ../auth-dialog/main.c:156 ../properties/nm-pptp-dialog.ui.h:10 +msgid "Password:" +msgstr "Hasło:" -#: ../nm-pptp.desktop.in.h:2 +#: ../nm-pptp.desktop.in.h:1 msgid "PPTP VPN Connection Manager" msgstr "Menedżer połączeń PPTP VPN" +#: ../nm-pptp.desktop.in.h:2 +msgid "Add, Remove, and Edit PPTP VPN Connections" +msgstr "Dodawanie, usuwanie i modyfikowanie połączeń PPTP VPN" + #: ../properties/advanced-dialog.c:187 msgid "All Available (Default)" msgstr "Wszystkie dostępne (domyślnie)" @@ -88,99 +92,176 @@ msgstr "EAP" #: ../properties/nm-pptp-dialog.ui.h:1 -msgid "Authentication" -msgstr "Uwierzytelnianie" +msgid "Default" +msgstr "Domyślne" #: ../properties/nm-pptp-dialog.ui.h:2 -msgid "Echo" -msgstr "Echo" - -#: ../properties/nm-pptp-dialog.ui.h:3 msgid "General" msgstr "Ogólne" +#: ../properties/nm-pptp-dialog.ui.h:3 +msgid "PPTP server IP or name. config: the first parameter of pptp" +msgstr "" +"Adres IP lub nazwa serwera PPTP. konfiguracja: pierwszy parametr pptp" + #: ../properties/nm-pptp-dialog.ui.h:4 -msgid "Optional" -msgstr "Opcjonalne" +msgid "_Gateway:" +msgstr "_Brama:" #: ../properties/nm-pptp-dialog.ui.h:5 -msgid "Security and Compression" -msgstr "Zabezpieczenia i kompresja" +msgid "Optional" +msgstr "Opcjonalne" #: ../properties/nm-pptp-dialog.ui.h:6 -msgid "Ad_vanced..." -msgstr "Zaa_wansowane..." +msgid "" +"Append the domain name to the local host name for authentication " +"purposes. config: domain " +msgstr "" +"Dołącza nazwę domeny do lokalnej nazwy komputera w celach " +"uwierzytelniania. konfiguracja: domain " #: ../properties/nm-pptp-dialog.ui.h:7 -msgid "Allow _BSD data compression" -msgstr "Kompresja danych _BSD" +msgid "NT Domain:" +msgstr "Domena NT:" #: ../properties/nm-pptp-dialog.ui.h:8 -msgid "Allow _Deflate data compression" -msgstr "Kompresja danych _Deflate" +msgid "Show password" +msgstr "Wyświetlanie hasła" #: ../properties/nm-pptp-dialog.ui.h:9 -msgid "Allow st_ateful encryption" -msgstr "Szyfrowanie st_ateful" - -#: ../properties/nm-pptp-dialog.ui.h:10 -msgid "Allow the following authentication methods:" -msgstr "Zezwolenie na następujące metody uwierzytelniania:" +msgid "Password passed to PPTP when prompted for it." +msgstr "Hasło przekazywane do PPTP." #: ../properties/nm-pptp-dialog.ui.h:11 -msgid "Default" -msgstr "Domyślne" +msgid "" +"Set the name used for authenticating the local system to the peer to ." +" config: user " +msgstr "" +"Ustawia nazwę używaną do uwierzytelniania lokalnego systemu z partnerem na " +". konfiguracja: user " #: ../properties/nm-pptp-dialog.ui.h:12 -msgid "NT Domain:" -msgstr "Domena NT:" +msgid "User name:" +msgstr "Nazwa użytkownika:" #: ../properties/nm-pptp-dialog.ui.h:13 -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 "" -"Uwaga: szyfrowanie MPPE jest dostępne tylko razem z metodami " -"uwierzytelniania MSCHAP. Aby zaznaczyć te pole wyboru, należy wybrać jedną " -"lub więcej z tych metod uwierzytelniania MSCHAP: MSCHAP lub MSCHAPv2." +msgid "Ad_vanced..." +msgstr "Zaa_wansowane..." #: ../properties/nm-pptp-dialog.ui.h:14 msgid "PPTP Advanced Options" msgstr "Zaawansowane opcje PPTP" #: ../properties/nm-pptp-dialog.ui.h:15 -msgid "Password:" -msgstr "Hasło:" +msgid "Authentication" +msgstr "Uwierzytelnianie" #: ../properties/nm-pptp-dialog.ui.h:16 -msgid "Send PPP _echo packets" -msgstr "Wysyłanie pakietów _echo PPP" +msgid "Allow the following authentication methods:" +msgstr "Zezwolenie na następujące metody uwierzytelniania:" #: ../properties/nm-pptp-dialog.ui.h:17 -msgid "Show password" -msgstr "Wyświetlanie hasła" +msgid "" +"Allow/disable authentication methods. config: refuse-pap, refuse-chap, " +"refuse-mschap, refuse-mschap-v2, refuse-eap" +msgstr "" +"Umożliwia/wyłącza metody uwierzytelniania. konfiguracja: refuse-pap, " +"refuse-chap, refuse-mschap, refuse-mschap-v2, refuse-eap" #: ../properties/nm-pptp-dialog.ui.h:18 -msgid "Use TCP _header compression" -msgstr "Kompresja _nagłówków TCP" +msgid "Security and Compression" +msgstr "Zabezpieczenia i kompresja" #: ../properties/nm-pptp-dialog.ui.h:19 msgid "Use _Point-to-Point encryption (MPPE)" msgstr "Szyfrowanie _Point-to-Point (MPPE)" #: ../properties/nm-pptp-dialog.ui.h:20 -msgid "User name:" -msgstr "Nazwa użytkownika:" +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 "" +"Uwaga: szyfrowanie MPPE jest dostępne tylko razem z metodami " +"uwierzytelniania MSCHAP. Aby zaznaczyć te pole wyboru, należy wybrać jedną " +"lub więcej z tych metod uwierzytelniania MSCHAP: MSCHAP lub MSCHAPv2." #: ../properties/nm-pptp-dialog.ui.h:21 -msgid "_Gateway:" -msgstr "_Brama:" - -#: ../properties/nm-pptp-dialog.ui.h:22 msgid "_Security:" msgstr "Za_bezpieczenia:" +#: ../properties/nm-pptp-dialog.ui.h:22 +msgid "" +"Require the use of MPPE, with 40/128-bit encryption or all. config: " +"require-mppe, require-mppe-128 or require-mppe-40" +msgstr "" +"Wymaga użycia MPPE, z 40/128-bitowym szyfrowaniem lub wszystkich. " +"konfiguracja: require-mppe, require-mppe-128 lub require-mppe-40" + +#: ../properties/nm-pptp-dialog.ui.h:23 +msgid "Allow st_ateful encryption" +msgstr "Szyfrowanie st_ateful" + +#: ../properties/nm-pptp-dialog.ui.h:24 +msgid "" +"Allow MPPE to use stateful mode. Stateless mode is still attempted first." +" config: mppe-stateful (when checked)" +msgstr "" +"Umożliwia MPPE używanie trybu stanowego. Tryb bezstanowy jest nadal " +"próbowany jako pierwszy. konfiguracja: mppe-stateful (kiedy jest wybrane)" + +#: ../properties/nm-pptp-dialog.ui.h:25 +msgid "Allow _BSD data compression" +msgstr "Kompresja danych _BSD" + +#: ../properties/nm-pptp-dialog.ui.h:26 +msgid "" +"Allow/disable BSD-Compress compression. config: nobsdcomp (when " +"unchecked)" +msgstr "" +"Umożliwia/wyłącza kompresję BSD-Compress. konfiguracja: nobsdcomp (kiedy " +"nie jest wybrane)" + +#: ../properties/nm-pptp-dialog.ui.h:27 +msgid "Allow _Deflate data compression" +msgstr "Kompresja danych _Deflate" + +#: ../properties/nm-pptp-dialog.ui.h:28 +msgid "" +"Allow/disable Deflate compression. config: nodeflate (when unchecked)" +msgstr "" +"Umożliwia/wyłącza kompresję Deflate. konfiguracja: nodeflate (kiedy nie " +"jest wybrane)" + +#: ../properties/nm-pptp-dialog.ui.h:29 +msgid "Use TCP _header compression" +msgstr "Kompresja _nagłówków TCP" + +#: ../properties/nm-pptp-dialog.ui.h:30 +msgid "" +"Allow/disable Van Jacobson style TCP/IP header compression in both the " +"transmit and the receive directions. config: novj (when unchecked)" +msgstr "" +"Umożliwia/wyłącza kompresję nagłówków TCP/IP w stylu Van Jacobsona w obu " +"kierunkach (wysyłanie i pobieranie). konfiguracja: novj (kiedy nie jest " +"wybrane)" + +#: ../properties/nm-pptp-dialog.ui.h:31 +msgid "Echo" +msgstr "Echo" + +#: ../properties/nm-pptp-dialog.ui.h:32 +msgid "Send PPP _echo packets" +msgstr "Wysyłanie pakietów _echo PPP" + +#: ../properties/nm-pptp-dialog.ui.h:33 +msgid "" +"Send LCP echo-requests to find out whether peer is alive. config: lcp-" +"echo-failure and lcp-echo-interval" +msgstr "" +"Wysyła żądania echa LCP, aby stwierdzić, czy partner jest aktywny. " +"konfiguracja: lcp-echo-failure i lcp-echo-interval" + #: ../properties/nm-pptp.c:49 msgid "Point-to-Point Tunneling Protocol (PPTP)" msgstr "Protokół tunelowania Point-to-Point (PPTP)" diff -Nru network-manager-pptp-0.9.2.0/po/pt_BR.po network-manager-pptp-0.9.4.0/po/pt_BR.po --- network-manager-pptp-0.9.2.0/po/pt_BR.po 2011-08-26 16:46:21.000000000 +0000 +++ network-manager-pptp-0.9.4.0/po/pt_BR.po 2012-02-07 21:09:08.000000000 +0000 @@ -11,61 +11,41 @@ msgid "" msgstr "" "Project-Id-Version: NetworkManager-pptp\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=Networ" -"kManager&keywords=I18N+L10N&component=VPN: pptp\n" -"POT-Creation-Date: 2011-03-31 19:59+0000\n" -"PO-Revision-Date: 2011-05-03 11:15-0200\n" -"Last-Translator: Djavan Fagundes \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-11-25 17:05+0000\n" +"PO-Revision-Date: 2011-11-26 16:05-0300\n" +"Last-Translator: Antonio Fernandes C. Neto \n" "Language-Team: Brazilian Portuguese \n" -"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Virtaal 0.6.1\n" -#: ../auth-dialog/gnome-two-password-dialog.c:129 -msgid "_Secondary Password:" -msgstr "_Senha secundária:" - -#: ../auth-dialog/gnome-two-password-dialog.c:243 -msgid "_Username:" -msgstr "Nome de _usuário:" - -#: ../auth-dialog/gnome-two-password-dialog.c:245 -msgid "_Domain:" -msgstr "_Domínio:" - -#: ../auth-dialog/gnome-two-password-dialog.c:247 +#: ../auth-dialog/vpn-password-dialog.c:95 msgid "_Password:" msgstr "_Senha:" -#: ../auth-dialog/gnome-two-password-dialog.c:342 -msgid "Connect _anonymously" -msgstr "Conectar _anonimamente" - -#: ../auth-dialog/gnome-two-password-dialog.c:347 -msgid "Connect as _user:" -msgstr "Conectar como _usuário:" - -#: ../auth-dialog/gnome-two-password-dialog.c:452 -msgid "_Remember passwords for this session" -msgstr "_Lembrar senhas para esta sessão" - -#: ../auth-dialog/gnome-two-password-dialog.c:454 -msgid "_Save passwords in keyring" -msgstr "_Salvar senhas no chaveiro" +#: ../auth-dialog/vpn-password-dialog.c:97 +msgid "_Secondary Password:" +msgstr "_Senha secundária:" + +#: ../auth-dialog/vpn-password-dialog.c:239 +msgid "Sh_ow passwords" +msgstr "M_ostrar senhas" #. 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 "" "Você precisa autenticar-se para acessar a Rede Particular Virtual \"%s\"." -#: ../auth-dialog/main.c:93 +#: ../auth-dialog/main.c:128 msgid "Authenticate VPN" msgstr "Autenticar VPN" @@ -203,23 +183,37 @@ msgid "_Security:" msgstr "_Segurança:" -#: ../properties/nm-pptp.c:50 +#: ../properties/nm-pptp.c:49 msgid "Point-to-Point Tunneling Protocol (PPTP)" msgstr "Protocolo de Encapsulamento Ponto a Ponto (PPTP)" -#: ../properties/nm-pptp.c:51 +#: ../properties/nm-pptp.c:50 msgid "Compatible with Microsoft and other PPTP VPN servers." msgstr "Compatível com servidores Microsoft e outros PPTP VPN." +#: ../properties/nm-pptp.c:317 +msgid "Saved" +msgstr "Salvo" + +#: ../properties/nm-pptp.c:325 +msgid "Always Ask" +msgstr "Perguntar sempre" + +#: ../properties/nm-pptp.c:330 +msgid "Not Required" +msgstr "Não requerido" + #: ../src/nm-pptp-service.c:160 #, c-format msgid "couldn't convert PPTP VPN gateway IP address '%s' (%d)" -msgstr "não foi possível converter o endereço IP do gateway PPTP VPN \"%s\" (%d)" +msgstr "" +"não foi possível converter o endereço IP do gateway PPTP VPN \"%s\" (%d)" #: ../src/nm-pptp-service.c:178 #, c-format msgid "couldn't look up PPTP VPN gateway IP address '%s' (%d)" -msgstr "não foi possível consultar o endereço IP do gateway PPTP VPN \"%s\" (%d)" +msgstr "" +"não foi possível consultar o endereço IP do gateway PPTP VPN \"%s\" (%d)" #: ../src/nm-pptp-service.c:202 #, c-format @@ -322,3 +316,21 @@ msgstr "" "nm-pptp-service provê integração PPTP VPN (compatível com Microsoft e outras " "implementações) ao NetworkManager." + +#~ msgid "_Username:" +#~ msgstr "Nome de _usuário:" + +#~ msgid "_Domain:" +#~ msgstr "_Domínio:" + +#~ msgid "Connect _anonymously" +#~ msgstr "Conectar _anonimamente" + +#~ msgid "Connect as _user:" +#~ msgstr "Conectar como _usuário:" + +#~ msgid "_Remember passwords for this session" +#~ msgstr "_Lembrar senhas para esta sessão" + +#~ msgid "_Save passwords in keyring" +#~ msgstr "_Salvar senhas no chaveiro" diff -Nru network-manager-pptp-0.9.2.0/po/sl.po network-manager-pptp-0.9.4.0/po/sl.po --- network-manager-pptp-0.9.2.0/po/sl.po 2011-08-26 16:46:21.000000000 +0000 +++ network-manager-pptp-0.9.4.0/po/sl.po 2012-03-02 17:01:37.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: network-manager-pptp master\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 22:04+0100\n" +"POT-Creation-Date: 2012-02-15 14:38+0000\n" +"PO-Revision-Date: 2012-02-29 14:27+0100\n" "Last-Translator: Matej Urbančič \n" "Language-Team: Slovenian GNOME Translation Team \n" "Language: \n" @@ -36,23 +36,29 @@ #. Otherwise, we have no saved password, or the password flags indicated #. * that the password should never be saved. #. -#: ../auth-dialog/main.c:127 +#: ../auth-dialog/main.c:141 #, c-format msgid "You need to authenticate to access the Virtual Private Network '%s'." msgstr "Dostop do navideznega zasebnega omrežja '%s' zahteva overitev." -#: ../auth-dialog/main.c:128 +#: ../auth-dialog/main.c:150 +#: ../auth-dialog/main.c:170 msgid "Authenticate VPN" msgstr "Overi VPN" -#: ../nm-pptp.desktop.in.h:1 -msgid "Add, Remove, and Edit PPTP VPN Connections" -msgstr "Dodajanje, odstranjevanje in urejanje PPTP VPN povezav" +#: ../auth-dialog/main.c:152 +#: ../properties/nm-pptp-dialog.ui.h:10 +msgid "Password:" +msgstr "Geslo:" -#: ../nm-pptp.desktop.in.h:2 +#: ../nm-pptp.desktop.in.h:1 msgid "PPTP VPN Connection Manager" msgstr "Upravljalnik PPTP VPN povezav" +#: ../nm-pptp.desktop.in.h:2 +msgid "Add, Remove, and Edit PPTP VPN Connections" +msgstr "Dodajanje, odstranjevanje in urejanje PPTP VPN povezav" + #: ../properties/advanced-dialog.c:187 msgid "All Available (Default)" msgstr "Vse razpoložljivo (privzeto)" @@ -86,93 +92,133 @@ msgstr "EAP" #: ../properties/nm-pptp-dialog.ui.h:1 -msgid "Authentication" -msgstr "Overitev" +msgid "Default" +msgstr "Privzeto" #: ../properties/nm-pptp-dialog.ui.h:2 -msgid "Echo" -msgstr "Odmev" - -#: ../properties/nm-pptp-dialog.ui.h:3 msgid "General" msgstr "Splošno" +#: ../properties/nm-pptp-dialog.ui.h:3 +msgid "PPTP server IP or name. config: the first parameter of pptp" +msgstr "Naslov IP ali ime strežnika PPTP. Nastavitev: prvi parameter protokola PPTP" + #: ../properties/nm-pptp-dialog.ui.h:4 -msgid "Optional" -msgstr "Izbirno" +msgid "_Gateway:" +msgstr "_Prehod:" #: ../properties/nm-pptp-dialog.ui.h:5 -msgid "Security and Compression" -msgstr "Varnost in stiskanje" +msgid "Optional" +msgstr "Izbirno" #: ../properties/nm-pptp-dialog.ui.h:6 -msgid "Ad_vanced..." -msgstr "_Napredno ..." +msgid "Append the domain name to the local host name for authentication purposes. config: domain " +msgstr "Pripni ime k imenu krajevnega gostitelja za overitev. Nastavitev: domena " #: ../properties/nm-pptp-dialog.ui.h:7 -msgid "Allow _BSD data compression" -msgstr "Dovoli _BSD stiskanje podatkov" +msgid "NT Domain:" +msgstr "Domena NT:" #: ../properties/nm-pptp-dialog.ui.h:8 -msgid "Allow _Deflate data compression" -msgstr "Dovoli _Deflate stiskanje podatkov" +msgid "Show password" +msgstr "Pokaži geslo" #: ../properties/nm-pptp-dialog.ui.h:9 -msgid "Allow st_ateful encryption" -msgstr "Dovoli _namensko šifriranje" - -#: ../properties/nm-pptp-dialog.ui.h:10 -msgid "Allow the following authentication methods:" -msgstr "Dovoli načine overitve:" +msgid "Password passed to PPTP when prompted for it." +msgstr "Geslo poslano na PPTP ob zahtevi." #: ../properties/nm-pptp-dialog.ui.h:11 -msgid "Default" -msgstr "Privzeto" +msgid "Set the name used for authenticating the local system to the peer to . config: user " +msgstr "Določitev imena za overjanje krajevnega sistema odjemalcu na . Nastavitev: uporabnik " #: ../properties/nm-pptp-dialog.ui.h:12 -msgid "NT Domain:" -msgstr "Domena NT:" +msgid "User name:" +msgstr "Uporabniško ime:" #: ../properties/nm-pptp-dialog.ui.h:13 -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 "Opomba: Šifriranje MPPE je na voljo le z MSCHAP načinom overitve. Za izbiro te možnosti, je treba najprej izbrati enega ali več načinov overitve MSCHAP: MSCHAP ali MSCHAPv2." +msgid "Ad_vanced..." +msgstr "_Napredno ..." #: ../properties/nm-pptp-dialog.ui.h:14 msgid "PPTP Advanced Options" msgstr "Napredne možnosti PPTP" #: ../properties/nm-pptp-dialog.ui.h:15 -msgid "Password:" -msgstr "Geslo:" +msgid "Authentication" +msgstr "Overitev" #: ../properties/nm-pptp-dialog.ui.h:16 -msgid "Send PPP _echo packets" -msgstr "Pošlji PPP _echo pakete" +msgid "Allow the following authentication methods:" +msgstr "Dovoli načine overitve:" #: ../properties/nm-pptp-dialog.ui.h:17 -msgid "Show password" -msgstr "Pokaži geslo" +msgid "Allow/disable authentication methods. config: refuse-pap, refuse-chap, refuse-mschap, refuse-mschap-v2, refuse-eap" +msgstr "Dovoli/Onemogoči način overjanja. Nastavitev: refuse-pap, refuse-chap, refuse-mschap, refuse-mschap-v2, refuse-eap" #: ../properties/nm-pptp-dialog.ui.h:18 -msgid "Use TCP _header compression" -msgstr "Uporabi stiskanje _glave TCP" +msgid "Security and Compression" +msgstr "Varnost in stiskanje" #: ../properties/nm-pptp-dialog.ui.h:19 msgid "Use _Point-to-Point encryption (MPPE)" msgstr "Uporabi šifriranje _točke-do-točke (MPPE)" #: ../properties/nm-pptp-dialog.ui.h:20 -msgid "User name:" -msgstr "Uporabniško ime:" +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 "Opomba: Šifriranje MPPE je na voljo le z MSCHAP načinom overitve. Za izbiro te možnosti, je treba najprej izbrati enega ali več načinov overitve MSCHAP: MSCHAP ali MSCHAPv2." #: ../properties/nm-pptp-dialog.ui.h:21 -msgid "_Gateway:" -msgstr "_Prehod:" - -#: ../properties/nm-pptp-dialog.ui.h:22 msgid "_Security:" msgstr "_Varnost:" +#: ../properties/nm-pptp-dialog.ui.h:22 +msgid "Require the use of MPPE, with 40/128-bit encryption or all. config: require-mppe, require-mppe-128 or require-mppe-40" +msgstr "Zahtevaj uporabo MPPE z 40/128-bitnim šifriranjem za vse. Nastavitev: require-mppe, require-mppe-128 ali require-mppe-40" + +#: ../properties/nm-pptp-dialog.ui.h:23 +msgid "Allow st_ateful encryption" +msgstr "Dovoli _namensko šifriranje" + +#: ../properties/nm-pptp-dialog.ui.h:24 +msgid "Allow MPPE to use stateful mode. Stateless mode is still attempted first. config: mppe-stateful (when checked)" +msgstr "Dovoli uporabo načina stanja MPPE. Način brez stanja je preizkušen privzeto. Nastavitev: mppe-stateful (izbrano)" + +#: ../properties/nm-pptp-dialog.ui.h:25 +msgid "Allow _BSD data compression" +msgstr "Dovoli _BSD stiskanje podatkov" + +#: ../properties/nm-pptp-dialog.ui.h:26 +msgid "Allow/disable BSD-Compress compression. config: nobsdcomp (when unchecked)" +msgstr "Dovoli/Onemogoči stiskanje z BSD-Compress. Nastavitev: nobsdcomp (neizbrano)" + +#: ../properties/nm-pptp-dialog.ui.h:27 +msgid "Allow _Deflate data compression" +msgstr "Dovoli _Deflate stiskanje podatkov" + +#: ../properties/nm-pptp-dialog.ui.h:28 +msgid "Allow/disable Deflate compression. config: nodeflate (when unchecked)" +msgstr "Dovoli/Onemogoči stiskanje Deflate. Nastavitev: nodeflate (neizbrano)" + +#: ../properties/nm-pptp-dialog.ui.h:29 +msgid "Use TCP _header compression" +msgstr "Uporabi stiskanje _glave TCP" + +#: ../properties/nm-pptp-dialog.ui.h:30 +msgid "Allow/disable Van Jacobson style TCP/IP header compression in both the transmit and the receive directions. config: novj (when unchecked)" +msgstr "Dovoli/Onemogoči slog stiskanja glav Van Jacobson v obeh smeren prenosa podatkov. Nastavitev: novj (neizbrano)" + +#: ../properties/nm-pptp-dialog.ui.h:31 +msgid "Echo" +msgstr "Odmev" + +#: ../properties/nm-pptp-dialog.ui.h:32 +msgid "Send PPP _echo packets" +msgstr "Pošlji PPP _echo pakete" + +#: ../properties/nm-pptp-dialog.ui.h:33 +msgid "Send LCP echo-requests to find out whether peer is alive. config: lcp-echo-failure and lcp-echo-interval" +msgstr "Pošlji zahteve echo LCP za ohranjevanje povezave. Nastavitev: lcp-echo-failure in lcp-echo-interval" + #: ../properties/nm-pptp.c:49 msgid "Point-to-Point Tunneling Protocol (PPTP)" msgstr "Point-to-Point protokol tuneliranja (PPTP)" @@ -181,6 +227,18 @@ msgid "Compatible with Microsoft and other PPTP VPN servers." msgstr "Združljivo z Microsoftovim in drugimi PPTP VPN strežniki." +#: ../properties/nm-pptp.c:317 +msgid "Saved" +msgstr "Shranjeno" + +#: ../properties/nm-pptp.c:325 +msgid "Always Ask" +msgstr "Vedno vprašaj" + +#: ../properties/nm-pptp.c:330 +msgid "Not Required" +msgstr "Ni zahtevano" + #: ../src/nm-pptp-service.c:160 #, c-format msgid "couldn't convert PPTP VPN gateway IP address '%s' (%d)" diff -Nru network-manager-pptp-0.9.2.0/po/sr@latin.po network-manager-pptp-0.9.4.0/po/sr@latin.po --- network-manager-pptp-0.9.2.0/po/sr@latin.po 1970-01-01 00:00:00.000000000 +0000 +++ network-manager-pptp-0.9.4.0/po/sr@latin.po 2012-03-16 16:34:48.000000000 +0000 @@ -0,0 +1,391 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Miroslav Nikolić , 2012. +msgid "" +msgstr "" +"Project-Id-Version: network-manager-pptp\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=Networ" +"kManager&keywords=I18N+L10N&component=VPN: pptp\n" +"POT-Creation-Date: 2012-03-02 20:10+0000\n" +"PO-Revision-Date: 2012-03-14 11:49+0200\n" +"Last-Translator: Miroslav Nikolić \n" +"Language-Team: Serbian \n" +"Language: sr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : " +"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Project-Style: gnome\n" + +#: ../auth-dialog/vpn-password-dialog.c:95 +msgid "_Password:" +msgstr "_Lozinka:" + +#: ../auth-dialog/vpn-password-dialog.c:97 +msgid "_Secondary Password:" +msgstr "_Sekundarna lozinka:" + +#: ../auth-dialog/vpn-password-dialog.c:239 +msgid "Sh_ow passwords" +msgstr "Pri_kaži lozinku" + +#. Otherwise, we have no saved password, or the password flags indicated +#. * that the password should never be saved. +#. +#: ../auth-dialog/main.c:145 +#, c-format +msgid "You need to authenticate to access the Virtual Private Network '%s'." +msgstr "" +"Morate da potvrdite identitet da biste mogli da pristupite Virtuelnoj " +"privatnoj mreži „%s“." + +#: ../auth-dialog/main.c:154 ../auth-dialog/main.c:174 +msgid "Authenticate VPN" +msgstr "Potvrdi VPN" + +#: ../auth-dialog/main.c:156 ../properties/nm-pptp-dialog.ui.h:10 +msgid "Password:" +msgstr "Lozinka:" + +#: ../nm-pptp.desktop.in.h:1 +msgid "PPTP VPN Connection Manager" +msgstr "PPTP VPN upravnik veze" + +#: ../nm-pptp.desktop.in.h:2 +msgid "Add, Remove, and Edit PPTP VPN Connections" +msgstr "Dodajte, uklanjajte i uređujte PPTP VPN veze" + +#: ../properties/advanced-dialog.c:187 +msgid "All Available (Default)" +msgstr "Sve dostupno (osnovno)" + +#: ../properties/advanced-dialog.c:191 +msgid "128-bit (most secure)" +msgstr "128-bitno (najsigurnije)" + +#: ../properties/advanced-dialog.c:200 +msgid "40-bit (less secure)" +msgstr "40-bitno (manje sigurno)" + +#: ../properties/advanced-dialog.c:309 +msgid "PAP" +msgstr "PAP" + +#: ../properties/advanced-dialog.c:322 +msgid "CHAP" +msgstr "CHAP" + +#: ../properties/advanced-dialog.c:334 +msgid "MSCHAP" +msgstr "MSCHAP" + +#: ../properties/advanced-dialog.c:346 +msgid "MSCHAPv2" +msgstr "MSCHAPv2" + +#: ../properties/advanced-dialog.c:359 +msgid "EAP" +msgstr "EAP" + +#: ../properties/nm-pptp-dialog.ui.h:1 +msgid "Default" +msgstr "Osnovno" + +#: ../properties/nm-pptp-dialog.ui.h:2 +msgid "General" +msgstr "Opšte" + +#: ../properties/nm-pptp-dialog.ui.h:3 +msgid "PPTP server IP or name. config: the first parameter of pptp" +msgstr "IP ili naziv PPTP servera. podešavanje: prvi parametar za pptp" + +#: ../properties/nm-pptp-dialog.ui.h:4 +msgid "_Gateway:" +msgstr "_Mrežni prolaz:" + +#: ../properties/nm-pptp-dialog.ui.h:5 +msgid "Optional" +msgstr "Mogućnosti" + +#: ../properties/nm-pptp-dialog.ui.h:6 +msgid "" +"Append the domain name to the local host name for authentication " +"purposes. config: domain " +msgstr "" +"Kači naziv domena na naziv lokalnog računara za svrhe " +"prijavljivanja. podešavanje: domen " + +#: ../properties/nm-pptp-dialog.ui.h:7 +msgid "NT Domain:" +msgstr "NT domen:" + +#: ../properties/nm-pptp-dialog.ui.h:8 +msgid "Show password" +msgstr "Prikaži lozinku" + +#: ../properties/nm-pptp-dialog.ui.h:9 +msgid "Password passed to PPTP when prompted for it." +msgstr "Lozinka data PPTP-u kada je zatražena." + +#: ../properties/nm-pptp-dialog.ui.h:11 +msgid "" +"Set the name used for authenticating the local system to the peer to ." +" config: user " +msgstr "" +"Podesite naziv korišćen za prijavljivanje lokalnog sistema parljaku na " +". podešavanje: korisnik " + +#: ../properties/nm-pptp-dialog.ui.h:12 +msgid "User name:" +msgstr "Korisničko ime:" + +#: ../properties/nm-pptp-dialog.ui.h:13 +msgid "Ad_vanced..." +msgstr "_Napredno..." + +#: ../properties/nm-pptp-dialog.ui.h:14 +msgid "PPTP Advanced Options" +msgstr "Napredne opcije za PPTP" + +#: ../properties/nm-pptp-dialog.ui.h:15 +msgid "Authentication" +msgstr "Prijava" + +#: ../properties/nm-pptp-dialog.ui.h:16 +msgid "Allow the following authentication methods:" +msgstr "Dozvoli sledeće načine prijavljivanja:" + +#: ../properties/nm-pptp-dialog.ui.h:17 +msgid "" +"Allow/disable authentication methods. config: refuse-pap, refuse-chap, " +"refuse-mschap, refuse-mschap-v2, refuse-eap" +msgstr "" +"Uključuje/isključuje načine prijavljivanja. podešavanje: refuse-pap, refuse-" +"chap, refuse-mschap, refuse-mschap-v2, refuse-eap" + +#: ../properties/nm-pptp-dialog.ui.h:18 +msgid "Security and Compression" +msgstr "Bezbednost i sažimanje" + +#: ../properties/nm-pptp-dialog.ui.h:19 +msgid "Use _Point-to-Point encryption (MPPE)" +msgstr "_Koristi šifrovanje „tačka-do-tačke“ (MPPE)" + +#: ../properties/nm-pptp-dialog.ui.h:20 +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 "" +"Napomena: MPPE šifrovanje je dostupno samo sa MSCHAP-om. Da uključite ovu " +"kućicu za izbor, izaberite jedan ili nekoliko MSCHAP načina prijavljivanja: " +"MSCHAP ili MSCHAPv2." + +#: ../properties/nm-pptp-dialog.ui.h:21 +msgid "_Security:" +msgstr "_Bezbednost:" + +#: ../properties/nm-pptp-dialog.ui.h:22 +msgid "" +"Require the use of MPPE, with 40/128-bit encryption or all. config: " +"require-mppe, require-mppe-128 or require-mppe-40" +msgstr "" +"Zahteva korišćenje MPPE-a, sa 40/128-bitnim šifrovanjem ili " +"sve. podešavanje: require-mppe, require-mppe-128 ili require-mppe-40" + +#: ../properties/nm-pptp-dialog.ui.h:23 +msgid "Allow st_ateful encryption" +msgstr "Dopusti _rečito šifrovanje" + +#: ../properties/nm-pptp-dialog.ui.h:24 +msgid "" +"Allow MPPE to use stateful mode. Stateless mode is still attempted first." +" config: mppe-stateful (when checked)" +msgstr "" +"Dopušta MPPE-u da koristi rečit režim. Rečit režim se još uvek pokušava kao " +"prvi. podešavanje: mppe-stateful (kada je izabran)" + +#: ../properties/nm-pptp-dialog.ui.h:25 +msgid "Allow _BSD data compression" +msgstr "Dozvoli _BSD pakovanje podataka" + +#: ../properties/nm-pptp-dialog.ui.h:26 +msgid "" +"Allow/disable BSD-Compress compression. config: nobsdcomp (when " +"unchecked)" +msgstr "" +"Uključuje/isključuje sažimanje BSD-Sažimanja. podešavanje: nobsdcomp (kada " +"nije izabrano)" + +#: ../properties/nm-pptp-dialog.ui.h:27 +msgid "Allow _Deflate data compression" +msgstr "Dozvoli _Deflejt pakovanje podataka" + +#: ../properties/nm-pptp-dialog.ui.h:28 +msgid "" +"Allow/disable Deflate compression. config: nodeflate (when unchecked)" +msgstr "" +"Uključuje/isključuje Deflejt sažimanje. podešavanje: nodeflate (kada nije " +"izabrano)" + +#: ../properties/nm-pptp-dialog.ui.h:29 +msgid "Use TCP _header compression" +msgstr "Koristi _pakovanje TCP zaglavlja" + +#: ../properties/nm-pptp-dialog.ui.h:30 +msgid "" +"Allow/disable Van Jacobson style TCP/IP header compression in both the " +"transmit and the receive directions. config: novj (when unchecked)" +msgstr "" +"Uključuje/isključuje Van Jakobsonov stil pakovanja TCP/IP zaglavlja kako u smeru " +"prenosa tako i u smeru prijema. podešavanje: novj (kada nije izabrano)" + +#: ../properties/nm-pptp-dialog.ui.h:31 +msgid "Echo" +msgstr "Odjek" + +#: ../properties/nm-pptp-dialog.ui.h:32 +msgid "Send PPP _echo packets" +msgstr "Šalji pakete PPP _odjeka" + +#: ../properties/nm-pptp-dialog.ui.h:33 +msgid "" +"Send LCP echo-requests to find out whether peer is alive. config: lcp-" +"echo-failure and lcp-echo-interval" +msgstr "" +"Šalje LCP zahteve odjeka da bi doznao da li je parnjak " +"aktivan. podešavanje: lcp-echo-failure i lcp-echo-period" + +#: ../properties/nm-pptp.c:49 +msgid "Point-to-Point Tunneling Protocol (PPTP)" +msgstr "Protok tunelisanja od tačke do tačke (PPTP)" + +#: ../properties/nm-pptp.c:50 +msgid "Compatible with Microsoft and other PPTP VPN servers." +msgstr "Saglasno sa Majkrosoftovim i drugim PPTP VPN serverima." + +#: ../properties/nm-pptp.c:317 +msgid "Saved" +msgstr "Sačuvano" + +#: ../properties/nm-pptp.c:325 +msgid "Always Ask" +msgstr "Pitaj uvek" + +#: ../properties/nm-pptp.c:330 +msgid "Not Required" +msgstr "Nije zatraženo" + +#: ../src/nm-pptp-service.c:160 +#, c-format +msgid "couldn't convert PPTP VPN gateway IP address '%s' (%d)" +msgstr "ne mogu da pretvorim IP adresu PPTP VPN mrežnog prolaza „%s“ (%d)" + +#: ../src/nm-pptp-service.c:178 +#, c-format +msgid "couldn't look up PPTP VPN gateway IP address '%s' (%d)" +msgstr "ne mogu da potražim IP adresu PPTP VPN mrežnog prolaza „%s“ (%d)" + +#: ../src/nm-pptp-service.c:202 +#, c-format +msgid "no usable addresses returned for PPTP VPN gateway '%s'" +msgstr "nisu vraćene upotrebljive adrese za PPTP VPN mrežni prolaz „%s“" + +#: ../src/nm-pptp-service.c:213 +#, c-format +msgid "no usable addresses returned for PPTP VPN gateway '%s' (%d)" +msgstr "nisu vraćene upotrebljive adrese za PPTP VPN mrežni prolaz „%s“ (%d)" + +#: ../src/nm-pptp-service.c:240 +msgid "Could not find secrets (connection invalid, no vpn setting)." +msgstr "Ne mogu da pronađem tajne (veza je neispravna, nema vpn podešavanja)." + +#: ../src/nm-pptp-service.c:252 +msgid "Invalid VPN username." +msgstr "Neispravno VPN korisničko ime." + +#: ../src/nm-pptp-service.c:261 +msgid "Missing VPN username." +msgstr "Nedostaje VPN korisničko ime." + +#: ../src/nm-pptp-service.c:271 +msgid "Missing or invalid VPN password." +msgstr "Nedostaje ili je neispravna VPN lozinka." + +#: ../src/nm-pptp-service.c:429 +msgid "No cached credentials." +msgstr "Nema pričuvanih uverenja." + +#: ../src/nm-pptp-service.c:575 +#, c-format +msgid "invalid gateway '%s'" +msgstr "neispravan mrežni prolaz „%s“" + +#: ../src/nm-pptp-service.c:589 +#, c-format +msgid "invalid integer property '%s'" +msgstr "neispravno svojstvo celog broja „%s“" + +#: ../src/nm-pptp-service.c:599 +#, c-format +msgid "invalid boolean property '%s' (not yes or no)" +msgstr "neispravno logičko svojstvo „%s“ (nije „da“ ili „ne“)" + +#: ../src/nm-pptp-service.c:606 +#, c-format +msgid "unhandled property '%s' type %s" +msgstr "nerukovano svojstvo „%s“ vrste %s" + +#: ../src/nm-pptp-service.c:617 +#, c-format +msgid "property '%s' invalid or not supported" +msgstr "svojstvo „%s“ je neispravno ili nije podržano" + +#: ../src/nm-pptp-service.c:635 +msgid "No VPN configuration options." +msgstr "Nema opcija za VPN podešavanje." + +#: ../src/nm-pptp-service.c:655 +#, c-format +msgid "Missing required option '%s'." +msgstr "Nedostaje zatražena opcija „%s“." + +#: ../src/nm-pptp-service.c:675 +msgid "No VPN secrets!" +msgstr "Nema VPN tajni!" + +#: ../src/nm-pptp-service.c:816 +msgid "Could not find pptp client binary." +msgstr "Ne mogu da pronađem izvršni pptp klijenta." + +#: ../src/nm-pptp-service.c:829 +msgid "Missing VPN gateway." +msgstr "Nedostaje VPN mrežni prolaz." + +#: ../src/nm-pptp-service.c:982 +msgid "Could not find the pppd binary." +msgstr "Ne mogu da pronađem pptp izvršni." + +#: ../src/nm-pptp-service.c:1112 +msgid "Invalid or missing PPTP gateway." +msgstr "Neispravan ili nedostaje PPTP mrežni prolaz." + +#: ../src/nm-pptp-service.c:1311 +msgid "Don't quit when VPN connection terminates" +msgstr "Ne prekida kada se završava VPN veza" + +#: ../src/nm-pptp-service.c:1312 +msgid "Enable verbose debug logging (may expose passwords)" +msgstr "" +"Uključuje opširno zapisivanje zarad ispravljanja grešaka (može da izloži " +"lozinke)" + +#: ../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-usluga obezbeđuje Upravniku mreže objedinjenu PPTP VPN mogućnost " +"(saglasnu sa Majkrosoftom i drugim primenama)." diff -Nru network-manager-pptp-0.9.2.0/po/sr.po network-manager-pptp-0.9.4.0/po/sr.po --- network-manager-pptp-0.9.2.0/po/sr.po 1970-01-01 00:00:00.000000000 +0000 +++ network-manager-pptp-0.9.4.0/po/sr.po 2012-03-16 16:34:48.000000000 +0000 @@ -0,0 +1,391 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Мирослав Николић , 2012. +msgid "" +msgstr "" +"Project-Id-Version: network-manager-pptp\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=Networ" +"kManager&keywords=I18N+L10N&component=VPN: pptp\n" +"POT-Creation-Date: 2012-03-02 20:10+0000\n" +"PO-Revision-Date: 2012-03-14 11:49+0200\n" +"Last-Translator: Мирослав Николић \n" +"Language-Team: Serbian \n" +"Language: sr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : " +"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Project-Style: gnome\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 "Sh_ow passwords" +msgstr "При_кажи лозинку" + +#. Otherwise, we have no saved password, or the password flags indicated +#. * that the password should never be saved. +#. +#: ../auth-dialog/main.c:145 +#, 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 +msgid "Authenticate VPN" +msgstr "Потврди ВПН" + +#: ../auth-dialog/main.c:156 ../properties/nm-pptp-dialog.ui.h:10 +msgid "Password:" +msgstr "Лозинка:" + +#: ../nm-pptp.desktop.in.h:1 +msgid "PPTP VPN Connection Manager" +msgstr "ППТП ВПН управник везе" + +#: ../nm-pptp.desktop.in.h:2 +msgid "Add, Remove, and Edit PPTP VPN Connections" +msgstr "Додајте, уклањајте и уређујте ППТП ВПН везе" + +#: ../properties/advanced-dialog.c:187 +msgid "All Available (Default)" +msgstr "Све доступно (основно)" + +#: ../properties/advanced-dialog.c:191 +msgid "128-bit (most secure)" +msgstr "128-битно (најсигурније)" + +#: ../properties/advanced-dialog.c:200 +msgid "40-bit (less secure)" +msgstr "40-битно (мање сигурно)" + +#: ../properties/advanced-dialog.c:309 +msgid "PAP" +msgstr "ПАП" + +#: ../properties/advanced-dialog.c:322 +msgid "CHAP" +msgstr "ЦХАП" + +#: ../properties/advanced-dialog.c:334 +msgid "MSCHAP" +msgstr "МСЦХАП" + +#: ../properties/advanced-dialog.c:346 +msgid "MSCHAPv2" +msgstr "МСЦХАПв2" + +#: ../properties/advanced-dialog.c:359 +msgid "EAP" +msgstr "ЕАП" + +#: ../properties/nm-pptp-dialog.ui.h:1 +msgid "Default" +msgstr "Основно" + +#: ../properties/nm-pptp-dialog.ui.h:2 +msgid "General" +msgstr "Опште" + +#: ../properties/nm-pptp-dialog.ui.h:3 +msgid "PPTP server IP or name. config: the first parameter of pptp" +msgstr "ИП или назив ППТП сервера. подешавање: први параметар за пптп" + +#: ../properties/nm-pptp-dialog.ui.h:4 +msgid "_Gateway:" +msgstr "_Мрежни пролаз:" + +#: ../properties/nm-pptp-dialog.ui.h:5 +msgid "Optional" +msgstr "Могућности" + +#: ../properties/nm-pptp-dialog.ui.h:6 +msgid "" +"Append the domain name to the local host name for authentication " +"purposes. config: domain " +msgstr "" +"Качи назив домена на назив локалног рачунара за сврхе " +"пријављивања. подешавање: домен " + +#: ../properties/nm-pptp-dialog.ui.h:7 +msgid "NT Domain:" +msgstr "НТ домен:" + +#: ../properties/nm-pptp-dialog.ui.h:8 +msgid "Show password" +msgstr "Прикажи лозинку" + +#: ../properties/nm-pptp-dialog.ui.h:9 +msgid "Password passed to PPTP when prompted for it." +msgstr "Лозинка дата ППТП-у када је затражена." + +#: ../properties/nm-pptp-dialog.ui.h:11 +msgid "" +"Set the name used for authenticating the local system to the peer to ." +" config: user " +msgstr "" +"Подесите назив коришћен за пријављивање локалног система парљаку на " +". подешавање: корисник " + +#: ../properties/nm-pptp-dialog.ui.h:12 +msgid "User name:" +msgstr "Корисничко име:" + +#: ../properties/nm-pptp-dialog.ui.h:13 +msgid "Ad_vanced..." +msgstr "_Напредно..." + +#: ../properties/nm-pptp-dialog.ui.h:14 +msgid "PPTP Advanced Options" +msgstr "Напредне опције за ППТП" + +#: ../properties/nm-pptp-dialog.ui.h:15 +msgid "Authentication" +msgstr "Пријава" + +#: ../properties/nm-pptp-dialog.ui.h:16 +msgid "Allow the following authentication methods:" +msgstr "Дозволи следеће начине пријављивања:" + +#: ../properties/nm-pptp-dialog.ui.h:17 +msgid "" +"Allow/disable authentication methods. config: refuse-pap, refuse-chap, " +"refuse-mschap, refuse-mschap-v2, refuse-eap" +msgstr "" +"Укључује/искључује начине пријављивања. подешавање: refuse-pap, refuse-" +"chap, refuse-mschap, refuse-mschap-v2, refuse-eap" + +#: ../properties/nm-pptp-dialog.ui.h:18 +msgid "Security and Compression" +msgstr "Безбедност и сажимање" + +#: ../properties/nm-pptp-dialog.ui.h:19 +msgid "Use _Point-to-Point encryption (MPPE)" +msgstr "_Користи шифровање „тачка-до-тачке“ (МППЕ)" + +#: ../properties/nm-pptp-dialog.ui.h:20 +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 "" +"Напомена: МППЕ шифровање је доступно само са МСЦХАП-ом. Да укључите ову " +"кућицу за избор, изаберите један или неколико МСЦХАП начина пријављивања: " +"МСЦХАП или МСЦХАПв2." + +#: ../properties/nm-pptp-dialog.ui.h:21 +msgid "_Security:" +msgstr "_Безбедност:" + +#: ../properties/nm-pptp-dialog.ui.h:22 +msgid "" +"Require the use of MPPE, with 40/128-bit encryption or all. config: " +"require-mppe, require-mppe-128 or require-mppe-40" +msgstr "" +"Захтева коришћење МППЕ-а, са 40/128-битним шифровањем или " +"све. подешавање: require-mppe, require-mppe-128 или require-mppe-40" + +#: ../properties/nm-pptp-dialog.ui.h:23 +msgid "Allow st_ateful encryption" +msgstr "Допусти _речито шифровање" + +#: ../properties/nm-pptp-dialog.ui.h:24 +msgid "" +"Allow MPPE to use stateful mode. Stateless mode is still attempted first." +" config: mppe-stateful (when checked)" +msgstr "" +"Допушта МППЕ-у да користи речит режим. Речит режим се још увек покушава као " +"први. подешавање: mppe-stateful (када је изабран)" + +#: ../properties/nm-pptp-dialog.ui.h:25 +msgid "Allow _BSD data compression" +msgstr "Дозволи _БСД паковање података" + +#: ../properties/nm-pptp-dialog.ui.h:26 +msgid "" +"Allow/disable BSD-Compress compression. config: nobsdcomp (when " +"unchecked)" +msgstr "" +"Укључује/искључује сажимање БСД-Сажимања. подешавање: nobsdcomp (када " +"није изабрано)" + +#: ../properties/nm-pptp-dialog.ui.h:27 +msgid "Allow _Deflate data compression" +msgstr "Дозволи _Дефлејт паковање података" + +#: ../properties/nm-pptp-dialog.ui.h:28 +msgid "" +"Allow/disable Deflate compression. config: nodeflate (when unchecked)" +msgstr "" +"Укључује/искључује Дефлејт сажимање. подешавање: nodeflate (када није " +"изабрано)" + +#: ../properties/nm-pptp-dialog.ui.h:29 +msgid "Use TCP _header compression" +msgstr "Користи _паковање ТЦП заглавља" + +#: ../properties/nm-pptp-dialog.ui.h:30 +msgid "" +"Allow/disable Van Jacobson style TCP/IP header compression in both the " +"transmit and the receive directions. config: novj (when unchecked)" +msgstr "" +"Укључује/искључује Ван Јакобсонов стил паковања ТЦП/ИП заглавља како у смеру " +"преноса тако и у смеру пријема. подешавање: novj (када није изабрано)" + +#: ../properties/nm-pptp-dialog.ui.h:31 +msgid "Echo" +msgstr "Одјек" + +#: ../properties/nm-pptp-dialog.ui.h:32 +msgid "Send PPP _echo packets" +msgstr "Шаљи пакете ППП _одјека" + +#: ../properties/nm-pptp-dialog.ui.h:33 +msgid "" +"Send LCP echo-requests to find out whether peer is alive. config: lcp-" +"echo-failure and lcp-echo-interval" +msgstr "" +"Шаље ЛЦП захтеве одјека да би дознао да ли је парњак " +"активан. подешавање: lcp-echo-failure и lcp-echo-период" + +#: ../properties/nm-pptp.c:49 +msgid "Point-to-Point Tunneling Protocol (PPTP)" +msgstr "Проток тунелисања од тачке до тачке (ППТП)" + +#: ../properties/nm-pptp.c:50 +msgid "Compatible with Microsoft and other PPTP VPN servers." +msgstr "Сагласно са Мајкрософтовим и другим ППТП ВПН серверима." + +#: ../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 +#, c-format +msgid "couldn't convert PPTP VPN gateway IP address '%s' (%d)" +msgstr "не могу да претворим ИП адресу ППТП ВПН мрежног пролаза „%s“ (%d)" + +#: ../src/nm-pptp-service.c:178 +#, c-format +msgid "couldn't look up PPTP VPN gateway IP address '%s' (%d)" +msgstr "не могу да потражим ИП адресу ППТП ВПН мрежног пролаза „%s“ (%d)" + +#: ../src/nm-pptp-service.c:202 +#, c-format +msgid "no usable addresses returned for PPTP VPN gateway '%s'" +msgstr "нису враћене употребљиве адресе за ППТП ВПН мрежни пролаз „%s“" + +#: ../src/nm-pptp-service.c:213 +#, c-format +msgid "no usable addresses returned for PPTP VPN gateway '%s' (%d)" +msgstr "нису враћене употребљиве адресе за ППТП ВПН мрежни пролаз „%s“ (%d)" + +#: ../src/nm-pptp-service.c:240 +msgid "Could not find secrets (connection invalid, no vpn setting)." +msgstr "Не могу да пронађем тајне (веза је неисправна, нема впн подешавања)." + +#: ../src/nm-pptp-service.c:252 +msgid "Invalid VPN username." +msgstr "Неисправно ВПН корисничко име." + +#: ../src/nm-pptp-service.c:261 +msgid "Missing VPN username." +msgstr "Недостаје ВПН корисничко име." + +#: ../src/nm-pptp-service.c:271 +msgid "Missing or invalid VPN password." +msgstr "Недостаје или је неисправна ВПН лозинка." + +#: ../src/nm-pptp-service.c:429 +msgid "No cached credentials." +msgstr "Нема причуваних уверења." + +#: ../src/nm-pptp-service.c:575 +#, c-format +msgid "invalid gateway '%s'" +msgstr "неисправан мрежни пролаз „%s“" + +#: ../src/nm-pptp-service.c:589 +#, c-format +msgid "invalid integer property '%s'" +msgstr "неисправно својство целог броја „%s“" + +#: ../src/nm-pptp-service.c:599 +#, c-format +msgid "invalid boolean property '%s' (not yes or no)" +msgstr "неисправно логичко својство „%s“ (није „да“ или „не“)" + +#: ../src/nm-pptp-service.c:606 +#, c-format +msgid "unhandled property '%s' type %s" +msgstr "неруковано својство „%s“ врсте %s" + +#: ../src/nm-pptp-service.c:617 +#, c-format +msgid "property '%s' invalid or not supported" +msgstr "својство „%s“ је неисправно или није подржано" + +#: ../src/nm-pptp-service.c:635 +msgid "No VPN configuration options." +msgstr "Нема опција за ВПН подешавање." + +#: ../src/nm-pptp-service.c:655 +#, c-format +msgid "Missing required option '%s'." +msgstr "Недостаје затражена опција „%s“." + +#: ../src/nm-pptp-service.c:675 +msgid "No VPN secrets!" +msgstr "Нема ВПН тајни!" + +#: ../src/nm-pptp-service.c:816 +msgid "Could not find pptp client binary." +msgstr "Не могу да пронађем извршни пптп клијента." + +#: ../src/nm-pptp-service.c:829 +msgid "Missing VPN gateway." +msgstr "Недостаје ВПН мрежни пролаз." + +#: ../src/nm-pptp-service.c:982 +msgid "Could not find the pppd binary." +msgstr "Не могу да пронађем пптп извршни." + +#: ../src/nm-pptp-service.c:1112 +msgid "Invalid or missing PPTP gateway." +msgstr "Неисправан или недостаје ППТП мрежни пролаз." + +#: ../src/nm-pptp-service.c:1311 +msgid "Don't quit when VPN connection terminates" +msgstr "Не прекида када се завршава ВПН веза" + +#: ../src/nm-pptp-service.c:1312 +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 "" +"нм-пптп-услуга обезбеђује Управнику мреже обједињену ППТП ВПН могућност " +"(сагласну са Мајкрософтом и другим применама)." diff -Nru network-manager-pptp-0.9.2.0/po/sv.po network-manager-pptp-0.9.4.0/po/sv.po --- network-manager-pptp-0.9.2.0/po/sv.po 2011-10-28 19:28:30.000000000 +0000 +++ network-manager-pptp-0.9.4.0/po/sv.po 2012-03-02 17:01:37.000000000 +0000 @@ -1,7 +1,7 @@ -# Swedish messages for NetworkManager. -# Copyright (C) 2004-2011 Free Software Foundation, Inc. +# Swedish messages for NetworkManager PPTP. +# Copyright (C) 2004-2012 Free Software Foundation, Inc. # Christian Rose , 2004, 2005, 2006. -# Daniel Nylander , 2006, 2007, 2008, 2009, 2011. +# Daniel Nylander , 2006, 2007, 2008, 2009, 2011, 2012. # # $Id: sv.po,v 1.6 2006/12/05 06:26:57 dnylande Exp $ # @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: NetworkManager-pptp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-07 11:45+0200\n" -"PO-Revision-Date: 2011-10-07 11:45+0100\n" +"POT-Creation-Date: 2012-02-28 21:55+0100\n" +"PO-Revision-Date: 2012-02-28 21:58+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -34,23 +34,29 @@ #. Otherwise, we have no saved password, or the password flags indicated #. * that the password should never be saved. #. -#: ../auth-dialog/main.c:127 +#: ../auth-dialog/main.c:141 #, 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:128 +#: ../auth-dialog/main.c:150 +#: ../auth-dialog/main.c:170 msgid "Authenticate VPN" msgstr "Autentisera VPN" -#: ../nm-pptp.desktop.in.h:1 -msgid "Add, Remove, and Edit PPTP VPN Connections" -msgstr "Lägg till, ta bort och redigera PPTP VPN-anslutningar" +#: ../auth-dialog/main.c:152 +#: ../properties/nm-pptp-dialog.ui.h:10 +msgid "Password:" +msgstr "Lösenord:" -#: ../nm-pptp.desktop.in.h:2 +#: ../nm-pptp.desktop.in.h:1 msgid "PPTP VPN Connection Manager" msgstr "PPTP VPN-anslutningshanterare" +#: ../nm-pptp.desktop.in.h:2 +msgid "Add, Remove, and Edit PPTP VPN Connections" +msgstr "Lägg till, ta bort och redigera PPTP VPN-anslutningar" + #: ../properties/advanced-dialog.c:187 msgid "All Available (Default)" msgstr "Alla tillgängliga (Standard)" @@ -84,93 +90,133 @@ msgstr "EAP" #: ../properties/nm-pptp-dialog.ui.h:1 -msgid "Authentication" -msgstr "Autentisering" +msgid "Default" +msgstr "Standard" #: ../properties/nm-pptp-dialog.ui.h:2 -msgid "Echo" -msgstr "Eko" - -#: ../properties/nm-pptp-dialog.ui.h:3 msgid "General" msgstr "Allmänt" +#: ../properties/nm-pptp-dialog.ui.h:3 +msgid "PPTP server IP or name. config: the first parameter of pptp" +msgstr "IP eller namn på PPTP-server. config: första parametern för pptp" + #: ../properties/nm-pptp-dialog.ui.h:4 -msgid "Optional" -msgstr "Valfritt" +msgid "_Gateway:" +msgstr "_Gateway:" #: ../properties/nm-pptp-dialog.ui.h:5 -msgid "Security and Compression" -msgstr "Säkerhet och komprimering" +msgid "Optional" +msgstr "Valfritt" #: ../properties/nm-pptp-dialog.ui.h:6 -msgid "Ad_vanced..." -msgstr "A_vancerat..." +msgid "Append the domain name to the local host name for authentication purposes. config: domain " +msgstr "Lägg till domännamnet till det lokala värdnamnet för autentiseringssyften. config: domain " #: ../properties/nm-pptp-dialog.ui.h:7 -msgid "Allow _BSD data compression" -msgstr "Tillåt _BSD-datakomprimering" +msgid "NT Domain:" +msgstr "NT-domän:" #: ../properties/nm-pptp-dialog.ui.h:8 -msgid "Allow _Deflate data compression" -msgstr "Tillåt _Deflate-datakomprimering" +msgid "Show password" +msgstr "Visa lösenordet" #: ../properties/nm-pptp-dialog.ui.h:9 -msgid "Allow st_ateful encryption" -msgstr "Tillåt t_illståndsbaserad kryptering" - -#: ../properties/nm-pptp-dialog.ui.h:10 -msgid "Allow the following authentication methods:" -msgstr "Tillåt följande autentiseringsmetoder:" +msgid "Password passed to PPTP when prompted for it." +msgstr "Lösenord att skicka till PPTP när det efterfrågas." #: ../properties/nm-pptp-dialog.ui.h:11 -msgid "Default" -msgstr "Standard" +msgid "Set the name used for authenticating the local system to the peer to . config: user " +msgstr "Ange namnet att använda för autentisering av det lokala systemet till motparten till . config: user " #: ../properties/nm-pptp-dialog.ui.h:12 -msgid "NT Domain:" -msgstr "NT-domän:" +msgid "User name:" +msgstr "Användarnamn:" #: ../properties/nm-pptp-dialog.ui.h:13 -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 "Observera: MPPE-kryptering är endast tillgängligt med MSCHAP-autentiseringsmetoder. För att aktivera denna kryssruta så välj en eller flera av MSCHAP-autentiseringsmetoderna: MSCHAP eller MSCHAPv2." +msgid "Ad_vanced..." +msgstr "A_vancerat..." #: ../properties/nm-pptp-dialog.ui.h:14 msgid "PPTP Advanced Options" msgstr "Avancerade PPTP-alternativ" #: ../properties/nm-pptp-dialog.ui.h:15 -msgid "Password:" -msgstr "Lösenord:" +msgid "Authentication" +msgstr "Autentisering" #: ../properties/nm-pptp-dialog.ui.h:16 -msgid "Send PPP _echo packets" -msgstr "Skicka PPP-_ekopaket" +msgid "Allow the following authentication methods:" +msgstr "Tillåt följande autentiseringsmetoder:" #: ../properties/nm-pptp-dialog.ui.h:17 -msgid "Show password" -msgstr "Visa lösenordet" +msgid "Allow/disable authentication methods. config: refuse-pap, refuse-chap, refuse-mschap, refuse-mschap-v2, refuse-eap" +msgstr "Tillåt/inaktivera autentiseringsmetoder. config: refuse-pap, refuse-chap, refuse-mschap, refuse-mschap-v2, refuse-eap" #: ../properties/nm-pptp-dialog.ui.h:18 -msgid "Use TCP _header compression" -msgstr "Använd komprimering av TCP-_huvud" +msgid "Security and Compression" +msgstr "Säkerhet och komprimering" #: ../properties/nm-pptp-dialog.ui.h:19 msgid "Use _Point-to-Point encryption (MPPE)" msgstr "Använd _Point-to-Point-kryptering (MPPE)" #: ../properties/nm-pptp-dialog.ui.h:20 -msgid "User name:" -msgstr "Användarnamn:" +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 "Observera: MPPE-kryptering är endast tillgängligt med MSCHAP-autentiseringsmetoder. För att aktivera denna kryssruta så välj en eller flera av MSCHAP-autentiseringsmetoderna: MSCHAP eller MSCHAPv2." #: ../properties/nm-pptp-dialog.ui.h:21 -msgid "_Gateway:" -msgstr "_Gateway:" - -#: ../properties/nm-pptp-dialog.ui.h:22 msgid "_Security:" msgstr "_Säkerhet:" +#: ../properties/nm-pptp-dialog.ui.h:22 +msgid "Require the use of MPPE, with 40/128-bit encryption or all. config: require-mppe, require-mppe-128 or require-mppe-40" +msgstr "Krävs användning av MPPE, med 40/128-bitars kryptering eller alla. config: require-mppe, require-mppe-128 eller require-mppe-40" + +#: ../properties/nm-pptp-dialog.ui.h:23 +msgid "Allow st_ateful encryption" +msgstr "Tillåt t_illståndsbaserad kryptering" + +#: ../properties/nm-pptp-dialog.ui.h:24 +msgid "Allow MPPE to use stateful mode. Stateless mode is still attempted first. config: mppe-stateful (when checked)" +msgstr "" + +#: ../properties/nm-pptp-dialog.ui.h:25 +msgid "Allow _BSD data compression" +msgstr "Tillåt _BSD-datakomprimering" + +#: ../properties/nm-pptp-dialog.ui.h:26 +msgid "Allow/disable BSD-Compress compression. config: nobsdcomp (when unchecked)" +msgstr "Tillåt/inaktivera BSD-Compress-kompression. config: nobsdcomp (när inte kryssad)" + +#: ../properties/nm-pptp-dialog.ui.h:27 +msgid "Allow _Deflate data compression" +msgstr "Tillåt _Deflate-datakomprimering" + +#: ../properties/nm-pptp-dialog.ui.h:28 +msgid "Allow/disable Deflate compression. config: nodeflate (when unchecked)" +msgstr "Tillåt/inaktivera Deflate-kompression. config: nodeflate (när inte kryssad)" + +#: ../properties/nm-pptp-dialog.ui.h:29 +msgid "Use TCP _header compression" +msgstr "Använd komprimering av TCP-_huvud" + +#: ../properties/nm-pptp-dialog.ui.h:30 +msgid "Allow/disable Van Jacobson style TCP/IP header compression in both the transmit and the receive directions. config: novj (when unchecked)" +msgstr "" + +#: ../properties/nm-pptp-dialog.ui.h:31 +msgid "Echo" +msgstr "Eko" + +#: ../properties/nm-pptp-dialog.ui.h:32 +msgid "Send PPP _echo packets" +msgstr "Skicka PPP-_ekopaket" + +#: ../properties/nm-pptp-dialog.ui.h:33 +msgid "Send LCP echo-requests to find out whether peer is alive. config: lcp-echo-failure and lcp-echo-interval" +msgstr "" + #: ../properties/nm-pptp.c:49 msgid "Point-to-Point Tunneling Protocol (PPTP)" msgstr "Point-to-Point Tunneling Protocol (PPTP)" @@ -179,6 +225,18 @@ msgid "Compatible with Microsoft and other PPTP VPN servers." msgstr "Kompatibel med Microsoft och andra PPTP VPN-servrar." +#: ../properties/nm-pptp.c:317 +msgid "Saved" +msgstr "Sparad" + +#: ../properties/nm-pptp.c:325 +msgid "Always Ask" +msgstr "Fråga alltid" + +#: ../properties/nm-pptp.c:330 +msgid "Not Required" +msgstr "Krävs inte" + #: ../src/nm-pptp-service.c:160 #, c-format msgid "couldn't convert PPTP VPN gateway IP address '%s' (%d)" @@ -287,28 +345,40 @@ #~ 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" #~ msgstr "OK" + #~ msgid "Authentication Type:" #~ msgstr "Autentiseringstyp:" + #~ msgid "_Remember for this session" #~ msgstr "_Kom ihåg för denna session" + #~ msgid "_Save in keyring" #~ msgstr "_Spara i nyckelring" + #~ msgid "Authenticate Connection" #~ msgstr "Autentisera anslutning" + #~ msgid "" #~ "Authentication Information\n" #~ "\n" @@ -323,50 +393,72 @@ #~ "\n" #~ "Välj en lämplig autentiseringstyp och tillhandahåll nödvändig information " #~ "nedan:\n" + #~ msgid "Authentication Required" #~ msgstr "Autentisering krävs" + #~ msgid "_Authentication Type:" #~ msgstr "_Autentiseringstyp:" + #~ msgid "_Remote name:" #~ msgstr "_Fjärrnamn:" + #~ msgid "VPN Connection Manager (PPP generic)" #~ msgstr "VPN-anslutningshanterare (allmän PPP)" + #~ msgid "00:00:00:00" #~ msgstr "00:00:00:00" + #~ msgid "Delays & Timeouts" #~ msgstr "Fördröjningar och tidsgränser" + #~ msgid "Packet Parameters" #~ msgstr "Paketparametrar" + #~ msgid "Example: 172.16.0.0/16 10.11.12.0/24" #~ msgstr "Exempel: 172.16.0.0/16 10.11.12.0/24" + #~ msgid "" #~ "A list of extra options to pppd as would be typed on the command line" #~ msgstr "" #~ "En lista på extra flaggor till pppd som de matats in på kommandoraden" + #~ msgid "C_hannel:" #~ msgstr "Ka_nal:" + #~ msgid "Co_nnect delay:" #~ msgstr "Anslu_tningsfördröjning:" + #~ msgid "Compression & Encryption" #~ msgstr "Komprimering & kryptering" + #~ msgid "Connection" #~ msgstr "Anslutning" + #~ msgid "Connection na_me:" #~ msgstr "Anslutningsna_mn:" + #~ msgid "Context _number:" #~ msgstr "_Sammanhangsnr:" + #~ msgid "Custom _PPP options:" #~ msgstr "Anpassade _PPP-flaggor:" + #~ msgid "Debug _output" #~ msgstr "Felsöknings_utdata" + #~ msgid "Disconnect after this many LCP echo requests fail" #~ msgstr "Koppla från när så här många LCP echo-begäranden misslyckats" + #~ msgid "E_xclusive device access (UUCP-style lock)" #~ msgstr "E_xklusiv enhetsåtkomst (lås i UUCP-stil)" + #~ msgid "Enable stateful _MPPE" #~ msgstr "Aktivera \"stateful _MPPE\"" + #~ msgid "Find Device" #~ msgstr "Sök enhet" + #~ msgid "" #~ "For security reasons, options entered in the box above are checked " #~ "against a list of allowed options before a connection is established. " @@ -375,51 +467,71 @@ #~ "Av säkerhetsskäl kommer flaggor som matats in i rutan ovanför att " #~ "kontrolleras mot en lista av tillåtna flaggor innan en anslutning " #~ "etableras. För närvarande finns det inga flaggor i listan." + #~ msgid "GPRS Options" #~ msgstr "GPRS-alternativ" + #~ msgid "Host name or IP address of the PPTP server" #~ msgstr "Värdnamn eller IP-adress till PPTP-servern" + #~ msgid "IP a_ddress:" #~ msgstr "IP-a_dress:" + #~ msgid "" #~ "If BSD compression is not allowed the 'nobsdcomp' option is passed to pppd" #~ msgstr "" #~ "Om BSD-komprimering inte tillåts kommer flaggan \"nobsdcomp\" att skickas " #~ "till pppd" + #~ msgid "" #~ "If Deflate compression is not allowed the 'nodefate' option is passed to " #~ "pppd" #~ msgstr "" #~ "Om Deflate-komprimering inte tillåts kommer flaggan \"nodeflate\" att " #~ "skickas till pppd" + #~ msgid "Maximum Receive Unit" #~ msgstr "Största mottagningsenhet" + #~ msgid "Maximum Transmit Unit" #~ msgstr "Största överföringsenhet" + #~ msgid "Refuse C_HAP" #~ msgstr "Vägra C_HAP" + #~ msgid "Refuse _EAP" #~ msgstr "Vägra _EAP" + #~ msgid "Refuse _MS CHAP" #~ msgstr "Vägra _MS CHAP" + #~ msgid "Require 128 bit M_PPE encryption" #~ msgstr "Kräv 128-bitars M_PPE-kryptering" + #~ msgid "Require MPPE _encryption" #~ msgstr "Kräv MPPE-_kryptering" + #~ msgid "Require explicit IP _address" #~ msgstr "Kräv explicit IP-_adress" + #~ msgid "Requires existing network connection" #~ msgstr "Kräver en existerande nätverksanslutning" + #~ msgid "Routing" #~ msgstr "Routing" + #~ msgid "Serial Options" #~ msgstr "Seriealternativ" + #~ msgid "Service providers GPRS access point from device config" #~ msgstr "GPRS-accesspunkt för tjänsteleverantörer från enhetskonfiguration" + #~ msgid "Service providers IP address" #~ msgstr "IP-adress för tjänsteleverantörer" + #~ msgid "Telep_hone number:" #~ msgstr "Tele_fonnummer:" + #~ msgid "" #~ "This is the friendly name that will be used to identify this network " #~ "connection, \n" @@ -428,175 +540,254 @@ #~ "Detta är det namn som kommer att användas för att identifiera detta " #~ "nätverk, \n" #~ "t.ex. \"Campus-VPN\" eller \"Företagsnätverket\"" + #~ msgid "Time in seconds between echo requests" #~ msgstr "Tid i sekunder mellan echo-begäranden" + #~ msgid "Typ_e:" #~ msgstr "Ty_p:" + #~ msgid "Use peer _DNS" #~ msgstr "Använd fjärr-_DNS" + #~ msgid "When checked the \"refuse-chap\" option is passed to pppd." #~ msgstr "" #~ "När denna är kryssad kommer flaggan \"refuse-chap\" att skickas till pppd." + #~ msgid "When checked the \"refuse-eap\" option is passed to pppd." #~ msgstr "" #~ "När denna är kryssad kommer flaggan \"refuse-eap\" att skickas till pppd." + #~ msgid "When checked the \"refuse-mschap\" option is passed to pppd." #~ msgstr "" #~ "När denna är kryssad kommer flaggan \"refuse-mschap\" att skickas till " #~ "pppd." + #~ msgid "When checked the 'lock' option is passed to pppd" #~ msgstr "När denna är kryssad kommer flaggan \"lock\" att skickas till pppd." + #~ msgid "When checked the 'require-mppc' option is passed to pppd" #~ msgstr "" #~ "När denna är kryssad kommer flaggan \"require-mppc\" att skickas till " #~ "pppd." + #~ msgid "" #~ "When checked this sets the pppd 'debug' option and adds some extra " #~ "information from the NetworkManager plugin" #~ msgstr "" #~ "När denna är kryssad ställs pppd-flaggan \"debug\" in och lägger till " #~ "extra information från insticksmodulen NetworkManager" + #~ msgid "When checked this sets the pppd 'noipdefault' option" #~ msgstr "När denna är kryssad ställs pppd-flaggan \"noipdefault\" in" + #~ msgid "When checked this sets the pppd 'usepeerdns' option" #~ msgstr "När denna är kryssad ställs pppd-flaggan \"usepeerdns\" in" + #~ msgid "" #~ "When this check box is cleared the \"noauth\" option is passed to pppd." #~ msgstr "" #~ "När denna inte är kryssad kommer flaggan \"noauth\" att skickas till pppd." + #~ msgid "_Access point name:" #~ msgstr "Namn på _accesspunkt:" + #~ msgid "_Device address:" #~ msgstr "_Enhetsadress:" + #~ msgid "_Hardware RTS/CTS" #~ msgstr "_Hårdvaru-RTS/CTS" + #~ msgid "_Import Saved Configuration..." #~ msgstr "_Importera sparad konfiguration..." + #~ msgid "_Modem connection" #~ msgstr "_Modemanslutning" + #~ msgid "_Only use VPN connection for these addresses:" #~ msgstr "Använd _endast VPN-anslutning för dessa adresser:" + #~ msgid "_Packet type:" #~ msgstr "_Pakettyp:" + #~ msgid "_Peer DNS through tunnel" #~ msgstr "_Fjärr-DNS genom tunnel" + #~ msgid "_Require MPPC compression" #~ msgstr "_Kräv MPPC-komprimering" + #~ msgid "pppd tunnel (PPTP, BTGPRS, Dialup)" #~ msgstr "pppd-tunnel (PPTP, BTGPRS, Uppringd)" + #~ msgid "Name" #~ msgstr "Namn" + #~ msgid "PPTP Server" #~ msgstr "PPTP-server" + #~ msgid "Telephone Number" #~ msgstr "Telefonnummer" + #~ msgid "Bluetooth Address" #~ msgstr "Bluetooth-adress" + #~ msgid "Bluetooth Channel" #~ msgstr "Bluetooth-kanal" + #~ msgid "GPRS APN" #~ msgstr "GPRS APN" + #~ msgid "GPRS IP" #~ msgstr "GPRS-IP" + #~ msgid "GPRS Context No." #~ msgstr "GPRS-sammanhangsnr" + #~ msgid "GPRS Packet Type" #~ msgstr "GPRS-pakettyp" + #~ msgid "Use CTS/RTS flow control" #~ msgstr "Använd CTS/RTS-flödeskontroll" + #~ msgid "Connect via a modem" #~ msgstr "Anslut via ett modem" + #~ msgid "Require IP to be provided" #~ msgstr "Kräv att IP tillhandahålls" + #~ msgid "Use Peer DNS" #~ msgstr "Använd fjärr-DNS" + #~ msgid "Use MPPE encryption" #~ msgstr "Använd MPPE-kryptering" + #~ msgid "Use 128 bit MPPE encryption" #~ msgstr "Använd 128-bitars MPPE-kryptering" + #~ msgid "Enable stateful MPPE" #~ msgstr "Aktivera \"stateful MPPE\"" + #~ msgid "Do not use deflate compression" #~ msgstr "Använd inte Deflate-komprimering" + #~ msgid "Do not use BSD compression" #~ msgstr "Använd inte BSD-komprimering" + #~ msgid "Exclusive device access by pppd" #~ msgstr "Exklusiv enhetsåtkomst för pppd" + #~ msgid "Authenticate remote peer" #~ msgstr "Autentisera fjärrpart" + #~ msgid "Refuse EAP" #~ msgstr "Vägra EAP" + #~ msgid "Refuse CHAP" #~ msgstr "Vägra CHAP" + #~ msgid "Maximum transmit unit (in bytes)" #~ msgstr "Maximal överföringsenhet (i byte)" + #~ msgid "Maximum receive unit (in bytes)" #~ msgstr "Maximal mottagningsenhet (i byte)" + #~ msgid "Number of failed LCP echos to cause disconnect" #~ msgstr "Antal misslyckade LCP-ekon som orsakar frånkoppling" + #~ msgid "Interval (in seconds) at which to issue LCP echos" #~ msgstr "Intervall (i sekunder) som LCP-ekon ska göras" + #~ msgid "Interval (in milliseconds) to wait before connecting." #~ msgstr "Intervall (i millisekunder) att vänta före anslutning." + #~ msgid "Custom PPP options" #~ msgstr "Anpassade PPP-flaggor" + #~ msgid "Use Peer DNS over the Tunnel" #~ msgstr "Använd fjärr-DNS över tunneln" + #~ msgid "Specific networks available" #~ msgstr "Specifika tillgängliga nätverk" + #~ msgid "Limit to specific networks" #~ msgstr "Begränsa till specifika nätverk" + #~ msgid "The following '%s' connection will be created:" #~ msgstr "Följande \"%s\"-anslutning kommer att skapas:" + #~ msgid "\t%s: %s\n" #~ msgstr "\t%s: %s\n" + #~ msgid "The connection details can be changed using the \"Back\" button." #~ msgstr "" #~ "Anslutningsdetaljerna kan ändras genom att använda knappen \"Bakåt\"." + #~ msgid "Select file to import" #~ msgstr "Välj fil att importera" + #~ msgid "Save as..." #~ msgstr "Spara som..." + #~ msgid "A file named \"%s\" already exists." #~ msgstr "En fil med namnet \"%s\" finns redan." + #~ msgid "Do you want to replace it with the one you are saving?" #~ msgstr "Vill du ersätta den med den du håller på att spara?" + #~ msgid "auth-chap-window" #~ msgstr "auth-chap-window" + #~ msgid "auth-mschapv2-window" #~ msgstr "auth-mschapv2-window" + #~ msgid "auth-none-window" #~ msgstr "auth-none-window" + #~ msgid "Connection Name" #~ msgstr "Anslutningsnamn" + #~ msgid "Require Explicit IP Addr" #~ msgstr "Kräv explicit ip-addr" + #~ msgid "Telephone number to dial" #~ msgstr "Telefonnummer att ringa" + #~ msgid "_Channel:" #~ msgstr "_Kanal:" + #~ msgid "_IP Address:" #~ msgstr "_Ip-adress:" + #~ msgid "Tunnel via pppd" #~ msgstr "Tunnla via pppd" + #~ msgid "Bluetooth options" #~ msgstr "Bluetooth-alternativ" + #~ msgid "Dial-up options" #~ msgstr "Uppringningsalternativ" + #~ msgid "GPRS options" #~ msgstr "GPRS-alternativ" + #~ msgid "PPTP options" #~ msgstr "PPTP-alternativ" + #~ msgid "Required Information" #~ msgstr "Nödvändig information" + #~ msgid "Routing options" #~ msgstr "Routingalternativ" + #~ msgid "Connection Type:" #~ msgstr "Anslutningstyp:" + #~ msgid "MPPE encryption" #~ msgstr "MPPE-kryptering" + #~ msgid "Numeric Tweaks" #~ msgstr "Numeriska justeringar" + #~ msgid "" #~ "Please enter the information provided by your system administrator below. " #~ "Do not enter your password here as you will be prompted when connecting." @@ -604,40 +795,56 @@ #~ "Ange den information som har tillhandahållits av din systemadministratör " #~ "nedan. Ange inte lösenordet här eftersom du kommer att efterfrågas det " #~ "när du ansluter." + #~ msgid "Show on connection on menu" #~ msgstr "Visa på anslutning på meny" + #~ msgid "" #~ "_Name used to identify the connection to the private network, e.g. " #~ "\"Campus VPN\" or \"Corporate Network\"" #~ msgstr "" #~ "_Namn som används för att identifiera anslutningen till det privata " #~ "nätverket, exempelvis \"Campus-VPN\" eller \"Företagsnätverket\"" + #~ msgid "Remember password for this session" #~ msgstr "Kom ihåg lösenordet för denna session" + #~ msgid "Save password in keyring" #~ msgstr "Spara lösenordet i nyckelring" + #~ msgid "Bluetooth options" #~ msgstr "Bluetooth-alternativ" + #~ msgid "Dial-up options" #~ msgstr "Uppringningsalternativ" + #~ msgid "PPTP options" #~ msgstr "PPTP-alternativ" + #~ msgid "Gateway:" #~ msgstr "Gateway:" + #~ msgid "Only use VPN connection for these addresses" #~ msgstr "Använd endast VPN-anslutning för dessa adresser" + #~ msgid "Group Name:" #~ msgstr "Gruppnamn:" + #~ msgid "Use domain for authentication" #~ msgstr "Använd domän för autentisering" + #~ msgid "_Import..." #~ msgstr "_Importera..." + #~ msgid "Compatible Cisco VPN client (vpnc)" #~ msgstr "Kompatibel Cisco VPN-klient (vpnc)" + #~ msgid "\tUsername: %s\n" #~ msgstr "\tAnvändarnamn: %s\n" + #~ msgid "\tDomain: %s\n" #~ msgstr "\tDomän: %s\n" + #~ msgid "" #~ "The following vpnc VPN connection will be created:\n" #~ "\n" @@ -656,8 +863,10 @@ #~ "\tGruppnamn: %s\n" #~ "%s%s%s\n" #~ "Anslutningsdetaljerna kan ändras genom att använda knappen \"Redigera\".\n" + #~ msgid "TCP tunneling not supported" #~ msgstr "TCP-tunnling stöds inte" + #~ msgid "" #~ "The VPN settings file '%s' specifies that VPN traffic should be tunneled " #~ "through TCP which is currently not supported in the vpnc software.\n" @@ -670,33 +879,39 @@ #~ "\n" #~ "Anslutningen kan fortfarande skapas, med inaktiverad TCP-tunnling, men " #~ "det kanske inte fungerar som väntat." + #~ msgid "Cannot import settings" #~ msgstr "Kan inte importera inställningar" + #~ msgid "The VPN settings file '%s' does not contain valid data." #~ msgstr "VPN-inställningsfilen \"%s\" innehåller inte giltiga data." + #~ msgid "" #~ "The VPN login failed because the user name and password were not accepted." #~ msgstr "" #~ "VPN-inloggningen misslyckades eftersom användarnamnet och lösenordet inte " #~ "accepterades." + #~ msgid "The VPN login failed because the VPN program could not be started." #~ msgstr "" #~ "VPN-inloggningen misslyckades eftersom VPN-programmet inte kunde startas." + #~ msgid "" #~ "The VPN login failed because the VPN program could not connect to the VPN " #~ "server." #~ msgstr "" #~ "VPN-inloggningen misslyckades eftersom VPN-programmet inte kunde ansluta " #~ "till VPN-servern." + #~ msgid "" #~ "The VPN login failed because the VPN configuration options were invalid." #~ msgstr "" #~ "VPN-inloggningen misslyckades eftersom VPN-konfigurationsalternativen var " #~ "ogiltiga." + #~ msgid "" #~ "The VPN login failed because the VPN program received an invalid " #~ "configuration from the VPN server." #~ msgstr "" #~ "VPN-inloggningen misslyckades eftersom VPN-programmet mottog en ogiltig " #~ "konfiguration från VPN-servern." - diff -Nru network-manager-pptp-0.9.2.0/po/zh_CN.po network-manager-pptp-0.9.4.0/po/zh_CN.po --- network-manager-pptp-0.9.2.0/po/zh_CN.po 2011-08-26 16:46:21.000000000 +0000 +++ network-manager-pptp-0.9.4.0/po/zh_CN.po 2011-12-13 00:37:59.000000000 +0000 @@ -10,8 +10,8 @@ "Project-Id-Version: NetworkManager-pptp master\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-09 19:11+0000\n" -"PO-Revision-Date: 2011-04-11 01:27+0800\n" +"POT-Creation-Date: 2011-11-07 15:35+0000\n" +"PO-Revision-Date: 2011-11-27 18:26+0800\n" "Last-Translator: YunQiang Su \n" "Language-Team: Chinese (simplified) \n" "MIME-Version: 1.0\n" @@ -19,47 +19,27 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../auth-dialog/gnome-two-password-dialog.c:129 -msgid "_Secondary Password:" -msgstr "次要密码(_S)：" - -#: ../auth-dialog/gnome-two-password-dialog.c:243 -msgid "_Username:" -msgstr "用户名(_U)：" - -#: ../auth-dialog/gnome-two-password-dialog.c:245 -msgid "_Domain:" -msgstr "域(_D)：" - -#: ../auth-dialog/gnome-two-password-dialog.c:247 +#: ../auth-dialog/vpn-password-dialog.c:95 msgid "_Password:" msgstr "密码(_P)：" -#: ../auth-dialog/gnome-two-password-dialog.c:342 -msgid "Connect _anonymously" -msgstr "匿名连接(_A)" - -#: ../auth-dialog/gnome-two-password-dialog.c:347 -msgid "Connect as _user:" -msgstr "以用户连接(_U)：" - -#: ../auth-dialog/gnome-two-password-dialog.c:452 -msgid "_Remember passwords for this session" -msgstr "本次会话记住密码(_R)" - -#: ../auth-dialog/gnome-two-password-dialog.c:454 -msgid "_Save passwords in keyring" -msgstr "在密钥环中保存密码(_S)" +#: ../auth-dialog/vpn-password-dialog.c:97 +msgid "_Secondary Password:" +msgstr "次要密码(_S)：" + +#: ../auth-dialog/vpn-password-dialog.c:239 +msgid "Sh_ow passwords" +msgstr "显示密码(_O)" #. 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 "您需要进行身份验证才能访问虚拟专用网络 '%s'。" -#: ../auth-dialog/main.c:93 +#: ../auth-dialog/main.c:128 msgid "Authenticate VPN" msgstr "认证 VPN" @@ -196,14 +176,26 @@ msgid "_Security:" msgstr "安全性(_S)：" -#: ../properties/nm-pptp.c:50 +#: ../properties/nm-pptp.c:49 msgid "Point-to-Point Tunneling Protocol (PPTP)" msgstr "点到点隧道协议(PPTP)" -#: ../properties/nm-pptp.c:51 +#: ../properties/nm-pptp.c:50 msgid "Compatible with Microsoft and other PPTP VPN servers." msgstr "与微软及其他的 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 #, c-format msgid "couldn't convert PPTP VPN gateway IP address '%s' (%d)" @@ -226,7 +218,7 @@ #: ../src/nm-pptp-service.c:240 msgid "Could not find secrets (connection invalid, no vpn setting)." -msgstr "" +msgstr "无法找到机密(连接无效，无 VPN 设置)。" #: ../src/nm-pptp-service.c:252 msgid "Invalid VPN username." @@ -280,7 +272,7 @@ #: ../src/nm-pptp-service.c:675 msgid "No VPN secrets!" -msgstr "" +msgstr "没有 VPN 机密信息！" #: ../src/nm-pptp-service.c:816 msgid "Could not find pptp client binary." @@ -313,3 +305,21 @@ msgstr "" "nm-pptp-service 为网络管理器提供了集成的 PPTP VPN 功能(与微软和其他实现兼" "容)。" + +#~ msgid "_Username:" +#~ msgstr "用户名(_U)：" + +#~ msgid "_Domain:" +#~ msgstr "域(_D)：" + +#~ msgid "Connect _anonymously" +#~ msgstr "匿名连接(_A)" + +#~ msgid "Connect as _user:" +#~ msgstr "以用户连接(_U)：" + +#~ msgid "_Remember passwords for this session" +#~ msgstr "本次会话记住密码(_R)" + +#~ msgid "_Save passwords in keyring" +#~ msgstr "在密钥环中保存密码(_S)" diff -Nru network-manager-pptp-0.9.2.0/properties/nm-pptp-dialog.ui network-manager-pptp-0.9.4.0/properties/nm-pptp-dialog.ui --- network-manager-pptp-0.9.2.0/properties/nm-pptp-dialog.ui 2011-11-09 17:54:27.000000000 +0000 +++ network-manager-pptp-0.9.4.0/properties/nm-pptp-dialog.ui 2012-02-07 21:09:08.000000000 +0000 @@ -57,6 +57,7 @@ True True + PPTP server IP or name. config: the first parameter of pptp 1 @@ -123,6 +124,7 @@ True True + Append the domain name <domain> to the local host name for authentication purposes. config: domain <domain> 1 @@ -184,6 +186,7 @@ True True False + Password passed to PPTP when prompted for it. 1 @@ -210,6 +213,7 @@ True True + Set the name used for authenticating the local system to the peer to <name>. config: user <name> 1 @@ -351,6 +355,7 @@ True True False + Allow/disable authentication methods. config: refuse-pap, refuse-chap, refuse-mschap, refuse-mschap-v2, refuse-eap @@ -441,6 +446,7 @@ True model1 + Require the use of MPPE, with 40/128-bit encryption or all. config: require-mppe, require-mppe-128 or require-mppe-40 @@ -462,6 +468,7 @@ Allow st_ateful encryption True True + Allow MPPE to use stateful mode. Stateless mode is still attempted first. config: mppe-stateful (when checked) False @@ -489,6 +496,7 @@ Allow _BSD data compression True True + Allow/disable BSD-Compress compression. config: nobsdcomp (when unchecked) False @@ -503,6 +511,7 @@ Allow _Deflate data compression True True + Allow/disable Deflate compression. config: nodeflate (when unchecked) False @@ -517,6 +526,7 @@ Use TCP _header compression True True + Allow/disable Van Jacobson style TCP/IP header compression in both the transmit and the receive directions. config: novj (when unchecked) False @@ -565,6 +575,7 @@ Send PPP _echo packets True True + Send LCP echo-requests to find out whether peer is alive. config: lcp-echo-failure and lcp-echo-interval diff -Nru network-manager-pptp-0.9.2.0/src/nm-pptp-pppd-plugin.c network-manager-pptp-0.9.4.0/src/nm-pptp-pppd-plugin.c --- network-manager-pptp-0.9.2.0/src/nm-pptp-pppd-plugin.c 2010-10-08 15:57:35.000000000 +0000 +++ network-manager-pptp-0.9.4.0/src/nm-pptp-pppd-plugin.c 2012-03-02 20:12:05.000000000 +0000 @@ -230,13 +230,13 @@ } static int -get_chap_check() +get_chap_check(void) { return 1; } static int -get_pap_check() +get_pap_check(void) { return 1; }