Hello community,
here is the log from the commit of package NetworkManager-openvpn
checked in at Thu Aug 14 02:01:23 CEST 2008.
--------
--- NetworkManager-openvpn/NetworkManager-openvpn.changes 2008-07-16 09:24:30.000000000 +0200
+++ NetworkManager-openvpn/NetworkManager-openvpn.changes 2008-08-02 13:38:04.000000000 +0200
@@ -1,0 +2,5 @@
+Sat Aug 2 14:36:49 EEST 2008 - tambet@suse.de
+
+- Bring up to date with SVN again.
+
+-------------------------------------------------------------------
Old:
----
NetworkManager-openvpn-0.7.0.r3820.tar.bz2
New:
----
NetworkManager-openvpn-0.7.0.r3880.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager-openvpn.spec ++++++
--- /var/tmp/diff_new_pack.X23577/_old 2008-08-14 02:00:41.000000000 +0200
+++ /var/tmp/diff_new_pack.X23577/_new 2008-08-14 02:00:41.000000000 +0200
@@ -1,10 +1,17 @@
#
-# spec file for package NetworkManager-openvpn (Version 0.7.0.r3820)
+# spec file for package NetworkManager-openvpn (Version 0.7.0.r3880)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -17,7 +24,7 @@
%define prefix %{_prefix}
%define sysconfdir %{_sysconfdir}
Summary: NetworkManager VPN support for OpenVPN
-Version: 0.7.0.r3820
+Version: 0.7.0.r3880
Release: 1
License: GPL v2 or later
Group: Productivity/Networking/System
@@ -74,7 +81,7 @@
%makeinstall
%find_lang %{name}
# No headers, no development files:
-rm $RPM_BUILD_ROOT%{_libdir}/*.la
+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
@@ -92,21 +99,23 @@
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc README
-%{_bindir}/nm-openvpn-service
-%{_bindir}/nm-openvpn-service-openvpn-helper
+%{_libdir}/nm-openvpn-service
+%{_libdir}/nm-openvpn-service-openvpn-helper
%dir %{sysconfdir}/NetworkManager/VPN
%{sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name
%{sysconfdir}/dbus-1/system.d/nm-openvpn-service.conf
%files gnome
%defattr(-,root,root,-)
-%{_libdir}/libnm-openvpn-properties.so*
+%{_libdir}/NetworkManager/libnm-openvpn-properties.so*
%{_libdir}/nm-openvpn-auth-dialog
%{_datadir}/applications/nm-openvpn.desktop
%{_datadir}/gnome-vpn-properties
%{_datadir}/icons/hicolor/*/*/*.png
%changelog
+* Sat Aug 02 2008 tambet@suse.de
+- Bring up to date with SVN again.
* Wed Jul 16 2008 bili@suse.de
- Upgrade to 0.7.0.r3820 from upstream for build failed.
* Fri May 16 2008 bili@suse.de
@@ -151,14 +160,14 @@
in fact not user-editable (Novell bug #164989)
* Tue Apr 11 2006 rml@suse.de
- Report error if configuration exportation fails (Novell #164980)
-* Wed Mar 29 2006 rml@suse.de
+* Thu Mar 30 2006 rml@suse.de
- Send per-route MSS information to NetworkManager (bug #157988)
-* Mon Mar 20 2006 rml@suse.de
+* Tue Mar 21 2006 rml@suse.de
- Require NetworkManager-gnome (Novell bug #158691)
* Fri Feb 03 2006 rml@suse.de
- Update to 0.3.2cvs20060202
- Update NM API
-* Wed Jan 25 2006 mls@suse.de
+* Thu Jan 26 2006 mls@suse.de
- converted neededforbuild to BuildRequires
* Thu Jan 19 2006 rml@suse.de
- Update to 20060119
++++++ NetworkManager-openvpn-0.7.0.r3820.tar.bz2 -> NetworkManager-openvpn-0.7.0.r3880.tar.bz2 ++++++
++++ 1779 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.0/ChangeLog new/NetworkManager-openvpn-0.7.0/ChangeLog
--- old/NetworkManager-openvpn-0.7.0/ChangeLog 2008-07-15 10:35:32.000000000 +0200
+++ new/NetworkManager-openvpn-0.7.0/ChangeLog 2008-07-31 11:31:23.000000000 +0200
@@ -1,3 +1,32 @@
+2008-07-28 Dan Williams
+
+ * properties/auth-helpers.c
+ - (populate_cipher_combo): don't depend on shell and utils which may not
+ always be there
+
+2008-07-27 Dan Williams
+
+ Patch from Michael Biebl
+
+ * Move service to $LIBEXECDIR, remove unneeded compilation flags, move
+ properties plugin to $LIBDIR/NetworkManager
+
+2008-07-19 Dan Williams
+
+ * properties/nm-openvpn.c
+ - (advanced_dialog_response_cb): only update if OK was pressed
+
+2008-07-18 Dan Williams
+
+ * src/nm-openvpn-service.c
+ - (nm_openvpn_start_openvpn_binary): only add tls-auth direction if
+ it's non-empty (Nathaniel McCallum)
+
+2008-07-17 Tambet Ingo
+
+ * properties/nm-openvpn.c (openvpn_plugin_ui_class_init): Don't add empty
+ private data to the class, it produces a runtime warning.
+
2008-07-07 Dan Williams
* src/nm-openvpn-service-openvpn-helper.c
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.0/Makefile.am new/NetworkManager-openvpn-0.7.0/Makefile.am
--- old/NetworkManager-openvpn-0.7.0/Makefile.am 2008-07-15 10:35:32.000000000 +0200
+++ new/NetworkManager-openvpn-0.7.0/Makefile.am 2008-07-31 11:31:23.000000000 +0200
@@ -22,10 +22,8 @@
icon_DATA = gnome-mime-application-x-openvpn-settings.png
endif
-nm-openvpn-service.name: $(srcdir)/nm-openvpn-service.name.in Makefile
- sed -e 's|[@]BINDIR[@]|$(bindir)|g' \
- < $(srcdir)/nm-openvpn-service.name.in \
- > nm-openvpn-service.name
+nm-openvpn-service.name: $(srcdir)/nm-openvpn-service.name.in
+ sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' $< >$@
EXTRA_DIST = nm-openvpn-service.name.in \
$(dbusservice_DATA) \
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.0/nm-openvpn-service.name.in new/NetworkManager-openvpn-0.7.0/nm-openvpn-service.name.in
--- old/NetworkManager-openvpn-0.7.0/nm-openvpn-service.name.in 2008-07-15 10:35:32.000000000 +0200
+++ new/NetworkManager-openvpn-0.7.0/nm-openvpn-service.name.in 2008-07-31 11:31:23.000000000 +0200
@@ -1,7 +1,7 @@
[VPN Connection]
name=openvpn
service=org.freedesktop.NetworkManager.openvpn
-program=@BINDIR@/nm-openvpn-service
+program=@LIBEXECDIR@/nm-openvpn-service
[GNOME]
auth-dialog=nm-openvpn-auth-dialog
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.0/po/ar.po new/NetworkManager-openvpn-0.7.0/po/ar.po
--- old/NetworkManager-openvpn-0.7.0/po/ar.po 2008-04-16 08:00:19.000000000 +0200
+++ new/NetworkManager-openvpn-0.7.0/po/ar.po 2008-08-01 13:25:23.000000000 +0200
@@ -9,14 +9,15 @@
msgstr ""
"Project-Id-Version: Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-26 09:03+0000\n"
+"POT-Creation-Date: 2008-07-31 10:41+0100\n"
"PO-Revision-Date: 2007-12-26 09:06+0100\n"
"Last-Translator: Djihed Afifi \n"
"Language-Team: Arabic \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && n<=10 ? 2 : 3\n"
+"Plural-Forms: Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && "
+"n<=10 ? 2 : 3\n"
"X-Poedit-Language: Arabic\n"
"X-Generator: KBabel 1.11.4\n"
@@ -52,407 +53,469 @@
msgid "_Save password in keyring"
msgstr "ا_حفظ كلمة السر في حلقة المفاتيح"
-#: ../auth-dialog/main.c:181
+#: ../auth-dialog/main.c:187
#, c-format
msgid "You need to authenticate to access the Virtual Private Network '%s'."
msgstr "تحتاج إلى التوثيق لتَنفُذ إلى الشبكة الخاصة التخيلية '%s'."
-#: ../auth-dialog/main.c:182
+#: ../auth-dialog/main.c:188
msgid "Authenticate VPN"
msgstr "وثِّق VPN"
-#: ../auth-dialog/main.c:195
+#: ../auth-dialog/main.c:201
msgid "Certificate pass_word:"
msgstr "كلمة سر ال_شهادة:"
-#: ../auth-dialog/main.c:210
+#: ../auth-dialog/main.c:216
msgid "Certificate password:"
msgstr "كلمة سر الشهادة:"
-#: ../properties/nm-openvpn.c:150
-msgid "OpenVPN Client"
-msgstr "عميل OpenVPN"
-
-#: ../properties/nm-openvpn.c:826
-msgid "The following OpenVPN connection will be created:"
-msgstr "ستُنشأ اتصالات OpenVPN التالية:"
-
-#: ../properties/nm-openvpn.c:828
-#, c-format
-msgid "Name: %s"
-msgstr "الإسم: %s"
-
-#: ../properties/nm-openvpn.c:836
-msgid "Connection Type: X.509 Certificates"
-msgstr "نوع الإتصال: X.509 Certificates"
-
-#: ../properties/nm-openvpn.c:839
-#: ../properties/nm-openvpn.c:866
-#: ../properties/nm-openvpn.c:878
-#, c-format
-msgid "CA: %s"
-msgstr "CA: %s"
-
-#: ../properties/nm-openvpn.c:842
-#: ../properties/nm-openvpn.c:881
-#, c-format
-msgid "Cert: %s"
-msgstr "شهادة: %s"
-
-#: ../properties/nm-openvpn.c:845
-#: ../properties/nm-openvpn.c:884
-#, c-format
-msgid "Key: %s"
-msgstr "مفتاح: %s"
-
-#: ../properties/nm-openvpn.c:849
-msgid "Connection Type: Shared Key"
-msgstr "نوع الإتصال: مفتاح مشترَك"
-
-#: ../properties/nm-openvpn.c:852
-#, c-format
-msgid "Shared Key: %s"
-msgstr "مفتاح مشترَك: %s"
-
-#: ../properties/nm-openvpn.c:855
-#, c-format
-msgid "Local IP: %s"
-msgstr "IP م_حلّي: %s"
-
-#: ../properties/nm-openvpn.c:858
-#, c-format
-msgid "Remote IP: %s"
-msgstr "IP بعيد: %s"
-
-#: ../properties/nm-openvpn.c:863
-msgid "Connection Type: Password"
-msgstr "نوع الإتصال: كلمة سّر"
-
-#: ../properties/nm-openvpn.c:869
-#: ../properties/nm-openvpn.c:887
-#, c-format
-msgid "Username: %s"
-msgstr "اسم المستخدم: %s"
-
-#: ../properties/nm-openvpn.c:875
-msgid "Connection Type: X.509 with Password Authentication"
-msgstr "نوع الإتصال: X.509 مع توثق عبر كلمة سر"
-
-#: ../properties/nm-openvpn.c:893
-#, c-format
-msgid "Remote: %s"
-msgstr "عن بعد: %s"
-
-#: ../properties/nm-openvpn.c:896
-#, c-format
-msgid "Port: %s"
-msgstr "ميناء: %s"
-
-#: ../properties/nm-openvpn.c:899
-#, c-format
-msgid "Device: %s"
-msgstr "الجهاز: %s"
-
-#: ../properties/nm-openvpn.c:899
-msgid "TAP"
-msgstr "TAP"
-
-#: ../properties/nm-openvpn.c:899
-msgid "TUN"
-msgstr "TUN"
-
-#: ../properties/nm-openvpn.c:902
-#, c-format
-msgid "Protocol: %s"
-msgstr "البروتوكول: %s"
-
-#: ../properties/nm-openvpn.c:902
-msgid "TCP"
-msgstr "TCP"
-
-#: ../properties/nm-openvpn.c:902
-msgid "UDP"
-msgstr "UDP"
+#: ../properties/auth-helpers.c:68
+msgid "Choose a Certificate Authority certificate..."
+msgstr ""
-#: ../properties/nm-openvpn.c:906
-#, c-format
-msgid "Routes: %s"
-msgstr "المسارات: %s"
+#: ../properties/auth-helpers.c:87
+msgid "Choose your personal certificate..."
+msgstr ""
-#: ../properties/nm-openvpn.c:910
-#, c-format
-msgid "Use LZO Compression: %s"
-msgstr "ا_ستعمل ضغط LZO: %s"
+#: ../properties/auth-helpers.c:105
+msgid "Choose your private key..."
+msgstr ""
-#: ../properties/nm-openvpn.c:910
-msgid "Yes"
-msgstr "نعم"
+#: ../properties/auth-helpers.c:158
+msgid "Choose an OpenVPN static key..."
+msgstr ""
-#: ../properties/nm-openvpn.c:910
-msgid "No"
+#: ../properties/auth-helpers.c:176 ../properties/auth-helpers.c:886
+#, fuzzy
+msgid "None"
msgstr "لا"
-#: ../properties/nm-openvpn.c:914
-#, c-format
-msgid "Cipher: %s"
-msgstr "شيفرة: %s"
+#: ../properties/auth-helpers.c:519
+msgid "PEM certificates (*.pem, *.crt, *.key)"
+msgstr ""
-#: ../properties/nm-openvpn.c:919
-#, c-format
-msgid "TLS auth: %s %s"
-msgstr "توثيق TLS: %s %s "
+#: ../properties/auth-helpers.c:579
+msgid "OpenVPN Static Keys (*.key)"
+msgstr ""
+
+#: ../properties/auth-helpers.c:711
+#, fuzzy
+msgid "Default"
+msgstr "(افتراضي: 1194)"
-#: ../properties/nm-openvpn.c:923
-msgid "The connection details can be changed using the \"Edit\" button."
-msgstr "يمكن تغيير تفاصيل الإتصال باستخدام زر \"حرِّر\"."
-
-#: ../properties/nm-openvpn.c:1153
-msgid "Cannot import settings"
-msgstr "تعذّر استيراد الإعدادات"
+#: ../properties/nm-openvpn.c:53
+#, fuzzy
+msgid "OpenVPN"
+msgstr "عميل OpenVPN"
-#: ../properties/nm-openvpn.c:1155
-#, c-format
-msgid "The VPN settings file '%s' does not contain valid data."
-msgstr "لا يحتوي ملف اعدادات VPN '%s' على بيانات صالحة."
+#: ../properties/nm-openvpn.c:54
+msgid "Compatible with the OpenVPN server."
+msgstr ""
-#: ../properties/nm-openvpn.c:1202
-msgid "Select file to import"
-msgstr "انتقِ ملفّ للإستيراد"
-
-#: ../properties/nm-openvpn.c:1261
-#: ../properties/nm-openvpn.c:1273
-#: ../properties/nm-openvpn.c:1276
-msgid "Select CA to use"
-msgstr "انتقِ CA ليُستخدم"
-
-#: ../properties/nm-openvpn.c:1264
-#: ../properties/nm-openvpn.c:1279
-msgid "Select certificate to use"
-msgstr "انتقِ شهادة لتُستخدم"
-
-#: ../properties/nm-openvpn.c:1267
-#: ../properties/nm-openvpn.c:1282
-msgid "Select key to use"
-msgstr "انتقِ مفتاحا ليُستخدم"
-
-#: ../properties/nm-openvpn.c:1270
-msgid "Select shared key to use"
-msgstr "انتقِ مفتاحا مُشارَكا ليُستخدم"
-
-#: ../properties/nm-openvpn.c:1285
-msgid "Select TA to use"
-msgstr "انتقِ TA ليُستخدم"
-
-#. printf ("in impl_export\n");
-#: ../properties/nm-openvpn.c:1527
-msgid "Save as..."
-msgstr "احفظ كـ..."
+#: ../properties/nm-openvpn.c:308 ../properties/nm-openvpn-dialog.glade.h:7
+#, fuzzy
+msgid "Certificates (TLS)"
+msgstr "ش_هادة:"
-#: ../properties/nm-openvpn.c:1556
-#, c-format
-msgid "A file named \"%s\" already exists."
-msgstr "يوجد ملف بالإسم \"%s\" مسبقاً."
+#: ../properties/nm-openvpn.c:320
+msgid "Password"
+msgstr "كلمة السّر"
-#: ../properties/nm-openvpn.c:1559
-msgid "Do you want to replace it with the one you are saving?"
-msgstr "أتريد استبداله بالملف الذي تقوم بحفظه؟"
-
-#: ../properties/nm-openvpn.c:1573
-msgid "Failed to export configuration"
-msgstr "فشل تصدير الإعدادات"
+#: ../properties/nm-openvpn.c:334
+msgid "Password with Certificates (TLS)"
+msgstr ""
-#: ../properties/nm-openvpn.c:1575
-#, c-format
-msgid "Failed to save file %s"
-msgstr "فشل حفظ الملف %s"
+#: ../properties/nm-openvpn.c:346
+msgid "Static Key"
+msgstr ""
#: ../properties/nm-openvpn-dialog.glade.h:1
-msgid "(Default: 1194)"
-msgstr "(افتراضي: 1194)"
+msgid " "
+msgstr ""
#: ../properties/nm-openvpn-dialog.glade.h:2
-msgid "65536"
-msgstr "65536"
+#, fuzzy
+msgid "<b>Authentication</b>"
+msgstr "<b>اسم الإتصال</b>"
#: ../properties/nm-openvpn-dialog.glade.h:3
-msgid "<i>example: 172.16.0.0/16 10.11.12.0/24</i>"
-msgstr "<i>مثال: 172.16.0.0/16 10.11.12.0/24</i>"
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "<b>مطلوب</b>"
#: ../properties/nm-openvpn-dialog.glade.h:4
-msgid "Ad_vanced"
-msgstr "مت_قدم"
+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 ""
#: ../properties/nm-openvpn-dialog.glade.h:5
-msgid "C_A file:"
-msgstr "_ملفّ CA:"
+#, fuzzy
+msgid "Ad_vanced..."
+msgstr "مت_قدم"
#: ../properties/nm-openvpn-dialog.glade.h:6
-msgid "C_ertificate:"
+#, fuzzy
+msgid "CA Certificate:"
msgstr "ش_هادة:"
-#: ../properties/nm-openvpn-dialog.glade.h:7
-msgid "Co_nnection type:"
-msgstr "_نوع الإتصال:"
-
#: ../properties/nm-openvpn-dialog.glade.h:8
-msgid "Connection na_me:"
-msgstr "ا_سم الإتصال:"
+#, fuzzy
+msgid "Cipher:"
+msgstr "شيفرة: %s"
#: ../properties/nm-openvpn-dialog.glade.h:9
-msgid "Direction:"
-msgstr "الإتجاه:"
+msgid "General"
+msgstr ""
#: ../properties/nm-openvpn-dialog.glade.h:10
-msgid "Import _Saved Configuration..."
-msgstr "ا_ستورد اعدادات محفوظة..."
+#, fuzzy
+msgid "Key Direction:"
+msgstr "الإتجاه:"
#: ../properties/nm-openvpn-dialog.glade.h:11
-msgid "Name used to identify the connection to the private network, e.g. \"Campus VPN\" or \"Corporate Network\""
-msgstr "الإ_سم المستخدم لتعريف الإتصال للشبكة الخاصة، مثلا: \"Campus VPN\" أو \"Corporate Network\""
+msgid "Key File:"
+msgstr ""
#: ../properties/nm-openvpn-dialog.glade.h:12
-msgid "Network"
-msgstr "شبكة"
+msgid "OpenVPN Advanced Options"
+msgstr "خيارات OpenVPN متقدمة"
#: ../properties/nm-openvpn-dialog.glade.h:13
-msgid "Only use _VPN connection for these addresses:"
-msgstr "استخدم _فقط اتصالات VPN لهذه العناوين:"
+#, fuzzy
+msgid "Private Key:"
+msgstr "مفتاح مشترَك:"
#: ../properties/nm-openvpn-dialog.glade.h:14
-msgid "OpenVPN Advanced Options"
-msgstr "خيارات OpenVPN متقدمة"
+#, fuzzy
+msgid "Static Key:"
+msgstr "مفتاح مشترَك:"
#: ../properties/nm-openvpn-dialog.glade.h:15
-msgid "OpenVPN Configuration"
-msgstr "اعدادات OpenVPN"
+msgid "Type:"
+msgstr ""
#: ../properties/nm-openvpn-dialog.glade.h:16
-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 "من فضلك أدخل المعلومات التي وفرها مدير نظامك بأسفل. لا تدخل كلمة السر هنا حيث أنك ستسأل عنها عند الإتصال."
+#, fuzzy
+msgid "Use L_ZO data compression"
+msgstr "استعمل _ضغط LZO"
#: ../properties/nm-openvpn-dialog.glade.h:17
-msgid "Please note that the file you import is not an OpenVPN configuration file. Ask your administrator for the file."
-msgstr "من فضلك لا حظ أن الملف الذي استوردته ليس ملف إعدادات OpenVPN. اسأل مدير نظامك عن الملف."
+#, fuzzy
+msgid "Use a TA_P device"
+msgstr "ا_ستخدم جهاز TAP"
#: ../properties/nm-openvpn-dialog.glade.h:18
-msgid "Shared _key:"
-msgstr "مف_تاح مشترَك:"
+#, fuzzy
+msgid "Use a _TCP connection"
+msgstr "استخدم ات_صال TCP"
#: ../properties/nm-openvpn-dialog.glade.h:19
-msgid "TLS-Auth"
-msgstr "TLS-Auth"
+msgid "Use additional TLS authentication"
+msgstr ""
#: ../properties/nm-openvpn-dialog.glade.h:20
-msgid "Use L_ZO compression"
-msgstr "استعمل _ضغط LZO"
+#, fuzzy
+msgid "Use custom gateway p_ort:"
+msgstr "منفذ ال_بوّابة:"
#: ../properties/nm-openvpn-dialog.glade.h:21
-msgid "Use TA_P device"
-msgstr "ا_ستخدم جهاز TAP"
+#, fuzzy
+msgid "User Certificate:"
+msgstr "ش_هادة:"
#: ../properties/nm-openvpn-dialog.glade.h:22
-msgid "Use _TCP connection"
-msgstr "استخدم ات_صال TCP"
+#, fuzzy
+msgid "User name:"
+msgstr "ا_سم المستخدم:"
#: ../properties/nm-openvpn-dialog.glade.h:23
-msgid "Use _TLS auth:"
-msgstr "اس_تخدم توثيق TLS:"
+#, fuzzy
+msgid "_Gateway:"
+msgstr "منفذ ال_بوّابة:"
#: ../properties/nm-openvpn-dialog.glade.h:24
-msgid "Use cip_her:"
-msgstr "استخدم _شيفرة:"
+msgid "gtk-cancel"
+msgstr ""
#: ../properties/nm-openvpn-dialog.glade.h:25
-msgid ""
-"X.509 Certificates\n"
-"Pre-shared key\n"
-"Password Authentication\n"
-"X.509 with Password Authentication"
-msgstr ""
-"شهادات X.509\n"
-"مفتاح قبل المُشاركة\n"
-"توثيق بكلمة سر\n"
-"X.509 مع توثيق بكلمة سر"
+msgid "gtk-ok"
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:26
+msgid "page 1"
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:27
+msgid "page 2"
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:28
+msgid "page 3"
+msgstr ""
#: ../properties/nm-openvpn-dialog.glade.h:29
-msgid "_0"
-msgstr "_0"
+msgid "page 4"
+msgstr ""
-#: ../properties/nm-openvpn-dialog.glade.h:30
-msgid "_1"
-msgstr "_1"
-
-#: ../properties/nm-openvpn-dialog.glade.h:31
-msgid "_Gateway address:"
-msgstr "عنوان ال_بوّابة:"
+#~ msgid "The following OpenVPN connection will be created:"
+#~ msgstr "ستُنشأ اتصالات OpenVPN التالية:"
-#: ../properties/nm-openvpn-dialog.glade.h:32
-msgid "_Gateway port:"
-msgstr "منفذ ال_بوّابة:"
+#~ msgid "Name: %s"
+#~ msgstr "الإسم: %s"
-#: ../properties/nm-openvpn-dialog.glade.h:33
-msgid "_Key:"
-msgstr "م_فتاح:"
-
-#: ../properties/nm-openvpn-dialog.glade.h:34
-msgid "_Local IP:"
-msgstr "IP م_حلًي:"
-
-#: ../properties/nm-openvpn-dialog.glade.h:35
-msgid "_Remote IP:"
-msgstr "IP الآخر:"
+#~ msgid "Connection Type: X.509 Certificates"
+#~ msgstr "نوع الإتصال: X.509 Certificates"
-#: ../properties/nm-openvpn-dialog.glade.h:36
-msgid "_User name:"
-msgstr "ا_سم المستخدم:"
+#~ msgid "CA: %s"
+#~ msgstr "CA: %s"
+
+#~ msgid "Cert: %s"
+#~ msgstr "شهادة: %s"
+
+#~ msgid "Key: %s"
+#~ msgstr "مفتاح: %s"
+
+#~ msgid "Connection Type: Shared Key"
+#~ msgstr "نوع الإتصال: مفتاح مشترَك"
+
+#~ msgid "Shared Key: %s"
+#~ msgstr "مفتاح مشترَك: %s"
+
+#~ msgid "Local IP: %s"
+#~ msgstr "IP م_حلّي: %s"
+
+#~ msgid "Remote IP: %s"
+#~ msgstr "IP بعيد: %s"
+
+#~ msgid "Connection Type: Password"
+#~ msgstr "نوع الإتصال: كلمة سّر"
+
+#~ msgid "Username: %s"
+#~ msgstr "اسم المستخدم: %s"
+
+#~ msgid "Connection Type: X.509 with Password Authentication"
+#~ msgstr "نوع الإتصال: X.509 مع توثق عبر كلمة سر"
+
+#~ msgid "Remote: %s"
+#~ msgstr "عن بعد: %s"
+
+#~ msgid "Port: %s"
+#~ msgstr "ميناء: %s"
+
+#~ msgid "Device: %s"
+#~ msgstr "الجهاز: %s"
+
+#~ msgid "TAP"
+#~ msgstr "TAP"
+
+#~ msgid "TUN"
+#~ msgstr "TUN"
+
+#~ msgid "Protocol: %s"
+#~ msgstr "البروتوكول: %s"
+
+#~ msgid "TCP"
+#~ msgstr "TCP"
+
+#~ msgid "UDP"
+#~ msgstr "UDP"
+
+#~ msgid "Routes: %s"
+#~ msgstr "المسارات: %s"
+
+#~ msgid "Use LZO Compression: %s"
+#~ msgstr "ا_ستعمل ضغط LZO: %s"
+
+#~ msgid "Yes"
+#~ msgstr "نعم"
+
+#~ msgid "TLS auth: %s %s"
+#~ msgstr "توثيق TLS: %s %s "
+
+#~ msgid "The connection details can be changed using the \"Edit\" button."
+#~ msgstr "يمكن تغيير تفاصيل الإتصال باستخدام زر \"حرِّر\"."
+
+#~ msgid "Cannot import settings"
+#~ msgstr "تعذّر استيراد الإعدادات"
+
+#~ msgid "The VPN settings file '%s' does not contain valid data."
+#~ msgstr "لا يحتوي ملف اعدادات VPN '%s' على بيانات صالحة."
+
+#~ msgid "Select file to import"
+#~ msgstr "انتقِ ملفّ للإستيراد"
+
+#~ msgid "Select CA to use"
+#~ msgstr "انتقِ CA ليُستخدم"
+
+#~ msgid "Select certificate to use"
+#~ msgstr "انتقِ شهادة لتُستخدم"
+
+#~ msgid "Select key to use"
+#~ msgstr "انتقِ مفتاحا ليُستخدم"
+
+#~ msgid "Select shared key to use"
+#~ msgstr "انتقِ مفتاحا مُشارَكا ليُستخدم"
+
+#~ msgid "Select TA to use"
+#~ msgstr "انتقِ TA ليُستخدم"
+
+#~ msgid "Save as..."
+#~ msgstr "احفظ كـ..."
+
+#~ msgid "A file named \"%s\" already exists."
+#~ msgstr "يوجد ملف بالإسم \"%s\" مسبقاً."
+
+#~ msgid "Do you want to replace it with the one you are saving?"
+#~ msgstr "أتريد استبداله بالملف الذي تقوم بحفظه؟"
+
+#~ msgid "Failed to export configuration"
+#~ msgstr "فشل تصدير الإعدادات"
+
+#~ msgid "Failed to save file %s"
+#~ msgstr "فشل حفظ الملف %s"
+
+#~ msgid "65536"
+#~ msgstr "65536"
+
+#~ msgid "<i>example: 172.16.0.0/16 10.11.12.0/24</i>"
+#~ msgstr "<i>مثال: 172.16.0.0/16 10.11.12.0/24</i>"
-#: ../properties/nm-openvpn-dialog.glade.h:37
-msgid "_none"
-msgstr "لا _شيء"
+#~ msgid "C_A file:"
+#~ msgstr "_ملفّ CA:"
+
+#~ msgid "Co_nnection type:"
+#~ msgstr "_نوع الإتصال:"
+
+#~ msgid "Connection na_me:"
+#~ msgstr "ا_سم الإتصال:"
+
+#~ msgid "Import _Saved Configuration..."
+#~ msgstr "ا_ستورد اعدادات محفوظة..."
+
+#~ msgid ""
+#~ "Name used to identify the connection to the private network, e.g. "
+#~ "\"Campus VPN\" or \"Corporate Network\""
+#~ msgstr ""
+#~ "الإ_سم المستخدم لتعريف الإتصال للشبكة الخاصة، مثلا: \"Campus VPN\" أو "
+#~ "\"Corporate Network\""
+
+#~ msgid "Network"
+#~ msgstr "شبكة"
+
+#~ msgid "Only use _VPN connection for these addresses:"
+#~ msgstr "استخدم _فقط اتصالات VPN لهذه العناوين:"
+
+#~ msgid "OpenVPN Configuration"
+#~ msgstr "اعدادات OpenVPN"
+
+#~ 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 ""
+#~ "من فضلك أدخل المعلومات التي وفرها مدير نظامك بأسفل. لا تدخل كلمة السر هنا "
+#~ "حيث أنك ستسأل عنها عند الإتصال."
+
+#~ msgid ""
+#~ "Please note that the file you import is not an OpenVPN configuration "
+#~ "file. Ask your administrator for the file."
+#~ msgstr ""
+#~ "من فضلك لا حظ أن الملف الذي استوردته ليس ملف إعدادات OpenVPN. اسأل مدير "
+#~ "نظامك عن الملف."
+
+#~ msgid "Shared _key:"
+#~ msgstr "مف_تاح مشترَك:"
+
+#~ msgid "TLS-Auth"
+#~ msgstr "TLS-Auth"
+
+#~ msgid "Use _TLS auth:"
+#~ msgstr "اس_تخدم توثيق TLS:"
+
+#~ msgid "Use cip_her:"
+#~ msgstr "استخدم _شيفرة:"
+
+#~ msgid ""
+#~ "X.509 Certificates\n"
+#~ "Pre-shared key\n"
+#~ "Password Authentication\n"
+#~ "X.509 with Password Authentication"
+#~ msgstr ""
+#~ "شهادات X.509\n"
+#~ "مفتاح قبل المُشاركة\n"
+#~ "توثيق بكلمة سر\n"
+#~ "X.509 مع توثيق بكلمة سر"
+
+#~ msgid "_0"
+#~ msgstr "_0"
+
+#~ msgid "_1"
+#~ msgstr "_1"
+
+#~ msgid "_Gateway address:"
+#~ msgstr "عنوان ال_بوّابة:"
+
+#~ msgid "_Key:"
+#~ msgstr "م_فتاح:"
+
+#~ msgid "_Local IP:"
+#~ msgstr "IP م_حلًي:"
+
+#~ msgid "_Remote IP:"
+#~ msgstr "IP الآخر:"
+
+#~ msgid "_none"
+#~ msgstr "لا _شيء"
#~ msgid "Add, Remove, and Edit VPN Connections"
#~ msgstr "أضِف، احذِف، و حرِّر اتصالات VPN"
+
#~ msgid "VPN Connection Manager (OpenVPN)"
#~ msgstr "مدير اتصالت VPN (OpenVPN)"
+
#~ msgid ""
#~ "The VPN login failed because the user name and password were not accepted "
#~ "or the certificate password was wrong."
#~ msgstr ""
#~ "فشل ولوج VPN لأن اسم المستخدم أو كلمة السر لم تُقبل أو أن كلمة سر الشهادة "
#~ "كانت خطأ."
+
#~ msgid "The VPN login failed because the VPN program could not be started."
#~ msgstr "فشل ولوج VPN لأن برنامج VPN لا يمكن بدأه."
+
#~ msgid ""
#~ "The VPN login failed because the VPN program could not connect to the VPN "
#~ "server."
#~ msgstr "فشل ولوج VPN لأن برنامج VPN لا يمكنه الإتصال بخادم VPN."
+
#~ msgid ""
#~ "The VPN login failed because the VPN configuration options were invalid."
#~ msgstr "فشل ولوج VPN لأن خيارات اعدادات VPN غير صالحة."
+
#~ msgid ""
#~ "The VPN login failed because the VPN program received an invalid "
#~ "configuration from the VPN server."
#~ msgstr "فشل ولوج VPN لأن برنامج VPN لم يتلقى اعدادات صالحة من خادم VPN."
+
#~ msgid "VPN connection failed"
#~ msgstr "فشل اتصال VPN"
+
#~ msgid "<b>Connection Information</b>"
#~ msgstr "<b>معلومات الإتصال</b>"
-#~ msgid "<b>Connection Name</b>"
-#~ msgstr "<b>اسم الإتصال</b>"
-#~ msgid "Password"
-#~ msgstr "كلمة السّر"
-#~ msgid "Shared Key:"
-#~ msgstr "مفتاح مشترَك:"
+
#~ msgid "Username:"
#~ msgstr "اسم المستخدم:"
+
#~ msgid "X.509"
#~ msgstr "X.509"
+
#~ msgid "X.509/Pass"
#~ msgstr "X.509/Pass"
-#~ msgid "<b>Required</b>"
-#~ msgstr "<b>مطلوب</b>"
+
#~ msgid "CA file:"
#~ msgstr "ملفّ CA:"
+
#~ msgid "Optional"
#~ msgstr "خياري"
-
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.0/po/ChangeLog new/NetworkManager-openvpn-0.7.0/po/ChangeLog
--- old/NetworkManager-openvpn-0.7.0/po/ChangeLog 2008-07-15 10:35:32.000000000 +0200
+++ new/NetworkManager-openvpn-0.7.0/po/ChangeLog 2008-08-01 13:25:23.000000000 +0200
@@ -1,3 +1,19 @@
+2008-07-31 Djihed Afifi
+
+ * ar.po: Updated Arabic Translation by Djihed Afifi.
+
+2008-07-31 Djihed Afifi
+
+ * ar.po: Updated Arabic Translation by Djihed Afifi.
+
+2008-07-25 Daniel Nylander
+
+ * sv.po: Updated Swedish translation.
+
+2008-07-20 Jorge Gonzalez
+
+ * es.po: Updated Spanish translation
+
2008-07-11 Tambet Ingo
* de.po: Fix typos (From Markus Becker ).
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.0/po/es.po new/NetworkManager-openvpn-0.7.0/po/es.po
--- old/NetworkManager-openvpn-0.7.0/po/es.po 2008-07-15 10:35:32.000000000 +0200
+++ new/NetworkManager-openvpn-0.7.0/po/es.po 2008-07-24 09:52:27.000000000 +0200
@@ -13,8 +13,8 @@
msgstr ""
"Project-Id-Version: NetworkManager-openvpn.HEAD\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-01 03:19+0000\n"
-"PO-Revision-Date: 2008-07-04 17:38+0200\n"
+"POT-Creation-Date: 2008-07-19 18:11+0000\n"
+"PO-Revision-Date: 2008-07-20 15:41+0200\n"
"Last-Translator: Jorge González \n"
"Language-Team: Español \n"
"MIME-Version: 1.0\n"
@@ -91,23 +91,23 @@
msgid "Choose your private key..."
msgstr "Elija su clave privada…"
-#: ../properties/auth-helpers.c:159
+#: ../properties/auth-helpers.c:158
msgid "Choose an OpenVPN static key..."
msgstr "Elija una clave estática OpenVPN…"
-#: ../properties/auth-helpers.c:177 ../properties/auth-helpers.c:866
+#: ../properties/auth-helpers.c:176 ../properties/auth-helpers.c:864
msgid "None"
msgstr "Ninguno"
-#: ../properties/auth-helpers.c:520
+#: ../properties/auth-helpers.c:519
msgid "PEM certificates (*.pem, *.crt, *.key)"
msgstr "Certificados PEM (*.pem, *.crt, *.key)"
-#: ../properties/auth-helpers.c:580
+#: ../properties/auth-helpers.c:579
msgid "OpenVPN Static Keys (*.key)"
msgstr "Claves estáticas OpenVPN (*.key)"
-#: ../properties/auth-helpers.c:705
+#: ../properties/auth-helpers.c:703
msgid "Default"
msgstr "Predeterminado"
@@ -119,19 +119,19 @@
msgid "Compatible with the OpenVPN server."
msgstr "Compatible con el servidor OpenVPN."
-#: ../properties/nm-openvpn.c:314 ../properties/nm-openvpn-dialog.glade.h:7
+#: ../properties/nm-openvpn.c:310 ../properties/nm-openvpn-dialog.glade.h:7
msgid "Certificates (TLS)"
msgstr "Certificados (TLS)"
-#: ../properties/nm-openvpn.c:326
+#: ../properties/nm-openvpn.c:322
msgid "Password"
msgstr "Contraseña"
-#: ../properties/nm-openvpn.c:340
+#: ../properties/nm-openvpn.c:336
msgid "Password with Certificates (TLS)"
msgstr "Contraseñas con certificados (TLS)"
-#: ../properties/nm-openvpn.c:352
+#: ../properties/nm-openvpn.c:348
msgid "Static Key"
msgstr "Clave estática"
@@ -186,74 +186,78 @@
msgstr "Archivo de clave:"
#: ../properties/nm-openvpn-dialog.glade.h:12
+msgid "OpenVPN Advanced Options"
+msgstr "Opciones avanzadas de OpenVPN"
+
+#: ../properties/nm-openvpn-dialog.glade.h:13
msgid "Private Key:"
msgstr "Clave privada:"
-#: ../properties/nm-openvpn-dialog.glade.h:13
+#: ../properties/nm-openvpn-dialog.glade.h:14
msgid "Static Key:"
msgstr "Clave estática:"
-#: ../properties/nm-openvpn-dialog.glade.h:14
+#: ../properties/nm-openvpn-dialog.glade.h:15
msgid "Type:"
msgstr "Tipo:"
-#: ../properties/nm-openvpn-dialog.glade.h:15
+#: ../properties/nm-openvpn-dialog.glade.h:16
msgid "Use L_ZO data compression"
msgstr "Usar compresión L_ZO"
# include/scanner/scanner_usb.ycp:47
# include/scanner/scanner_usb.ycp:47
# include/scanner/scanner_usb.ycp:47
-#: ../properties/nm-openvpn-dialog.glade.h:16
+#: ../properties/nm-openvpn-dialog.glade.h:17
msgid "Use a TA_P device"
msgstr "Usar dispositivo TA_P"
# include/printconf/dialogs.ycp:150
-#: ../properties/nm-openvpn-dialog.glade.h:17
+#: ../properties/nm-openvpn-dialog.glade.h:18
msgid "Use a _TCP connection"
msgstr "Usar conexión _TCP"
-#: ../properties/nm-openvpn-dialog.glade.h:18
+#: ../properties/nm-openvpn-dialog.glade.h:19
msgid "Use additional TLS authentication"
msgstr "Usar autenticación TLS adicional"
-#: ../properties/nm-openvpn-dialog.glade.h:19
+#: ../properties/nm-openvpn-dialog.glade.h:20
msgid "Use custom gateway p_ort:"
msgstr "Usar un p_uerto de pasarela personalizado:"
-#: ../properties/nm-openvpn-dialog.glade.h:20
+#: ../properties/nm-openvpn-dialog.glade.h:21
msgid "User Certificate:"
msgstr "Certificado de usuario:"
-#: ../properties/nm-openvpn-dialog.glade.h:21
+#: ../properties/nm-openvpn-dialog.glade.h:22
msgid "User name:"
msgstr "Nombre de usuario:"
-#: ../properties/nm-openvpn-dialog.glade.h:22
+#: ../properties/nm-openvpn-dialog.glade.h:23
msgid "_Gateway:"
msgstr "_Pasarela:"
-#: ../properties/nm-openvpn-dialog.glade.h:23
+#: ../properties/nm-openvpn-dialog.glade.h:24
msgid "gtk-cancel"
msgstr "gtk-cancel"
-#: ../properties/nm-openvpn-dialog.glade.h:24
+#: ../properties/nm-openvpn-dialog.glade.h:25
msgid "gtk-ok"
msgstr "gtk-ok"
-#: ../properties/nm-openvpn-dialog.glade.h:25
+#: ../properties/nm-openvpn-dialog.glade.h:26
msgid "page 1"
msgstr "página 1"
-#: ../properties/nm-openvpn-dialog.glade.h:26
+#: ../properties/nm-openvpn-dialog.glade.h:27
msgid "page 2"
msgstr "página 2"
-#: ../properties/nm-openvpn-dialog.glade.h:27
+#: ../properties/nm-openvpn-dialog.glade.h:28
msgid "page 3"
msgstr "página 3"
-#: ../properties/nm-openvpn-dialog.glade.h:28
+#: ../properties/nm-openvpn-dialog.glade.h:29
msgid "page 4"
msgstr "página 4"
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.0/po/sv.po new/NetworkManager-openvpn-0.7.0/po/sv.po
--- old/NetworkManager-openvpn-0.7.0/po/sv.po 2008-06-29 12:32:40.000000000 +0200
+++ new/NetworkManager-openvpn-0.7.0/po/sv.po 2008-07-31 11:31:23.000000000 +0200
@@ -9,8 +9,8 @@
msgstr ""
"Project-Id-Version: NetworkManager-openvpn\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-24 00:04+0200\n"
-"PO-Revision-Date: 2008-06-24 00:07+0100\n"
+"POT-Creation-Date: 2008-07-25 22:40+0200\n"
+"PO-Revision-Date: 2008-07-25 22:42+0100\n"
"Last-Translator: Daniel Nylander \n"
"Language-Team: Swedish \n"
"MIME-Version: 1.0\n"
@@ -67,27 +67,61 @@
msgid "Certificate password:"
msgstr "Certifikatlösenord:"
-#: ../properties/nm-openvpn.c:52
+#: ../properties/auth-helpers.c:68
+msgid "Choose a Certificate Authority certificate..."
+msgstr "Välj ett CA-certifikat (Certifikatutfärdare)..."
+
+#: ../properties/auth-helpers.c:87
+msgid "Choose your personal certificate..."
+msgstr "Välj ditt personliga certifikat..."
+
+#: ../properties/auth-helpers.c:105
+msgid "Choose your private key..."
+msgstr "Välj din privata nyckel..."
+
+#: ../properties/auth-helpers.c:158
+msgid "Choose an OpenVPN static key..."
+msgstr "Välj en statisk OpenVPN-nyckel..."
+
+#: ../properties/auth-helpers.c:176
+#: ../properties/auth-helpers.c:864
+msgid "None"
+msgstr "Ingen"
+
+#: ../properties/auth-helpers.c:519
+msgid "PEM certificates (*.pem, *.crt, *.key)"
+msgstr "PEM-certifikat (*.pem, *.crt, *.key)"
+
+#: ../properties/auth-helpers.c:579
+msgid "OpenVPN Static Keys (*.key)"
+msgstr "Statiska OpenVPN-nycklar (*.key)"
+
+#: ../properties/auth-helpers.c:703
+msgid "Default"
+msgstr "Standard"
+
+#: ../properties/nm-openvpn.c:53
msgid "OpenVPN"
msgstr "OpenVPN"
-#: ../properties/nm-openvpn.c:53
+#: ../properties/nm-openvpn.c:54
msgid "Compatible with the OpenVPN server."
msgstr "Kompatibel med OpenVPN-servern."
-#: ../properties/nm-openvpn.c:239
+#: ../properties/nm-openvpn.c:308
+#: ../properties/nm-openvpn-dialog.glade.h:7
msgid "Certificates (TLS)"
msgstr "Certifikat (TLS)"
-#: ../properties/nm-openvpn.c:251
+#: ../properties/nm-openvpn.c:320
msgid "Password"
msgstr "Lösenord"
-#: ../properties/nm-openvpn.c:265
+#: ../properties/nm-openvpn.c:334
msgid "Password with Certificates (TLS)"
msgstr "Lösenord med certifikat (TLS)"
-#: ../properties/nm-openvpn.c:277
+#: ../properties/nm-openvpn.c:346
msgid "Static Key"
msgstr "Statisk nyckel"
@@ -115,47 +149,91 @@
msgid "CA Certificate:"
msgstr "CA-certifikat:"
-#: ../properties/nm-openvpn-dialog.glade.h:7
+#: ../properties/nm-openvpn-dialog.glade.h:8
+msgid "Cipher:"
+msgstr "Skiffer:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:9
+msgid "General"
+msgstr "Allmänt"
+
+#: ../properties/nm-openvpn-dialog.glade.h:10
msgid "Key Direction:"
msgstr "Nyckelriktning:"
-#: ../properties/nm-openvpn-dialog.glade.h:8
+#: ../properties/nm-openvpn-dialog.glade.h:11
+msgid "Key File:"
+msgstr "Nyckelfil:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:12
+msgid "OpenVPN Advanced Options"
+msgstr "Avancerade alternativ för OpenVPN"
+
+#: ../properties/nm-openvpn-dialog.glade.h:13
msgid "Private Key:"
msgstr "Privat nyckel:"
-#: ../properties/nm-openvpn-dialog.glade.h:9
+#: ../properties/nm-openvpn-dialog.glade.h:14
msgid "Static Key:"
msgstr "Statisk nyckel:"
-#: ../properties/nm-openvpn-dialog.glade.h:10
+#: ../properties/nm-openvpn-dialog.glade.h:15
msgid "Type:"
msgstr "Typ:"
-#: ../properties/nm-openvpn-dialog.glade.h:11
+#: ../properties/nm-openvpn-dialog.glade.h:16
+msgid "Use L_ZO data compression"
+msgstr "Använd L_ZO-datakomprimering"
+
+#: ../properties/nm-openvpn-dialog.glade.h:17
+msgid "Use a TA_P device"
+msgstr "Använd en TA_P-enhet"
+
+#: ../properties/nm-openvpn-dialog.glade.h:18
+msgid "Use a _TCP connection"
+msgstr "Använd en _TCP-anslutning"
+
+#: ../properties/nm-openvpn-dialog.glade.h:19
+msgid "Use additional TLS authentication"
+msgstr "Använd ytterligare TLS-autentisering"
+
+#: ../properties/nm-openvpn-dialog.glade.h:20
+msgid "Use custom gateway p_ort:"
+msgstr "Använd anpassad gatewayp_ort:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:21
msgid "User Certificate:"
msgstr "Användarcertifikat:"
-#: ../properties/nm-openvpn-dialog.glade.h:12
+#: ../properties/nm-openvpn-dialog.glade.h:22
msgid "User name:"
msgstr "Användarnamn:"
-#: ../properties/nm-openvpn-dialog.glade.h:13
+#: ../properties/nm-openvpn-dialog.glade.h:23
msgid "_Gateway:"
msgstr "_Gateway:"
-#: ../properties/nm-openvpn-dialog.glade.h:14
+#: ../properties/nm-openvpn-dialog.glade.h:24
+msgid "gtk-cancel"
+msgstr "Avbryt"
+
+#: ../properties/nm-openvpn-dialog.glade.h:25
+msgid "gtk-ok"
+msgstr "OK"
+
+#: ../properties/nm-openvpn-dialog.glade.h:26
msgid "page 1"
msgstr "sida 1"
-#: ../properties/nm-openvpn-dialog.glade.h:15
+#: ../properties/nm-openvpn-dialog.glade.h:27
msgid "page 2"
msgstr "sida 2"
-#: ../properties/nm-openvpn-dialog.glade.h:16
+#: ../properties/nm-openvpn-dialog.glade.h:28
msgid "page 3"
msgstr "sida 3"
-#: ../properties/nm-openvpn-dialog.glade.h:17
+#: ../properties/nm-openvpn-dialog.glade.h:29
msgid "page 4"
msgstr "sida 4"
@@ -211,10 +289,6 @@
#~ msgstr "Använd LZO-komprimering: %s"
#~ msgid "Yes"
#~ msgstr "Ja"
-#~ msgid "No"
-#~ msgstr "Nej"
-#~ msgid "Cipher: %s"
-#~ msgstr "Skiffer: %s"
#~ msgid "TLS auth: %s %s"
#~ msgstr "TLS-autentisering: %s %s"
#~ msgid "The connection details can be changed using the \"Edit\" button."
@@ -246,8 +320,6 @@
#~ msgstr "Misslyckades med att exportera konfiguration"
#~ msgid "Failed to save file %s"
#~ msgstr "Misslyckades med att spara filen %s"
-#~ msgid "(Default: 1194)"
-#~ msgstr "(Standard: 1194)"
#~ msgid "65536"
#~ msgstr "65536"
#~ msgid "<i>example: 172.16.0.0/16 10.11.12.0/24</i>"
@@ -270,8 +342,6 @@
#~ msgstr "Nätverk"
#~ msgid "Only use _VPN connection for these addresses:"
#~ msgstr "Använd endast _VPN-anslutning för dessa adresser:"
-#~ msgid "OpenVPN Advanced Options"
-#~ msgstr "Avancerade alternativ för OpenVPN"
#~ msgid "OpenVPN Configuration"
#~ msgstr "Konfiguration för OpenVPN"
#~ msgid ""
@@ -291,12 +361,6 @@
#~ msgstr "Delad _nyckel:"
#~ msgid "TLS-Auth"
#~ msgstr "TLS-Auth"
-#~ msgid "Use L_ZO compression"
-#~ msgstr "Använd L_ZO-komprimering"
-#~ msgid "Use TA_P device"
-#~ msgstr "Använd TA_P-enhet"
-#~ msgid "Use _TCP connection"
-#~ msgstr "Använd _TCP-anslutning"
#~ msgid "Use _TLS auth:"
#~ msgstr "Använd _TLS-autentisering:"
#~ msgid "Use cip_her:"
@@ -434,8 +498,6 @@
#~ msgstr "Gruppnamn:"
#~ msgid "Override user name"
#~ msgstr "Åsidosätt användarnamn"
-#~ msgid "Use domain for authentication"
-#~ msgstr "Använd domän för autentisering"
#~ msgid "_Import..."
#~ msgstr "_Importera..."
#~ msgid "Compatible Cisco VPN client (vpnc)"
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.0/properties/auth-helpers.c new/NetworkManager-openvpn-0.7.0/properties/auth-helpers.c
--- old/NetworkManager-openvpn-0.7.0/properties/auth-helpers.c 2008-07-15 10:35:32.000000000 +0200
+++ new/NetworkManager-openvpn-0.7.0/properties/auth-helpers.c 2008-07-31 11:31:23.000000000 +0200
@@ -681,18 +681,26 @@
GtkListStore *store;
GtkTreeIter iter;
const char *openvpn_binary = NULL;
- gchar *cmdline, *tmp, *token;
+ gchar *tmp, **items, **item;
gboolean user_added = FALSE;
+ char *argv[3];
+ GError *error = NULL;
+ gboolean success, found_blank = FALSE;
openvpn_binary = nm_find_openvpn ();
if (!openvpn_binary)
return;
- cmdline = g_strdup_printf("/bin/sh -c \"%s --show-ciphers | /bin/awk '/^[A-Z][A-Z0-9]+-/ { print $1 }'\"", openvpn_binary);
- if (!g_spawn_command_line_sync(cmdline, &tmp, NULL, NULL, NULL))
- goto end;
-
- token = strtok(tmp, "\n");
+ argv[0] = (char *) openvpn_binary;
+ argv[1] = "--show-ciphers";
+ argv[2] = NULL;
+
+ success = g_spawn_sync ("/", argv, NULL, 0, NULL, NULL, &tmp, NULL, NULL, &error);
+ if (!success) {
+ g_warning ("%s: couldn't determine ciphers: %s", __func__, error->message);
+ g_error_free (error);
+ return;
+ }
store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
gtk_combo_box_set_model (box, GTK_TREE_MODEL (store));
@@ -703,18 +711,32 @@
TLS_CIPHER_COL_NAME, _("Default"),
TLS_CIPHER_COL_DEFAULT, TRUE, -1);
- while (token) {
- if (strlen (token)) {
+ items = g_strsplit (tmp, "\n", 0);
+ g_free (tmp);
+
+ for (item = items; *item; item++) {
+ char *space = strchr (*item, ' ');
+
+ /* Don't add anything until after the first blank line */
+ if (!found_blank) {
+ if (!strlen (*item))
+ found_blank = TRUE;
+ continue;
+ }
+
+ if (space)
+ *space = '\0';
+
+ if (strlen (*item)) {
gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter,
- TLS_CIPHER_COL_NAME, token,
+ TLS_CIPHER_COL_NAME, *item,
TLS_CIPHER_COL_DEFAULT, FALSE, -1);
- if (user_cipher && !strcmp (token, user_cipher)) {
+ if (user_cipher && !strcmp (*item, user_cipher)) {
gtk_combo_box_set_active_iter (box, &iter);
user_added = TRUE;
}
}
- token = strtok (NULL, "\n");
}
/* Add the user-specified cipher if it exists wasn't found by openvpn */
@@ -731,7 +753,7 @@
g_object_unref (G_OBJECT (store));
end:
- g_free(tmp);
+ g_strfreev (items);
}
static void
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.0/properties/Makefile.am new/NetworkManager-openvpn-0.7.0/properties/Makefile.am
--- old/NetworkManager-openvpn-0.7.0/properties/Makefile.am 2008-07-01 11:21:19.000000000 +0200
+++ new/NetworkManager-openvpn-0.7.0/properties/Makefile.am 2008-07-31 11:31:23.000000000 +0200
@@ -1,6 +1,5 @@
-
-
-lib_LTLIBRARIES = libnm-openvpn-properties.la
+plugindir = $(libdir)/NetworkManager
+plugin_LTLIBRARIES = libnm-openvpn-properties.la
libnm_openvpn_properties_la_SOURCES = \
nm-openvpn.c \
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.0/properties/nm-openvpn.c new/NetworkManager-openvpn-0.7.0/properties/nm-openvpn.c
--- old/NetworkManager-openvpn-0.7.0/properties/nm-openvpn.c 2008-07-15 10:35:32.000000000 +0200
+++ new/NetworkManager-openvpn-0.7.0/properties/nm-openvpn.c 2008-07-31 11:31:23.000000000 +0200
@@ -1,6 +1,6 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
/***************************************************************************
- * CVSID: $Id: nm-openvpn.c 3802 2008-07-03 02:27:21Z dcbw $
+ * CVSID: $Id$
*
* nm-openvpn.c : GNOME UI dialogs for configuring openvpn VPN connections
*
@@ -63,12 +63,6 @@
G_IMPLEMENT_INTERFACE (NM_TYPE_VPN_PLUGIN_UI_INTERFACE,
openvpn_plugin_ui_interface_init))
-#define OPENVPN_PLUGIN_UI_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), OPENVPN_TYPE_PLUGIN_UI, OpenvpnPluginUiPrivate))
-
-typedef struct {
-} OpenvpnPluginUiPrivate;
-
-
/************** UI widget class **************/
static void openvpn_plugin_ui_widget_interface_init (NMVpnPluginUiWidgetInterface *iface_class);
@@ -195,8 +189,6 @@
static void
advanced_dialog_close_cb (GtkWidget *dialog, gpointer user_data)
{
- OpenvpnPluginUiWidget *self = OPENVPN_PLUGIN_UI_WIDGET (user_data);
-
gtk_widget_hide (dialog);
/* gtk_widget_destroy() will remove the window from the window group */
gtk_widget_destroy (dialog);
@@ -209,6 +201,11 @@
OpenvpnPluginUiWidgetPrivate *priv = OPENVPN_PLUGIN_UI_WIDGET_GET_PRIVATE (self);
GError *error = NULL;
+ if (response != GTK_RESPONSE_OK) {
+ advanced_dialog_close_cb (dialog, self);
+ return;
+ }
+
if (priv->advanced)
g_hash_table_destroy (priv->advanced);
priv->advanced = advanced_dialog_new_hash_from_dialog (dialog, &error);
@@ -702,8 +699,6 @@
{
GObjectClass *object_class = G_OBJECT_CLASS (req_class);
- g_type_class_add_private (req_class, sizeof (OpenvpnPluginUiPrivate));
-
object_class->get_property = get_property;
g_object_class_override_property (object_class,
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.0/properties/nm-openvpn-dialog.glade new/NetworkManager-openvpn-0.7.0/properties/nm-openvpn-dialog.glade
--- old/NetworkManager-openvpn-0.7.0/properties/nm-openvpn-dialog.glade 2008-06-29 12:32:40.000000000 +0200
+++ new/NetworkManager-openvpn-0.7.0/properties/nm-openvpn-dialog.glade 2008-07-24 09:52:27.000000000 +0200
@@ -658,6 +658,7 @@
</widget>
<widget class="GtkDialog" id="openvpn-advanced-dialog">
<property name="border_width">5</property>
+ <property name="title" translatable="yes">OpenVPN Advanced Options</property>
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
<property name="destroy_with_parent">True</property>
<property name="icon_name">stock-preferences</property>
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.0/src/Makefile.am new/NetworkManager-openvpn-0.7.0/src/Makefile.am
--- old/NetworkManager-openvpn-0.7.0/src/Makefile.am 2008-04-16 08:00:14.000000000 +0200
+++ new/NetworkManager-openvpn-0.7.0/src/Makefile.am 2008-07-31 11:31:23.000000000 +0200
@@ -1,7 +1,6 @@
AM_CPPFLAGS = \
$(DBUS_CFLAGS) \
$(NETWORK_MANAGER_CFLAGS) \
- -Wall \
-DDBUS_API_SUBJECT_TO_CHANGE \
-DG_DISABLE_DEPRECATED \
-DBINDIR=\"$(bindir)\" \
@@ -13,7 +12,7 @@
-DLOCALSTATEDIR=\""$(localstatedir)"\" \
-DDATADIR=\"$(datadir)\"
-bin_PROGRAMS = nm-openvpn-service nm-openvpn-service-openvpn-helper
+libexec_PROGRAMS = nm-openvpn-service nm-openvpn-service-openvpn-helper
nm_openvpn_service_SOURCES = \
nm-openvpn-service.c \
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.0/src/nm-openvpn-service.c new/NetworkManager-openvpn-0.7.0/src/nm-openvpn-service.c
--- old/NetworkManager-openvpn-0.7.0/src/nm-openvpn-service.c 2008-07-01 11:21:19.000000000 +0200
+++ new/NetworkManager-openvpn-0.7.0/src/nm-openvpn-service.c 2008-07-31 11:31:23.000000000 +0200
@@ -18,7 +18,7 @@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * $Id: nm-openvpn-service.c 3788 2008-07-01 02:27:16Z dcbw $
+ * $Id$
*
*/
@@ -53,7 +53,7 @@
#include "nm-openvpn-service.h"
#include "nm-utils.h"
-#define NM_OPENVPN_HELPER_PATH BINDIR"/nm-openvpn-service-openvpn-helper"
+#define NM_OPENVPN_HELPER_PATH LIBEXECDIR"/nm-openvpn-service-openvpn-helper"
G_DEFINE_TYPE (NMOpenvpnPlugin, nm_openvpn_plugin, NM_TYPE_VPN_PLUGIN)
@@ -444,7 +444,7 @@
g_ptr_array_add (openvpn_argv, (gpointer) g_value_get_string ((GValue *) tmp));
tmp = g_hash_table_lookup (properties, NM_OPENVPN_KEY_TA_DIR);
- if (tmp)
+ if (tmp && strlen (g_value_get_string (tmp)))
g_ptr_array_add (openvpn_argv, (gpointer) g_value_get_string ((GValue *) tmp));
}
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.0/src/nm-openvpn-service-openvpn-helper.c new/NetworkManager-openvpn-0.7.0/src/nm-openvpn-service-openvpn-helper.c
--- old/NetworkManager-openvpn-0.7.0/src/nm-openvpn-service-openvpn-helper.c 2008-07-15 10:35:32.000000000 +0200
+++ new/NetworkManager-openvpn-0.7.0/src/nm-openvpn-service-openvpn-helper.c 2008-07-24 09:52:08.000000000 +0200
@@ -22,7 +22,7 @@
* (C) Copyright 2005 Red Hat, Inc.
* (C) Copyright 2005 Tim Niemueller
*
- * $Id: nm-openvpn-service-openvpn-helper.c 3813 2008-07-07 18:58:42Z dcbw $
+ * $Id$
*
*/
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org