Hello community,
here is the log from the commit of package NetworkManager-openvpn for openSUSE:Factory
checked in at Fri Mar 5 11:41:44 CET 2010.
--------
--- NetworkManager-openvpn/NetworkManager-openvpn.changes 2010-01-30 23:40:52.000000000 +0100
+++ /mounts/work_src_done/STABLE/NetworkManager-openvpn/NetworkManager-openvpn.changes 2010-02-23 11:55:30.000000000 +0100
@@ -1,0 +2,9 @@
+Tue Feb 23 09:08:09 CET 2010 - dimstar@opensuse.org
+
+- Update to version 0.8:
+ + build: disabled .desktop for now
+ + bgo#606998 - core: handle remote VPN peer correctly in share
+ key mode too
+ + Updated translations.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
NetworkManager-openvpn-0.7.999.tar.bz2
New:
----
NetworkManager-openvpn-0.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager-openvpn.spec ++++++
--- /var/tmp/diff_new_pack.gDWaMk/_old 2010-03-05 11:40:37.000000000 +0100
+++ /var/tmp/diff_new_pack.gDWaMk/_new 2010-03-05 11:40:37.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package NetworkManager-openvpn (Version 0.7.999)
+# spec file for package NetworkManager-openvpn (Version 0.8)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -24,8 +24,9 @@
%define prefix %{_prefix}
%define sysconfdir %{_sysconfdir}
Summary: NetworkManager VPN support for OpenVPN
-Version: 0.7.999
+Version: 0.8
Release: 1
+# FIXME .desktop icons are currently disabled (on purpose) in the NM tarballs. They will re-appear later on (when nmce supports --import)
License: GPLv2+
Group: Productivity/Networking/System
Url: http://www.gnome.org/projects/NetworkManager
@@ -40,12 +41,6 @@
NetworkManager-openvpn provides VPN support to NetworkManager for
OpenVPN.
-
-
-Authors:
---------
- Tim Niemueller
-
%package gnome
License: GPLv2+
Summary: NetworkManager VPN support for OpenVPN
@@ -58,12 +53,6 @@
NetworkManager-openvpn provides VPN support to NetworkManager for
OpenVPN.
-
-
-Authors:
---------
- Tim Niemueller
-
%prep
%setup -n %{name}-%{version}
%patch0 -p1
@@ -83,10 +72,11 @@
rm $RPM_BUILD_ROOT%{_libdir}/NetworkManager/*.la
# FIXME: There is no MIME type definition for application/x-openvpn-settings in /usr/share/mime/packages.
# Without it, MIME icon has no effect.
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/mimetypes
-mv $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-openvpn-settings.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/mimetypes/
-cp nm-openvpn-settings.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/
-%suse_update_desktop_file nm-openvpn GNOME Network Monitor Applet
+#mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/mimetypes
+#mv $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-openvpn-settings.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/mimetypes/
+install -D nm-openvpn-settings.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/nm-openvpn-settings.png
+# FIXME .desktop icons are currently disabled (on purpose) in the NM tarballs. They will re-appear later on (when nmce supports --import)
+# %%suse_update_desktop_file nm-openvpn GNOME Network Monitor Applet
%clean
rm -rf $RPM_BUILD_ROOT
@@ -108,7 +98,8 @@
%defattr(-,root,root,-)
%{_libdir}/NetworkManager/libnm-openvpn-properties.so*
%{_libexecdir}/nm-openvpn-auth-dialog
-%{_datadir}/applications/nm-openvpn.desktop
+# FIXME .desktop icons are currently disabled (on purpose) in the NM tarballs. They will re-appear later on (when nmce supports --import)
+#%{_datadir}/applications/nm-openvpn.desktop
%{_datadir}/gnome-vpn-properties
%{_datadir}/icons/hicolor/*/*/*.png
++++++ NetworkManager-openvpn-0.7.999.tar.bz2 -> NetworkManager-openvpn-0.8.tar.bz2 ++++++
++++ 1850 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/NetworkManager-openvpn-0.7.999/configure.ac new/NetworkManager-openvpn-0.8/configure.ac
--- old/NetworkManager-openvpn-0.7.999/configure.ac 2010-01-22 00:20:35.000000000 +0100
+++ new/NetworkManager-openvpn-0.8/configure.ac 2010-02-18 17:20:16.000000000 +0100
@@ -1,6 +1,6 @@
AC_PREREQ(2.52)
-AC_INIT(NetworkManager-openvpn, 0.7.999, dcbw@redhat.com, NetworkManager-openvpn)
+AC_INIT(NetworkManager-openvpn, 0.8, dcbw@redhat.com, NetworkManager-openvpn)
AM_INIT_AUTOMAKE([1.9 subdir-objects tar-ustar no-dist-gzip dist-bzip2])
AM_MAINTAINER_MODE
@@ -65,7 +65,7 @@
AC_SUBST(DBUS_CFLAGS)
AC_SUBST(DBUS_LIBS)
-PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= 0.7.999 libnm-util >= 0.7.999 libnm-glib libnm-glib-vpn)
+PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= 0.8 libnm-util >= 0.8 libnm-glib libnm-glib-vpn)
AC_SUBST(NETWORK_MANAGER_CFLAGS)
AC_SUBST(NETWORK_MANAGER_LIBS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/NetworkManager-openvpn-0.7.999/m4/ltversion.m4 new/NetworkManager-openvpn-0.8/m4/ltversion.m4
--- old/NetworkManager-openvpn-0.7.999/m4/ltversion.m4 2009-07-13 15:57:13.000000000 +0200
+++ new/NetworkManager-openvpn-0.8/m4/ltversion.m4 2010-02-02 23:52:05.000000000 +0100
@@ -9,15 +9,15 @@
# Generated from ltversion.in.
-# serial 3012 ltversion.m4
+# serial 3017 ltversion.m4
# This file is part of GNU Libtool
-m4_define([LT_PACKAGE_VERSION], [2.2.6])
-m4_define([LT_PACKAGE_REVISION], [1.3012])
+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
+m4_define([LT_PACKAGE_REVISION], [1.3017])
AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.6'
-macro_revision='1.3012'
+[macro_version='2.2.6b'
+macro_revision='1.3017'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/NetworkManager-openvpn-0.7.999/Makefile.am new/NetworkManager-openvpn-0.8/Makefile.am
--- old/NetworkManager-openvpn-0.7.999/Makefile.am 2009-10-30 21:52:22.000000000 +0100
+++ new/NetworkManager-openvpn-0.8/Makefile.am 2010-02-03 00:00:16.000000000 +0100
@@ -12,14 +12,18 @@
nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN
nmvpnservice_DATA = nm-openvpn-service.name
+desktopfile = nm-openvpn.desktop.in
+iconfile = gnome-mime-application-x-openvpn-settings.png
+
if WITH_GNOME
-desktopdir = $(datadir)/applications
-desktop_in_files = nm-openvpn.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-@INTLTOOL_DESKTOP_RULE@
+# FIXME: uncomment when nmce gets --import support
+#desktopdir = $(datadir)/applications
+#desktop_in_files = $(desktopfile)
+#desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+#@INTLTOOL_DESKTOP_RULE@
-icondir = $(datadir)/icons/hicolor/48x48/apps
-icon_DATA = gnome-mime-application-x-openvpn-settings.png
+#icondir = $(datadir)/icons/hicolor/48x48/apps
+#icon_DATA = $(iconfile)
endif
nm-openvpn-service.name: $(srcdir)/nm-openvpn-service.name.in
@@ -27,8 +31,8 @@
EXTRA_DIST = nm-openvpn-service.name.in \
$(dbusservice_DATA) \
- $(desktop_in_files) \
- $(icon_DATA) \
+ $(desktopfile) \
+ $(iconfile) \
intltool-extract.in \
intltool-merge.in \
intltool-update.in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/NetworkManager-openvpn-0.7.999/po/cs.po new/NetworkManager-openvpn-0.8/po/cs.po
--- old/NetworkManager-openvpn-0.7.999/po/cs.po 2009-04-20 13:09:39.000000000 +0200
+++ new/NetworkManager-openvpn-0.8/po/cs.po 2010-02-16 04:24:31.000000000 +0100
@@ -3,20 +3,24 @@
# This file is distributed under the same license as the NetworkManager-openvpn package.
# Jakub Friedl , 2006.
# Jiří Eischmann , 2008.
-# Zdeněk Hataš , 2009.
+# Zdeněk Hataš , 2009, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: NetworkManager-openvpn\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-12 19:25+0100\n"
-"PO-Revision-Date: 2009-03-08 10:31+0100\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=NetworkManager&component=VPN: openvpn\n"
+"POT-Creation-Date: 2010-02-04 21:44+0000\n"
+"PO-Revision-Date: 2010-02-03 10:43+0100\n"
"Last-Translator: Zdeněk Hataš \n"
"Language-Team: Czech \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Poedit-Language: Czech\n"
+"X-Poedit-Country: CZECH REPUBLIC\n"
+"X-Poedit-SourceCharset: utf-8\n"
#: ../auth-dialog/gnome-two-password-dialog.c:130
msgid "_Password:"
@@ -83,28 +87,28 @@
msgid "Choose an OpenVPN static key..."
msgstr "Zvolit statický klíč OpenVPN..."
-#: ../properties/auth-helpers.c:274 ../properties/auth-helpers.c:901
-#: ../properties/auth-helpers.c:1054
+#: ../properties/auth-helpers.c:274 ../properties/auth-helpers.c:950
+#: ../properties/auth-helpers.c:1133
msgid "None"
msgstr "Žádný"
-#: ../properties/auth-helpers.c:654
+#: ../properties/auth-helpers.c:691
msgid "PEM certificates (*.pem, *.crt, *.key, *.cer)"
msgstr "Certifikáty PEM (*.pem, *.crt, *.key, *.cer)"
-#: ../properties/auth-helpers.c:714
+#: ../properties/auth-helpers.c:751
msgid "OpenVPN Static Keys (*.key)"
msgstr "Statické klíče OpenVPN (*.key)"
-#: ../properties/auth-helpers.c:823 ../properties/auth-helpers.c:893
+#: ../properties/auth-helpers.c:872 ../properties/auth-helpers.c:942
msgid "Default"
msgstr "Výchozí"
-#: ../properties/auth-helpers.c:903
+#: ../properties/auth-helpers.c:952
msgid "MD-5"
msgstr "MD-5"
-#: ../properties/auth-helpers.c:905
+#: ../properties/auth-helpers.c:954
msgid "SHA-1"
msgstr "SHA-1"
@@ -146,6 +150,14 @@
#: ../properties/nm-openvpn-dialog.glade.h:4
msgid ""
+"<i>Connect only to servers whose certificate matches the given subject.\n"
+"Example: /CN=myvpn.company.com</i>"
+msgstr ""
+"<i>Připojit pouze k serverům, jejichž certifikát odpovídá danému subjektu.\n"
+"Příklad: /CN=myvpn.company.com</i>"
+
+#: ../properties/nm-openvpn-dialog.glade.h:6
+msgid ""
"<i>If key direction is used, it must be the opposite of that used on the VPN "
"peer. For example, if the peer uses '1', this connection must use '0'. If "
"you are unsure what value to use, contact your system administrator.</i>"
@@ -154,102 +166,115 @@
"když protějšek používá '1', toto připojení musí použít '0'. Pokud si nejste "
"jisti, jakou hodnotu použít, kontaktujte administrátora svého systému.</i>"
-#: ../properties/nm-openvpn-dialog.glade.h:5
+#: ../properties/nm-openvpn-dialog.glade.h:7
msgid "Ad_vanced..."
msgstr "P_okročilé..."
-#: ../properties/nm-openvpn-dialog.glade.h:6
+#: ../properties/nm-openvpn-dialog.glade.h:8
msgid "CA Certificate:"
msgstr "Certifikát CA:"
-#: ../properties/nm-openvpn-dialog.glade.h:7
+#: ../properties/nm-openvpn-dialog.glade.h:9
msgid "Cipher:"
msgstr "Šifra:"
-#: ../properties/nm-openvpn-dialog.glade.h:8
+#: ../properties/nm-openvpn-dialog.glade.h:10
msgid "General"
msgstr "Obecné"
-#: ../properties/nm-openvpn-dialog.glade.h:9
+#: ../properties/nm-openvpn-dialog.glade.h:11
msgid "HMAC Authentication:"
msgstr "Autentizace HMAC:"
-#: ../properties/nm-openvpn-dialog.glade.h:10
+#: ../properties/nm-openvpn-dialog.glade.h:12
msgid "Key Direction:"
msgstr "Směr klíče:"
-#: ../properties/nm-openvpn-dialog.glade.h:11
+#: ../properties/nm-openvpn-dialog.glade.h:13
msgid "Key File:"
msgstr "Soubor klíče:"
-#: ../properties/nm-openvpn-dialog.glade.h:12
+#: ../properties/nm-openvpn-dialog.glade.h:14
msgid "Local IP Address:"
msgstr "Místní IP adresa:"
-#: ../properties/nm-openvpn-dialog.glade.h:13
+#: ../properties/nm-openvpn-dialog.glade.h:15
msgid "OpenVPN Advanced Options"
msgstr "Pokročilé volby OpenVPN"
-#: ../properties/nm-openvpn-dialog.glade.h:14
+#: ../properties/nm-openvpn-dialog.glade.h:16
msgid "Password:"
msgstr "Heslo:"
-#: ../properties/nm-openvpn-dialog.glade.h:15
+#: ../properties/nm-openvpn-dialog.glade.h:17
msgid "Private Key Password:"
msgstr "Heslo soukromého klíče:"
-#: ../properties/nm-openvpn-dialog.glade.h:16
+#: ../properties/nm-openvpn-dialog.glade.h:18
msgid "Private Key:"
msgstr "Soukromý klíč:"
-#: ../properties/nm-openvpn-dialog.glade.h:17
+#: ../properties/nm-openvpn-dialog.glade.h:19
+msgid "Remote IP Address:"
+msgstr "Vzdálená adresa IP:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:20
msgid "Security"
msgstr "Zabezpečení"
-#: ../properties/nm-openvpn-dialog.glade.h:18
+#: ../properties/nm-openvpn-dialog.glade.h:21
msgid "Show passwords"
msgstr "Zobrazit hesla"
-#: ../properties/nm-openvpn-dialog.glade.h:19
+#: ../properties/nm-openvpn-dialog.glade.h:22
msgid "Static Key:"
msgstr "Statický klíč:"
-#: ../properties/nm-openvpn-dialog.glade.h:20
+#: ../properties/nm-openvpn-dialog.glade.h:23
+msgid "Subject Match:"
+msgstr "Subjekt odpovídá:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:24
msgid "TLS Authentication"
msgstr "Autentizace TLS"
-#: ../properties/nm-openvpn-dialog.glade.h:21
+#: ../properties/nm-openvpn-dialog.glade.h:25
msgid "Type:"
msgstr "Typ:"
-#: ../properties/nm-openvpn-dialog.glade.h:22
+#: ../properties/nm-openvpn-dialog.glade.h:26
msgid "Use L_ZO data compression"
msgstr "Použít kompresi L_ZO"
-#: ../properties/nm-openvpn-dialog.glade.h:23
+#: ../properties/nm-openvpn-dialog.glade.h:27
msgid "Use a TA_P device"
msgstr "Použít TA_P zařízení"
-#: ../properties/nm-openvpn-dialog.glade.h:24
+#: ../properties/nm-openvpn-dialog.glade.h:28
msgid "Use a _TCP connection"
msgstr "Použít _TCP spojení"
-#: ../properties/nm-openvpn-dialog.glade.h:25
+#: ../properties/nm-openvpn-dialog.glade.h:29
msgid "Use additional TLS authentication"
msgstr "Použít dodatečnou autentizaci TLS"
-#: ../properties/nm-openvpn-dialog.glade.h:26
+#: ../properties/nm-openvpn-dialog.glade.h:30
+msgid "Use custom _renegotiation interval:"
+msgstr "Použít vlastní interval opětovného _připojení:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:31
msgid "Use custom gateway p_ort:"
msgstr "P_oužít vlastní port brány:"
-#: ../properties/nm-openvpn-dialog.glade.h:27
+#: ../properties/nm-openvpn-dialog.glade.h:32
msgid "User Certificate:"
msgstr "Uživatelský certifikát:"
-#: ../properties/nm-openvpn-dialog.glade.h:28
+#: ../properties/nm-openvpn-dialog.glade.h:33
msgid "User name:"
msgstr "Uživatelské jméno:"
-#: ../properties/nm-openvpn-dialog.glade.h:29
+#: ../properties/nm-openvpn-dialog.glade.h:34
msgid "_Gateway:"
msgstr "_Brána:"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/NetworkManager-openvpn-0.7.999/po/et.po new/NetworkManager-openvpn-0.8/po/et.po
--- old/NetworkManager-openvpn-0.7.999/po/et.po 2010-01-18 09:48:16.000000000 +0100
+++ new/NetworkManager-openvpn-0.8/po/et.po 2010-02-16 04:24:31.000000000 +0100
@@ -5,15 +5,15 @@
#
# Priit Laes , 2007.
# Ivar Smolin , 2007.
-# Mattias Põldaru , 2007-2009.
+# Mattias Põldaru <mahfiaz gmail com>, 2007-2010.
#
msgid ""
msgstr ""
"Project-Id-Version: NetworkManager-openvpn\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=NetworkManager&component=VPN: openvpn\n"
-"POT-Creation-Date: 2009-10-30 07:33+0000\n"
-"PO-Revision-Date: 2009-11-01 18:53+0300\n"
+"POT-Creation-Date: 2010-02-11 01:28+0000\n"
+"PO-Revision-Date: 2010-02-13 00:24+0300\n"
"Last-Translator: Mattias Põldaru <mahfiaz gmail com>\n"
"Language-Team: Estonian \n"
"MIME-Version: 1.0\n"
@@ -115,6 +115,14 @@
msgstr "<b>Üldine</b>"
msgid ""
+"<i>Connect only to servers whose certificate matches the given subject.\n"
+"Example: /CN=myvpn.company.com</i>"
+msgstr ""
+"<i>Ühendus luuakse ainult serveriga, mille sertifikaat kattub määratud "
+"nimega.\n"
+"Näiteks: /CN=myvpn.kompanii.com</i>"
+
+msgid ""
"<i>If key direction is used, it must be the opposite of that used on the VPN "
"peer. For example, if the peer uses '1', this connection must use '0'. If "
"you are unsure what value to use, contact your system administrator.</i>"
@@ -171,6 +179,9 @@
msgid "Static Key:"
msgstr "Püsivõti:"
+msgid "Subject Match:"
+msgstr "Kattuv nimi:"
+
msgid "TLS Authentication"
msgstr "TLS'iga autentimine"
@@ -204,215 +215,3 @@
msgid "_Gateway:"
msgstr "_Gateway:"
-#~ msgid "Certificate Password:"
-#~ msgstr "Sertifikaadi parool:"
-
-#~ msgid "Select A File"
-#~ msgstr "Vali fail"
-
-#~ msgid "Add, Remove, and Edit VPN Connections"
-#~ msgstr "VPN-ühenduste lisamine, muutmine ja eemaldamine"
-
-#~ msgid "VPN Connection Manager (OpenVPN)"
-#~ msgstr "VPN ühenduse haldaja (OpenVPN)"
-
-#~ msgid "The following OpenVPN connection will be created:"
-#~ msgstr "Luuakse järgnev OpenVPN ühendus:"
-
-#~ msgid "Name: %s"
-#~ msgstr "Nimi: %s"
-
-#~ msgid "Connection Type: X.509 Certificates"
-#~ msgstr "Ühenduse tüüp: X.509 Sertifikaadid"
-
-#~ msgid "CA: %s"
-#~ msgstr "CA: %s"
-
-#~ msgid "Cert: %s"
-#~ msgstr "Sertif.: %s"
-
-#~ msgid "Key: %s"
-#~ msgstr "Võti: %s"
-
-#~ msgid "Connection Type: Shared Key"
-#~ msgstr "Ühenduse tüüp: Jagatud võti"
-
-#~ msgid "Shared Key: %s"
-#~ msgstr "Jagatud võti: %s"
-
-#~ msgid "Remote IP: %s"
-#~ msgstr "Kaug-IP: %s"
-
-#~ msgid "Connection Type: Password"
-#~ msgstr "Ühenduse tüüp: parooliga"
-
-#~ msgid "Username: %s"
-#~ msgstr "Kasutajanimi: %s"
-
-#~ msgid "Connection Type: X.509 with Password Authentication"
-#~ msgstr "Ühenduse tüüp: X.509 parooliga autentimisega"
-
-#~ msgid "Remote: %s"
-#~ msgstr "Kauglogimine: %s"
-
-#~ msgid "Port: %s"
-#~ msgstr "Port: %s"
-
-#~ msgid "Device: %s"
-#~ msgstr "Seade: %s"
-
-#~ msgid "TAP"
-#~ msgstr "TAP"
-
-#~ msgid "TUN"
-#~ msgstr "TUN"
-
-#~ msgid "Protocol: %s"
-#~ msgstr "Protokoll: %s"
-
-#~ msgid "TCP"
-#~ msgstr "TCP"
-
-#~ msgid "UDP"
-#~ msgstr "UDP"
-
-#~ msgid "Routes: %s"
-#~ msgstr "Marsruudid: %s"
-
-#~ msgid "Use LZO Compression: %s"
-#~ msgstr "LZO pakkimise kasutamine: %s"
-
-#~ msgid "Yes"
-#~ msgstr "Jah"
-
-#~ msgid "TLS auth: %s %s"
-#~ msgstr "TLS autentimine: %s %s"
-
-#~ msgid "The connection details can be changed using the \"Edit\" button."
-#~ msgstr "Ühenduse üksikasju saab muuta kasutades \"Muuda\" nuppu."
-
-#~ msgid "Cannot import settings"
-#~ msgstr "Sätteid ei saa importida"
-
-#~ msgid "The VPN settings file '%s' does not contain valid data."
-#~ msgstr "VPN-seadete fail '%s' ei sisalda sobivat teavet."
-
-#~ msgid "Select file to import"
-#~ msgstr "Vali imporditav fail"
-
-#~ msgid "Select certificate to use"
-#~ msgstr "Vali kasutatav sertifikaat"
-
-#~ msgid "Select key to use"
-#~ msgstr "Vali võti"
-
-#~ msgid "Select shared key to use"
-#~ msgstr "Vali jagatud võti"
-
-#~ msgid "Select TA to use"
-#~ msgstr "Vali TA"
-
-#~ msgid "Save as..."
-#~ msgstr "Salvesta kui..."
-
-#~ msgid "A file named \"%s\" already exists."
-#~ msgstr "Fail nimega \"%s\" on juba olemas."
-
-#~ msgid "Do you want to replace it with the one you are saving?"
-#~ msgstr "Kas soovid seda salvestatava failiga asendada?"
-
-#~ msgid "Failed to export configuration"
-#~ msgstr "Tõrge seadistuste eksportimisel"
-
-#~ msgid "Failed to save file %s"
-#~ msgstr "Faili %s salvestamine nurjus"
-
-#~ msgid "65536"
-#~ msgstr "65536"
-
-#~ msgid "<i>example: 172.16.0.0/16 10.11.12.0/24</i>"
-#~ msgstr "<i>näide: 172.16.0.0/16 10.11.12.0/24</i>"
-
-#~ msgid "C_A file:"
-#~ msgstr "C_A fail:"
-
-#~ msgid "Co_nnection type:"
-#~ msgstr "Ühe_nduse tüüp:"
-
-#~ msgid "Connection na_me:"
-#~ msgstr "Üh_enduse nimi:"
-
-#~ msgid "Import _Saved Configuration..."
-#~ msgstr "_Impordi salvestatud seaded..."
-
-#~ msgid ""
-#~ "Name used to identify the connection to the private network, e.g. "
-#~ "\"Campus VPN\" or \"Corporate Network\""
-#~ msgstr "VPN-võrgu nimi, näiteks \"Kool\" või \"Ametivõrk\"."
-
-#~ msgid "Network"
-#~ msgstr "Võrk"
-
-#~ msgid "Only use _VPN connection for these addresses:"
-#~ msgstr "_Kasuta VPN-ühendust ainult nende aadresside jaoks:"
-
-#~ msgid "OpenVPN Configuration"
-#~ msgstr "OpenVPN sätted"
-
-#~ msgid ""
-#~ "Please enter the information provided by your system administrator below. "
-#~ "Do not enter your password here as you will be prompted when connecting."
-#~ msgstr ""
-#~ "Palun sisesta süsteemi administraatorilt saadud teave. Ära siia parooli "
-#~ "sisesta, seda küsitakse ühendumisel."
-
-#~ msgid ""
-#~ "Please note that the file you import is not an OpenVPN configuration "
-#~ "file. Ask your administrator for the file."
-#~ msgstr ""
-#~ "Imporditav fail ei ole OpenVPN-i seadete fail. Küsi administraatorilt "
-#~ "õiget faili."
-
-#~ msgid "Shared _key:"
-#~ msgstr "Jagatud _võti:"
-
-#~ msgid "TLS-Auth"
-#~ msgstr "TLS-Auth"
-
-#~ msgid "Use _TLS auth:"
-#~ msgstr "_TLS autentimise kasutamine:"
-
-#~ msgid "Use cip_her:"
-#~ msgstr "_Kasutatav šiffer:"
-
-#~ msgid ""
-#~ "X.509 Certificates\n"
-#~ "Pre-shared key\n"
-#~ "Password Authentication\n"
-#~ "X.509 with Password Authentication"
-#~ msgstr ""
-#~ "X.509 Sertifikaadid\n"
-#~ "Eeljagatud võti\n"
-#~ "Parooliga autentimine\n"
-#~ "X.509 parooliga autentimisega"
-
-#~ msgid "_0"
-#~ msgstr "_0"
-
-#~ msgid "_1"
-#~ msgstr "_1"
-
-#~ msgid "_Gateway address:"
-#~ msgstr "_Gateway aadress:"
-
-#~ msgid "_Key:"
-#~ msgstr "_Võti:"
-
-#~ msgid "_Local IP:"
-#~ msgstr "_Kohalik IP:"
-
-#~ msgid "_Remote IP:"
-#~ msgstr "_Kaug-IP:"
-
-#~ msgid "_none"
-#~ msgstr "_puudub"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/NetworkManager-openvpn-0.7.999/po/it.po new/NetworkManager-openvpn-0.8/po/it.po
--- old/NetworkManager-openvpn-0.7.999/po/it.po 2009-04-30 16:30:36.000000000 +0200
+++ new/NetworkManager-openvpn-0.8/po/it.po 2010-02-03 00:00:16.000000000 +0100
@@ -2,24 +2,23 @@
# Copyright (C) 2006, 2007, 2008, 2009 the NetworkManager-OpenVPN'S COPYRIGHT HOLDER
# This file is distributed under the same license as the NetworkManager-OpenVPN package.
# Francesco Marletta , 2006, 2007, 2008, 2009.
-#
+# Luca Ferretti , 2010.
msgid ""
msgstr ""
"Project-Id-Version: NetworkManager-OpenVPN 0.7.1\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&component=VPN: openvpn\n"
-"POT-Creation-Date: 2009-04-17 15:41+0000\n"
-"PO-Revision-Date: 2009-04-18 18:08+0200\n"
-"Last-Translator: Francesco Marletta \n"
-"Language-Team: italian \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-01-25 23:13+0100\n"
+"PO-Revision-Date: 2010-01-27 01:25+0100\n"
+"Last-Translator: Luca Ferretti \n"
+"Language-Team: Italian \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../auth-dialog/gnome-two-password-dialog.c:130
msgid "_Password:"
-msgstr "_Password:"
+msgstr "Pass_word:"
#: ../auth-dialog/gnome-two-password-dialog.c:131
msgid "_Secondary Password:"
@@ -53,8 +52,7 @@
#, c-format
msgid "You need to authenticate to access the Virtual Private Network '%s'."
msgstr ""
-"È necessario autenticarsi per accedere alla Rete Privata Virtuale (VPN) \"%s"
-"\"."
+"È necessario autenticarsi per accedere alla VPN (rete privata virtuale) «%s»."
#: ../auth-dialog/main.c:128
msgid "Authenticate VPN"
@@ -84,8 +82,8 @@
msgid "Choose an OpenVPN static key..."
msgstr "Scegliere una chiave statica OpenVPN..."
-#: ../properties/auth-helpers.c:274 ../properties/auth-helpers.c:938
-#: ../properties/auth-helpers.c:1091
+#: ../properties/auth-helpers.c:274 ../properties/auth-helpers.c:950
+#: ../properties/auth-helpers.c:1133
msgid "None"
msgstr "Nessuno"
@@ -97,15 +95,15 @@
msgid "OpenVPN Static Keys (*.key)"
msgstr "Chiavi statiche OpenVPN (*.key)"
-#: ../properties/auth-helpers.c:860 ../properties/auth-helpers.c:930
+#: ../properties/auth-helpers.c:872 ../properties/auth-helpers.c:942
msgid "Default"
msgstr "Predefinito"
-#: ../properties/auth-helpers.c:940
+#: ../properties/auth-helpers.c:952
msgid "MD-5"
msgstr "MD-5"
-#: ../properties/auth-helpers.c:942
+#: ../properties/auth-helpers.c:954
msgid "SHA-1"
msgstr "SHA-1"
@@ -147,116 +145,132 @@
#: ../properties/nm-openvpn-dialog.glade.h:4
msgid ""
+"<i>Connect only to servers whose certificate matches the given subject.\n"
+"Example: /CN=myvpn.company.com</i>"
+msgstr ""
+"<i>Connette solo a quei server il cui certificato corrisponde all'oggetto indicato.\n"
+"Esempio: /CN=miavpn.compagnia.com</i>"
+
+#: ../properties/nm-openvpn-dialog.glade.h:6
+msgid ""
"<i>If key direction is used, it must be the opposite of that used on the VPN "
"peer. For example, if the peer uses '1', this connection must use '0'. If "
"you are unsure what value to use, contact your system administrator.</i>"
msgstr ""
-"<i>Se la direzione della chiave è usata, deve essere opposta a quella usata "
-"sul peer della VPN. Per esempio, se il peer usa \"1\", questa connessione "
-"deve usare \"0\". Se si è incerti sul valore da usare, contattare "
-"l'amministratore di sistema.</i>"
+"<i>Se viene usata la direzione della chiave, deve essere opposta a quella "
+"usata sul peer della VPN. Per esempio, se il peer usa \"1\", questa "
+"connessione deve usare \"0\". Se si è incerti sul valore da usare, "
+"contattare l'amministratore di sistema.</i>"
# NdT: sono le preferenze avanzate
-#: ../properties/nm-openvpn-dialog.glade.h:5
+#: ../properties/nm-openvpn-dialog.glade.h:7
msgid "Ad_vanced..."
msgstr "A_vanzate..."
-#: ../properties/nm-openvpn-dialog.glade.h:6
+#: ../properties/nm-openvpn-dialog.glade.h:8
msgid "CA Certificate:"
msgstr "Certificato CA:"
-#: ../properties/nm-openvpn-dialog.glade.h:7
+#: ../properties/nm-openvpn-dialog.glade.h:9
msgid "Cipher:"
msgstr "Cifrario:"
-#: ../properties/nm-openvpn-dialog.glade.h:8
+#: ../properties/nm-openvpn-dialog.glade.h:10
msgid "General"
msgstr "Generale"
-#: ../properties/nm-openvpn-dialog.glade.h:9
+#: ../properties/nm-openvpn-dialog.glade.h:11
msgid "HMAC Authentication:"
msgstr "Autenticazione HMAC:"
-#: ../properties/nm-openvpn-dialog.glade.h:10
+#: ../properties/nm-openvpn-dialog.glade.h:12
msgid "Key Direction:"
-msgstr "Direzione chiave:"
+msgstr "Direzione della chiave:"
-#: ../properties/nm-openvpn-dialog.glade.h:11
+#: ../properties/nm-openvpn-dialog.glade.h:13
msgid "Key File:"
msgstr "File chiave:"
-#: ../properties/nm-openvpn-dialog.glade.h:12
+#: ../properties/nm-openvpn-dialog.glade.h:14
msgid "Local IP Address:"
msgstr "Indirizzo IP locale:"
-#: ../properties/nm-openvpn-dialog.glade.h:13
+#: ../properties/nm-openvpn-dialog.glade.h:15
msgid "OpenVPN Advanced Options"
msgstr "Opzioni OpenVPN avanzate"
-#: ../properties/nm-openvpn-dialog.glade.h:14
+#: ../properties/nm-openvpn-dialog.glade.h:16
msgid "Password:"
msgstr "Password:"
-#: ../properties/nm-openvpn-dialog.glade.h:15
+#: ../properties/nm-openvpn-dialog.glade.h:17
msgid "Private Key Password:"
-msgstr "Password chiave privata:"
+msgstr "Password della chiave privata:"
-#: ../properties/nm-openvpn-dialog.glade.h:16
+#: ../properties/nm-openvpn-dialog.glade.h:18
msgid "Private Key:"
msgstr "Chiave privata:"
-#: ../properties/nm-openvpn-dialog.glade.h:17
+#: ../properties/nm-openvpn-dialog.glade.h:19
msgid "Remote IP Address:"
msgstr "Indirizzo IP remoto:"
-#: ../properties/nm-openvpn-dialog.glade.h:18
+#: ../properties/nm-openvpn-dialog.glade.h:20
msgid "Security"
msgstr "Sicurezza"
-#: ../properties/nm-openvpn-dialog.glade.h:19
+#: ../properties/nm-openvpn-dialog.glade.h:21
msgid "Show passwords"
msgstr "Mostra password"
-#: ../properties/nm-openvpn-dialog.glade.h:20
+#: ../properties/nm-openvpn-dialog.glade.h:22
msgid "Static Key:"
msgstr "Chiave statica:"
-#: ../properties/nm-openvpn-dialog.glade.h:21
+#: ../properties/nm-openvpn-dialog.glade.h:23
+msgid "Subject Match:"
+msgstr "Corrispondenza per oggetto:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:24
msgid "TLS Authentication"
msgstr "Autenticazione TLS"
-#: ../properties/nm-openvpn-dialog.glade.h:22
+#: ../properties/nm-openvpn-dialog.glade.h:25
msgid "Type:"
msgstr "Tipo:"
-#: ../properties/nm-openvpn-dialog.glade.h:23
+#: ../properties/nm-openvpn-dialog.glade.h:26
msgid "Use L_ZO data compression"
-msgstr "Usare compressione L_ZO"
+msgstr "Usare la compressione L_ZO"
-#: ../properties/nm-openvpn-dialog.glade.h:24
+#: ../properties/nm-openvpn-dialog.glade.h:27
msgid "Use a TA_P device"
msgstr "Usare un device TA_P"
-#: ../properties/nm-openvpn-dialog.glade.h:25
+#: ../properties/nm-openvpn-dialog.glade.h:28
msgid "Use a _TCP connection"
msgstr "Usare una connessione _TCP"
-#: ../properties/nm-openvpn-dialog.glade.h:26
+#: ../properties/nm-openvpn-dialog.glade.h:29
msgid "Use additional TLS authentication"
msgstr "Usare autenticazione TLS aggiuntiva"
-#: ../properties/nm-openvpn-dialog.glade.h:27
+#: ../properties/nm-openvpn-dialog.glade.h:30
+msgid "Use custom _renegotiation interval:"
+msgstr "Usare un intervallo di _rinegoziazione personalizzato:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:31
msgid "Use custom gateway p_ort:"
msgstr "Usare una p_orta gateway personalizzata:"
-#: ../properties/nm-openvpn-dialog.glade.h:28
+#: ../properties/nm-openvpn-dialog.glade.h:32
msgid "User Certificate:"
msgstr "Certificato utente:"
-#: ../properties/nm-openvpn-dialog.glade.h:29
+#: ../properties/nm-openvpn-dialog.glade.h:33
msgid "User name:"
msgstr "Nome utente:"
-#: ../properties/nm-openvpn-dialog.glade.h:30
+#: ../properties/nm-openvpn-dialog.glade.h:34
msgid "_Gateway:"
msgstr "_Gateway:"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/NetworkManager-openvpn-0.7.999/po/pa.po new/NetworkManager-openvpn-0.8/po/pa.po
--- old/NetworkManager-openvpn-0.7.999/po/pa.po 2010-01-18 09:48:16.000000000 +0100
+++ new/NetworkManager-openvpn-0.8/po/pa.po 2010-02-16 04:24:31.000000000 +0100
@@ -2,14 +2,14 @@
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
#
-# A S Alam , 2007, 2009.
+# A S Alam , 2007, 2009, 2010.
msgid ""
msgstr ""
"Project-Id-Version: NetworkManager-openvpn.HEAD\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
"cgi?product=NetworkManager&component=VPN: openvpn\n"
-"POT-Creation-Date: 2009-09-28 11:36+0000\n"
-"PO-Revision-Date: 2009-10-08 09:07+0530\n"
+"POT-Creation-Date: 2010-02-04 21:44+0000\n"
+"PO-Revision-Date: 2010-02-11 06:57+0530\n"
"Last-Translator: A S Alam \n"
"Language-Team: Punjabi/Panjabi \n"
"MIME-Version: 1.0\n"
@@ -83,8 +83,8 @@
msgid "Choose an OpenVPN static key..."
msgstr "OpenVPN ਸਟੇਟਿਕ ਕੁੰਜੀ ਚੁਣੋ..."
-#: ../properties/auth-helpers.c:274 ../properties/auth-helpers.c:949
-#: ../properties/auth-helpers.c:1126
+#: ../properties/auth-helpers.c:274 ../properties/auth-helpers.c:950
+#: ../properties/auth-helpers.c:1133
msgid "None"
msgstr "ਕੋਈ ਨਹੀਂ"
@@ -96,15 +96,15 @@
msgid "OpenVPN Static Keys (*.key)"
msgstr "OpenVPN ਸਟੇਟਿਕ ਕੁੰਜੀਆਂ (*.key)"
-#: ../properties/auth-helpers.c:871 ../properties/auth-helpers.c:941
+#: ../properties/auth-helpers.c:872 ../properties/auth-helpers.c:942
msgid "Default"
msgstr "ਡਿਫਾਲਟ"
-#: ../properties/auth-helpers.c:951
+#: ../properties/auth-helpers.c:952
msgid "MD-5"
msgstr "MD-5"
-#: ../properties/auth-helpers.c:953
+#: ../properties/auth-helpers.c:954
msgid "SHA-1"
msgstr "SHA-1"
@@ -146,6 +146,14 @@
#: ../properties/nm-openvpn-dialog.glade.h:4
msgid ""
+"<i>Connect only to servers whose certificate matches the given subject.\n"
+"Example: /CN=myvpn.company.com</i>"
+msgstr ""
+"<i>ਕੇਵਲ ਸਰਵਰਾਂ ਨਾਲ ਕੁਨੈਕਟ ਕਰੋ, ਜਿਸ ਦੇ ਸਰਟੀਫਿਕੇਟ ਨਾਲ ਦਿੱਤਾ ਵਿਸ਼ਾ ਮਿਲਦਾ ਹੋਵੇ।\n"
+"ਜਿਵੇਂ: /CN=myvpn.company.com</i>"
+
+#: ../properties/nm-openvpn-dialog.glade.h:6
+msgid ""
"<i>If key direction is used, it must be the opposite of that used on the VPN "
"peer. For example, if the peer uses '1', this connection must use '0'. If "
"you are unsure what value to use, contact your system administrator.</i>"
@@ -154,111 +162,115 @@
"ਪੀਅਰ '1' ਵਰਤਦਾ ਹੈ ਤਾਂ ਇਹ ਕੁਨੈਕਸ਼ਨ '0' ਵਰਤਦਾ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ। ਜੇ ਤੁਸੀਂ ਇਸ ਦੇ ਮੁੱਲ ਵਰਤਣ ਬਾਰੇ "
"ਯਕੀਨੀ ਨਹੀਂ ਹੋ ਤਾਂ ਆਪਣੇ ਪਰਸ਼ਾਸ਼ਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।</i>"
-#: ../properties/nm-openvpn-dialog.glade.h:5
+#: ../properties/nm-openvpn-dialog.glade.h:7
msgid "Ad_vanced..."
msgstr "ਮਾਹਰ(_v)..."
-#: ../properties/nm-openvpn-dialog.glade.h:6
+#: ../properties/nm-openvpn-dialog.glade.h:8
msgid "CA Certificate:"
msgstr "CA ਸਰਟੀਫਕੇਟ:"
-#: ../properties/nm-openvpn-dialog.glade.h:7
+#: ../properties/nm-openvpn-dialog.glade.h:9
msgid "Cipher:"
msgstr "ਸੀਫ਼ਰ:"
-#: ../properties/nm-openvpn-dialog.glade.h:8
+#: ../properties/nm-openvpn-dialog.glade.h:10
msgid "General"
msgstr "ਆਮ"
-#: ../properties/nm-openvpn-dialog.glade.h:9
+#: ../properties/nm-openvpn-dialog.glade.h:11
msgid "HMAC Authentication:"
msgstr "HMAC ਪਰਮਾਣਕਿਤਾ:"
-#: ../properties/nm-openvpn-dialog.glade.h:10
+#: ../properties/nm-openvpn-dialog.glade.h:12
msgid "Key Direction:"
msgstr "ਕੁੰਜੀ ਦਿਸ਼ਾ:"
-#: ../properties/nm-openvpn-dialog.glade.h:11
+#: ../properties/nm-openvpn-dialog.glade.h:13
msgid "Key File:"
msgstr "ਕੁੰਜੀ ਫਾਇਲ:"
-#: ../properties/nm-openvpn-dialog.glade.h:12
+#: ../properties/nm-openvpn-dialog.glade.h:14
msgid "Local IP Address:"
msgstr "ਲੋਕਲ IP ਐਡਰੈੱਸ:"
-#: ../properties/nm-openvpn-dialog.glade.h:13
+#: ../properties/nm-openvpn-dialog.glade.h:15
msgid "OpenVPN Advanced Options"
msgstr "OpenVPN ਮਾਹਰ ਚੋਣਾਂ"
-#: ../properties/nm-openvpn-dialog.glade.h:14
+#: ../properties/nm-openvpn-dialog.glade.h:16
msgid "Password:"
msgstr "ਪਾਸਵਰਡ:"
-#: ../properties/nm-openvpn-dialog.glade.h:15
+#: ../properties/nm-openvpn-dialog.glade.h:17
msgid "Private Key Password:"
msgstr "ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ ਪਾਸਵਰਡ:"
-#: ../properties/nm-openvpn-dialog.glade.h:16
+#: ../properties/nm-openvpn-dialog.glade.h:18
msgid "Private Key:"
msgstr "ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ:"
-#: ../properties/nm-openvpn-dialog.glade.h:17
+#: ../properties/nm-openvpn-dialog.glade.h:19
msgid "Remote IP Address:"
msgstr "ਰਿਮੋਟ IP ਐਡਰੈੱਸ:"
-#: ../properties/nm-openvpn-dialog.glade.h:18
+#: ../properties/nm-openvpn-dialog.glade.h:20
msgid "Security"
msgstr "ਸੁਰੱਖਿਆ"
-#: ../properties/nm-openvpn-dialog.glade.h:19
+#: ../properties/nm-openvpn-dialog.glade.h:21
msgid "Show passwords"
msgstr "ਪਾਸਵਰਡ ਵੇਖੋ"
-#: ../properties/nm-openvpn-dialog.glade.h:20
+#: ../properties/nm-openvpn-dialog.glade.h:22
msgid "Static Key:"
msgstr "ਸਟੇਟਿਕ ਕੁੰਜੀ:"
-#: ../properties/nm-openvpn-dialog.glade.h:21
+#: ../properties/nm-openvpn-dialog.glade.h:23
+msgid "Subject Match:"
+msgstr "ਵਿਸ਼ਾ ਮਿਲਦਾ:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:24
msgid "TLS Authentication"
msgstr "TLS ਪਰਮਾਣਕਿਤਾ"
-#: ../properties/nm-openvpn-dialog.glade.h:22
+#: ../properties/nm-openvpn-dialog.glade.h:25
msgid "Type:"
msgstr "ਟਾਈਪ:"
-#: ../properties/nm-openvpn-dialog.glade.h:23
+#: ../properties/nm-openvpn-dialog.glade.h:26
msgid "Use L_ZO data compression"
msgstr "L_ZO ਡਾਟਾ ਕੰਪਰੈਸ਼ਨ ਵਰਤੋਂ"
-#: ../properties/nm-openvpn-dialog.glade.h:24
+#: ../properties/nm-openvpn-dialog.glade.h:27
msgid "Use a TA_P device"
msgstr "TA_P ਜੰਤਰ ਵਰਤੋਂ"
-#: ../properties/nm-openvpn-dialog.glade.h:25
+#: ../properties/nm-openvpn-dialog.glade.h:28
msgid "Use a _TCP connection"
msgstr "_TCP ਕੁਨੈਕਸ਼ਨ ਵਰਤੋਂ"
-#: ../properties/nm-openvpn-dialog.glade.h:26
+#: ../properties/nm-openvpn-dialog.glade.h:29
msgid "Use additional TLS authentication"
msgstr "ਹੋਰ TLS ਪਰਮਾਣਕਿਤਾ ਵਰਤੋਂ"
-#: ../properties/nm-openvpn-dialog.glade.h:27
+#: ../properties/nm-openvpn-dialog.glade.h:30
msgid "Use custom _renegotiation interval:"
msgstr "ਪਸੰਦੀਦਾ ਰੀਨੈਗੋਸ਼ੀਏਸ਼ਨ ਅੰਤਰਾਲ ਵਰਤੋਂ(_r):"
-#: ../properties/nm-openvpn-dialog.glade.h:28
+#: ../properties/nm-openvpn-dialog.glade.h:31
msgid "Use custom gateway p_ort:"
msgstr "ਕਸਟਮ ਗੇਟਵੇ ਪੋਰਟ ਵਰਤੋਂ(_o):"
-#: ../properties/nm-openvpn-dialog.glade.h:29
+#: ../properties/nm-openvpn-dialog.glade.h:32
msgid "User Certificate:"
msgstr "ਯੂਜ਼ਰ ਸਰਟੀਫਕੇਟ:"
-#: ../properties/nm-openvpn-dialog.glade.h:30
+#: ../properties/nm-openvpn-dialog.glade.h:33
msgid "User name:"
msgstr "ਯੂਜ਼ਰ ਨਾਂ:"
-#: ../properties/nm-openvpn-dialog.glade.h:31
+#: ../properties/nm-openvpn-dialog.glade.h:34
msgid "_Gateway:"
msgstr "ਗੇਟਵੇ(_G):"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/NetworkManager-openvpn-0.7.999/po/sv.po new/NetworkManager-openvpn-0.8/po/sv.po
--- old/NetworkManager-openvpn-0.7.999/po/sv.po 2010-01-18 09:48:16.000000000 +0100
+++ new/NetworkManager-openvpn-0.8/po/sv.po 2010-02-16 04:24:31.000000000 +0100
@@ -1,7 +1,7 @@
# Swedish messages for NetworkManager openvpn.
-# Copyright (C) 2004, 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 Free Software Foundation, Inc.
# Christian Rose , 2004, 2005, 2006.
-# Daniel Nylander , 2006, 2007, 2008, 2009.
+# Daniel Nylander , 2006, 2007, 2008, 2009, 2010.
#
# $Id: sv.po,v 1.6 2006/12/10 18:35:50 dnylande Exp $
#
@@ -9,8 +9,8 @@
msgstr ""
"Project-Id-Version: NetworkManager-openvpn\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-28 23:34+0100\n"
-"PO-Revision-Date: 2009-10-28 23:34+0100\n"
+"POT-Creation-Date: 2010-02-04 22:41+0100\n"
+"PO-Revision-Date: 2010-02-04 22:42+0100\n"
"Last-Translator: Daniel Nylander \n"
"Language-Team: Swedish \n"
"MIME-Version: 1.0\n"
@@ -84,8 +84,8 @@
msgstr "Välj en statisk OpenVPN-nyckel..."
#: ../properties/auth-helpers.c:274
-#: ../properties/auth-helpers.c:949
-#: ../properties/auth-helpers.c:1126
+#: ../properties/auth-helpers.c:950
+#: ../properties/auth-helpers.c:1133
msgid "None"
msgstr "Ingen"
@@ -97,16 +97,16 @@
msgid "OpenVPN Static Keys (*.key)"
msgstr "Statiska OpenVPN-nycklar (*.key)"
-#: ../properties/auth-helpers.c:871
-#: ../properties/auth-helpers.c:941
+#: ../properties/auth-helpers.c:872
+#: ../properties/auth-helpers.c:942
msgid "Default"
msgstr "Standard"
-#: ../properties/auth-helpers.c:951
+#: ../properties/auth-helpers.c:952
msgid "MD-5"
msgstr "MD-5"
-#: ../properties/auth-helpers.c:953
+#: ../properties/auth-helpers.c:954
msgid "SHA-1"
msgstr "SHA-1"
@@ -147,114 +147,126 @@
msgstr "<b>Allmänt</b>"
#: ../properties/nm-openvpn-dialog.glade.h:4
+msgid ""
+"<i>Connect only to servers whose certificate matches the given subject.\n"
+"Example: /CN=myvpn.company.com</i>"
+msgstr ""
+"<i>Anslut endast till servrar vars certifikat matchar angiven information.\n"
+"Exempel: /CN=mittvpn.företag.se</i>"
+
+#: ../properties/nm-openvpn-dialog.glade.h:6
msgid "<i>If key direction is used, it must be the opposite of that used on the VPN peer. For example, if the peer uses '1', this connection must use '0'. If you are unsure what value to use, contact your system administrator.</i>"
msgstr "<i>Om nyckelriktning används så måste den vara motsatsen till den som används på VPN-parten. Till exempel om parten använder \"1\" måste denna anslutning vara \"0\". Om du är osäker vilket värde du ska använda kan du kontakta din systemadministratör.</i>"
-#: ../properties/nm-openvpn-dialog.glade.h:5
+#: ../properties/nm-openvpn-dialog.glade.h:7
msgid "Ad_vanced..."
msgstr "A_vancerat..."
-#: ../properties/nm-openvpn-dialog.glade.h:6
+#: ../properties/nm-openvpn-dialog.glade.h:8
msgid "CA Certificate:"
msgstr "CA-certifikat:"
-#: ../properties/nm-openvpn-dialog.glade.h:7
+#: ../properties/nm-openvpn-dialog.glade.h:9
msgid "Cipher:"
msgstr "Skiffer:"
-#: ../properties/nm-openvpn-dialog.glade.h:8
+#: ../properties/nm-openvpn-dialog.glade.h:10
msgid "General"
msgstr "Allmänt"
-#: ../properties/nm-openvpn-dialog.glade.h:9
+#: ../properties/nm-openvpn-dialog.glade.h:11
msgid "HMAC Authentication:"
msgstr "HMAC-autentisering:"
-#: ../properties/nm-openvpn-dialog.glade.h:10
+#: ../properties/nm-openvpn-dialog.glade.h:12
msgid "Key Direction:"
msgstr "Nyckelriktning:"
-#: ../properties/nm-openvpn-dialog.glade.h:11
+#: ../properties/nm-openvpn-dialog.glade.h:13
msgid "Key File:"
msgstr "Nyckelfil:"
-#: ../properties/nm-openvpn-dialog.glade.h:12
+#: ../properties/nm-openvpn-dialog.glade.h:14
msgid "Local IP Address:"
msgstr "Lokal IP-adress:"
-#: ../properties/nm-openvpn-dialog.glade.h:13
+#: ../properties/nm-openvpn-dialog.glade.h:15
msgid "OpenVPN Advanced Options"
msgstr "Avancerade alternativ för OpenVPN"
-#: ../properties/nm-openvpn-dialog.glade.h:14
+#: ../properties/nm-openvpn-dialog.glade.h:16
msgid "Password:"
msgstr "Lösenord:"
-#: ../properties/nm-openvpn-dialog.glade.h:15
+#: ../properties/nm-openvpn-dialog.glade.h:17
msgid "Private Key Password:"
msgstr "Lösenord för privat nyckel:"
-#: ../properties/nm-openvpn-dialog.glade.h:16
+#: ../properties/nm-openvpn-dialog.glade.h:18
msgid "Private Key:"
msgstr "Privat nyckel:"
-#: ../properties/nm-openvpn-dialog.glade.h:17
+#: ../properties/nm-openvpn-dialog.glade.h:19
msgid "Remote IP Address:"
msgstr "Fjärr-IP-adress:"
-#: ../properties/nm-openvpn-dialog.glade.h:18
+#: ../properties/nm-openvpn-dialog.glade.h:20
msgid "Security"
msgstr "Säkerhet"
-#: ../properties/nm-openvpn-dialog.glade.h:19
+#: ../properties/nm-openvpn-dialog.glade.h:21
msgid "Show passwords"
msgstr "Visa lösenord"
-#: ../properties/nm-openvpn-dialog.glade.h:20
+#: ../properties/nm-openvpn-dialog.glade.h:22
msgid "Static Key:"
msgstr "Statisk nyckel:"
-#: ../properties/nm-openvpn-dialog.glade.h:21
+#: ../properties/nm-openvpn-dialog.glade.h:23
+msgid "Subject Match:"
+msgstr "Matcha följande:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:24
msgid "TLS Authentication"
msgstr "TLS-autentisering"
-#: ../properties/nm-openvpn-dialog.glade.h:22
+#: ../properties/nm-openvpn-dialog.glade.h:25
msgid "Type:"
msgstr "Typ:"
-#: ../properties/nm-openvpn-dialog.glade.h:23
+#: ../properties/nm-openvpn-dialog.glade.h:26
msgid "Use L_ZO data compression"
msgstr "Använd L_ZO-datakomprimering"
-#: ../properties/nm-openvpn-dialog.glade.h:24
+#: ../properties/nm-openvpn-dialog.glade.h:27
msgid "Use a TA_P device"
msgstr "Använd en TA_P-enhet"
-#: ../properties/nm-openvpn-dialog.glade.h:25
+#: ../properties/nm-openvpn-dialog.glade.h:28
msgid "Use a _TCP connection"
msgstr "Använd en _TCP-anslutning"
-#: ../properties/nm-openvpn-dialog.glade.h:26
+#: ../properties/nm-openvpn-dialog.glade.h:29
msgid "Use additional TLS authentication"
msgstr "Använd ytterligare TLS-autentisering"
-#: ../properties/nm-openvpn-dialog.glade.h:27
+#: ../properties/nm-openvpn-dialog.glade.h:30
msgid "Use custom _renegotiation interval:"
msgstr "Använd anpassat intervall för _omförhandling:"
-#: ../properties/nm-openvpn-dialog.glade.h:28
+#: ../properties/nm-openvpn-dialog.glade.h:31
msgid "Use custom gateway p_ort:"
msgstr "Använd anpassad gatewayp_ort:"
-#: ../properties/nm-openvpn-dialog.glade.h:29
+#: ../properties/nm-openvpn-dialog.glade.h:32
msgid "User Certificate:"
msgstr "Användarcertifikat:"
-#: ../properties/nm-openvpn-dialog.glade.h:30
+#: ../properties/nm-openvpn-dialog.glade.h:33
msgid "User name:"
msgstr "Användarnamn:"
-#: ../properties/nm-openvpn-dialog.glade.h:31
+#: ../properties/nm-openvpn-dialog.glade.h:34
msgid "_Gateway:"
msgstr "_Gateway:"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/NetworkManager-openvpn-0.7.999/src/nm-openvpn-service-openvpn-helper.c new/NetworkManager-openvpn-0.8/src/nm-openvpn-service-openvpn-helper.c
--- old/NetworkManager-openvpn-0.7.999/src/nm-openvpn-service-openvpn-helper.c 2009-07-14 12:55:21.000000000 +0200
+++ new/NetworkManager-openvpn-0.8/src/nm-openvpn-service-openvpn-helper.c 2010-02-02 23:59:48.000000000 +0100
@@ -36,6 +36,9 @@
#include
#include
#include
+#include
+#include
+
#include
#include
#include
@@ -274,6 +277,86 @@
return value;
}
+static GValue *
+trusted_remote_to_gvalue (void)
+{
+ char *tmp;
+ GValue *val = NULL;
+ struct in_addr addr;
+ const char *p;
+ gboolean is_name = FALSE;
+
+ tmp = getenv ("trusted_ip");
+ if (!tmp)
+ tmp = getenv ("remote_1");
+ if (!tmp) {
+ g_warning ("%s: did not receive remote gateway address", __func__);
+ return NULL;
+ }
+
+ /* Check if it seems to be a hostname hostname */
+ p = tmp;
+ while (*p) {
+ if (*p != '.' && !isdigit (*p)) {
+ is_name = TRUE;
+ break;
+ }
+ p++;
+ }
+
+ /* Resolve a hostname if required */
+ if (is_name) {
+ struct addrinfo hints;
+ struct addrinfo *result = NULL, *rp;
+ int err;
+
+ memset (&hints, 0, sizeof (hints));
+
+ hints.ai_family = AF_INET;
+ hints.ai_flags = AI_ADDRCONFIG;
+ err = getaddrinfo (tmp, NULL, &hints, &result);
+ if (err != 0) {
+ g_warning ("%s: failed to look up VPN gateway address '%s' (%d)",
+ __func__, tmp, err);
+ return NULL;
+ }
+
+ /* FIXME: so what if the name resolves to multiple IP addresses? We
+ * don't know which one pptp decided to use so we could end up using a
+ * different one here, and the VPN just won't work.
+ */
+ for (rp = result; rp; rp = rp->ai_next) {
+ if ( (rp->ai_family == AF_INET)
+ && (rp->ai_addrlen == sizeof (struct sockaddr_in))) {
+ struct sockaddr_in *inptr = (struct sockaddr_in *) rp->ai_addr;
+
+ memcpy (&addr, &(inptr->sin_addr), sizeof (struct in_addr));
+ break;
+ }
+ }
+
+ freeaddrinfo (result);
+ } else {
+ errno = 0;
+ if (inet_pton (AF_INET, tmp, &addr) <= 0) {
+ g_warning ("%s: failed to convert VPN gateway address '%s' (%d)",
+ __func__, tmp, errno);
+ return NULL;
+ }
+ }
+
+ if (addr.s_addr != 0) {
+ val = g_slice_new0 (GValue);
+ g_value_init (val, G_TYPE_UINT);
+ g_value_set_uint (val, addr.s_addr);
+ } else {
+ g_warning ("%s: failed to convert or look up VPN gateway address '%s'",
+ __func__, tmp);
+ }
+
+ return val;
+}
+
int
main (int argc, char *argv[])
{
@@ -300,7 +383,7 @@
config = g_hash_table_new (g_str_hash, g_str_equal);
/* External world-visible VPN gateway */
- val = addr_to_gvalue (getenv ("trusted_ip"));
+ val = trusted_remote_to_gvalue ();
if (val)
g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY, val);
else
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org