Commit 9c6392aa authored by Michael Biebl's avatar Michael Biebl

Imported Upstream version 0.9.4.0

parent 18a09684
......@@ -29,7 +29,9 @@ endif
nm-openvpn-service.name: $(srcdir)/nm-openvpn-service.name.in
sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' $< >$@
DISTCHECK_CONFIGURE_FLAGS = --with-tests=yes
DISTCHECK_CONFIGURE_FLAGS = \
--with-tests=yes \
--enable-more-warnings=yes
EXTRA_DIST = nm-openvpn-service.name.in \
$(dbusservice_DATA) \
......
......@@ -292,7 +292,10 @@ nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN
nmvpnservice_DATA = nm-openvpn-service.name
desktopfile = nm-openvpn.desktop.in
iconfile = gnome-mime-application-x-openvpn-settings.png
DISTCHECK_CONFIGURE_FLAGS = --with-tests=yes
DISTCHECK_CONFIGURE_FLAGS = \
--with-tests=yes \
--enable-more-warnings=yes
EXTRA_DIST = nm-openvpn-service.name.in \
$(dbusservice_DATA) \
$(desktopfile) \
......
=======================================================
network-manager-openvpn-0.9.4
Overview of changes since network-manager-openvpn-0.9.2
=======================================================
This is a new stable release of network-manager-openvpn. Notable changes include:
* Updated translations
* Fix issues with password dialog width on recent GTK+ versions
* Allow cipher and HMAC options to be set for Static Key mode
* Support for "external UI mode" for DE-native dialogs (ie, GNOME Shell and others)
=======================================================
network-manager-openvpn-0.9.2
Overview of changes since network-manager-openvpn-0.9.0
......
......@@ -45,6 +45,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)
{
......@@ -74,6 +76,37 @@ keyring_lookup_secret (const char *uuid, const char *secret_name)
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_name,
const char *vpn_uuid,
......@@ -81,6 +114,7 @@ get_secrets (const char *vpn_name,
gboolean need_certpass,
gboolean retry,
gboolean allow_interaction,
gboolean external_ui_mode,
const char *in_pass,
NMSettingSecretFlags pw_flags,
char **out_password,
......@@ -119,20 +153,42 @@ get_secrets (const char *vpn_name,
need_secret = TRUE;
}
/* Either interaction is not allowed so pass back any passwords we have
* without asking the user, or we've got all the passwords we need already.
*/
if (allow_interaction == FALSE || (!need_secret && !retry)) {
/* In other_ui mode, we don't actually show the dialog. Instead we pass back everything
that is needed to build it */
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"));
if (need_password)
keyfile_add_entry_info (keyfile, NM_OPENVPN_KEY_PASSWORD, password ? password : "", _("Password:"), TRUE, allow_interaction);
if (need_certpass)
keyfile_add_entry_info (keyfile, NM_OPENVPN_KEY_CERTPASS, certpass ? certpass : "", _("Certificate password:"), TRUE, allow_interaction);
keyfile_print_stdout (keyfile);
g_key_file_unref (keyfile);
success = TRUE;
goto out;
} else if (allow_interaction == FALSE || (!need_secret && !retry)) {
/* Either interaction is not allowed so pass back any passwords we have
* without asking the user, or we've got all the passwords we need already.
*/
if (need_password)
*out_password = password;
if (need_certpass)
*out_certpass = certpass;
g_free (prompt);
return TRUE;
}
prompt = g_strdup_printf (_("You need to authenticate to access the Virtual Private Network '%s'."), vpn_name);
dialog = VPN_PASSWORD_DIALOG (vpn_password_dialog_new (_("Authenticate VPN"), prompt, NULL));
g_free (prompt);
/* pre-fill dialog with the password */
if (need_password && need_certpass) {
......@@ -158,11 +214,6 @@ get_secrets (const char *vpn_name,
}
}
if (password)
gnome_keyring_memory_free (password);
if (certpass)
gnome_keyring_memory_free (certpass);
gtk_widget_show (GTK_WIDGET (dialog));
if (vpn_password_dialog_run_and_block (dialog)) {
......@@ -180,6 +231,12 @@ get_secrets (const char *vpn_name,
gtk_widget_destroy (GTK_WIDGET (dialog));
out:
gnome_keyring_memory_free (password);
gnome_keyring_memory_free (certpass);
g_free (prompt);
return success;
}
......@@ -247,6 +304,7 @@ main (int argc, char *argv[])
GHashTable *data = NULL, *secrets = NULL;
gboolean need_password = FALSE, need_certpass = FALSE;
char *new_password = NULL, *new_certpass = NULL;
gboolean external_ui_mode = FALSE;
NMSettingSecretFlags pw_flags = NM_SETTING_SECRET_FLAG_NONE;
NMSettingSecretFlags cp_flags = NM_SETTING_SECRET_FLAG_NONE;
GOptionContext *context;
......@@ -256,6 +314,7 @@ main (int argc, char *argv[])
{ "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 }
};
......@@ -288,7 +347,21 @@ main (int argc, char *argv[])
get_password_types (data, &need_password, &need_certpass);
if (!need_password && !need_certpass) {
printf ("%s\n%s\n\n\n", NM_OPENVPN_KEY_NOSECRET, "true");
if (external_ui_mode) {
GKeyFile *keyfile;
keyfile = g_key_file_new ();
g_key_file_set_integer (keyfile, UI_KEYFILE_GROUP, "Version", 2);
keyfile_add_entry_info (keyfile, NM_OPENVPN_KEY_NOSECRET, "true", "", TRUE, FALSE);
keyfile_print_stdout (keyfile);
g_key_file_unref (keyfile);
} else {
/* The older protocol */
printf ("%s\n%s\n\n\n", NM_OPENVPN_KEY_NOSECRET, "true");
}
return 0;
}
......@@ -300,6 +373,7 @@ main (int argc, char *argv[])
need_certpass,
retry,
allow_interaction,
external_ui_mode,
g_hash_table_lookup (secrets, NM_OPENVPN_KEY_PASSWORD),
pw_flags,
&new_password,
......@@ -308,22 +382,24 @@ main (int argc, char *argv[])
&new_certpass))
return 1; /* canceled */
if (need_password && new_password)
printf ("%s\n%s\n", NM_OPENVPN_KEY_PASSWORD, new_password);
if (need_certpass && new_certpass)
printf ("%s\n%s\n", NM_OPENVPN_KEY_CERTPASS, new_certpass);
printf ("\n\n");
if (!external_ui_mode) {
if (need_password && new_password)
printf ("%s\n%s\n", NM_OPENVPN_KEY_PASSWORD, new_password);
if (need_certpass && new_certpass)
printf ("%s\n%s\n", NM_OPENVPN_KEY_CERTPASS, new_certpass);
printf ("\n\n");
if (new_password)
gnome_keyring_memory_free (new_password);
if (new_certpass)
gnome_keyring_memory_free (new_certpass);
if (new_password)
gnome_keyring_memory_free (new_password);
if (new_certpass)
gnome_keyring_memory_free (new_certpass);
/* 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);
......
......@@ -281,6 +281,7 @@ vpn_password_dialog_new (const char *title,
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);
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for NetworkManager-openvpn 0.9.2.0.
# Generated by GNU Autoconf 2.68 for NetworkManager-openvpn 0.9.4.0.
#
# Report bugs to <dcbw@redhat.com>.
#
......@@ -570,8 +570,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='NetworkManager-openvpn'
PACKAGE_TARNAME='NetworkManager-openvpn'
PACKAGE_VERSION='0.9.2.0'
PACKAGE_STRING='NetworkManager-openvpn 0.9.2.0'
PACKAGE_VERSION='0.9.4.0'
PACKAGE_STRING='NetworkManager-openvpn 0.9.4.0'
PACKAGE_BUGREPORT='dcbw@redhat.com'
PACKAGE_URL=''
......@@ -1369,7 +1369,7 @@ if test "$ac_init_help" = "long"; then
# 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-openvpn 0.9.2.0 to adapt to many kinds of systems.
\`configure' configures NetworkManager-openvpn 0.9.4.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1440,7 +1440,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of NetworkManager-openvpn 0.9.2.0:";;
short | recursive ) echo "Configuration of NetworkManager-openvpn 0.9.4.0:";;
esac
cat <<\_ACEOF
......@@ -1458,7 +1458,7 @@ Optional Features:
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]
......@@ -1571,7 +1571,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
NetworkManager-openvpn configure 0.9.2.0
NetworkManager-openvpn configure 0.9.4.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
......@@ -1994,7 +1994,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by NetworkManager-openvpn $as_me 0.9.2.0, which was
It was created by NetworkManager-openvpn $as_me 0.9.4.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
......@@ -2809,7 +2809,7 @@ fi
# Define the identity of the package.
PACKAGE='NetworkManager-openvpn'
VERSION='0.9.2.0'
VERSION='0.9.4.0'
cat >>confdefs.h <<_ACEOF
......@@ -13511,21 +13511,21 @@ if test -n "$NM_CFLAGS"; then
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
......@@ -13536,21 +13536,21 @@ if test -n "$NM_LIBS"; then
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
......@@ -13570,23 +13570,23 @@ else
_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
......@@ -14182,7 +14182,7 @@ fi
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
......@@ -14190,7 +14190,7 @@ $as_echo_n "checking for more warnings... " >&6; }
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 \
......@@ -14226,6 +14226,9 @@ $as_echo "$has_option" >&6; }
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; }
......@@ -14823,7 +14826,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by NetworkManager-openvpn $as_me 0.9.2.0, which was
This file was extended by NetworkManager-openvpn $as_me 0.9.4.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -14889,7 +14892,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
NetworkManager-openvpn config.status 0.9.2.0
NetworkManager-openvpn config.status 0.9.4.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
......
AC_PREREQ(2.52)
AC_INIT(NetworkManager-openvpn, 0.9.2.0, dcbw@redhat.com, NetworkManager-openvpn)
AC_INIT(NetworkManager-openvpn, 0.9.4.0, dcbw@redhat.com, NetworkManager-openvpn)
AM_INIT_AUTOMAKE([1.9 subdir-objects tar-ustar no-dist-gzip dist-bzip2])
AM_MAINTAINER_MODE
......@@ -66,10 +66,10 @@ AC_SUBST(DBUS_CFLAGS)
AC_SUBST(DBUS_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)
......
......@@ -8050,7 +8050,7 @@ EOF
elif test -n "$runpath_var"; then
case "$perm_rpath " in
*" $libdir "*) ;;
*) func_apped perm_rpath " $libdir" ;;
*) func_append perm_rpath " $libdir" ;;
esac
fi
done
......
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 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
unset SAVE_CFLAGS
done
unset option
if test "x$set_more_warnings" = xerror; then
CFLAGS="$CFLAGS -Werror"
fi
else
AC_MSG_RESULT(no)
fi
......
......@@ -6,4 +6,5 @@ program=@LIBEXECDIR@/nm-openvpn-service
[GNOME]
auth-dialog=nm-openvpn-auth-dialog
properties=libnm-openvpn-properties
supports-external-ui-mode=true
......@@ -12,6 +12,7 @@ de
dz
el
en_GB
eo
es
et
eu
......
This diff is collapsed.
......@@ -12,9 +12,9 @@ msgstr ""
"Project-Id-Version: network-manager-openvpn master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=NetworkManager&keywords=I18N+L10N&component=VPN: openvpn\n"
"POT-Creation-Date: 2011-11-02 11:21+0000\n"
"PO-Revision-Date: 2011-11-06 21:36+0100\n"
"Last-Translator: Christian Kirbach <Christian.Kirbach@googlemail.com>\n"
"POT-Creation-Date: 2011-11-06 20:52+0000\n"
"PO-Revision-Date: 2011-11-18 20:18+0100\n"
"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
"Language-Team: Deutsch <gnome-de@gnome.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
......@@ -204,8 +204,8 @@ msgstr ""
#: ../properties/nm-openvpn-dialog.ui.h:7
msgid ""
"<i>Select this option if your organization requires the use of a proxy "
"server to access the Internet.</i>"
"<i>Select this option if your organization requires the use of a proxy server "
"to access the Internet.</i>"
msgstr ""
"<i>Wählen Sie diese Option, falls in Ihrer Organisation ein Proxy-Server zum "
"Zugriff auf das Internet notwendig ist.</i>"
......@@ -238,9 +238,11 @@ msgstr "Zusätzliche Ebene zur HMAC-Legitimierung hinzufügen."
#: ../properties/nm-openvpn-dialog.ui.h:12
msgid ""
"Authenticate packets with HMAC using message digest algorithm. The default "
"is SHA1.&#10;config: auth"
"Authenticate packets with HMAC using message digest algorithm. The default is "
"SHA1.&#10;config: auth"
msgstr ""
"Pakete mit HMAC mittels Nachrichtenzusammenfassungs-Algorithmus legitimieren. "
"Vorgabe ist SHA1.&#10;config: auth"
#: ../properties/nm-openvpn-dialog.ui.h:13
msgid "CA Certificate:"
......@@ -264,16 +266,16 @@ msgstr ""
#: ../properties/nm-openvpn-dialog.ui.h:17
msgid ""
"Connect to remote host through a proxy with this port.&#10;config: http-"
"proxy or socks-proxy"
"Connect to remote host through a proxy with this port.&#10;config: http-proxy "
"or socks-proxy"
msgstr ""
"Zum entfernten Rechner über einen Proxy mit diesem Port verbinden.&#10;"
"config: http-proxy oder socks-proxy"
#: ../properties/nm-openvpn-dialog.ui.h:18
msgid ""
"Direction for Static Key encryption mode (non-TLS).&#10;config: static "
"<file> [direction]"
"Direction for Static Key encryption mode (non-TLS).&#10;config: static <file> "
"[direction]"
msgstr ""
"Richtung für den Verschlüsselungsmodus des statischen Schlüssels (Nicht-TLS)."
"&#10;config: static <Datei> [Richtung]"
......@@ -345,8 +347,7 @@ msgstr "Lokale IP-Adresse:"
#: ../properties/nm-openvpn-dialog.ui.h:31
msgid "Local peer's private key in .pem format.&#10;config: key"
msgstr ""
"Privater Schlüssel des lokalen Rechners im .pem-Format.&#10;config: key"
msgstr "Privater Schlüssel des lokalen Rechners im .pem-Format.&#10;config: key"
#: ../properties/nm-openvpn-dialog.ui.h:32
msgid ""
......@@ -384,6 +385,8 @@ msgid ""
"Pre-shared file for Static Key encryption mode (non-TLS).&#10;config: static "
"<file>"
msgstr ""
"Voreingestellte Datei für Verschlüsselungsmodus des statischen Schlüssels "
"(Nicht-TLS).&#10;config: static <file>"
#: ../properties/nm-openvpn-dialog.ui.h:40
msgid "Private Key Password:"
......@@ -439,8 +442,8 @@ msgstr "Maximale TCP-Segmentgröße (MSS) des Tunnels einschränken"
#: ../properties/nm-openvpn-dialog.ui.h:52
msgid ""
"Retry indefinitely on proxy errors. It simulates a SIGUSR1 reset.&#10;"
"config: http-proxy-retry or socks-proxy-retry"
"Retry indefinitely on proxy errors. It simulates a SIGUSR1 reset.&#10;config: "
"http-proxy-retry or socks-proxy-retry"
msgstr ""
"Bei Proxy-Fehlern auf unbestimmte Zeit erneut versuchen, wodurch ein SIGUSR1-"
"Reset simuliert wird.&#10;config: http-proxy-retry or socks-proxy-retry"
......@@ -502,16 +505,14 @@ msgid "Use L_ZO data compression"
msgstr "L_ZO-Komprimierung verwenden"
#: ../properties/nm-openvpn-dialog.ui.h:66
msgid ""
"Use TAP virtual network device instead of TUN.&#10;config: dev tap | tun"
msgid "Use TAP virtual network device instead of TUN.&#10;config: dev tap | tun"
msgstr ""
"Virtuelles TAP-Netzwerkgerät anstelle von TUN verwenden.&#10;config: dev tap "
"| tun"
#: ../properties/nm-openvpn-dialog.ui.h:67
msgid ""
"Use TCP for communicating with remote host.&#10;config: proto tcp-client | "
"udp"
"Use TCP for communicating with remote host.&#10;config: proto tcp-client | udp"
msgstr ""
"TCP zur Kommunikation mit der Gegenstelle verwenden.&#10;config: proto tcp-"
"client | udp"
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -211,6 +211,7 @@ validate_one_property (const char *key, const char *value, gpointer user_data)
g_set_error (info->error,
NM_VPN_PLUGIN_ERROR,
NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
/* Translators: keep "yes" and "no" untranslated! */
_("invalid boolean property '%s' (not yes or no)"),
key);
break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment