[network-manager-openswan/lr/libreswan] all: rename to NetworkManager-libreswan
- From: Lubomir Rintel <lkundrak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-openswan/lr/libreswan] all: rename to NetworkManager-libreswan
- Date: Sun, 1 Nov 2015 13:16:51 +0000 (UTC)
commit ed10b9f49781db251237b27174c868ca08d99b38
Author: Lubomir Rintel <lkundrak v3 sk>
Date: Sun Nov 1 12:16:05 2015 +0100
all: rename to NetworkManager-libreswan
.gitignore | 16 +-
Makefile.am | 10 +-
auth-dialog/Makefile.am | 10 +-
auth-dialog/main.c | 48 ++--
...n.in => nm-libreswan-auth-dialog.desktop.in.in} | 2 +-
autogen.sh | 2 +-
configure.ac | 10 +-
...openswan.doap => network-manager-libreswan.doap | 10 +-
...nswan-service.conf => nm-libreswan-service.conf | 8 +-
nm-libreswan-service.name.in | 14 ++
nm-openswan-service.name.in | 13 -
po/POTFILES.in | 8 +-
po/POTFILES.skip | 4 +-
po/ar.po | 2 +-
po/bg.po | 4 +-
po/bs.po | 52 ++--
po/ca.po | 4 +-
po/cs.po | 54 +++---
po/da.po | 4 +-
po/de.po | 62 +++---
po/el.po | 60 +++---
po/es.po | 64 +++---
po/et.po | 4 +-
po/eu.po | 62 +++---
po/fi.po | 56 +++---
po/fr.po | 4 +-
po/gl.po | 56 +++---
po/gu.po | 4 +-
po/hu.po | 68 +++---
po/id.po | 66 +++---
po/it.po | 54 +++---
po/ja.po | 54 +++---
po/lt.po | 58 +++---
po/lv.po | 54 +++---
po/mk.po | 4 +-
po/mr.po | 4 +-
po/nl.po | 4 +-
po/or.po | 4 +-
po/pa.po | 4 +-
po/pl.po | 52 ++--
po/pt.po | 4 +-
po/pt_BR.po | 60 +++---
po/ru.po | 2 +-
po/sl.po | 58 +++---
po/sr.po | 66 +++---
po/sr latin po | 66 +++---
po/sv.po | 56 +++---
po/ta.po | 4 +-
po/te.po | 4 +-
po/tr.po | 60 +++---
po/zh_CN.po | 4 +-
po/zh_HK.po | 4 +-
po/zh_TW.po | 4 +-
properties/Makefile.am | 34 ++--
...m-openswan-dialog.ui => nm-libreswan-dialog.ui} | 2 +-
properties/{nm-openswan.c => nm-libreswan.c} | 196 ++++++++--------
properties/nm-libreswan.h | 71 ++++++
properties/nm-openswan.h | 71 ------
src/Makefile.am | 24 +-
...vice-helper.c => nm-libreswan-service-helper.c} | 28 ++--
...m-openswan-service.c => nm-libreswan-service.c} | 248 ++++++++++----------
src/nm-libreswan-service.h | 54 +++++
src/nm-openswan-service.h | 54 -----
63 files changed, 1125 insertions(+), 1122 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 31bb06f..c07e7cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,13 +28,13 @@ m4/intltool.m4
m4/libtool.m4
m4/lt*.m4
-auth-dialog/nm-openswan-auth-dialog
-auth-dialog/nm-openswan-auth-dialog.desktop
-auth-dialog/nm-openswan-auth-dialog.desktop.in
-nm-openswan-service.name
-nm-openswan.desktop
-src/nm-openswan-service
-src/nm-openswan-service-helper
+auth-dialog/nm-libreswan-auth-dialog
+auth-dialog/nm-libreswan-auth-dialog.desktop
+auth-dialog/nm-libreswan-auth-dialog.desktop.in
+nm-libreswan-service.name
+nm-libreswan.desktop
+src/nm-libreswan-service
+src/nm-libreswan-service-helper
src/show-xfrm
-/NetworkManager-openswan*.tar*
+/NetworkManager-libreswan*.tar*
diff --git a/Makefile.am b/Makefile.am
index 1292e69..6e57cd7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,24 +7,24 @@ SUBDIRS += auth-dialog properties po
endif
dbusservicedir = $(sysconfdir)/dbus-1/system.d
-dbusservice_DATA = nm-openswan-service.conf
+dbusservice_DATA = nm-libreswan-service.conf
nmvpnservicedir = $(NM_VPN_SERVICE_DIR)
-nmvpnservice_DATA = nm-openswan-service.name
+nmvpnservice_DATA = nm-libreswan-service.name
if WITH_LIBNM_GLIB
nmvpnoldservicedir = $(sysconfdir)/NetworkManager/VPN
-nmvpnoldservice_DATA = nm-openswan-service.name
+nmvpnoldservice_DATA = nm-libreswan-service.name
endif
-nm-openswan-service.name: $(srcdir)/nm-openswan-service.name.in
+nm-libreswan-service.name: $(srcdir)/nm-libreswan-service.name.in
sed -e 's|[ ]LIBEXECDIR[@]|$(libexecdir)|g' \
-e 's|[ ]PLUGINDIR[@]|$(libdir)/NetworkManager|g' \
$< >$@
DISTCHECK_CONFIGURE_FLAGS = --enable-more-warnings=yes
-EXTRA_DIST = nm-openswan-service.name.in \
+EXTRA_DIST = nm-libreswan-service.name.in \
$(dbusservice_DATA) \
intltool-extract.in \
intltool-merge.in \
diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am
index 4d7bdeb..c988932 100644
--- a/auth-dialog/Makefile.am
+++ b/auth-dialog/Makefile.am
@@ -8,11 +8,11 @@ AM_CPPFLAGS = \
-DBINDIR=\""$(bindir)"\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\"
-libexec_PROGRAMS = nm-openswan-auth-dialog
+libexec_PROGRAMS = nm-libreswan-auth-dialog
-nm_openswan_auth_dialog_SOURCES = main.c
+nm_libreswan_auth_dialog_SOURCES = main.c
-nm_openswan_auth_dialog_LDADD = \
+nm_libreswan_auth_dialog_LDADD = \
$(LIBNM_LIBS) \
$(GTK_LIBS) \
$(LIBNMA_LIBS) \
@@ -20,8 +20,8 @@ nm_openswan_auth_dialog_LDADD = \
@INTLTOOL_DESKTOP_RULE@
desktopdir = $(datadir)/applications
-desktop_in_in_files = nm-openswan-auth-dialog.desktop.in.in
-desktop_in_files = nm-openswan-auth-dialog.desktop.in
+desktop_in_in_files = nm-libreswan-auth-dialog.desktop.in.in
+desktop_in_files = nm-libreswan-auth-dialog.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
EXTRA_DIST = \
diff --git a/auth-dialog/main.c b/auth-dialog/main.c
index 7d07b8a..3af2912 100644
--- a/auth-dialog/main.c
+++ b/auth-dialog/main.c
@@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* NetworkManager Wireless Applet -- Display wireless access points and allow user control
+/* NetworkManager-libreswan -- Network Manager Libreswan plugin
*
* Dan Williams <dcbw redhat com>
* Avesh Agarwal <avagarwa redhat com>
@@ -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.
*
- * (C) Copyright 2004 - 2011 Red Hat, Inc.
+ * (C) Copyright 2004 - 2015 Red Hat, Inc.
*/
#ifdef HAVE_CONFIG_H
@@ -37,7 +37,7 @@
#include <nm-vpn-service-plugin.h>
#include <nma-vpn-password-dialog.h>
-#include <../src/nm-openswan-service.h>
+#include <../src/nm-libreswan-service.h>
#define KEYRING_UUID_TAG "connection-uuid"
#define KEYRING_SN_TAG "setting-name"
@@ -186,7 +186,7 @@ eui_finish (const char *vpn_name,
if (need_password || existing_password || retry) {
show = (need_password && !existing_password) || retry;
keyfile_add_entry_info (keyfile,
- NM_OPENSWAN_XAUTH_PASSWORD,
+ NM_LIBRESWAN_XAUTH_PASSWORD,
existing_password ? existing_password : "",
_("Password:"),
TRUE,
@@ -196,7 +196,7 @@ eui_finish (const char *vpn_name,
if (need_group_password || existing_group_password || retry) {
show = (need_group_password && !existing_group_password) || retry;
keyfile_add_entry_info (keyfile,
- NM_OPENSWAN_PSK_VALUE,
+ NM_LIBRESWAN_PSK_VALUE,
existing_group_password ? existing_group_password : "",
_("Group Password:"),
TRUE,
@@ -297,9 +297,9 @@ std_finish (const char *vpn_name,
{
/* Send the passwords back to our parent */
if (password)
- printf ("%s\n%s\n", NM_OPENSWAN_XAUTH_PASSWORD, password);
+ printf ("%s\n%s\n", NM_LIBRESWAN_XAUTH_PASSWORD, password);
if (group_password)
- printf ("%s\n%s\n", NM_OPENSWAN_PSK_VALUE, group_password);
+ printf ("%s\n%s\n", NM_LIBRESWAN_PSK_VALUE, group_password);
printf ("\n\n");
/* for good measure, flush stdout since Kansas is going Bye-Bye */
@@ -324,12 +324,12 @@ get_pw_flags (GHashTable *hash, const char *secret_name, const char *mode_name)
/* Otherwise try old "password type" value */
val = g_hash_table_lookup (hash, mode_name);
if (val) {
- if (g_strcmp0 (val, NM_OPENSWAN_PW_TYPE_ASK) == 0)
+ if (g_strcmp0 (val, NM_LIBRESWAN_PW_TYPE_ASK) == 0)
return NM_SETTING_SECRET_FLAG_NOT_SAVED;
- else if (g_strcmp0 (val, NM_OPENSWAN_PW_TYPE_UNUSED) == 0)
+ else if (g_strcmp0 (val, NM_LIBRESWAN_PW_TYPE_UNUSED) == 0)
return NM_SETTING_SECRET_FLAG_NOT_REQUIRED;
- /* NM_OPENSWAN_PW_TYPE_SAVE means FLAG_NONE */
+ /* NM_LIBRESWAN_PW_TYPE_SAVE means FLAG_NONE */
}
return NM_SETTING_SECRET_FLAG_NONE;
@@ -351,20 +351,20 @@ get_existing_passwords (GHashTable *vpn_data,
g_return_if_fail (out_group_password != NULL);
if (need_password) {
- upw_flags = get_pw_flags (existing_secrets, NM_OPENSWAN_XAUTH_PASSWORD,
NM_OPENSWAN_XAUTH_PASSWORD_INPUT_MODES);
+ upw_flags = get_pw_flags (existing_secrets, NM_LIBRESWAN_XAUTH_PASSWORD,
NM_LIBRESWAN_XAUTH_PASSWORD_INPUT_MODES);
if (!(upw_flags & NM_SETTING_SECRET_FLAG_NOT_SAVED)) {
- *out_password = g_strdup (g_hash_table_lookup (existing_secrets,
NM_OPENSWAN_XAUTH_PASSWORD));
+ *out_password = g_strdup (g_hash_table_lookup (existing_secrets,
NM_LIBRESWAN_XAUTH_PASSWORD));
if (!*out_password)
- *out_password = keyring_lookup_secret (vpn_uuid, NM_OPENSWAN_XAUTH_PASSWORD);
+ *out_password = keyring_lookup_secret (vpn_uuid, NM_LIBRESWAN_XAUTH_PASSWORD);
}
}
if (need_group_password) {
- gpw_flags = get_pw_flags (existing_secrets, NM_OPENSWAN_PSK_VALUE,
NM_OPENSWAN_PSK_INPUT_MODES);
+ gpw_flags = get_pw_flags (existing_secrets, NM_LIBRESWAN_PSK_VALUE,
NM_LIBRESWAN_PSK_INPUT_MODES);
if (!(gpw_flags & NM_SETTING_SECRET_FLAG_NOT_SAVED)) {
- *out_group_password = g_strdup (g_hash_table_lookup (existing_secrets,
NM_OPENSWAN_PSK_VALUE));
+ *out_group_password = g_strdup (g_hash_table_lookup (existing_secrets,
NM_LIBRESWAN_PSK_VALUE));
if (!*out_group_password)
- *out_group_password = keyring_lookup_secret (vpn_uuid, NM_OPENSWAN_PSK_VALUE);
+ *out_group_password = keyring_lookup_secret (vpn_uuid,
NM_LIBRESWAN_PSK_VALUE);
}
}
}
@@ -386,21 +386,21 @@ get_passwords_required (GHashTable *data,
for (iter = hints; iter && *iter; iter++) {
if (!prompt && g_str_has_prefix (*iter, VPN_MSG_TAG))
prompt = g_strdup (*iter + strlen (VPN_MSG_TAG));
- else if (strcmp (*iter, NM_OPENSWAN_XAUTH_PASSWORD) == 0)
+ else if (strcmp (*iter, NM_LIBRESWAN_XAUTH_PASSWORD) == 0)
*out_need_password = TRUE;
- else if (strcmp (*iter, NM_OPENSWAN_PSK_VALUE) == 0)
+ else if (strcmp (*iter, NM_LIBRESWAN_PSK_VALUE) == 0)
*out_need_group_password = TRUE;
}
return prompt;
}
/* User password (XAuth password) */
- flags = get_pw_flags (data, NM_OPENSWAN_XAUTH_PASSWORD, NM_OPENSWAN_XAUTH_PASSWORD_INPUT_MODES);
+ flags = get_pw_flags (data, NM_LIBRESWAN_XAUTH_PASSWORD, NM_LIBRESWAN_XAUTH_PASSWORD_INPUT_MODES);
if (!(flags & NM_SETTING_SECRET_FLAG_NOT_REQUIRED))
*out_need_password = TRUE;
- /* Group password (IPSec secret) */
- flags = get_pw_flags (data, NM_OPENSWAN_PSK_VALUE, NM_OPENSWAN_PSK_INPUT_MODES);
+ /* Group password (IPsec secret) */
+ flags = get_pw_flags (data, NM_LIBRESWAN_PSK_VALUE, NM_LIBRESWAN_PSK_INPUT_MODES);
if (!(flags & NM_SETTING_SECRET_FLAG_NOT_REQUIRED))
*out_need_group_password = TRUE;
@@ -451,7 +451,7 @@ main (int argc, char *argv[])
gtk_init (&argc, &argv);
textdomain (GETTEXT_PACKAGE);
- context = g_option_context_new ("- IPSec auth dialog");
+ context = g_option_context_new ("- IPsec auth dialog");
g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
if (!g_option_context_parse (context, &argc, &argv, &error)) {
@@ -467,8 +467,8 @@ main (int argc, char *argv[])
return 1;
}
- if (strcmp (vpn_service, NM_DBUS_SERVICE_OPENSWAN) != 0) {
- fprintf (stderr, "This dialog only works with the '%s' service\n", NM_DBUS_SERVICE_OPENSWAN);
+ if (strcmp (vpn_service, NM_DBUS_SERVICE_LIBRESWAN) != 0) {
+ fprintf (stderr, "This dialog only works with the '%s' service\n", NM_DBUS_SERVICE_LIBRESWAN);
return 1;
}
diff --git a/auth-dialog/nm-openswan-auth-dialog.desktop.in.in
b/auth-dialog/nm-libreswan-auth-dialog.desktop.in.in
similarity index 72%
rename from auth-dialog/nm-openswan-auth-dialog.desktop.in.in
rename to auth-dialog/nm-libreswan-auth-dialog.desktop.in.in
index 9c91b6b..401b2a9 100644
--- a/auth-dialog/nm-openswan-auth-dialog.desktop.in.in
+++ b/auth-dialog/nm-libreswan-auth-dialog.desktop.in.in
@@ -1,7 +1,7 @@
[Desktop Entry]
_Name=Network
_Comment=Request VPN authentication
-Exec= LIBEXECDIR@/nm-openswan-auth-dialog
+Exec= LIBEXECDIR@/nm-libreswan-auth-dialog
Terminal=false
Type=Application
NoDisplay=true
diff --git a/autogen.sh b/autogen.sh
index f37ec64..6762ee4 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,7 +4,7 @@
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
REQUIRED_AUTOMAKE_VERSION=1.7
-PKG_NAME=NetworkManager-openswan
+PKG_NAME=NetworkManager-libreswan
(test -f $srcdir/configure.ac \
&& test -f $srcdir/auth-dialog/main.c) || {
diff --git a/configure.ac b/configure.ac
index c9319ea..50f37fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
AC_PREREQ(2.52)
-AC_INIT(NetworkManager-openswan, 1.1.0, avagarwa redhat com, NetworkManager-openswan)
+AC_INIT(NetworkManager-libreswan, 1.1.0, avagarwa redhat com, NetworkManager-libreswan)
AM_INIT_AUTOMAKE([subdir-objects no-dist-gzip dist-xz])
AM_MAINTAINER_MODE
@@ -42,9 +42,9 @@ AC_CHECK_FUNCS(select socket uname)
dnl
dnl GNOME support
dnl
-AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-openswan without GNOME support,
e.g. vpn service only]))
+AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-libreswan without GNOME support,
e.g. vpn service only]))
AM_CONDITIONAL(WITH_GNOME, test x"$with_gnome" != xno)
-AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-openswan without
libnm-glib comatibility]))
+AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-libreswan without
libnm-glib comatibility]))
AM_CONDITIONAL(WITH_LIBNM_GLIB, test x"$with_libnm_glib" != xno)
dnl ensure that when the Automake generated makefile calls aclocal,
@@ -55,7 +55,7 @@ if test -n "$ac_macro_dir"; then
fi
AC_SUBST([ACLOCAL_AMFLAGS])
-GETTEXT_PACKAGE=NetworkManager-openswan
+GETTEXT_PACKAGE=NetworkManager-libreswan
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
@@ -108,7 +108,7 @@ AC_CONFIG_FILES([
Makefile
src/Makefile
auth-dialog/Makefile
-auth-dialog/nm-openswan-auth-dialog.desktop.in
+auth-dialog/nm-libreswan-auth-dialog.desktop.in
properties/Makefile
po/Makefile.in
])
diff --git a/network-manager-openswan.doap b/network-manager-libreswan.doap
similarity index 80%
rename from network-manager-openswan.doap
rename to network-manager-libreswan.doap
index ef8f820..6ebb528 100644
--- a/network-manager-openswan.doap
+++ b/network-manager-libreswan.doap
@@ -4,13 +4,13 @@
xmlns:gnome="http://api.gnome.org/doap-extensions#";
xmlns="http://usefulinc.com/ns/doap#";>
- <name xml:lang="en">network-manager-openswan</name>
- <shortdesc xml:lang="en">OpenSWAN VPN client plugin for NetworkManager</shortdesc>
- <description>Provides easy connections to IPsec VPNs using NetworkManager and OpenSWAN.</description>
+ <name xml:lang="en">network-manager-libreswan</name>
+ <shortdesc xml:lang="en">Libreswan VPN client plugin for NetworkManager</shortdesc>
+ <description>Provides easy connections to IPsec VPNs using NetworkManager and Libreswan.</description>
<homepage rdf:resource="https://wiki.gnome.org/Projects/NetworkManager"; />
<mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/networkmanager-list"; />
- <download-page rdf:resource="http://download.gnome.org/sources/NetworkManager-openswan/"; />
- <bug-database
rdf:resource="https://bugzilla.gnome.org/browse.cgi?product=NetworkManager&component=VPN:%20Openswan"; />
+ <download-page rdf:resource="http://download.gnome.org/sources/NetworkManager-libreswan/"; />
+ <bug-database
rdf:resource="https://bugzilla.gnome.org/browse.cgi?product=NetworkManager&component=VPN:%20Libreswan"; />
<category rdf:resource="http://api.gnome.org/doap-extensions#desktop"; />
diff --git a/nm-openswan-service.conf b/nm-libreswan-service.conf
similarity index 50%
rename from nm-openswan-service.conf
rename to nm-libreswan-service.conf
index 1e2ba06..b5cecc6 100644
--- a/nm-openswan-service.conf
+++ b/nm-libreswan-service.conf
@@ -3,12 +3,12 @@
"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd";>
<busconfig>
<policy user="root">
- <allow own="org.freedesktop.NetworkManager.openswan"/>
- <allow send_destination="org.freedesktop.NetworkManager.openswan"/>
+ <allow own="org.freedesktop.NetworkManager.libreswan"/>
+ <allow send_destination="org.freedesktop.NetworkManager.libreswan"/>
</policy>
<policy context="default">
- <deny own="org.freedesktop.NetworkManager.openswan"/>
- <deny send_destination="org.freedesktop.NetworkManager.openswan"/>
+ <deny own="org.freedesktop.NetworkManager.libreswan"/>
+ <deny send_destination="org.freedesktop.NetworkManager.libreswan"/>
</policy>
</busconfig>
diff --git a/nm-libreswan-service.name.in b/nm-libreswan-service.name.in
new file mode 100644
index 0000000..cb221d1
--- /dev/null
+++ b/nm-libreswan-service.name.in
@@ -0,0 +1,14 @@
+[VPN Connection]
+name=libreswan
+service=org.freedesktop.NetworkManager.libreswan
+aliases=org.freedesktop.NetworkManager.openswan
+program= LIBEXECDIR@/nm-libreswan-service
+
+[libnm]
+plugin= PLUGINDIR@/libnm-vpn-plugin-libreswan.so
+
+[GNOME]
+auth-dialog= LIBEXECDIR@/nm-libreswan-auth-dialog
+properties= PLUGINDIR@/libnm-libreswan-properties
+supports-external-ui-mode=true
+supports-hints=true
diff --git a/po/POTFILES.in b/po/POTFILES.in
index eeeb16f..ea08bcb 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,7 @@
# List of source files containing translatable strings.
# Please keep this file sorted alphabetically.
auth-dialog/main.c
-auth-dialog/nm-openswan-auth-dialog.desktop.in.in
-properties/nm-openswan.c
-[type: gettext/glade]properties/nm-openswan-dialog.ui
-src/nm-openswan-service.c
+auth-dialog/nm-libreswan-auth-dialog.desktop.in.in
+properties/nm-libreswan.c
+[type: gettext/glade]properties/nm-libreswan-dialog.ui
+src/nm-libreswan-service.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index e8fab9a..3ebf1db 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,3 +1,3 @@
-auth-dialog/nm-openswan-auth-dialog.desktop.in
+auth-dialog/nm-libreswan-auth-dialog.desktop.in
# https://bugs.launchpad.net/intltool/+bug/1117944
-sub/auth-dialog/nm-openswan-auth-dialog.desktop.in
+sub/auth-dialog/nm-libreswan-auth-dialog.desktop.in
diff --git a/po/ar.po b/po/ar.po
index 21276d2..845becc 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -81,7 +81,7 @@ msgstr "عميل متوافق مع VPN سيسكو (vpnc) "
#: ../properties/nm-vpnc.c:52
msgid ""
-"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based "
+"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-based "
"VPN gateways."
msgstr ""
diff --git a/po/bg.po b/po/bg.po
index fc0cc1f..fce2aa2 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -75,10 +75,10 @@ msgstr "ВЧМ съвместима със Cisco (vpnc)"
#: ../properties/nm-vpnc.c:52
msgid ""
-"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based "
+"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-based "
"VPN gateways."
msgstr ""
-"Съвместима с шлюзове предоставящи ВЧМ чрез IPSec на Cisco, Juniper, "
+"Съвместима с шлюзове предоставящи ВЧМ чрез IPsec на Cisco, Juniper, "
"Netscreen и Sonicwall."
#: ../properties/nm-vpnc.c:204
diff --git a/po/bs.po b/po/bs.po
index 07fc9b4..6408a6d 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: bosnianuniversetranslation\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=network-manager-openswan&keywords=I18N+L10N&component=general\n"
+"product=network-manager-libreswan&keywords=I18N+L10N&component=general\n"
"POT-Creation-Date: 2015-02-26 23:32+0000\n"
"PO-Revision-Date: 2015-02-05 00:27+0000\n"
"Last-Translator: Dženana <dkapetanov1 etf unsa ba>\n"
@@ -46,106 +46,106 @@ msgid "You need to authenticate to access the Virtual Private Network '%s'."
msgstr ""
"Trebate provjeriti atutentičnost za pristup virtuelnoj privatnoj mreži '%s'."
-#: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:1
+#: ../auth-dialog/nm-libreswan-auth-dialog.desktop.in.in.h:1
msgid "Network"
msgstr "Mreža"
-#: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:2
+#: ../auth-dialog/nm-libreswan-auth-dialog.desktop.in.in.h:2
msgid "Request VPN authentication"
msgstr "Zatraži VPN autentifikaciju"
-#: ../properties/nm-openswan.c:47
+#: ../properties/nm-libreswan.c:47
msgid "IPsec based VPN"
msgstr "IPsec VPN koji se temelji"
-#: ../properties/nm-openswan.c:48
+#: ../properties/nm-libreswan.c:48
msgid "IPsec, IKEv1, IKEv2 based VPN"
msgstr "IPsec, IKEv1, IKEv2 baziran VPN"
-#: ../properties/nm-openswan.c:303
+#: ../properties/nm-libreswan.c:303
msgid "Saved"
msgstr "Snimljeno"
-#: ../properties/nm-openswan.c:310
+#: ../properties/nm-libreswan.c:310
msgid "Always Ask"
msgstr "Uvijek pitaj"
-#: ../properties/nm-openswan.c:317
+#: ../properties/nm-libreswan.c:317
msgid "Not Required"
msgstr "Nije potrebno"
-#: ../properties/nm-openswan-dialog.ui.h:1
+#: ../properties/nm-libreswan-dialog.ui.h:1
msgid " "
msgstr " "
-#: ../properties/nm-openswan-dialog.ui.h:2
+#: ../properties/nm-libreswan-dialog.ui.h:2
msgid "<b>General</b>"
msgstr "<b>Opšte</b>"
-#: ../properties/nm-openswan-dialog.ui.h:3
+#: ../properties/nm-libreswan-dialog.ui.h:3
msgid "Show passwords"
msgstr "Prikaži lozinke"
-#: ../properties/nm-openswan-dialog.ui.h:4
+#: ../properties/nm-libreswan-dialog.ui.h:4
msgid "Gro_up password:"
msgstr "Lozinka gru_pe:"
-#: ../properties/nm-openswan-dialog.ui.h:5
+#: ../properties/nm-libreswan-dialog.ui.h:5
msgid "_Gateway:"
msgstr "_Mrežni izlaz:"
-#: ../properties/nm-openswan-dialog.ui.h:6
+#: ../properties/nm-libreswan-dialog.ui.h:6
msgid "G_roup name:"
msgstr "Ime g_rupe:"
-#: ../properties/nm-openswan-dialog.ui.h:7
+#: ../properties/nm-libreswan-dialog.ui.h:7
msgid "_User password:"
msgstr "_Korisnička šifra:"
-#: ../properties/nm-openswan-dialog.ui.h:8
+#: ../properties/nm-libreswan-dialog.ui.h:8
msgid "<b>Optional</b>"
msgstr "<b>Opciono</b>"
-#: ../properties/nm-openswan-dialog.ui.h:9
+#: ../properties/nm-libreswan-dialog.ui.h:9
msgid "User name:"
msgstr "Korisničko ime:"
-#: ../properties/nm-openswan-dialog.ui.h:10
+#: ../properties/nm-libreswan-dialog.ui.h:10
msgid "Phase1 Algorithms:"
msgstr "Faza1Algoritmi;:"
-#: ../properties/nm-openswan-dialog.ui.h:11
+#: ../properties/nm-libreswan-dialog.ui.h:11
msgid "Phase2 Algorithms:"
msgstr "Faza2Algoritmi;:"
-#: ../properties/nm-openswan-dialog.ui.h:12
+#: ../properties/nm-libreswan-dialog.ui.h:12
msgid "Domain:"
msgstr "Domena:"
-#: ../src/nm-openswan-service.c:831
+#: ../src/nm-libreswan-service.c:831
msgid "A password is required."
msgstr "Lozinka je potrebna."
-#: ../src/nm-openswan-service.c:1197
+#: ../src/nm-libreswan-service.c:1197
msgid ""
"Could not process the request because the VPN connection settings were "
"invalid."
msgstr ""
"Ne mogu obraditi zahtjev zato što postavke VPN konekcije su bile neispravne."
-#: ../src/nm-openswan-service.c:1211
+#: ../src/nm-libreswan-service.c:1211
msgid "Unhandled pending authentication."
msgstr "Neobrađena autentifikacija na čekanju."
-#: ../src/nm-openswan-service.c:1297
+#: ../src/nm-libreswan-service.c:1297
msgid "Don't quit when VPN connection terminates"
msgstr "Ne izlazi kada se VPN konekcija prekida"
-#: ../src/nm-openswan-service.c:1298
+#: ../src/nm-libreswan-service.c:1298
msgid "Enable verbose debug logging (may expose passwords)"
msgstr "Omogući detaljno praćenje grešaka (može otkriti lozinke)"
-#: ../src/nm-openswan-service.c:1321
+#: ../src/nm-libreswan-service.c:1321
msgid ""
"This service provides integrated IPsec VPN capability to NetworkManager."
msgstr "Ova usluga obezbeđuje Upravniku mreže objedinjenu IPsec VPN mogućnost."
diff --git a/po/ca.po b/po/ca.po
index 6ef9d0e..a312bc8 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -64,11 +64,11 @@ msgstr "VPN compatible amb Cisco (vpnc)"
#: ../properties/nm-vpnc.c:54
msgid ""
-"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based "
+"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-based "
"VPN gateways."
msgstr ""
"Compatible amb diverses passarel·les VPN Cisco, Juniper, Netscreen i "
-"Sonicwall basades en IPSec."
+"Sonicwall basades en IPsec."
#: ../properties/nm-vpnc.c:339
msgid "Saved"
diff --git a/po/cs.po b/po/cs.po
index 691d97b..600b044 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -9,9 +9,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: network-manager-openswan\n"
+"Project-Id-Version: network-manager-libreswan\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=network-manager-openswan&keywords=I18N+L10N&component=general\n"
+"product=network-manager-libreswan&keywords=I18N+L10N&component=general\n"
"POT-Creation-Date: 2014-12-13 11:12+0000\n"
"PO-Revision-Date: 2014-11-03 15:47+0100\n"
"Last-Translator: Zdeněk Hataš <zdenek hatas gmail com>\n"
@@ -49,106 +49,106 @@ msgstr "Heslo _skupiny:"
msgid "You need to authenticate to access the Virtual Private Network '%s'."
msgstr "Pro přístup do VPN „%s“ se musí provést ověření."
-#: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:1
+#: ../auth-dialog/nm-libreswan-auth-dialog.desktop.in.in.h:1
msgid "Network"
msgstr "Síť"
-#: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:2
+#: ../auth-dialog/nm-libreswan-auth-dialog.desktop.in.in.h:2
msgid "Request VPN authentication"
msgstr "Požadovat ověření VPN"
-#: ../properties/nm-openswan.c:47
+#: ../properties/nm-libreswan.c:47
msgid "IPsec based VPN"
msgstr "VPN pomocí IPsec"
-#: ../properties/nm-openswan.c:48
+#: ../properties/nm-libreswan.c:48
msgid "IPsec, IKEv1, IKEv2 based VPN"
msgstr "VPN pomocí IPsec, IKEv1, IKEv2"
-#: ../properties/nm-openswan.c:303
+#: ../properties/nm-libreswan.c:303
msgid "Saved"
msgstr "Uloženo"
-#: ../properties/nm-openswan.c:310
+#: ../properties/nm-libreswan.c:310
msgid "Always Ask"
msgstr "Vždy se ptát"
-#: ../properties/nm-openswan.c:317
+#: ../properties/nm-libreswan.c:317
msgid "Not Required"
msgstr "Není vyžadováno"
-#: ../properties/nm-openswan-dialog.ui.h:1
+#: ../properties/nm-libreswan-dialog.ui.h:1
msgid " "
msgstr " "
-#: ../properties/nm-openswan-dialog.ui.h:2
+#: ../properties/nm-libreswan-dialog.ui.h:2
msgid "<b>General</b>"
msgstr "<b>Obecné</b>"
-#: ../properties/nm-openswan-dialog.ui.h:3
+#: ../properties/nm-libreswan-dialog.ui.h:3
msgid "Show passwords"
msgstr "Zobrazit hesla"
-#: ../properties/nm-openswan-dialog.ui.h:4
+#: ../properties/nm-libreswan-dialog.ui.h:4
msgid "Gro_up password:"
msgstr "Heslo sk_upiny:"
-#: ../properties/nm-openswan-dialog.ui.h:5
+#: ../properties/nm-libreswan-dialog.ui.h:5
msgid "_Gateway:"
msgstr "_Brána:"
-#: ../properties/nm-openswan-dialog.ui.h:6
+#: ../properties/nm-libreswan-dialog.ui.h:6
msgid "G_roup name:"
msgstr "Název sk_upiny:"
-#: ../properties/nm-openswan-dialog.ui.h:7
+#: ../properties/nm-libreswan-dialog.ui.h:7
msgid "_User password:"
msgstr "_Uživ. heslo:"
-#: ../properties/nm-openswan-dialog.ui.h:8
+#: ../properties/nm-libreswan-dialog.ui.h:8
msgid "<b>Optional</b>"
msgstr "<b>Volitelné</b>"
-#: ../properties/nm-openswan-dialog.ui.h:9
+#: ../properties/nm-libreswan-dialog.ui.h:9
msgid "User name:"
msgstr "Uživ. jméno:"
-#: ../properties/nm-openswan-dialog.ui.h:10
+#: ../properties/nm-libreswan-dialog.ui.h:10
msgid "Phase1 Algorithms:"
msgstr "Algoritmy Fáze1:"
-#: ../properties/nm-openswan-dialog.ui.h:11
+#: ../properties/nm-libreswan-dialog.ui.h:11
msgid "Phase2 Algorithms:"
msgstr "Alogritmy Fáze2:"
-#: ../properties/nm-openswan-dialog.ui.h:12
+#: ../properties/nm-libreswan-dialog.ui.h:12
msgid "Domain:"
msgstr "Doména:"
-#: ../src/nm-openswan-service.c:831
+#: ../src/nm-libreswan-service.c:831
msgid "A password is required."
msgstr "Je požadováno heslo."
-#: ../src/nm-openswan-service.c:1197
+#: ../src/nm-libreswan-service.c:1197
msgid ""
"Could not process the request because the VPN connection settings were "
"invalid."
msgstr ""
"Nelze zpracovat požadavek, protože nastavení připojení VPN nejsou platná."
-#: ../src/nm-openswan-service.c:1211
+#: ../src/nm-libreswan-service.c:1211
msgid "Unhandled pending authentication."
msgstr "Neošetřené čekající ověření."
-#: ../src/nm-openswan-service.c:1297
+#: ../src/nm-libreswan-service.c:1297
msgid "Don't quit when VPN connection terminates"
msgstr "Neskončit, dokud se spojení VPN ukončuje"
-#: ../src/nm-openswan-service.c:1298
+#: ../src/nm-libreswan-service.c:1298
msgid "Enable verbose debug logging (may expose passwords)"
msgstr "Zapnout podrobnou evidenci ladění (může odhalit hesla)"
-#: ../src/nm-openswan-service.c:1321
+#: ../src/nm-libreswan-service.c:1321
msgid ""
"This service provides integrated IPsec VPN capability to NetworkManager."
msgstr ""
diff --git a/po/da.po b/po/da.po
index b4aa947..6aa1b9c 100644
--- a/po/da.po
+++ b/po/da.po
@@ -67,10 +67,10 @@ msgstr "Cisco-kompatibelt VPN (vpnc)"
#: ../properties/nm-vpnc.c:54
msgid ""
-"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based "
+"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-based "
"VPN gateways."
msgstr ""
-"Kompatibel med forskellige Cisco, Juniper, Netscreen, og Sonicwall IPSec-"
+"Kompatibel med forskellige Cisco, Juniper, Netscreen, og Sonicwall IPsec-"
"baserede VPN-adgangspunkter."
#: ../properties/nm-vpnc.c:339
diff --git a/po/de.po b/po/de.po
index b7d544e..250af08 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,9 +8,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: NetworkManager OpenSWAN\n"
+"Project-Id-Version: NetworkManager Libreswan\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=network-manager-openswan&keywords=I18N+L10N&component=general\n"
+"product=network-manager-libreswan&keywords=I18N+L10N&component=general\n"
"POT-Creation-Date: 2015-02-13 11:42+0000\n"
"PO-Revision-Date: 2015-01-29 22:11+0100\n"
"Last-Translator: Christian Kirbach <christian kirbach gmail com>\n"
@@ -49,87 +49,87 @@ msgstr ""
"Sie müssen sich legitimieren, um auf das Virtuelle private Netzwerk »%s« "
"zugreifen zu können."
-#: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:1
+#: ../auth-dialog/nm-libreswan-auth-dialog.desktop.in.in.h:1
msgid "Network"
msgstr "Netzwerk"
-#: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:2
+#: ../auth-dialog/nm-libreswan-auth-dialog.desktop.in.in.h:2
msgid "Request VPN authentication"
msgstr "Legitimierung für VPN anfordern"
-#: ../properties/nm-openswan.c:47
+#: ../properties/nm-libreswan.c:47
msgid "IPsec based VPN"
msgstr "IPsec-basiertes VPN"
-#: ../properties/nm-openswan.c:48
+#: ../properties/nm-libreswan.c:48
msgid "IPsec, IKEv1, IKEv2 based VPN"
msgstr "IPsec, IKEv1, IKEv2-basiertes VPN"
-#: ../properties/nm-openswan.c:303
+#: ../properties/nm-libreswan.c:303
msgid "Saved"
msgstr "Gespeichert"
-#: ../properties/nm-openswan.c:310
+#: ../properties/nm-libreswan.c:310
msgid "Always Ask"
msgstr "Immer fragen"
-#: ../properties/nm-openswan.c:317
+#: ../properties/nm-libreswan.c:317
msgid "Not Required"
msgstr "Nicht notwendig"
-#: ../properties/nm-openswan-dialog.ui.h:1
+#: ../properties/nm-libreswan-dialog.ui.h:1
msgid " "
msgstr " "
-#: ../properties/nm-openswan-dialog.ui.h:2
+#: ../properties/nm-libreswan-dialog.ui.h:2
msgid "<b>General</b>"
msgstr "<b>Allgemein</b>"
-#: ../properties/nm-openswan-dialog.ui.h:3
+#: ../properties/nm-libreswan-dialog.ui.h:3
msgid "Show passwords"
msgstr "Passwörter anzeigen"
-#: ../properties/nm-openswan-dialog.ui.h:4
+#: ../properties/nm-libreswan-dialog.ui.h:4
msgid "Gro_up password:"
msgstr "_Gruppenpasswort:"
-#: ../properties/nm-openswan-dialog.ui.h:5
+#: ../properties/nm-libreswan-dialog.ui.h:5
msgid "_Gateway:"
msgstr "_Gateway:"
-#: ../properties/nm-openswan-dialog.ui.h:6
+#: ../properties/nm-libreswan-dialog.ui.h:6
msgid "G_roup name:"
msgstr "G_ruppenname:"
-#: ../properties/nm-openswan-dialog.ui.h:7
+#: ../properties/nm-libreswan-dialog.ui.h:7
msgid "_User password:"
msgstr "Ben_utzerpasswort:"
-#: ../properties/nm-openswan-dialog.ui.h:8
+#: ../properties/nm-libreswan-dialog.ui.h:8
msgid "<b>Optional</b>"
msgstr "<b>Optional</b>"
-#: ../properties/nm-openswan-dialog.ui.h:9
+#: ../properties/nm-libreswan-dialog.ui.h:9
msgid "User name:"
msgstr "Benutzername:"
-#: ../properties/nm-openswan-dialog.ui.h:10
+#: ../properties/nm-libreswan-dialog.ui.h:10
msgid "Phase1 Algorithms:"
msgstr "Phase1-Algorithmen:"
-#: ../properties/nm-openswan-dialog.ui.h:11
+#: ../properties/nm-libreswan-dialog.ui.h:11
msgid "Phase2 Algorithms:"
msgstr "Phase2-Algorithmen:"
-#: ../properties/nm-openswan-dialog.ui.h:12
+#: ../properties/nm-libreswan-dialog.ui.h:12
msgid "Domain:"
msgstr "Domäne:"
-#: ../src/nm-openswan-service.c:831
+#: ../src/nm-libreswan-service.c:831
msgid "A password is required."
msgstr "Ein Passwort ist notwendig."
-#: ../src/nm-openswan-service.c:1197
+#: ../src/nm-libreswan-service.c:1197
msgid ""
"Could not process the request because the VPN connection settings were "
"invalid."
@@ -137,19 +137,19 @@ msgstr ""
"Die Anfrage konnte nicht verarbeitet werden, weil die VPN-"
"Konfigurationseinstellungen ungültig waren."
-#: ../src/nm-openswan-service.c:1211
+#: ../src/nm-libreswan-service.c:1211
msgid "Unhandled pending authentication."
msgstr "Nicht verarbeitete, ausstehende Legitimierung."
-#: ../src/nm-openswan-service.c:1297
+#: ../src/nm-libreswan-service.c:1297
msgid "Don't quit when VPN connection terminates"
msgstr "Nicht bei Abbruch der VPN-Verbindung beenden"
-#: ../src/nm-openswan-service.c:1298
+#: ../src/nm-libreswan-service.c:1298
msgid "Enable verbose debug logging (may expose passwords)"
msgstr "Ausführliches Diagnoseprotokoll aktivieren (kann Passwörter enthalten)"
-#: ../src/nm-openswan-service.c:1321
+#: ../src/nm-libreswan-service.c:1321
msgid ""
"This service provides integrated IPsec VPN capability to NetworkManager."
msgstr "Dieser Dienst bietet ein integriertes IPsec-VPN für NetworkManager."
@@ -163,8 +163,8 @@ msgstr "Dieser Dienst bietet ein integriertes IPsec-VPN für NetworkManager."
#~ msgid "Sh_ow passwords"
#~ msgstr "Passwörter an_zeigen"
-#~ msgid "IPsec Based VPN Connection Manager (openswan)"
-#~ msgstr "Auf IPsec basierender VPN-Verbindungsmanager (openswan)"
+#~ msgid "IPsec Based VPN Connection Manager (libreswan)"
+#~ msgstr "Auf IPsec basierender VPN-Verbindungsmanager (libreswan)"
#~ msgid "Add, Remove, and Edit VPN Connections"
#~ msgstr "VPN-Verbindungen hinzufügen, entfernen und bearbeiten"
@@ -179,11 +179,11 @@ msgstr "Dieser Dienst bietet ein integriertes IPsec-VPN für NetworkManager."
#~ msgstr "Cisco-kompatibler VPN-Client (vpnc)"
#~ msgid ""
-#~ "Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-"
+#~ "Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-"
#~ "based VPN gateways."
#~ msgstr ""
#~ "Kompatibel zu verschiedenen VPN-Gateways von Cisco, Juniper, Netscreen "
-#~ "und Sonicwall (IPSec-basiert)."
+#~ "und Sonicwall (IPsec-basiert)."
#~ msgid "Secure (default)"
#~ msgstr "Sicher (Vorgabe)"
diff --git a/po/el.po b/po/el.po
index ef09af3..b333b46 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: NetworkManager-vpnc.HEAD\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=network-manager-openswan&keywords=I18N+L10N&component=general\n"
+"product=network-manager-libreswan&keywords=I18N+L10N&component=general\n"
"POT-Creation-Date: 2014-12-13 11:12+0000\n"
"PO-Revision-Date: 2015-02-25 15:19+0200\n"
"Last-Translator: Tom Tryfonidis <tomtryf gmail com>\n"
@@ -48,87 +48,87 @@ msgstr ""
"Χρειάζεστε πιστοποίηση για να αποκτήσετε πρόσβαση στο Ιδιωτικό Εικονικό "
"Δίκτυο (VPN) '%s'."
-#: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:1
+#: ../auth-dialog/nm-libreswan-auth-dialog.desktop.in.in.h:1
msgid "Network"
msgstr "Δίκτυο"
-#: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:2
+#: ../auth-dialog/nm-libreswan-auth-dialog.desktop.in.in.h:2
msgid "Request VPN authentication"
msgstr "Απαιτεί VPN πιστοποίηση"
-#: ../properties/nm-openswan.c:47
+#: ../properties/nm-libreswan.c:47
msgid "IPsec based VPN"
msgstr "IPsec βασισμένο στο VPN"
-#: ../properties/nm-openswan.c:48
+#: ../properties/nm-libreswan.c:48
msgid "IPsec, IKEv1, IKEv2 based VPN"
msgstr "IPsec, IKEv1, IKEv2 βασισμένο στο VPN"
-#: ../properties/nm-openswan.c:303
+#: ../properties/nm-libreswan.c:303
msgid "Saved"
msgstr "Αποθηκευμένη"
-#: ../properties/nm-openswan.c:310
+#: ../properties/nm-libreswan.c:310
msgid "Always Ask"
msgstr "Να γίνεται πάντα ερώτηση"
-#: ../properties/nm-openswan.c:317
+#: ../properties/nm-libreswan.c:317
msgid "Not Required"
msgstr "Δεν απαιτείται"
-#: ../properties/nm-openswan-dialog.ui.h:1
+#: ../properties/nm-libreswan-dialog.ui.h:1
msgid " "
msgstr " "
-#: ../properties/nm-openswan-dialog.ui.h:2
+#: ../properties/nm-libreswan-dialog.ui.h:2
msgid "<b>General</b>"
msgstr "<b>Γενικά</b>"
-#: ../properties/nm-openswan-dialog.ui.h:3
+#: ../properties/nm-libreswan-dialog.ui.h:3
msgid "Show passwords"
msgstr "Εμφάνιση κωδικών πρόσβασης"
-#: ../properties/nm-openswan-dialog.ui.h:4
+#: ../properties/nm-libreswan-dialog.ui.h:4
msgid "Gro_up password:"
msgstr "Κωδικός πρόσβασης ο_μάδας:"
-#: ../properties/nm-openswan-dialog.ui.h:5
+#: ../properties/nm-libreswan-dialog.ui.h:5
msgid "_Gateway:"
msgstr "_Πύλη:"
-#: ../properties/nm-openswan-dialog.ui.h:6
+#: ../properties/nm-libreswan-dialog.ui.h:6
msgid "G_roup name:"
msgstr "Όνομα ομά_δας:"
-#: ../properties/nm-openswan-dialog.ui.h:7
+#: ../properties/nm-libreswan-dialog.ui.h:7
msgid "_User password:"
msgstr "Κωδικός πρόσβασης χ_ρήστη:"
-#: ../properties/nm-openswan-dialog.ui.h:8
+#: ../properties/nm-libreswan-dialog.ui.h:8
msgid "<b>Optional</b>"
msgstr "<b>Προαιρετικά</b>"
-#: ../properties/nm-openswan-dialog.ui.h:9
+#: ../properties/nm-libreswan-dialog.ui.h:9
msgid "User name:"
msgstr "Όνομα χρήστη:"
-#: ../properties/nm-openswan-dialog.ui.h:10
+#: ../properties/nm-libreswan-dialog.ui.h:10
msgid "Phase1 Algorithms:"
msgstr "Αλγόριθμοι Phase1:"
-#: ../properties/nm-openswan-dialog.ui.h:11
+#: ../properties/nm-libreswan-dialog.ui.h:11
msgid "Phase2 Algorithms:"
msgstr "Αλγόριθμοι Phase2:"
-#: ../properties/nm-openswan-dialog.ui.h:12
+#: ../properties/nm-libreswan-dialog.ui.h:12
msgid "Domain:"
msgstr "Τομέας:"
-#: ../src/nm-openswan-service.c:831
+#: ../src/nm-libreswan-service.c:831
msgid "A password is required."
msgstr "Απαιτείται κωδικός πρόσβασης"
-#: ../src/nm-openswan-service.c:1197
+#: ../src/nm-libreswan-service.c:1197
msgid ""
"Could not process the request because the VPN connection settings were "
"invalid."
@@ -136,28 +136,28 @@ msgstr ""
"Αδύνατη η επεξεργασία του αιτήματος διότι οι ρυθμίσεις της σύνδεσης VPN ήταν "
"άκυρες."
-#: ../src/nm-openswan-service.c:1211
+#: ../src/nm-libreswan-service.c:1211
msgid "Unhandled pending authentication."
msgstr "Ανεπίλυτη αναμονή πιστοποίησης."
-#: ../src/nm-openswan-service.c:1297
+#: ../src/nm-libreswan-service.c:1297
msgid "Don't quit when VPN connection terminates"
msgstr "Να μην γίνει έξοδος όταν η σύνδεση VPN τερματίζει"
-#: ../src/nm-openswan-service.c:1298
+#: ../src/nm-libreswan-service.c:1298
msgid "Enable verbose debug logging (may expose passwords)"
msgstr ""
"Ενεργοποίηση καταγραφής εντοπισμού σφαλμάτων (μπορεί να εκθέσει τους "
"κωδικούς πρόσβασης)"
-#: ../src/nm-openswan-service.c:1321
+#: ../src/nm-libreswan-service.c:1321
msgid ""
"This service provides integrated IPsec VPN capability to NetworkManager."
msgstr "Αυτή η υπηρεσία παρέχει δυνατότητες IPsec VPN στον NetworkManager."
#~| msgid "VPN Connection Manager (vpnc)"
-#~ msgid "IPsec Based VPN Connection Manager (openswan)"
-#~ msgstr "Διαχειριστής σύνδεσης IPsec βασισμένο στο VPN (openswan)"
+#~ msgid "IPsec Based VPN Connection Manager (libreswan)"
+#~ msgstr "Διαχειριστής σύνδεσης IPsec βασισμένο στο VPN (libreswan)"
#~ msgid "Add, Remove, and Edit VPN Connections"
#~ msgstr "Προσθήκη, απομάκρυνση και επεξεργασία συνδέσεων VPN"
@@ -178,10 +178,10 @@ msgstr "Αυτή η υπηρεσία παρέχει δυνατότητες IPsec
#~ msgstr "Συμβατός με Cisco πελάτης VPN (vpnc)"
#~ msgid ""
-#~ "Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-"
+#~ "Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-"
#~ "based VPN gateways."
#~ msgstr ""
-#~ "Συμβατός με διάφορες βασισμένες στο IPSec πύλες VPN των Cisco, Juniper, "
+#~ "Συμβατός με διάφορες βασισμένες στο IPsec πύλες VPN των Cisco, Juniper, "
#~ "Netscreen και Sonicwall."
#~ msgid "Secure (default)"
diff --git a/po/es.po b/po/es.po
index 79d8aa9..7dc8559 100644
--- a/po/es.po
+++ b/po/es.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: NetworkManager-vpnc.HEAD\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=network-manager-openswan&keywords=I18N+L10N&component=general\n"
+"product=network-manager-libreswan&keywords=I18N+L10N&component=general\n"
"POT-Creation-Date: 2014-12-13 11:12+0000\n"
"PO-Revision-Date: 2015-01-12 19:07+0100\n"
"Last-Translator: Daniel Mustieles <daniel mustieles gmail com>\n"
@@ -54,90 +54,90 @@ msgstr "Contraseña del _grupo:"
msgid "You need to authenticate to access the Virtual Private Network '%s'."
msgstr "Debe autenticarse para acceder a la red privada virtual «%s»."
-#: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:1
+#: ../auth-dialog/nm-libreswan-auth-dialog.desktop.in.in.h:1
msgid "Network"
msgstr "Red"
-#: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:2
+#: ../auth-dialog/nm-libreswan-auth-dialog.desktop.in.in.h:2
msgid "Request VPN authentication"
msgstr "Solicitar autenticación VPN"
-#: ../properties/nm-openswan.c:47
+#: ../properties/nm-libreswan.c:47
msgid "IPsec based VPN"
-msgstr "VPN basada en IPSec"
+msgstr "VPN basada en IPsec"
-#: ../properties/nm-openswan.c:48
+#: ../properties/nm-libreswan.c:48
msgid "IPsec, IKEv1, IKEv2 based VPN"
-msgstr "VPN basada en IPSec, IKEv1, IKEv2"
+msgstr "VPN basada en IPsec, IKEv1, IKEv2"
-#: ../properties/nm-openswan.c:303
+#: ../properties/nm-libreswan.c:303
msgid "Saved"
msgstr "Guardado"
-#: ../properties/nm-openswan.c:310
+#: ../properties/nm-libreswan.c:310
msgid "Always Ask"
msgstr "Preguntar siempre"
-#: ../properties/nm-openswan.c:317
+#: ../properties/nm-libreswan.c:317
msgid "Not Required"
msgstr "No requerido"
-#: ../properties/nm-openswan-dialog.ui.h:1
+#: ../properties/nm-libreswan-dialog.ui.h:1
msgid " "
msgstr " "
-#: ../properties/nm-openswan-dialog.ui.h:2
+#: ../properties/nm-libreswan-dialog.ui.h:2
msgid "<b>General</b>"
msgstr "<b>General</b>"
-#: ../properties/nm-openswan-dialog.ui.h:3
+#: ../properties/nm-libreswan-dialog.ui.h:3
msgid "Show passwords"
msgstr "Mostrar contraseñas"
-#: ../properties/nm-openswan-dialog.ui.h:4
+#: ../properties/nm-libreswan-dialog.ui.h:4
msgid "Gro_up password:"
msgstr "Contraseña del gr_upo:"
-#: ../properties/nm-openswan-dialog.ui.h:5
+#: ../properties/nm-libreswan-dialog.ui.h:5
msgid "_Gateway:"
msgstr "_Pasarela:"
# clients/lan_dns.ycp:280
# clients/lan_dns.ycp:269
# include/users/ui.ycp:1021
-#: ../properties/nm-openswan-dialog.ui.h:6
+#: ../properties/nm-libreswan-dialog.ui.h:6
msgid "G_roup name:"
msgstr "Nombre del g_rupo:"
-#: ../properties/nm-openswan-dialog.ui.h:7
+#: ../properties/nm-libreswan-dialog.ui.h:7
msgid "_User password:"
msgstr "Contraseña del _usuario:"
-#: ../properties/nm-openswan-dialog.ui.h:8
+#: ../properties/nm-libreswan-dialog.ui.h:8
msgid "<b>Optional</b>"
msgstr "<b>Opcional</b>"
-#: ../properties/nm-openswan-dialog.ui.h:9
+#: ../properties/nm-libreswan-dialog.ui.h:9
msgid "User name:"
msgstr "Nombre de usuario:"
-#: ../properties/nm-openswan-dialog.ui.h:10
+#: ../properties/nm-libreswan-dialog.ui.h:10
msgid "Phase1 Algorithms:"
msgstr "Algoritmos de fase 1:"
-#: ../properties/nm-openswan-dialog.ui.h:11
+#: ../properties/nm-libreswan-dialog.ui.h:11
msgid "Phase2 Algorithms:"
msgstr "Algoritmos de fase 2:"
-#: ../properties/nm-openswan-dialog.ui.h:12
+#: ../properties/nm-libreswan-dialog.ui.h:12
msgid "Domain:"
msgstr "Dominio:"
-#: ../src/nm-openswan-service.c:831
+#: ../src/nm-libreswan-service.c:831
msgid "A password is required."
msgstr "Se requiere una contraseña."
-#: ../src/nm-openswan-service.c:1197
+#: ../src/nm-libreswan-service.c:1197
msgid ""
"Could not process the request because the VPN connection settings were "
"invalid."
@@ -145,21 +145,21 @@ msgstr ""
"No se pudo procesar la solicitud porque la configuración de la conexión VPN "
"no es válida."
-#: ../src/nm-openswan-service.c:1211
+#: ../src/nm-libreswan-service.c:1211
msgid "Unhandled pending authentication."
msgstr "Autenticación pendiente no manejada."
-#: ../src/nm-openswan-service.c:1297
+#: ../src/nm-libreswan-service.c:1297
msgid "Don't quit when VPN connection terminates"
msgstr "No salir cuando termine la conexión VPN"
-#: ../src/nm-openswan-service.c:1298
+#: ../src/nm-libreswan-service.c:1298
msgid "Enable verbose debug logging (may expose passwords)"
msgstr "Activar el registro detallado del depurado (puede mostrar contraseñas)"
-#: ../src/nm-openswan-service.c:1321
+#: ../src/nm-libreswan-service.c:1321
#| msgid ""
-#| "nm-openswan-service provides integrated IPsec VPN capability to "
+#| "nm-libreswan-service provides integrated IPsec VPN capability to "
#| "NetworkManager."
msgid ""
"This service provides integrated IPsec VPN capability to NetworkManager."
@@ -168,8 +168,8 @@ msgstr ""
"NetworkManager."
# include/network/modem/dialogs.ycp:400
-#~ msgid "IPsec Based VPN Connection Manager (openswan)"
-#~ msgstr "Gestor de conexiones VPNbasado en IPSec (openswan)"
+#~ msgid "IPsec Based VPN Connection Manager (libreswan)"
+#~ msgstr "Gestor de conexiones VPNbasado en IPsec (libreswan)"
#~ msgid "Add, Remove, and Edit VPN Connections"
#~ msgstr "Añadir, eliminar y editar conexiones VPN"
@@ -196,7 +196,7 @@ msgstr ""
#~ msgstr "Compatible con Cisco VPN (vpnc)"
#~ msgid ""
-#~ "Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-"
+#~ "Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-"
#~ "based VPN gateways."
#~ msgstr ""
#~ "Compatible con varias puertas de enlace VPN basadas en IpSec como Cisco, "
diff --git a/po/et.po b/po/et.po
index 09e8a34..4b29ab8 100644
--- a/po/et.po
+++ b/po/et.po
@@ -66,8 +66,8 @@ msgid "Cisco Compatible VPN (vpnc)"
msgstr "Cisco VPN kliendiga ühilduv (vpnc)"
#: ../properties/nm-vpnc.c:54
-msgid "Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based VPN gateways."
-msgstr "Ühilduv erinevate Cisco, Juniper, Netscreen, ja Sonicwall IPSec seadmetel baseeruvate VPN
võrgulüüsidega."
+msgid "Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-based VPN gateways."
+msgstr "Ühilduv erinevate Cisco, Juniper, Netscreen, ja Sonicwall IPsec seadmetel baseeruvate VPN
võrgulüüsidega."
#: ../properties/nm-vpnc.c:339
msgid "Saved"
diff --git a/po/eu.po b/po/eu.po
index 65626b6..e66bac6 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,4 +1,4 @@
-# Basque translation for network-manager-openswan.
+# Basque translation for network-manager-libreswan.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
#
@@ -7,7 +7,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: network-manager-openswan master\n"
+"Project-Id-Version: network-manager-libreswan master\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-02-07 17:57+0100\n"
"PO-Revision-Date: 2015-02-07 17:55+0100\n"
@@ -46,87 +46,87 @@ msgstr "_Taldearen pasahitza:"
msgid "You need to authenticate to access the Virtual Private Network '%s'."
msgstr "Autentifikatu egin behar zara '%s' VPN-ra sarbidetzeko."
-#: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:1
+#: ../auth-dialog/nm-libreswan-auth-dialog.desktop.in.in.h:1
msgid "Network"
msgstr "Sarea"
-#: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:2
+#: ../auth-dialog/nm-libreswan-auth-dialog.desktop.in.in.h:2
msgid "Request VPN authentication"
msgstr "Eskatu VPNren autentifikazioa"
-#: ../properties/nm-openswan.c:47
+#: ../properties/nm-libreswan.c:47
msgid "IPsec based VPN"
msgstr "IPsec-en oinarritutako VPN-a"
-#: ../properties/nm-openswan.c:48
+#: ../properties/nm-libreswan.c:48
msgid "IPsec, IKEv1, IKEv2 based VPN"
msgstr "IPsec, IKEv1, IKEv2 oinarritutako VPN-a"
-#: ../properties/nm-openswan.c:303
+#: ../properties/nm-libreswan.c:303
msgid "Saved"
msgstr "Gordeta"
-#: ../properties/nm-openswan.c:310
+#: ../properties/nm-libreswan.c:310
msgid "Always Ask"
msgstr "Galdetu beti"
-#: ../properties/nm-openswan.c:317
+#: ../properties/nm-libreswan.c:317
msgid "Not Required"
msgstr "Ez da beharrezkoa"
-#: ../properties/nm-openswan-dialog.ui.h:1
+#: ../properties/nm-libreswan-dialog.ui.h:1
msgid " "
msgstr " "
-#: ../properties/nm-openswan-dialog.ui.h:2
+#: ../properties/nm-libreswan-dialog.ui.h:2
msgid "<b>General</b>"
msgstr "<b>Orokorra</b>"
-#: ../properties/nm-openswan-dialog.ui.h:3
+#: ../properties/nm-libreswan-dialog.ui.h:3
msgid "Show passwords"
msgstr "Erakutsi pasahitzak"
-#: ../properties/nm-openswan-dialog.ui.h:4
+#: ../properties/nm-libreswan-dialog.ui.h:4
msgid "Gro_up password:"
msgstr "_Taldearen pasahitza:"
-#: ../properties/nm-openswan-dialog.ui.h:5
+#: ../properties/nm-libreswan-dialog.ui.h:5
msgid "_Gateway:"
msgstr "_Atebidea:"
-#: ../properties/nm-openswan-dialog.ui.h:6
+#: ../properties/nm-libreswan-dialog.ui.h:6
msgid "G_roup name:"
msgstr "_Taldearen izena:"
-#: ../properties/nm-openswan-dialog.ui.h:7
+#: ../properties/nm-libreswan-dialog.ui.h:7
msgid "_User password:"
msgstr "_Erabiltzailearen pasahitza:"
-#: ../properties/nm-openswan-dialog.ui.h:8
+#: ../properties/nm-libreswan-dialog.ui.h:8
msgid "<b>Optional</b>"
msgstr "<b>Aukerakoa</b>"
-#: ../properties/nm-openswan-dialog.ui.h:9
+#: ../properties/nm-libreswan-dialog.ui.h:9
msgid "User name:"
msgstr "Erabiltzaile-izena:"
-#: ../properties/nm-openswan-dialog.ui.h:10
+#: ../properties/nm-libreswan-dialog.ui.h:10
msgid "Phase1 Algorithms:"
msgstr "1. faseko algoritmoak:"
-#: ../properties/nm-openswan-dialog.ui.h:11
+#: ../properties/nm-libreswan-dialog.ui.h:11
msgid "Phase2 Algorithms:"
msgstr "2. faseko algoritmoak:"
-#: ../properties/nm-openswan-dialog.ui.h:12
+#: ../properties/nm-libreswan-dialog.ui.h:12
msgid "Domain:"
msgstr "Domeinua:"
-#: ../src/nm-openswan-service.c:831
+#: ../src/nm-libreswan-service.c:831
msgid "A password is required."
msgstr "Pasahitza behar da."
-#: ../src/nm-openswan-service.c:1197
+#: ../src/nm-libreswan-service.c:1197
msgid ""
"Could not process the request because the VPN connection settings were "
"invalid."
@@ -134,19 +134,19 @@ msgstr ""
"Ezin izan da eskaera prozesatu VPN konexioaren ezarpenak baliogabekoak "
"direlako."
-#: ../src/nm-openswan-service.c:1211
+#: ../src/nm-libreswan-service.c:1211
msgid "Unhandled pending authentication."
msgstr "Autentifikatzea falta dena kudeatu gabe."
-#: ../src/nm-openswan-service.c:1297
+#: ../src/nm-libreswan-service.c:1297
msgid "Don't quit when VPN connection terminates"
msgstr "Ez irten VPNaren konexioa amaitzean"
-#: ../src/nm-openswan-service.c:1298
+#: ../src/nm-libreswan-service.c:1298
msgid "Enable verbose debug logging (may expose passwords)"
msgstr "Gaitu arazketaren erregistro xehea (pasahitzak erakuts ditzake)"
-#: ../src/nm-openswan-service.c:1321
+#: ../src/nm-libreswan-service.c:1321
msgid ""
"This service provides integrated IPsec VPN capability to NetworkManager."
msgstr ""
@@ -162,8 +162,8 @@ msgstr ""
#~ msgid "Sh_ow passwords"
#~ msgstr "_Erakutsi pasahitzak"
-#~ msgid "IPsec Based VPN Connection Manager (openswan)"
-#~ msgstr "IPsec-en oinarritutako VPN konexioen kudeatzailea (openswan)"
+#~ msgid "IPsec Based VPN Connection Manager (libreswan)"
+#~ msgstr "IPsec-en oinarritutako VPN konexioen kudeatzailea (libreswan)"
#~ msgid "Add, Remove, and Edit VPN Connections"
#~ msgstr "Gehitu, kendu eta editatu VPN konexioak"
@@ -178,10 +178,10 @@ msgstr ""
#~ msgstr "VPN Cisco-rekin bateragarria (vpnc)"
#~ msgid ""
-#~ "Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-"
+#~ "Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-"
#~ "based VPN gateways."
#~ msgstr ""
-#~ "Hainbat Cisco, Juniper, Netscreen eta Sonicwall IPSec-ean oinarritutako "
+#~ "Hainbat Cisco, Juniper, Netscreen eta Sonicwall IPsec-ean oinarritutako "
#~ "VPN atebideekin bateragarria."
#~ msgid "Secure (default)"
diff --git a/po/fi.po b/po/fi.po
index 0dd79be..9ea94c0 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: network-manager-vpnc\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=network-manager-openswan&keywords=I18N+L10N&component=general\n"
+"product=network-manager-libreswan&keywords=I18N+L10N&component=general\n"
"POT-Creation-Date: 2013-09-11 18:22+0000\n"
"PO-Revision-Date: 2013-09-22 19:59+0300\n"
"Last-Translator: Jiri Grönroos <jiri gronroos+l10n iki fi>\n"
@@ -44,94 +44,94 @@ msgstr "Ryhmän salasana:"
msgid "_Group Password:"
msgstr "_Ryhmän salasana:"
-#: ../nm-openswan.desktop.in.h:1
+#: ../nm-libreswan.desktop.in.h:1
#| msgid "VPN Connection Manager (vpnc)"
-msgid "IPsec Based VPN Connection Manager (openswan)"
-msgstr "IPsec-pohjainen VPN-yhteysohjelmisto (openswan)"
+msgid "IPsec Based VPN Connection Manager (libreswan)"
+msgstr "IPsec-pohjainen VPN-yhteysohjelmisto (libreswan)"
-#: ../nm-openswan.desktop.in.h:2
+#: ../nm-libreswan.desktop.in.h:2
msgid "Add, Remove, and Edit VPN Connections"
msgstr "Lisää, poista tai muokkaa VPN-yhteyksiä"
-#: ../properties/nm-openswan.c:47
+#: ../properties/nm-libreswan.c:47
msgid "IPsec based VPN"
msgstr "IPsec-pohjainen VPN"
-#: ../properties/nm-openswan.c:48
+#: ../properties/nm-libreswan.c:48
msgid "IPsec, IKEv1, IKEv2 based VPN"
msgstr "IPsec-, IKEv1- ja IKEv2-pohjainen VPN"
-#: ../properties/nm-openswan.c:274
+#: ../properties/nm-libreswan.c:274
msgid "Saved"
msgstr "Tallennettu"
-#: ../properties/nm-openswan.c:281
+#: ../properties/nm-libreswan.c:281
msgid "Always Ask"
msgstr "Kysy aina"
-#: ../properties/nm-openswan.c:288
+#: ../properties/nm-libreswan.c:288
msgid "Not Required"
msgstr "Ei vaadittu"
-#: ../properties/nm-openswan-dialog.ui.h:1
+#: ../properties/nm-libreswan-dialog.ui.h:1
msgid " "
msgstr " "
-#: ../properties/nm-openswan-dialog.ui.h:2
+#: ../properties/nm-libreswan-dialog.ui.h:2
msgid "<b>General</b>"
msgstr "<b>Yleisasetukset</b>"
-#: ../properties/nm-openswan-dialog.ui.h:3
+#: ../properties/nm-libreswan-dialog.ui.h:3
msgid "Show passwords"
msgstr "Näytä salasanat"
-#: ../properties/nm-openswan-dialog.ui.h:4
+#: ../properties/nm-libreswan-dialog.ui.h:4
msgid "Gro_up password:"
msgstr "_Ryhmän salasana:"
-#: ../properties/nm-openswan-dialog.ui.h:5
+#: ../properties/nm-libreswan-dialog.ui.h:5
msgid "_Gateway:"
msgstr "_Yhdyskäytävä:"
-#: ../properties/nm-openswan-dialog.ui.h:6
+#: ../properties/nm-libreswan-dialog.ui.h:6
msgid "G_roup name:"
msgstr "_Ryhmän nimi:"
-#: ../properties/nm-openswan-dialog.ui.h:7
+#: ../properties/nm-libreswan-dialog.ui.h:7
msgid "_User password:"
msgstr "_Käyttäjän salasana:"
-#: ../properties/nm-openswan-dialog.ui.h:8
+#: ../properties/nm-libreswan-dialog.ui.h:8
msgid "<b>Optional</b>"
msgstr "<b>Lisäasetukset</b>"
-#: ../properties/nm-openswan-dialog.ui.h:9
+#: ../properties/nm-libreswan-dialog.ui.h:9
msgid "User name:"
msgstr "Käyttäjätunnus:"
-#: ../properties/nm-openswan-dialog.ui.h:10
+#: ../properties/nm-libreswan-dialog.ui.h:10
msgid "Phase1 Algorithms:"
msgstr "Phase1-algoritmit:"
-#: ../properties/nm-openswan-dialog.ui.h:11
+#: ../properties/nm-libreswan-dialog.ui.h:11
msgid "Phase2 Algorithms:"
msgstr "Phase2-algoritmit:"
-#: ../properties/nm-openswan-dialog.ui.h:12
+#: ../properties/nm-libreswan-dialog.ui.h:12
msgid "Domain:"
msgstr "Toimialue:"
-#: ../src/nm-openswan-service.c:877
+#: ../src/nm-libreswan-service.c:877
msgid "Don't quit when VPN connection terminates"
msgstr "Älä lopeta VPN-yhteyden päättyessä"
-#: ../src/nm-openswan-service.c:878
+#: ../src/nm-libreswan-service.c:878
msgid "Enable verbose debug logging (may expose passwords)"
msgstr ""
-#: ../src/nm-openswan-service.c:901
+#: ../src/nm-libreswan-service.c:901
msgid ""
-"nm-openswan-service provides integrated IPsec VPN capability to "
+"nm-libreswan-service provides integrated IPsec VPN capability to "
"NetworkManager."
msgstr ""
@@ -160,11 +160,11 @@ msgstr ""
#~ msgstr "Cisco-yhteensopiva VPN-asiakas (vpnc)"
#~ msgid ""
-#~ "Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-"
+#~ "Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-"
#~ "based VPN gateways."
#~ msgstr ""
#~ "Yhteensopiva useiden esimerkiksi Ciscon, Juniperin, Netscreenin ja "
-#~ "Sonicwallin valmistamien IPSec-pohjaisten VPN-yhdyskäytävien kanssa."
+#~ "Sonicwallin valmistamien IPsec-pohjaisten VPN-yhdyskäytävien kanssa."
#~ msgid "Secure (default)"
#~ msgstr "Turvallinen (oletus)"
diff --git a/po/fr.po b/po/fr.po
index e8b9537..c601480 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -67,10 +67,10 @@ msgstr "VPN compatible Cisco (vpnc)"
#: ../properties/nm-vpnc.c:54
msgid ""
-"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based "
+"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-based "
"VPN gateways."
msgstr ""
-"Compatible avec de nombreuses passerelles VPN basées sur IPSec de Cisco, "
+"Compatible avec de nombreuses passerelles VPN basées sur IPsec de Cisco, "
"Juniper, Netscreen et Sonicwall."
#: ../properties/nm-vpnc.c:339
diff --git a/po/gl.po b/po/gl.po
index ce04bd7..6779e2e 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -40,98 +40,98 @@ msgstr "Contrasinal de grupo:"
msgid "_Group Password:"
msgstr "Contrasinal de _grupo:"
-#: ../nm-openswan.desktop.in.h:1
-msgid "IPsec Based VPN Connection Manager (openswan)"
-msgstr "Xestor de conexión VPN baseada en IPsec (openswan)"
+#: ../nm-libreswan.desktop.in.h:1
+msgid "IPsec Based VPN Connection Manager (libreswan)"
+msgstr "Xestor de conexión VPN baseada en IPsec (libreswan)"
-#: ../nm-openswan.desktop.in.h:2
+#: ../nm-libreswan.desktop.in.h:2
msgid "Add, Remove, and Edit VPN Connections"
msgstr "Engadir, eliminar e editar conexións VPN"
-#: ../properties/nm-openswan.c:47
+#: ../properties/nm-libreswan.c:47
msgid "IPsec based VPN"
msgstr "VPN baseada en IPsec"
-#: ../properties/nm-openswan.c:48
+#: ../properties/nm-libreswan.c:48
msgid "IPsec, IKEv1, IKEv2 based VPN"
msgstr "VPN baseada en IPsec, IKEv1, IKEv2"
-#: ../properties/nm-openswan.c:274
+#: ../properties/nm-libreswan.c:274
msgid "Saved"
msgstr "Gardado"
-#: ../properties/nm-openswan.c:281
+#: ../properties/nm-libreswan.c:281
msgid "Always Ask"
msgstr "Preguntar sempre"
-#: ../properties/nm-openswan.c:288
+#: ../properties/nm-libreswan.c:288
msgid "Not Required"
msgstr "Non requirido"
-#: ../properties/nm-openswan-dialog.ui.h:1
+#: ../properties/nm-libreswan-dialog.ui.h:1
msgid " "
msgstr " "
-#: ../properties/nm-openswan-dialog.ui.h:2
+#: ../properties/nm-libreswan-dialog.ui.h:2
msgid "<b>General</b>"
msgstr "<b>Xeral</b>"
-#: ../properties/nm-openswan-dialog.ui.h:3
+#: ../properties/nm-libreswan-dialog.ui.h:3
msgid "Show passwords"
msgstr "Mostrar os contrasinais"
-#: ../properties/nm-openswan-dialog.ui.h:4
+#: ../properties/nm-libreswan-dialog.ui.h:4
msgid "Gro_up password:"
msgstr "Contrasinal de gr_upo:"
-#: ../properties/nm-openswan-dialog.ui.h:5
+#: ../properties/nm-libreswan-dialog.ui.h:5
msgid "_Gateway:"
msgstr "_Pasarela:"
-#: ../properties/nm-openswan-dialog.ui.h:6
+#: ../properties/nm-libreswan-dialog.ui.h:6
msgid "G_roup name:"
msgstr "Nome de g_rupo:"
-#: ../properties/nm-openswan-dialog.ui.h:7
+#: ../properties/nm-libreswan-dialog.ui.h:7
msgid "_User password:"
msgstr "Contrasinal de _usuario:"
-#: ../properties/nm-openswan-dialog.ui.h:8
+#: ../properties/nm-libreswan-dialog.ui.h:8
msgid "<b>Optional</b>"
msgstr "<b>Opcional</b>"
-#: ../properties/nm-openswan-dialog.ui.h:9
+#: ../properties/nm-libreswan-dialog.ui.h:9
msgid "User name:"
msgstr "Nome de usuario:"
-#: ../properties/nm-openswan-dialog.ui.h:10
+#: ../properties/nm-libreswan-dialog.ui.h:10
msgid "Phase1 Algorithms:"
msgstr "Algoritmos de Phase1:"
-#: ../properties/nm-openswan-dialog.ui.h:11
+#: ../properties/nm-libreswan-dialog.ui.h:11
msgid "Phase2 Algorithms:"
msgstr "Algoritmos de Phase2:"
-#: ../properties/nm-openswan-dialog.ui.h:12
+#: ../properties/nm-libreswan-dialog.ui.h:12
msgid "Domain:"
msgstr "Dominio:"
-#: ../src/nm-openswan-service.c:877
+#: ../src/nm-libreswan-service.c:877
msgid "Don't quit when VPN connection terminates"
msgstr "Non saír cando unha conexión VPN remata."
-#: ../src/nm-openswan-service.c:878
+#: ../src/nm-libreswan-service.c:878
msgid "Enable verbose debug logging (may expose passwords)"
msgstr ""
"Activar o modo detallado de rexistro de depuración (pode mostrar "
"contrasinais en claro)."
-#: ../src/nm-openswan-service.c:901
+#: ../src/nm-libreswan-service.c:901
msgid ""
-"nm-openswan-service provides integrated IPsec VPN capability to "
+"nm-libreswan-service provides integrated IPsec VPN capability to "
"NetworkManager."
msgstr ""
-"nm-openswan-service fornece a capacidade de integrar VPN IPsec con "
+"nm-libreswan-service fornece a capacidade de integrar VPN IPsec con "
"NetworkManager."
#~ msgid "_Secondary Password:"
@@ -150,9 +150,9 @@ msgstr ""
#~ msgstr "VPN compatíbel con Cisco (vpnc)"
#~ msgid ""
-#~ "Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-"
+#~ "Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-"
#~ "based VPN gateways."
-#~ msgstr "Compatíbel con diferentes pasarelas VPN baseadas en IPSec."
+#~ msgstr "Compatíbel con diferentes pasarelas VPN baseadas en IPsec."
#~ msgid "Secure (default)"
#~ msgstr "Segura (predeterminado)"
diff --git a/po/gu.po b/po/gu.po
index cb864c4..9440c1a 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -65,9 +65,9 @@ msgstr "Cisco સુસંગત VPN (vpnc)"
#: ../properties/nm-vpnc.c:54
msgid ""
-"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based "
+"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-based "
"VPN gateways."
-msgstr "વિવિધ Cisco, Juniper, Netscreen, અને Sonicwall IPSec સાથે સુસંગત છે-આધારિત VPN ગેટવે."
+msgstr "વિવિધ Cisco, Juniper, Netscreen, અને Sonicwall IPsec સાથે સુસંગત છે-આધારિત VPN ગેટવે."
#: ../properties/nm-vpnc.c:339
msgid "Saved"
diff --git a/po/hu.po b/po/hu.po
index 10c5898..b008a1f 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,14 +1,14 @@
-# Hungarian translation of network-manager-openswan
+# Hungarian translation of network-manager-libreswan
# Copyright (C) 2006, 2007, 2008, Free Software Foundation, Inc.
-# This file is distributed under the same license as the network-manager-openswan package.
+# This file is distributed under the same license as the network-manager-libreswan package.
#
# Gabor Kelemen <kelemeng at gnome dot hu>, 2006, 2007, 2008, 2013.
# Balázs Úr <urbalazs at gmail dot com>, 2014.
msgid ""
msgstr ""
-"Project-Id-Version: network-manager-openswan master\n"
+"Project-Id-Version: network-manager-libreswan master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=network-manager-openswan&keywords=I18N+L10N&component=general\n"
+"product=network-manager-libreswan&keywords=I18N+L10N&component=general\n"
"POT-Creation-Date: 2014-12-13 11:12+0000\n"
"PO-Revision-Date: 2014-12-20 00:00+0100\n"
"Last-Translator: Balázs Úr <urbalazs gmail com>\n"
@@ -46,87 +46,87 @@ msgstr "_Csoportjelszó:"
msgid "You need to authenticate to access the Virtual Private Network '%s'."
msgstr "Azonosítania kell magát a(z) „%s” virtuális magánhálózat eléréséhez."
-#: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:1
+#: ../auth-dialog/nm-libreswan-auth-dialog.desktop.in.in.h:1
msgid "Network"
msgstr "Hálózat"
-#: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:2
+#: ../auth-dialog/nm-libreswan-auth-dialog.desktop.in.in.h:2
msgid "Request VPN authentication"
msgstr "VPN-azonosítás kérése"
-#: ../properties/nm-openswan.c:47
+#: ../properties/nm-libreswan.c:47
msgid "IPsec based VPN"
msgstr "IPsec alapú VPN"
-#: ../properties/nm-openswan.c:48
+#: ../properties/nm-libreswan.c:48
msgid "IPsec, IKEv1, IKEv2 based VPN"
msgstr "IPsec, IKEv1, IKEv2 alapú VPN"
-#: ../properties/nm-openswan.c:303
+#: ../properties/nm-libreswan.c:303
msgid "Saved"
msgstr "Mentett"
-#: ../properties/nm-openswan.c:310
+#: ../properties/nm-libreswan.c:310
msgid "Always Ask"
msgstr "Kérdés mindig"
-#: ../properties/nm-openswan.c:317
+#: ../properties/nm-libreswan.c:317
msgid "Not Required"
msgstr "Nem szükséges"
-#: ../properties/nm-openswan-dialog.ui.h:1
+#: ../properties/nm-libreswan-dialog.ui.h:1
msgid " "
msgstr " "
-#: ../properties/nm-openswan-dialog.ui.h:2
+#: ../properties/nm-libreswan-dialog.ui.h:2
msgid "<b>General</b>"
msgstr "<b>Általános</b>"
-#: ../properties/nm-openswan-dialog.ui.h:3
+#: ../properties/nm-libreswan-dialog.ui.h:3
msgid "Show passwords"
msgstr "Jelszavak megjelenítése"
-#: ../properties/nm-openswan-dialog.ui.h:4
+#: ../properties/nm-libreswan-dialog.ui.h:4
msgid "Gro_up password:"
msgstr "_Csoportjelszó:"
-#: ../properties/nm-openswan-dialog.ui.h:5
+#: ../properties/nm-libreswan-dialog.ui.h:5
msgid "_Gateway:"
msgstr "Á_tjáró:"
-#: ../properties/nm-openswan-dialog.ui.h:6
+#: ../properties/nm-libreswan-dialog.ui.h:6
msgid "G_roup name:"
msgstr "Cso_portnév:"
-#: ../properties/nm-openswan-dialog.ui.h:7
+#: ../properties/nm-libreswan-dialog.ui.h:7
msgid "_User password:"
msgstr "_Felhasználó jelszava:"
-#: ../properties/nm-openswan-dialog.ui.h:8
+#: ../properties/nm-libreswan-dialog.ui.h:8
msgid "<b>Optional</b>"
msgstr "<b>Opcionális</b>"
-#: ../properties/nm-openswan-dialog.ui.h:9
+#: ../properties/nm-libreswan-dialog.ui.h:9
msgid "User name:"
msgstr "Felhasználónév:"
-#: ../properties/nm-openswan-dialog.ui.h:10
+#: ../properties/nm-libreswan-dialog.ui.h:10
msgid "Phase1 Algorithms:"
msgstr "Phase1 algoritmusok:"
-#: ../properties/nm-openswan-dialog.ui.h:11
+#: ../properties/nm-libreswan-dialog.ui.h:11
msgid "Phase2 Algorithms:"
msgstr "Phase2 algoritmusok:"
-#: ../properties/nm-openswan-dialog.ui.h:12
+#: ../properties/nm-libreswan-dialog.ui.h:12
msgid "Domain:"
msgstr "Tartomány:"
-#: ../src/nm-openswan-service.c:831
+#: ../src/nm-libreswan-service.c:831
msgid "A password is required."
msgstr "Jelszó szükséges."
-#: ../src/nm-openswan-service.c:1197
+#: ../src/nm-libreswan-service.c:1197
msgid ""
"Could not process the request because the VPN connection settings were "
"invalid."
@@ -134,31 +134,31 @@ msgstr ""
"A kérés feldolgozása sikertelen, mivel a VPN-kapcsolat beállításai "
"érvénytelenek."
-#: ../src/nm-openswan-service.c:1211
+#: ../src/nm-libreswan-service.c:1211
msgid "Unhandled pending authentication."
msgstr "Kezeletlen várakozó hitelesítés."
-#: ../src/nm-openswan-service.c:1297
+#: ../src/nm-libreswan-service.c:1297
msgid "Don't quit when VPN connection terminates"
msgstr "Ne lépjen ki, ha a VPN-kapcsolat megszakad"
-#: ../src/nm-openswan-service.c:1298
+#: ../src/nm-libreswan-service.c:1298
msgid "Enable verbose debug logging (may expose passwords)"
msgstr ""
"Részletes hibakeresési naplózás engedélyezése (jelszavak is a naplóba "
"kerülhetnek)"
-#: ../src/nm-openswan-service.c:1321
+#: ../src/nm-libreswan-service.c:1321
#| msgid ""
-#| "nm-openswan-service provides integrated IPsec VPN capability to "
+#| "nm-libreswan-service provides integrated IPsec VPN capability to "
#| "NetworkManager."
msgid ""
"This service provides integrated IPsec VPN capability to NetworkManager."
msgstr ""
"Ez a szolgáltatás integrált IPsec VPN képességet biztosít a Hálózatkezelőnek."
-#~ msgid "IPsec Based VPN Connection Manager (openswan)"
-#~ msgstr "IPsec alapú VPN kapcsolatkezelő (openswan)"
+#~ msgid "IPsec Based VPN Connection Manager (libreswan)"
+#~ msgstr "IPsec alapú VPN kapcsolatkezelő (libreswan)"
#~ msgid "Add, Remove, and Edit VPN Connections"
#~ msgstr "VPN kapcsolatok hozzáadása, szerkesztése és eltávolítása"
@@ -182,10 +182,10 @@ msgstr ""
#~ msgstr "Cisco-kompatibilis VPN kliens (vpnc)"
#~ msgid ""
-#~ "Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-"
+#~ "Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-"
#~ "based VPN gateways."
#~ msgstr ""
-#~ "Kompatibilis számos Cisco, Juniper, Netscreen és Sonicwall IPSec-alapú "
+#~ "Kompatibilis számos Cisco, Juniper, Netscreen és Sonicwall IPsec-alapú "
#~ "VPN átjáróval."
#~ msgid "Secure (default)"
diff --git a/po/id.po b/po/id.po
index 89fcc68..0d665d8 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,13 +1,13 @@
-# Indonesian translation for network-manager-openswan.
-# Copyright (C) 2013 network-manager-openswan's COPYRIGHT HOLDER
-# This file is distributed under the same license as the network-manager-openswan package.
+# Indonesian translation for network-manager-libreswan.
+# Copyright (C) 2013 network-manager-libreswan's COPYRIGHT HOLDER
+# This file is distributed under the same license as the network-manager-libreswan package.
# Andika Triwidada <andika gmail com>, 2013, 2014.
#
msgid ""
msgstr ""
-"Project-Id-Version: network-manager-openswan master\n"
+"Project-Id-Version: network-manager-libreswan master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=network-manager-openswan&keywords=I18N+L10N&component=general\n"
+"product=network-manager-libreswan&keywords=I18N+L10N&component=general\n"
"POT-Creation-Date: 2014-03-05 18:28+0000\n"
"PO-Revision-Date: 2014-03-30 10:33+0700\n"
"Last-Translator: Andika Triwidada <andika gmail com>\n"
@@ -40,102 +40,102 @@ msgstr "Sandi Grup:"
msgid "_Group Password:"
msgstr "Sandi _Grup:"
-#: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:1
+#: ../auth-dialog/nm-libreswan-auth-dialog.desktop.in.in.h:1
msgid "Network"
msgstr "Jaringan"
-#: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:2
+#: ../auth-dialog/nm-libreswan-auth-dialog.desktop.in.in.h:2
msgid "Request VPN authentication"
msgstr "Minta otentikasi VPN"
-#: ../nm-openswan.desktop.in.h:1
-msgid "IPsec Based VPN Connection Manager (openswan)"
-msgstr "Manajer Koneksi VPN Berbasis IPsec (openswan)"
+#: ../nm-libreswan.desktop.in.h:1
+msgid "IPsec Based VPN Connection Manager (libreswan)"
+msgstr "Manajer Koneksi VPN Berbasis IPsec (libreswan)"
-#: ../nm-openswan.desktop.in.h:2
+#: ../nm-libreswan.desktop.in.h:2
msgid "Add, Remove, and Edit VPN Connections"
msgstr "Tambah, Hapus, dan Sunting Koneksi VPN"
-#: ../properties/nm-openswan.c:47
+#: ../properties/nm-libreswan.c:47
msgid "IPsec based VPN"
msgstr "VPN berbasis IPsec"
-#: ../properties/nm-openswan.c:48
+#: ../properties/nm-libreswan.c:48
msgid "IPsec, IKEv1, IKEv2 based VPN"
msgstr "VPN berbasis IPsec, IKEv1, IKEv2"
-#: ../properties/nm-openswan.c:304
+#: ../properties/nm-libreswan.c:304
msgid "Saved"
msgstr "Disimpan"
-#: ../properties/nm-openswan.c:311
+#: ../properties/nm-libreswan.c:311
msgid "Always Ask"
msgstr "Selalu Tanyakan"
-#: ../properties/nm-openswan.c:318
+#: ../properties/nm-libreswan.c:318
msgid "Not Required"
msgstr "Tak Diperlukan"
-#: ../properties/nm-openswan-dialog.ui.h:1
+#: ../properties/nm-libreswan-dialog.ui.h:1
msgid " "
msgstr " "
-#: ../properties/nm-openswan-dialog.ui.h:2
+#: ../properties/nm-libreswan-dialog.ui.h:2
msgid "<b>General</b>"
msgstr "<b>Umum</b>"
-#: ../properties/nm-openswan-dialog.ui.h:3
+#: ../properties/nm-libreswan-dialog.ui.h:3
msgid "Show passwords"
msgstr "Tampilkan sandi"
-#: ../properties/nm-openswan-dialog.ui.h:4
+#: ../properties/nm-libreswan-dialog.ui.h:4
msgid "Gro_up password:"
msgstr "Sandi gr_up:"
-#: ../properties/nm-openswan-dialog.ui.h:5
+#: ../properties/nm-libreswan-dialog.ui.h:5
msgid "_Gateway:"
msgstr "_Gateway:"
-#: ../properties/nm-openswan-dialog.ui.h:6
+#: ../properties/nm-libreswan-dialog.ui.h:6
msgid "G_roup name:"
msgstr "Nama g_rup:"
-#: ../properties/nm-openswan-dialog.ui.h:7
+#: ../properties/nm-libreswan-dialog.ui.h:7
msgid "_User password:"
msgstr "Sandi pengg_una:"
-#: ../properties/nm-openswan-dialog.ui.h:8
+#: ../properties/nm-libreswan-dialog.ui.h:8
msgid "<b>Optional</b>"
msgstr "<b>Opsional</b>"
-#: ../properties/nm-openswan-dialog.ui.h:9
+#: ../properties/nm-libreswan-dialog.ui.h:9
msgid "User name:"
msgstr "Nama pengguna:"
-#: ../properties/nm-openswan-dialog.ui.h:10
+#: ../properties/nm-libreswan-dialog.ui.h:10
msgid "Phase1 Algorithms:"
msgstr "Algoritma Fase1:"
-#: ../properties/nm-openswan-dialog.ui.h:11
+#: ../properties/nm-libreswan-dialog.ui.h:11
msgid "Phase2 Algorithms:"
msgstr "Algoritma Fase2:"
-#: ../properties/nm-openswan-dialog.ui.h:12
+#: ../properties/nm-libreswan-dialog.ui.h:12
msgid "Domain:"
msgstr "Domain:"
-#: ../src/nm-openswan-service.c:846
+#: ../src/nm-libreswan-service.c:846
msgid "Don't quit when VPN connection terminates"
msgstr "Jangan keluar ketika koneksi VPN berakhir"
-#: ../src/nm-openswan-service.c:847
+#: ../src/nm-libreswan-service.c:847
msgid "Enable verbose debug logging (may expose passwords)"
msgstr "Fungsikan log awakutu cerewet (mungkin mengungkap sandi)"
-#: ../src/nm-openswan-service.c:870
+#: ../src/nm-libreswan-service.c:870
msgid ""
-"nm-openswan-service provides integrated IPsec VPN capability to "
+"nm-libreswan-service provides integrated IPsec VPN capability to "
"NetworkManager."
msgstr ""
-"nm-openswan-service menyediakan kapabilitas VPN IPsec terintegrasi ke "
+"nm-libreswan-service menyediakan kapabilitas VPN IPsec terintegrasi ke "
"NetworkManager."
diff --git a/po/it.po b/po/it.po
index b8573fe..394ac0d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,9 +6,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: network-manager-openswan\n"
+"Project-Id-Version: network-manager-libreswan\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=network-manager-openswan&keywords=I18N+L10N&component=general\n"
+"product=network-manager-libreswan&keywords=I18N+L10N&component=general\n"
"POT-Creation-Date: 2014-12-13 11:12+0000\n"
"PO-Revision-Date: 2015-03-27 09:40+0100\n"
"Last-Translator: Milo Casagrande <milo milo name>\n"
@@ -47,87 +47,87 @@ msgid "You need to authenticate to access the Virtual Private Network '%s'."
msgstr ""
"È necessario autenticarsi per accedere alla Rete Privata Virtuale (VPN) «%s»."
-#: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:1
+#: ../auth-dialog/nm-libreswan-auth-dialog.desktop.in.in.h:1
msgid "Network"
msgstr "Rete"
-#: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:2
+#: ../auth-dialog/nm-libreswan-auth-dialog.desktop.in.in.h:2
msgid "Request VPN authentication"
msgstr "Richiede autenticazione VPN"
-#: ../properties/nm-openswan.c:47
+#: ../properties/nm-libreswan.c:47
msgid "IPsec based VPN"
msgstr "VPN basata su IPsec"
-#: ../properties/nm-openswan.c:48
+#: ../properties/nm-libreswan.c:48
msgid "IPsec, IKEv1, IKEv2 based VPN"
msgstr "VPN basta su IPsec, IKEv1, IKEv2"
-#: ../properties/nm-openswan.c:303
+#: ../properties/nm-libreswan.c:303
msgid "Saved"
msgstr "Salvato"
-#: ../properties/nm-openswan.c:310
+#: ../properties/nm-libreswan.c:310
msgid "Always Ask"
msgstr "Chiedi sempre"
-#: ../properties/nm-openswan.c:317
+#: ../properties/nm-libreswan.c:317
msgid "Not Required"
msgstr "Non richiesto"
-#: ../properties/nm-openswan-dialog.ui.h:1
+#: ../properties/nm-libreswan-dialog.ui.h:1
msgid " "
msgstr " "
-#: ../properties/nm-openswan-dialog.ui.h:2
+#: ../properties/nm-libreswan-dialog.ui.h:2
msgid "<b>General</b>"
msgstr "<b>Generale</b>"
-#: ../properties/nm-openswan-dialog.ui.h:3
+#: ../properties/nm-libreswan-dialog.ui.h:3
msgid "Show passwords"
msgstr "Mostra le password"
-#: ../properties/nm-openswan-dialog.ui.h:4
+#: ../properties/nm-libreswan-dialog.ui.h:4
msgid "Gro_up password:"
msgstr "Password di gr_uppo:"
-#: ../properties/nm-openswan-dialog.ui.h:5
+#: ../properties/nm-libreswan-dialog.ui.h:5
msgid "_Gateway:"
msgstr "_Gateway:"
-#: ../properties/nm-openswan-dialog.ui.h:6
+#: ../properties/nm-libreswan-dialog.ui.h:6
msgid "G_roup name:"
msgstr "Nome g_ruppo:"
-#: ../properties/nm-openswan-dialog.ui.h:7
+#: ../properties/nm-libreswan-dialog.ui.h:7
msgid "_User password:"
msgstr "Password _utente:"
-#: ../properties/nm-openswan-dialog.ui.h:8
+#: ../properties/nm-libreswan-dialog.ui.h:8
msgid "<b>Optional</b>"
msgstr "<b>Opzionale</b>"
-#: ../properties/nm-openswan-dialog.ui.h:9
+#: ../properties/nm-libreswan-dialog.ui.h:9
msgid "User name:"
msgstr "Nome utente:"
-#: ../properties/nm-openswan-dialog.ui.h:10
+#: ../properties/nm-libreswan-dialog.ui.h:10
msgid "Phase1 Algorithms:"
msgstr "Algoritmi phase1:"
-#: ../properties/nm-openswan-dialog.ui.h:11
+#: ../properties/nm-libreswan-dialog.ui.h:11
msgid "Phase2 Algorithms:"
msgstr "Algoritmi phase2:"
-#: ../properties/nm-openswan-dialog.ui.h:12
+#: ../properties/nm-libreswan-dialog.ui.h:12
msgid "Domain:"
msgstr "Dominio:"
-#: ../src/nm-openswan-service.c:831
+#: ../src/nm-libreswan-service.c:831
msgid "A password is required."
msgstr "È richiesta una password."
-#: ../src/nm-openswan-service.c:1197
+#: ../src/nm-libreswan-service.c:1197
msgid ""
"Could not process the request because the VPN connection settings were "
"invalid."
@@ -135,19 +135,19 @@ msgstr ""
"Impossibile elaborare la richiesta poiché le impostazioni della connessione "
"VPN non sono valide."
-#: ../src/nm-openswan-service.c:1211
+#: ../src/nm-libreswan-service.c:1211
msgid "Unhandled pending authentication."
msgstr "Autenticazione pendente non gestita."
-#: ../src/nm-openswan-service.c:1297
+#: ../src/nm-libreswan-service.c:1297
msgid "Don't quit when VPN connection terminates"
msgstr "Non esce quando la connessione VPN termina"
-#: ../src/nm-openswan-service.c:1298
+#: ../src/nm-libreswan-service.c:1298
msgid "Enable verbose debug logging (may expose passwords)"
msgstr "Abilita output di debug prolisso (potrebbe esporre le password)"
-#: ../src/nm-openswan-service.c:1321
+#: ../src/nm-libreswan-service.c:1321
msgid ""
"This service provides integrated IPsec VPN capability to NetworkManager."
msgstr ""
diff --git a/po/ja.po b/po/ja.po
index daafc59..8224644 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: NetworkManager-vpnc HEAD\n"
-"Report-Msgid-Bugs-To:
http://bugzilla.gnome.org/enter_bug.cgi?product=network-manager-openswan&keywords=I18N+L10N&component=general\n";
+"Report-Msgid-Bugs-To:
http://bugzilla.gnome.org/enter_bug.cgi?product=network-manager-libreswan&keywords=I18N+L10N&component=general\n";
"POT-Creation-Date: 2013-09-23 04:10+0000\n"
"PO-Revision-Date: 2013-10-03 14:18+0900\n"
"Last-Translator: Hajime Taira <htaira redhat com>\n"
@@ -37,93 +37,93 @@ msgstr "グループパスワード:"
msgid "_Group Password:"
msgstr "グループパスワード(_G):"
-#: ../nm-openswan.desktop.in.h:1
-msgid "IPsec Based VPN Connection Manager (openswan)"
-msgstr "IPsec ベースの VPN 接続マネージャー (openswan)"
+#: ../nm-libreswan.desktop.in.h:1
+msgid "IPsec Based VPN Connection Manager (libreswan)"
+msgstr "IPsec ベースの VPN 接続マネージャー (libreswan)"
-#: ../nm-openswan.desktop.in.h:2
+#: ../nm-libreswan.desktop.in.h:2
msgid "Add, Remove, and Edit VPN Connections"
msgstr "VPN 接続を追加、削除または編集"
-#: ../properties/nm-openswan.c:47
+#: ../properties/nm-libreswan.c:47
msgid "IPsec based VPN"
msgstr "IPsec ベースの VPN"
-#: ../properties/nm-openswan.c:48
+#: ../properties/nm-libreswan.c:48
msgid "IPsec, IKEv1, IKEv2 based VPN"
msgstr "IPsec, IKEv1, IKEv2 ベースの VPN"
-#: ../properties/nm-openswan.c:274
+#: ../properties/nm-libreswan.c:274
msgid "Saved"
msgstr "保存しました"
-#: ../properties/nm-openswan.c:281
+#: ../properties/nm-libreswan.c:281
msgid "Always Ask"
msgstr "毎回求める"
-#: ../properties/nm-openswan.c:288
+#: ../properties/nm-libreswan.c:288
msgid "Not Required"
msgstr "不要"
-#: ../properties/nm-openswan-dialog.ui.h:1
+#: ../properties/nm-libreswan-dialog.ui.h:1
msgid " "
msgstr " "
-#: ../properties/nm-openswan-dialog.ui.h:2
+#: ../properties/nm-libreswan-dialog.ui.h:2
msgid "<b>General</b>"
msgstr "<b>全般</b>"
-#: ../properties/nm-openswan-dialog.ui.h:3
+#: ../properties/nm-libreswan-dialog.ui.h:3
msgid "Show passwords"
msgstr "パスワードを表示する"
-#: ../properties/nm-openswan-dialog.ui.h:4
+#: ../properties/nm-libreswan-dialog.ui.h:4
msgid "Gro_up password:"
msgstr "グループパスワード(_U):"
-#: ../properties/nm-openswan-dialog.ui.h:5
+#: ../properties/nm-libreswan-dialog.ui.h:5
msgid "_Gateway:"
msgstr "ゲートウェイ(_G):"
-#: ../properties/nm-openswan-dialog.ui.h:6
+#: ../properties/nm-libreswan-dialog.ui.h:6
msgid "G_roup name:"
msgstr "グループ名(_R):"
-#: ../properties/nm-openswan-dialog.ui.h:7
+#: ../properties/nm-libreswan-dialog.ui.h:7
msgid "_User password:"
msgstr "ユーザーパスワード(_U):"
-#: ../properties/nm-openswan-dialog.ui.h:8
+#: ../properties/nm-libreswan-dialog.ui.h:8
msgid "<b>Optional</b>"
msgstr "<b>オプション</b>"
-#: ../properties/nm-openswan-dialog.ui.h:9
+#: ../properties/nm-libreswan-dialog.ui.h:9
msgid "User name:"
msgstr "ユーザー名:"
-#: ../properties/nm-openswan-dialog.ui.h:10
+#: ../properties/nm-libreswan-dialog.ui.h:10
msgid "Phase1 Algorithms:"
msgstr "フェーズ1 アルゴリズム:"
-#: ../properties/nm-openswan-dialog.ui.h:11
+#: ../properties/nm-libreswan-dialog.ui.h:11
msgid "Phase2 Algorithms:"
msgstr "フェーズ2 アルゴリズム:"
-#: ../properties/nm-openswan-dialog.ui.h:12
+#: ../properties/nm-libreswan-dialog.ui.h:12
msgid "Domain:"
msgstr "ドメイン:"
-#: ../src/nm-openswan-service.c:877
+#: ../src/nm-libreswan-service.c:877
msgid "Don't quit when VPN connection terminates"
msgstr "終了時に VPN 接続を切断しない"
-#: ../src/nm-openswan-service.c:878
+#: ../src/nm-libreswan-service.c:878
msgid "Enable verbose debug logging (may expose passwords)"
msgstr "詳細なデバッグログ機能を有効化する (パスワードが露出する可能性があります)"
-#: ../src/nm-openswan-service.c:901
-msgid "nm-openswan-service provides integrated IPsec VPN capability to NetworkManager."
-msgstr "nm-openswan-service は NetworkManager に統合化された IPsec VPN 機能を提供します。"
+#: ../src/nm-libreswan-service.c:901
+msgid "nm-libreswan-service provides integrated IPsec VPN capability to NetworkManager."
+msgstr "nm-libreswan-service は NetworkManager に統合化された IPsec VPN 機能を提供します。"
#~ msgid "_Secondary Password:"
#~ msgstr "第二パスワード(_S):"
diff --git a/po/lt.po b/po/lt.po
index c4f8514..1cd3534 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: NetworkManager-vpnc HEAD\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=network-manager-openswan&keywords=I18N+L10N&component=general\n"
+"product=network-manager-libreswan&keywords=I18N+L10N&component=general\n"
"POT-Creation-Date: 2014-12-13 11:12+0000\n"
"PO-Revision-Date: 2015-09-12 20:54+0300\n"
"Last-Translator: Aurimas Černius <aurisc4 gmail com>\n"
@@ -51,115 +51,115 @@ msgstr ""
"Norint gauti prieigą prie Virtualiojo Privačiojo Tinklo „%s“, reikia "
"nustatyti jūsų tapatybę."
-#: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:1
+#: ../auth-dialog/nm-libreswan-auth-dialog.desktop.in.in.h:1
msgid "Network"
msgstr "Tinklas"
-#: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:2
+#: ../auth-dialog/nm-libreswan-auth-dialog.desktop.in.in.h:2
msgid "Request VPN authentication"
msgstr "Prašyti VPN tapatybės patvirtinimo"
-#: ../properties/nm-openswan.c:47
+#: ../properties/nm-libreswan.c:47
msgid "IPsec based VPN"
msgstr "IPsec pagrindo VPN"
-#: ../properties/nm-openswan.c:48
+#: ../properties/nm-libreswan.c:48
msgid "IPsec, IKEv1, IKEv2 based VPN"
msgstr "IPsec, IKEv1, IKEv2 pagrindo VPN"
-#: ../properties/nm-openswan.c:303
+#: ../properties/nm-libreswan.c:303
msgid "Saved"
msgstr "Įrašyta"
-#: ../properties/nm-openswan.c:310
+#: ../properties/nm-libreswan.c:310
msgid "Always Ask"
msgstr "Visada klausti"
-#: ../properties/nm-openswan.c:317
+#: ../properties/nm-libreswan.c:317
msgid "Not Required"
msgstr "Nereikia"
-#: ../properties/nm-openswan-dialog.ui.h:1
+#: ../properties/nm-libreswan-dialog.ui.h:1
msgid " "
msgstr " "
-#: ../properties/nm-openswan-dialog.ui.h:2
+#: ../properties/nm-libreswan-dialog.ui.h:2
msgid "<b>General</b>"
msgstr "<b>Bendra</b>"
-#: ../properties/nm-openswan-dialog.ui.h:3
+#: ../properties/nm-libreswan-dialog.ui.h:3
msgid "Show passwords"
msgstr "Rodyti slaptažodžius:"
-#: ../properties/nm-openswan-dialog.ui.h:4
+#: ../properties/nm-libreswan-dialog.ui.h:4
msgid "Gro_up password:"
msgstr "Gr_upės slaptažodis:"
-#: ../properties/nm-openswan-dialog.ui.h:5
+#: ../properties/nm-libreswan-dialog.ui.h:5
msgid "_Gateway:"
msgstr "Š_liuzas:"
-#: ../properties/nm-openswan-dialog.ui.h:6
+#: ../properties/nm-libreswan-dialog.ui.h:6
msgid "G_roup name:"
msgstr "G_rupės vardas:"
-#: ../properties/nm-openswan-dialog.ui.h:7
+#: ../properties/nm-libreswan-dialog.ui.h:7
msgid "_User password:"
msgstr "_Naudotojo slaptažodis:"
-#: ../properties/nm-openswan-dialog.ui.h:8
+#: ../properties/nm-libreswan-dialog.ui.h:8
msgid "<b>Optional</b>"
msgstr "<b>Neprivalomas</b>"
-#: ../properties/nm-openswan-dialog.ui.h:9
+#: ../properties/nm-libreswan-dialog.ui.h:9
msgid "User name:"
msgstr "Naudotojo vardas:"
-#: ../properties/nm-openswan-dialog.ui.h:10
+#: ../properties/nm-libreswan-dialog.ui.h:10
msgid "Phase1 Algorithms:"
msgstr "Pirmos fazės algoritmai:"
-#: ../properties/nm-openswan-dialog.ui.h:11
+#: ../properties/nm-libreswan-dialog.ui.h:11
msgid "Phase2 Algorithms:"
msgstr "Antros fazės algoritmai:"
-#: ../properties/nm-openswan-dialog.ui.h:12
+#: ../properties/nm-libreswan-dialog.ui.h:12
msgid "Domain:"
msgstr "Sritis:"
-#: ../src/nm-openswan-service.c:831
+#: ../src/nm-libreswan-service.c:831
msgid "A password is required."
msgstr "Būtinas slaptažodis."
-#: ../src/nm-openswan-service.c:1197
+#: ../src/nm-libreswan-service.c:1197
msgid ""
"Could not process the request because the VPN connection settings were "
"invalid."
msgstr ""
"Nepavyko apdoroti užklausos, kadangi VPN ryšio nustatymai buvo neteisingi."
-#: ../src/nm-openswan-service.c:1211
+#: ../src/nm-libreswan-service.c:1211
msgid "Unhandled pending authentication."
msgstr "Neapdorotas laukiamas tapatybės patvirtinimas."
-#: ../src/nm-openswan-service.c:1297
+#: ../src/nm-libreswan-service.c:1297
msgid "Don't quit when VPN connection terminates"
msgstr "Neišeiti, kai nutrūksta VPN ryšys"
-#: ../src/nm-openswan-service.c:1298
+#: ../src/nm-libreswan-service.c:1298
msgid "Enable verbose debug logging (may expose passwords)"
msgstr "Įjungti išsamų derinimo žurnalą (gali parodyti slaptažodžius)"
-#: ../src/nm-openswan-service.c:1321
+#: ../src/nm-libreswan-service.c:1321
#| msgid ""
-#| "nm-openswan-service provides integrated IPsec VPN capability to "
+#| "nm-libreswan-service provides integrated IPsec VPN capability to "
#| "NetworkManager."
msgid ""
"This service provides integrated IPsec VPN capability to NetworkManager."
msgstr "Ši tarnyba sutekia NetworkManager integruotą IPsec VPN galimybę."
-#~ msgid "IPsec Based VPN Connection Manager (openswan)"
-#~ msgstr "IPsec pagrindo VPN ryšių valdyklė (openswan)"
+#~ msgid "IPsec Based VPN Connection Manager (libreswan)"
+#~ msgstr "IPsec pagrindo VPN ryšių valdyklė (libreswan)"
#~ msgid "Add, Remove, and Edit VPN Connections"
#~ msgstr "Pridėti, šalinti ir taisyti VPN ryšius"
diff --git a/po/lv.po b/po/lv.po
index adc3a34..88d06da 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=network-manager-openswan&keywords=I18N+L10N&component=general\n"
+"product=network-manager-libreswan&keywords=I18N+L10N&component=general\n"
"POT-Creation-Date: 2013-04-12 12:47+0000\n"
"PO-Revision-Date: 2013-04-21 23:41+0300\n"
"Last-Translator: Rūdolfs Mazurs <rudolfs mazurs gmail com>\n"
@@ -41,94 +41,94 @@ msgstr "Grupas parole:"
msgid "_Group Password:"
msgstr "_Grupas parole:"
-#: ../nm-openswan.desktop.in.h:1
-msgid "IPsec Based VPN Connection Manager (openswan)"
-msgstr "Uz IPsec balstīts VPN savienojumu pārvaldnieks (openswan)"
+#: ../nm-libreswan.desktop.in.h:1
+msgid "IPsec Based VPN Connection Manager (libreswan)"
+msgstr "Uz IPsec balstīts VPN savienojumu pārvaldnieks (libreswan)"
-#: ../nm-openswan.desktop.in.h:2
+#: ../nm-libreswan.desktop.in.h:2
msgid "Add, Remove, and Edit VPN Connections"
msgstr "Pievienot, noņemt un rediģēt VPN savienojumus"
-#: ../properties/nm-openswan.c:47
+#: ../properties/nm-libreswan.c:47
msgid "IPsec based VPN"
msgstr "Uz IPsec balstīts VPN"
-#: ../properties/nm-openswan.c:48
+#: ../properties/nm-libreswan.c:48
msgid "IPsec, IKEv1, IKEv2 based VPN"
msgstr "IPsec, IKEv1, IKEv2 balstīts VPN"
-#: ../properties/nm-openswan.c:274
+#: ../properties/nm-libreswan.c:274
msgid "Saved"
msgstr "Saglabāts"
-#: ../properties/nm-openswan.c:281
+#: ../properties/nm-libreswan.c:281
msgid "Always Ask"
msgstr "Vienmēr jautāt"
-#: ../properties/nm-openswan.c:288
+#: ../properties/nm-libreswan.c:288
msgid "Not Required"
msgstr "Nav nepieciešams"
-#: ../properties/nm-openswan-dialog.ui.h:1
+#: ../properties/nm-libreswan-dialog.ui.h:1
msgid " "
msgstr " "
-#: ../properties/nm-openswan-dialog.ui.h:2
+#: ../properties/nm-libreswan-dialog.ui.h:2
msgid "<b>General</b>"
msgstr "<b>Vispārējs</b>"
-#: ../properties/nm-openswan-dialog.ui.h:3
+#: ../properties/nm-libreswan-dialog.ui.h:3
msgid "Show passwords"
msgstr "Rādīt paroles"
-#: ../properties/nm-openswan-dialog.ui.h:4
+#: ../properties/nm-libreswan-dialog.ui.h:4
msgid "Gro_up password:"
msgstr "Gr_upas parole:"
-#: ../properties/nm-openswan-dialog.ui.h:5
+#: ../properties/nm-libreswan-dialog.ui.h:5
msgid "_Gateway:"
msgstr "_Vārteja:"
-#: ../properties/nm-openswan-dialog.ui.h:6
+#: ../properties/nm-libreswan-dialog.ui.h:6
msgid "G_roup name:"
msgstr "G_rupas nosaukums:"
-#: ../properties/nm-openswan-dialog.ui.h:7
+#: ../properties/nm-libreswan-dialog.ui.h:7
msgid "_User password:"
msgstr "_Lietotāja parole:"
-#: ../properties/nm-openswan-dialog.ui.h:8
+#: ../properties/nm-libreswan-dialog.ui.h:8
msgid "<b>Optional</b>"
msgstr "<b>Neobligāts</b>"
-#: ../properties/nm-openswan-dialog.ui.h:9
+#: ../properties/nm-libreswan-dialog.ui.h:9
msgid "User name:"
msgstr "Lietotājvārds:"
-#: ../properties/nm-openswan-dialog.ui.h:10
+#: ../properties/nm-libreswan-dialog.ui.h:10
msgid "Phase1 Algorithms:"
msgstr "Phase1 algoritms:"
-#: ../properties/nm-openswan-dialog.ui.h:11
+#: ../properties/nm-libreswan-dialog.ui.h:11
msgid "Phase2 Algorithms:"
msgstr "Phase2 algoritms:"
-#: ../properties/nm-openswan-dialog.ui.h:12
+#: ../properties/nm-libreswan-dialog.ui.h:12
msgid "Domain:"
msgstr "Domēns:"
-#: ../src/nm-openswan-service.c:877
+#: ../src/nm-libreswan-service.c:877
msgid "Don't quit when VPN connection terminates"
msgstr "Neiziet, kad tiek pārtraukts VPN savienojums"
-#: ../src/nm-openswan-service.c:878
+#: ../src/nm-libreswan-service.c:878
msgid "Enable verbose debug logging (may expose passwords)"
msgstr "Aktivēt detalizētu atkļūdošanas reģistrēšanu (var atklāt paroles)"
-#: ../src/nm-openswan-service.c:901
+#: ../src/nm-libreswan-service.c:901
msgid ""
-"nm-openswan-service provides integrated IPsec VPN capability to "
+"nm-libreswan-service provides integrated IPsec VPN capability to "
"NetworkManager."
msgstr ""
-"nm-openswan-service nodrošina NetworkManager integrētu IPsec VPN iespēju."
+"nm-libreswan-service nodrošina NetworkManager integrētu IPsec VPN iespēju."
diff --git a/po/mk.po b/po/mk.po
index d015234..d5e1ecd 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -79,10 +79,10 @@ msgstr "VPN компатибилен со Cisco (vpnc)"
#: ../properties/nm-vpnc.c:52
msgid ""
-"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based "
+"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-based "
"VPN gateways."
msgstr ""
-"Компатибилност со разни Cisco, Juniper, Netscreen и Sonicwall IPSec VPN "
+"Компатибилност со разни Cisco, Juniper, Netscreen и Sonicwall IPsec VPN "
"премини."
#: ../properties/nm-vpnc.c:194
diff --git a/po/mr.po b/po/mr.po
index e17578c..9cd6d5b 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -64,10 +64,10 @@ msgstr "Cisco सहत्व VPN (vpnc)"
#: ../properties/nm-vpnc.c:54
msgid ""
-"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based "
+"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-based "
"VPN gateways."
msgstr ""
-"विविध Cisco, Juniper, Netscreen, व Sonicwall IPSec-आधारीत "
+"विविध Cisco, Juniper, Netscreen, व Sonicwall IPsec-आधारीत "
"VPN गेटवे सह सहत्व."
#: ../properties/nm-vpnc.c:339
diff --git a/po/nl.po b/po/nl.po
index 29b412d..884ef9a 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -81,10 +81,10 @@ msgstr "Cisco-compatibele VPN-cliënt (vpnc)"
#: ../properties/nm-vpnc.c:54
msgid ""
-"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based "
+"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-based "
"VPN gateways."
msgstr ""
-"Geschikt voor verschillende Cisco, Juniper, Netscreen en Sonicwall IPSec-"
+"Geschikt voor verschillende Cisco, Juniper, Netscreen en Sonicwall IPsec-"
"gebaseerde VPN-gateways."
#: ../properties/nm-vpnc.c:282
diff --git a/po/or.po b/po/or.po
index 4245ed7..e5892eb 100644
--- a/po/or.po
+++ b/po/or.po
@@ -64,10 +64,10 @@ msgstr "Cisco ସୁସଙ୍ଗତ VPN (vpnc)"
#: ../properties/nm-vpnc.c:54
msgid ""
-"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based "
+"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-based "
"VPN gateways."
msgstr ""
-"ଭିନ୍ନ ପ୍ରକାରର Cisco, Juniper, Netscreen, ଏବଂ Sonicwall IPSec-ଆଧାରିତ "
+"ଭିନ୍ନ ପ୍ରକାରର Cisco, Juniper, Netscreen, ଏବଂ Sonicwall IPsec-ଆଧାରିତ "
"VPN ସହିତ ସୁସଂଗତ।"
#: ../properties/nm-vpnc.c:339
diff --git a/po/pa.po b/po/pa.po
index 970b1b2..2441d8e 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -68,10 +68,10 @@ msgstr "Cisco ਅਨੁਕੂਲ VPN (vpnc)"
#: ../properties/nm-vpnc.c:54
msgid ""
-"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based "
+"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-based "
"VPN gateways."
msgstr ""
-"ਕਈ ਸਿਸਕੋ, ਜੁਨੀਪੀਅਰ, ਨੈਟਸਕਰੀਨ ਅਤੇ ਸੋਨਿਕਵਾਲ IPSec-ਅਧਾਰਿਤ VPN ਗੇਟਵ ਨਾਲ ਅਨੁਕੂਲ "
+"ਕਈ ਸਿਸਕੋ, ਜੁਨੀਪੀਅਰ, ਨੈਟਸਕਰੀਨ ਅਤੇ ਸੋਨਿਕਵਾਲ IPsec-ਅਧਾਰਿਤ VPN ਗੇਟਵ ਨਾਲ ਅਨੁਕੂਲ "
"ਹੈ।"
#: ../properties/nm-vpnc.c:339
diff --git a/po/pl.po b/po/pl.po
index dd83f5f..7008ed9 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@
# Aviary.pl <gnomepl aviary pl>, 2008-2015.
msgid ""
msgstr ""
-"Project-Id-Version: network-manager-openswan\n"
+"Project-Id-Version: network-manager-libreswan\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-08-30 17:30+0200\n"
"PO-Revision-Date: 2015-08-30 17:32+0200\n"
@@ -52,87 +52,87 @@ msgstr ""
"Aby uzyskać dostęp do wirtualnej sieci prywatnej „%s”, należy dokonać "
"uwierzytelnienia."
-#: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:1
+#: ../auth-dialog/nm-libreswan-auth-dialog.desktop.in.in.h:1
msgid "Network"
msgstr "Sieć"
-#: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:2
+#: ../auth-dialog/nm-libreswan-auth-dialog.desktop.in.in.h:2
msgid "Request VPN authentication"
msgstr "Żądanie uwierzytelnienia sieci VPN"
-#: ../properties/nm-openswan.c:45
+#: ../properties/nm-libreswan.c:45
msgid "IPsec based VPN"
msgstr "VPN oparte na IPsec"
-#: ../properties/nm-openswan.c:46
+#: ../properties/nm-libreswan.c:46
msgid "IPsec, IKEv1, IKEv2 based VPN"
msgstr "VPN oparte na IPsec, IKEv1, IKEv2"
-#: ../properties/nm-openswan.c:301
+#: ../properties/nm-libreswan.c:301
msgid "Saved"
msgstr "Zapisano"
-#: ../properties/nm-openswan.c:308
+#: ../properties/nm-libreswan.c:308
msgid "Always Ask"
msgstr "Pytanie zawsze"
-#: ../properties/nm-openswan.c:315
+#: ../properties/nm-libreswan.c:315
msgid "Not Required"
msgstr "Niewymagane"
-#: ../properties/nm-openswan-dialog.ui.h:1
+#: ../properties/nm-libreswan-dialog.ui.h:1
msgid " "
msgstr " "
-#: ../properties/nm-openswan-dialog.ui.h:2
+#: ../properties/nm-libreswan-dialog.ui.h:2
msgid "<b>General</b>"
msgstr "<b>Ogólne</b>"
-#: ../properties/nm-openswan-dialog.ui.h:3
+#: ../properties/nm-libreswan-dialog.ui.h:3
msgid "Show passwords"
msgstr "Wyświetlanie haseł"
-#: ../properties/nm-openswan-dialog.ui.h:4
+#: ../properties/nm-libreswan-dialog.ui.h:4
msgid "Gro_up password:"
msgstr "_Hasło grupy:"
-#: ../properties/nm-openswan-dialog.ui.h:5
+#: ../properties/nm-libreswan-dialog.ui.h:5
msgid "_Gateway:"
msgstr "_Brama:"
-#: ../properties/nm-openswan-dialog.ui.h:6
+#: ../properties/nm-libreswan-dialog.ui.h:6
msgid "G_roup name:"
msgstr "Nazwa g_rupy:"
-#: ../properties/nm-openswan-dialog.ui.h:7
+#: ../properties/nm-libreswan-dialog.ui.h:7
msgid "_User password:"
msgstr "Hasło _użytkownika:"
-#: ../properties/nm-openswan-dialog.ui.h:8
+#: ../properties/nm-libreswan-dialog.ui.h:8
msgid "<b>Optional</b>"
msgstr "<b>Opcjonalne</b>"
-#: ../properties/nm-openswan-dialog.ui.h:9
+#: ../properties/nm-libreswan-dialog.ui.h:9
msgid "User name:"
msgstr "Nazwa użytkownika:"
-#: ../properties/nm-openswan-dialog.ui.h:10
+#: ../properties/nm-libreswan-dialog.ui.h:10
msgid "Phase1 Algorithms:"
msgstr "Algorytmy fazy pierwszej:"
-#: ../properties/nm-openswan-dialog.ui.h:11
+#: ../properties/nm-libreswan-dialog.ui.h:11
msgid "Phase2 Algorithms:"
msgstr "Algorytmy fazy drugiej:"
-#: ../properties/nm-openswan-dialog.ui.h:12
+#: ../properties/nm-libreswan-dialog.ui.h:12
msgid "Domain:"
msgstr "Domena:"
-#: ../src/nm-openswan-service.c:867
+#: ../src/nm-libreswan-service.c:867
msgid "A password is required."
msgstr "Wymagane jest hasło."
-#: ../src/nm-openswan-service.c:1235
+#: ../src/nm-libreswan-service.c:1235
msgid ""
"Could not process the request because the VPN connection settings were "
"invalid."
@@ -140,19 +140,19 @@ msgstr ""
"Nie można przetworzyć żądania, ponieważ ustawienia połączenia VPN są "
"nieprawidłowe."
-#: ../src/nm-openswan-service.c:1249
+#: ../src/nm-libreswan-service.c:1249
msgid "Unhandled pending authentication."
msgstr "Nieobsłużone oczekujące uwierzytelnienie."
-#: ../src/nm-openswan-service.c:1335
+#: ../src/nm-libreswan-service.c:1335
msgid "Don't quit when VPN connection terminates"
msgstr "Nie kończy działania, kiedy połączenie VPN jest kończone"
-#: ../src/nm-openswan-service.c:1336
+#: ../src/nm-libreswan-service.c:1336
msgid "Enable verbose debug logging (may expose passwords)"
msgstr "Włącza więcej komunikatów debugowania (może wyjawić hasła)"
-#: ../src/nm-openswan-service.c:1359
+#: ../src/nm-libreswan-service.c:1359
msgid ""
"This service provides integrated IPsec VPN capability to NetworkManager."
msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 7b4debb..b830776 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -63,9 +63,9 @@ msgstr "VPN Compatível com Cisco (vpnc)"
#: ../properties/nm-vpnc.c:54
msgid ""
-"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based "
+"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-based "
"VPN gateways."
-msgstr "Compatível com vários gateways VPN baseados no IPSec da Cisco, Juniper, Netscreen e Sonicwall."
+msgstr "Compatível com vários gateways VPN baseados no IPsec da Cisco, Juniper, Netscreen e Sonicwall."
#: ../properties/nm-vpnc.c:339
msgid "Saved"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index e53326a..1979502 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: NetworkManager-vpnc\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=network-";
-"manager-openswan&keywords=I18N+L10N&component=general\n"
+"manager-libreswan&keywords=I18N+L10N&component=general\n"
"POT-Creation-Date: 2014-12-13 11:12+0000\n"
"PO-Revision-Date: 2014-12-17 02:57-0300\n"
"Last-Translator: Rafael Ferreira <rafael f f1 gmail com>\n"
@@ -48,112 +48,112 @@ msgstr "Senha do _grupo:"
msgid "You need to authenticate to access the Virtual Private Network '%s'."
msgstr "Você precisa se autenticar para acessar a Rede Privada Virtual (VPN) \"%s\"."
-#: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:1
+#: ../auth-dialog/nm-libreswan-auth-dialog.desktop.in.in.h:1
msgid "Network"
msgstr "Rede"
-#: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:2
+#: ../auth-dialog/nm-libreswan-auth-dialog.desktop.in.in.h:2
msgid "Request VPN authentication"
msgstr "Solicitar autenticação de VPN"
-#: ../properties/nm-openswan.c:47
+#: ../properties/nm-libreswan.c:47
msgid "IPsec based VPN"
msgstr "VPN baseada em IPsec"
-#: ../properties/nm-openswan.c:48
+#: ../properties/nm-libreswan.c:48
msgid "IPsec, IKEv1, IKEv2 based VPN"
msgstr "VPN baseada em IPsec, IKEv1 e IKEv2"
-#: ../properties/nm-openswan.c:303
+#: ../properties/nm-libreswan.c:303
msgid "Saved"
msgstr "Salvo"
-#: ../properties/nm-openswan.c:310
+#: ../properties/nm-libreswan.c:310
msgid "Always Ask"
msgstr "Sempre perguntar"
-#: ../properties/nm-openswan.c:317
+#: ../properties/nm-libreswan.c:317
msgid "Not Required"
msgstr "Não requerido"
-#: ../properties/nm-openswan-dialog.ui.h:1
+#: ../properties/nm-libreswan-dialog.ui.h:1
msgid " "
msgstr " "
-#: ../properties/nm-openswan-dialog.ui.h:2
+#: ../properties/nm-libreswan-dialog.ui.h:2
msgid "<b>General</b>"
msgstr "<b>Geral</b>"
-#: ../properties/nm-openswan-dialog.ui.h:3
+#: ../properties/nm-libreswan-dialog.ui.h:3
msgid "Show passwords"
msgstr "Mostrar senhas"
-#: ../properties/nm-openswan-dialog.ui.h:4
+#: ../properties/nm-libreswan-dialog.ui.h:4
msgid "Gro_up password:"
msgstr "Senha do _grupo:"
-#: ../properties/nm-openswan-dialog.ui.h:5
+#: ../properties/nm-libreswan-dialog.ui.h:5
msgid "_Gateway:"
msgstr "_Gateway:"
-#: ../properties/nm-openswan-dialog.ui.h:6
+#: ../properties/nm-libreswan-dialog.ui.h:6
msgid "G_roup name:"
msgstr "Nome do g_rupo:"
-#: ../properties/nm-openswan-dialog.ui.h:7
+#: ../properties/nm-libreswan-dialog.ui.h:7
msgid "_User password:"
msgstr "Senha de _usuário:"
-#: ../properties/nm-openswan-dialog.ui.h:8
+#: ../properties/nm-libreswan-dialog.ui.h:8
msgid "<b>Optional</b>"
msgstr "<b>Opcional</b>"
-#: ../properties/nm-openswan-dialog.ui.h:9
+#: ../properties/nm-libreswan-dialog.ui.h:9
msgid "User name:"
msgstr "Nome do usuário:"
-#: ../properties/nm-openswan-dialog.ui.h:10
+#: ../properties/nm-libreswan-dialog.ui.h:10
msgid "Phase1 Algorithms:"
msgstr "Algoritmos da fase 1:"
-#: ../properties/nm-openswan-dialog.ui.h:11
+#: ../properties/nm-libreswan-dialog.ui.h:11
msgid "Phase2 Algorithms:"
msgstr "Algoritmos da fase 2:"
-#: ../properties/nm-openswan-dialog.ui.h:12
+#: ../properties/nm-libreswan-dialog.ui.h:12
msgid "Domain:"
msgstr "Domínio:"
-#: ../src/nm-openswan-service.c:831
+#: ../src/nm-libreswan-service.c:831
msgid "A password is required."
msgstr "A senha é necessária."
-#: ../src/nm-openswan-service.c:1197
+#: ../src/nm-libreswan-service.c:1197
msgid ""
"Could not process the request because the VPN connection settings were invalid."
msgstr ""
"Não é possível processar a requisição pelo fato da configuração conexão da VPN "
"eram inválidas."
-#: ../src/nm-openswan-service.c:1211
+#: ../src/nm-libreswan-service.c:1211
msgid "Unhandled pending authentication."
msgstr "Autenticação pendente não lidada."
-#: ../src/nm-openswan-service.c:1297
+#: ../src/nm-libreswan-service.c:1297
msgid "Don't quit when VPN connection terminates"
msgstr "Não sair quando a conexão VPN terminar"
-#: ../src/nm-openswan-service.c:1298
+#: ../src/nm-libreswan-service.c:1298
msgid "Enable verbose debug logging (may expose passwords)"
msgstr "Ativar registro de depuração detalhado (pode expor senhas)"
-#: ../src/nm-openswan-service.c:1321
+#: ../src/nm-libreswan-service.c:1321
msgid "This service provides integrated IPsec VPN capability to NetworkManager."
msgstr ""
"Este serviço oferece capacidade integrada de VPN IPsec ao Gerenciador de redes."
-#~ msgid "IPsec Based VPN Connection Manager (openswan)"
-#~ msgstr "Gerenciador de conexão VPN baseada em IPsec (openswan)"
+#~ msgid "IPsec Based VPN Connection Manager (libreswan)"
+#~ msgstr "Gerenciador de conexão VPN baseada em IPsec (libreswan)"
#~ msgid "Add, Remove, and Edit VPN Connections"
#~ msgstr "Adicione, remova e edite conexões VPN"
@@ -177,11 +177,11 @@ msgstr ""
#~ msgstr "Cliente VPN compatível com Cisco (vpnc)"
#~ msgid ""
-#~ "Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based "
+#~ "Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-based "
#~ "VPN gateways."
#~ msgstr ""
#~ "Compatível com vários VPN gateways Cisco, Juniper, NetScreen e SonicWALL "
-#~ "baseado em IPSec."
+#~ "baseado em IPsec."
#~ msgid "Secure (default)"
#~ msgstr "Seguro (padrão)"
diff --git a/po/ru.po b/po/ru.po
index 4f25a08..7543eae 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -67,7 +67,7 @@ msgstr "Cisco-совместимая VPN (vpnc)"
#: ../properties/nm-vpnc.c:54
msgid ""
-"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based "
+"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-based "
"VPN gateways."
msgstr "Совместим с различными роутерами Cisco, Juniper, Netscreen, Sonicwall."
diff --git a/po/sl.po b/po/sl.po
index 24058f2..7b83fbd 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: NetworkManager-vpnc\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=network-manager-openswan&keywords=I18N+L10N&component=general\n"
+"product=network-manager-libreswan&keywords=I18N+L10N&component=general\n"
"POT-Creation-Date: 2014-04-01 10:34+0000\n"
"PO-Revision-Date: 2014-04-01 22:29+0100\n"
"Last-Translator: Matej Urbančič <mateju svn gnome org>\n"
@@ -43,104 +43,104 @@ msgstr "Geslo skupine:"
msgid "_Group Password:"
msgstr "_Geslo skupine:"
-#: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:1
+#: ../auth-dialog/nm-libreswan-auth-dialog.desktop.in.in.h:1
msgid "Network"
msgstr "Omrežje"
-#: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:2
+#: ../auth-dialog/nm-libreswan-auth-dialog.desktop.in.in.h:2
msgid "Request VPN authentication"
msgstr "Zahtevaj overitev VPN"
-#: ../nm-openswan.desktop.in.h:1
-msgid "IPsec Based VPN Connection Manager (openswan)"
-msgstr "Upravitelj povezav VPN na osnovi IPsev (openswan)"
+#: ../nm-libreswan.desktop.in.h:1
+msgid "IPsec Based VPN Connection Manager (libreswan)"
+msgstr "Upravitelj povezav VPN na osnovi IPsev (libreswan)"
-#: ../nm-openswan.desktop.in.h:2
+#: ../nm-libreswan.desktop.in.h:2
msgid "Add, Remove, and Edit VPN Connections"
msgstr "Dodajte, odstranite ali uredite povezave VPN"
-#: ../properties/nm-openswan.c:47
+#: ../properties/nm-libreswan.c:47
msgid "IPsec based VPN"
msgstr "VPN s podporo IPsec"
-#: ../properties/nm-openswan.c:48
+#: ../properties/nm-libreswan.c:48
msgid "IPsec, IKEv1, IKEv2 based VPN"
msgstr "Omrežje VPN s podporo IPsec, IKEv1, IKEv2"
-#: ../properties/nm-openswan.c:304
+#: ../properties/nm-libreswan.c:304
msgid "Saved"
msgstr "Shranjeno"
-#: ../properties/nm-openswan.c:311
+#: ../properties/nm-libreswan.c:311
msgid "Always Ask"
msgstr "Vedno vprašaj"
-#: ../properties/nm-openswan.c:318
+#: ../properties/nm-libreswan.c:318
msgid "Not Required"
msgstr "Ni zahtevano"
-#: ../properties/nm-openswan-dialog.ui.h:1
+#: ../properties/nm-libreswan-dialog.ui.h:1
msgid " "
msgstr " "
-#: ../properties/nm-openswan-dialog.ui.h:2
+#: ../properties/nm-libreswan-dialog.ui.h:2
msgid "<b>General</b>"
msgstr "<b>Splošno</b>"
-#: ../properties/nm-openswan-dialog.ui.h:3
+#: ../properties/nm-libreswan-dialog.ui.h:3
msgid "Show passwords"
msgstr "Pokaži gesla"
-#: ../properties/nm-openswan-dialog.ui.h:4
+#: ../properties/nm-libreswan-dialog.ui.h:4
msgid "Gro_up password:"
msgstr "_Geslo skupine:"
-#: ../properties/nm-openswan-dialog.ui.h:5
+#: ../properties/nm-libreswan-dialog.ui.h:5
msgid "_Gateway:"
msgstr "_Prehod:"
-#: ../properties/nm-openswan-dialog.ui.h:6
+#: ../properties/nm-libreswan-dialog.ui.h:6
msgid "G_roup name:"
msgstr "I_me skupine:"
-#: ../properties/nm-openswan-dialog.ui.h:7
+#: ../properties/nm-libreswan-dialog.ui.h:7
msgid "_User password:"
msgstr "_Uporabniško geslo:"
-#: ../properties/nm-openswan-dialog.ui.h:8
+#: ../properties/nm-libreswan-dialog.ui.h:8
msgid "<b>Optional</b>"
msgstr "<b>Izbirno</b>"
-#: ../properties/nm-openswan-dialog.ui.h:9
+#: ../properties/nm-libreswan-dialog.ui.h:9
msgid "User name:"
msgstr "Uporabniško ime:"
-#: ../properties/nm-openswan-dialog.ui.h:10
+#: ../properties/nm-libreswan-dialog.ui.h:10
msgid "Phase1 Algorithms:"
msgstr "Algoritmi 1. koraka:"
-#: ../properties/nm-openswan-dialog.ui.h:11
+#: ../properties/nm-libreswan-dialog.ui.h:11
msgid "Phase2 Algorithms:"
msgstr "Algoritmi 2. koraka:"
-#: ../properties/nm-openswan-dialog.ui.h:12
+#: ../properties/nm-libreswan-dialog.ui.h:12
msgid "Domain:"
msgstr "Domena:"
-#: ../src/nm-openswan-service.c:846
+#: ../src/nm-libreswan-service.c:846
msgid "Don't quit when VPN connection terminates"
msgstr "Ne končaj, ko se prekine povezava VPN"
-#: ../src/nm-openswan-service.c:847
+#: ../src/nm-libreswan-service.c:847
msgid "Enable verbose debug logging (may expose passwords)"
msgstr "Omogoči podrobno beleženje razhroščevanja (lahko razkrije gesla)"
-#: ../src/nm-openswan-service.c:870
+#: ../src/nm-libreswan-service.c:870
msgid ""
-"nm-openswan-service provides integrated IPsec VPN capability to "
+"nm-libreswan-service provides integrated IPsec VPN capability to "
"NetworkManager."
msgstr ""
-"Storitev nm-openswan-service omogoča podporo IPsec VPN za program "
+"Storitev nm-libreswan-service omogoča podporo IPsec VPN za program "
"NetworkManager."
#~ msgid "_Secondary Password:"
diff --git a/po/sr.po b/po/sr.po
index cc2ece0..13ed73c 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,13 +1,13 @@
-# Serbian translation for network-manager-openswan.
+# Serbian translation for network-manager-libreswan.
# Courtesy of Prevod.org team (http://prevod.org/) -- 2013—2014.
-# Copyright (C) 2013 network-manager-openswan's COPYRIGHT HOLDER
-# This file is distributed under the same license as the network-manager-openswan package.
+# Copyright (C) 2013 network-manager-libreswan's COPYRIGHT HOLDER
+# This file is distributed under the same license as the network-manager-libreswan package.
# Мирослав Николић <miroslavnikolic rocketmail com>, 2013—2014.
msgid ""
msgstr ""
-"Project-Id-Version: network-manager-openswan master\n"
+"Project-Id-Version: network-manager-libreswan master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product";
-"=network-manager-openswan&keywords=I18N+L10N&component=general\n"
+"=network-manager-libreswan&keywords=I18N+L10N&component=general\n"
"POT-Creation-Date: 2014-12-27 11:15+0000\n"
"PO-Revision-Date: 2014-12-27 15:57+0200\n"
"Last-Translator: Мирослав Николић <miroslavnikolic rocketmail com>\n"
@@ -48,115 +48,115 @@ msgstr ""
"Морате да потврдите идентитет да бисте могли да приступите виртуелној "
"приватној мрежи „%s“."
-#: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:1
+#: ../auth-dialog/nm-libreswan-auth-dialog.desktop.in.in.h:1
msgid "Network"
msgstr "Мрежа"
-#: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:2
+#: ../auth-dialog/nm-libreswan-auth-dialog.desktop.in.in.h:2
msgid "Request VPN authentication"
msgstr "Захтевај ВПН потврђивање идентитета"
-#: ../properties/nm-openswan.c:47
+#: ../properties/nm-libreswan.c:47
msgid "IPsec based VPN"
msgstr "ВПН заснован на ИПсец-у"
-#: ../properties/nm-openswan.c:48
+#: ../properties/nm-libreswan.c:48
msgid "IPsec, IKEv1, IKEv2 based VPN"
msgstr "ВПН заснован на ИПсец-у, ИКЕв1 и ИКЕв2"
-#: ../properties/nm-openswan.c:303
+#: ../properties/nm-libreswan.c:303
msgid "Saved"
msgstr "Сачувано"
-#: ../properties/nm-openswan.c:310
+#: ../properties/nm-libreswan.c:310
msgid "Always Ask"
msgstr "Питај увек"
-#: ../properties/nm-openswan.c:317
+#: ../properties/nm-libreswan.c:317
msgid "Not Required"
msgstr "Није неопходно"
-#: ../properties/nm-openswan-dialog.ui.h:1
+#: ../properties/nm-libreswan-dialog.ui.h:1
msgid " "
msgstr " "
-#: ../properties/nm-openswan-dialog.ui.h:2
+#: ../properties/nm-libreswan-dialog.ui.h:2
msgid "<b>General</b>"
msgstr "<b>Опште</b>"
-#: ../properties/nm-openswan-dialog.ui.h:3
+#: ../properties/nm-libreswan-dialog.ui.h:3
msgid "Show passwords"
msgstr "Прикажи лозинке"
-#: ../properties/nm-openswan-dialog.ui.h:4
+#: ../properties/nm-libreswan-dialog.ui.h:4
msgid "Gro_up password:"
msgstr "_Лозинка групе:"
-#: ../properties/nm-openswan-dialog.ui.h:5
+#: ../properties/nm-libreswan-dialog.ui.h:5
msgid "_Gateway:"
msgstr "_Мрежни пролаз:"
-#: ../properties/nm-openswan-dialog.ui.h:6
+#: ../properties/nm-libreswan-dialog.ui.h:6
msgid "G_roup name:"
msgstr "_Назив групе:"
-#: ../properties/nm-openswan-dialog.ui.h:7
+#: ../properties/nm-libreswan-dialog.ui.h:7
msgid "_User password:"
msgstr "Лозинка _корисника:"
-#: ../properties/nm-openswan-dialog.ui.h:8
+#: ../properties/nm-libreswan-dialog.ui.h:8
msgid "<b>Optional</b>"
msgstr "<b>Могућности</b>"
-#: ../properties/nm-openswan-dialog.ui.h:9
+#: ../properties/nm-libreswan-dialog.ui.h:9
msgid "User name:"
msgstr "Корисничко име:"
-#: ../properties/nm-openswan-dialog.ui.h:10
+#: ../properties/nm-libreswan-dialog.ui.h:10
msgid "Phase1 Algorithms:"
msgstr "Алгоритми фазе 1:"
-#: ../properties/nm-openswan-dialog.ui.h:11
+#: ../properties/nm-libreswan-dialog.ui.h:11
msgid "Phase2 Algorithms:"
msgstr "Алгоритми фазе 2:"
-#: ../properties/nm-openswan-dialog.ui.h:12
+#: ../properties/nm-libreswan-dialog.ui.h:12
msgid "Domain:"
msgstr "Домен:"
-#: ../src/nm-openswan-service.c:831
+#: ../src/nm-libreswan-service.c:831
msgid "A password is required."
msgstr "Потребна је лозинка."
-#: ../src/nm-openswan-service.c:1197
+#: ../src/nm-libreswan-service.c:1197
msgid ""
"Could not process the request because the VPN connection settings were "
"invalid."
msgstr "Не могу да обрадим захтев зато што су подешавања ВПН везе неисправна."
-#: ../src/nm-openswan-service.c:1211
+#: ../src/nm-libreswan-service.c:1211
msgid "Unhandled pending authentication."
msgstr "Заказано потврђивање идентитета није исправно."
-#: ../src/nm-openswan-service.c:1297
+#: ../src/nm-libreswan-service.c:1297
msgid "Don't quit when VPN connection terminates"
msgstr "Не прекида када се завршава ВПН веза"
-#: ../src/nm-openswan-service.c:1298
+#: ../src/nm-libreswan-service.c:1298
msgid "Enable verbose debug logging (may expose passwords)"
msgstr ""
"Укључује опширно записивање зарад исправљања грешака (може да изложи лозинке)"
-#: ../src/nm-openswan-service.c:1321
+#: ../src/nm-libreswan-service.c:1321
#| msgid ""
-#| "nm-openswan-service provides integrated IPsec VPN capability to "
+#| "nm-libreswan-service provides integrated IPsec VPN capability to "
#| "NetworkManager."
msgid ""
"This service provides integrated IPsec VPN capability to NetworkManager."
msgstr "Ова услуга обезбеђује Управнику мреже обједињену ИПсец ВПН могућност."
-#~ msgid "IPsec Based VPN Connection Manager (openswan)"
-#~ msgstr "Управник ВПН везе заснован на ИПсец-у (openswan)"
+#~ msgid "IPsec Based VPN Connection Manager (libreswan)"
+#~ msgstr "Управник ВПН везе заснован на ИПсец-у (libreswan)"
#~ msgid "Add, Remove, and Edit VPN Connections"
#~ msgstr "Додајте, уклањајте и уређујте ВПН везе"
diff --git a/po/sr latin po b/po/sr latin po
index 997beab..be60d67 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -1,13 +1,13 @@
-# Serbian translation for network-manager-openswan.
+# Serbian translation for network-manager-libreswan.
# Courtesy of Prevod.org team (http://prevod.org/) -- 2013—2014.
-# Copyright (C) 2013 network-manager-openswan's COPYRIGHT HOLDER
-# This file is distributed under the same license as the network-manager-openswan package.
+# Copyright (C) 2013 network-manager-libreswan's COPYRIGHT HOLDER
+# This file is distributed under the same license as the network-manager-libreswan package.
# Miroslav Nikolić <miroslavnikolic rocketmail com>, 2013—2014.
msgid ""
msgstr ""
-"Project-Id-Version: network-manager-openswan master\n"
+"Project-Id-Version: network-manager-libreswan master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product";
-"=network-manager-openswan&keywords=I18N+L10N&component=general\n"
+"=network-manager-libreswan&keywords=I18N+L10N&component=general\n"
"POT-Creation-Date: 2014-12-27 11:15+0000\n"
"PO-Revision-Date: 2014-12-27 15:57+0200\n"
"Last-Translator: Miroslav Nikolić <miroslavnikolic rocketmail com>\n"
@@ -48,115 +48,115 @@ msgstr ""
"Morate da potvrdite identitet da biste mogli da pristupite virtuelnoj "
"privatnoj mreži „%s“."
-#: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:1
+#: ../auth-dialog/nm-libreswan-auth-dialog.desktop.in.in.h:1
msgid "Network"
msgstr "Mreža"
-#: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:2
+#: ../auth-dialog/nm-libreswan-auth-dialog.desktop.in.in.h:2
msgid "Request VPN authentication"
msgstr "Zahtevaj VPN potvrđivanje identiteta"
-#: ../properties/nm-openswan.c:47
+#: ../properties/nm-libreswan.c:47
msgid "IPsec based VPN"
msgstr "VPN zasnovan na IPsec-u"
-#: ../properties/nm-openswan.c:48
+#: ../properties/nm-libreswan.c:48
msgid "IPsec, IKEv1, IKEv2 based VPN"
msgstr "VPN zasnovan na IPsec-u, IKEv1 i IKEv2"
-#: ../properties/nm-openswan.c:303
+#: ../properties/nm-libreswan.c:303
msgid "Saved"
msgstr "Sačuvano"
-#: ../properties/nm-openswan.c:310
+#: ../properties/nm-libreswan.c:310
msgid "Always Ask"
msgstr "Pitaj uvek"
-#: ../properties/nm-openswan.c:317
+#: ../properties/nm-libreswan.c:317
msgid "Not Required"
msgstr "Nije neophodno"
-#: ../properties/nm-openswan-dialog.ui.h:1
+#: ../properties/nm-libreswan-dialog.ui.h:1
msgid " "
msgstr " "
-#: ../properties/nm-openswan-dialog.ui.h:2
+#: ../properties/nm-libreswan-dialog.ui.h:2
msgid "<b>General</b>"
msgstr "<b>Opšte</b>"
-#: ../properties/nm-openswan-dialog.ui.h:3
+#: ../properties/nm-libreswan-dialog.ui.h:3
msgid "Show passwords"
msgstr "Prikaži lozinke"
-#: ../properties/nm-openswan-dialog.ui.h:4
+#: ../properties/nm-libreswan-dialog.ui.h:4
msgid "Gro_up password:"
msgstr "_Lozinka grupe:"
-#: ../properties/nm-openswan-dialog.ui.h:5
+#: ../properties/nm-libreswan-dialog.ui.h:5
msgid "_Gateway:"
msgstr "_Mrežni prolaz:"
-#: ../properties/nm-openswan-dialog.ui.h:6
+#: ../properties/nm-libreswan-dialog.ui.h:6
msgid "G_roup name:"
msgstr "_Naziv grupe:"
-#: ../properties/nm-openswan-dialog.ui.h:7
+#: ../properties/nm-libreswan-dialog.ui.h:7
msgid "_User password:"
msgstr "Lozinka _korisnika:"
-#: ../properties/nm-openswan-dialog.ui.h:8
+#: ../properties/nm-libreswan-dialog.ui.h:8
msgid "<b>Optional</b>"
msgstr "<b>Mogućnosti</b>"
-#: ../properties/nm-openswan-dialog.ui.h:9
+#: ../properties/nm-libreswan-dialog.ui.h:9
msgid "User name:"
msgstr "Korisničko ime:"
-#: ../properties/nm-openswan-dialog.ui.h:10
+#: ../properties/nm-libreswan-dialog.ui.h:10
msgid "Phase1 Algorithms:"
msgstr "Algoritmi faze 1:"
-#: ../properties/nm-openswan-dialog.ui.h:11
+#: ../properties/nm-libreswan-dialog.ui.h:11
msgid "Phase2 Algorithms:"
msgstr "Algoritmi faze 2:"
-#: ../properties/nm-openswan-dialog.ui.h:12
+#: ../properties/nm-libreswan-dialog.ui.h:12
msgid "Domain:"
msgstr "Domen:"
-#: ../src/nm-openswan-service.c:831
+#: ../src/nm-libreswan-service.c:831
msgid "A password is required."
msgstr "Potrebna je lozinka."
-#: ../src/nm-openswan-service.c:1197
+#: ../src/nm-libreswan-service.c:1197
msgid ""
"Could not process the request because the VPN connection settings were "
"invalid."
msgstr "Ne mogu da obradim zahtev zato što su podešavanja VPN veze neispravna."
-#: ../src/nm-openswan-service.c:1211
+#: ../src/nm-libreswan-service.c:1211
msgid "Unhandled pending authentication."
msgstr "Zakazano potvrđivanje identiteta nije ispravno."
-#: ../src/nm-openswan-service.c:1297
+#: ../src/nm-libreswan-service.c:1297
msgid "Don't quit when VPN connection terminates"
msgstr "Ne prekida kada se završava VPN veza"
-#: ../src/nm-openswan-service.c:1298
+#: ../src/nm-libreswan-service.c:1298
msgid "Enable verbose debug logging (may expose passwords)"
msgstr ""
"Uključuje opširno zapisivanje zarad ispravljanja grešaka (može da izloži lozinke)"
-#: ../src/nm-openswan-service.c:1321
+#: ../src/nm-libreswan-service.c:1321
#| msgid ""
-#| "nm-openswan-service provides integrated IPsec VPN capability to "
+#| "nm-libreswan-service provides integrated IPsec VPN capability to "
#| "NetworkManager."
msgid ""
"This service provides integrated IPsec VPN capability to NetworkManager."
msgstr "Ova usluga obezbeđuje Upravniku mreže objedinjenu IPsec VPN mogućnost."
-#~ msgid "IPsec Based VPN Connection Manager (openswan)"
-#~ msgstr "Upravnik VPN veze zasnovan na IPsec-u (openswan)"
+#~ msgid "IPsec Based VPN Connection Manager (libreswan)"
+#~ msgstr "Upravnik VPN veze zasnovan na IPsec-u (libreswan)"
#~ msgid "Add, Remove, and Edit VPN Connections"
#~ msgstr "Dodajte, uklanjajte i uređujte VPN veze"
diff --git a/po/sv.po b/po/sv.po
index 5140fac..d5b15ce 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: NetworkManager-vpnc\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=network-manager-openswan&keywords=I18N+L10N&component=general\n"
+"product=network-manager-libreswan&keywords=I18N+L10N&component=general\n"
"POT-Creation-Date: 2015-10-26 13:50+0000\n"
"PO-Revision-Date: 2015-10-26 18:54+0100\n"
"Last-Translator: Anders Jonsson <anders jonsson norsjovallen se>\n"
@@ -46,87 +46,87 @@ msgstr "_Grupplösenord:"
msgid "You need to authenticate to access the Virtual Private Network '%s'."
msgstr "Du måste autentisera för att komma åt VPN-nätverket ”%s”."
-#: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:1
+#: ../auth-dialog/nm-libreswan-auth-dialog.desktop.in.in.h:1
msgid "Network"
msgstr "Nätverk"
-#: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:2
+#: ../auth-dialog/nm-libreswan-auth-dialog.desktop.in.in.h:2
msgid "Request VPN authentication"
msgstr "Begär VPN-autentisering"
-#: ../properties/nm-openswan.c:58
+#: ../properties/nm-libreswan.c:58
msgid "IPsec based VPN"
msgstr "IPsec-baserad VPN"
-#: ../properties/nm-openswan.c:59
+#: ../properties/nm-libreswan.c:59
msgid "IPsec, IKEv1, IKEv2 based VPN"
msgstr "IPsec-,IKEv1-, IKEv2-baserad VPN"
-#: ../properties/nm-openswan.c:281
+#: ../properties/nm-libreswan.c:281
msgid "Saved"
msgstr "Sparad"
-#: ../properties/nm-openswan.c:288
+#: ../properties/nm-libreswan.c:288
msgid "Always Ask"
msgstr "Fråga alltid"
-#: ../properties/nm-openswan.c:295
+#: ../properties/nm-libreswan.c:295
msgid "Not Required"
msgstr "Krävs inte"
-#: ../properties/nm-openswan-dialog.ui.h:1
+#: ../properties/nm-libreswan-dialog.ui.h:1
msgid " "
msgstr " "
-#: ../properties/nm-openswan-dialog.ui.h:2
+#: ../properties/nm-libreswan-dialog.ui.h:2
msgid "<b>General</b>"
msgstr "<b>Allmänt</b>"
-#: ../properties/nm-openswan-dialog.ui.h:3
+#: ../properties/nm-libreswan-dialog.ui.h:3
msgid "Show passwords"
msgstr "Visa lösenord"
-#: ../properties/nm-openswan-dialog.ui.h:4
+#: ../properties/nm-libreswan-dialog.ui.h:4
msgid "Gro_up password:"
msgstr "Gr_upplösenord:"
-#: ../properties/nm-openswan-dialog.ui.h:5
+#: ../properties/nm-libreswan-dialog.ui.h:5
msgid "_Gateway:"
msgstr "_Gateway:"
-#: ../properties/nm-openswan-dialog.ui.h:6
+#: ../properties/nm-libreswan-dialog.ui.h:6
msgid "G_roup name:"
msgstr "G_ruppnamn:"
-#: ../properties/nm-openswan-dialog.ui.h:7
+#: ../properties/nm-libreswan-dialog.ui.h:7
msgid "_User password:"
msgstr "Användarlös_enord:"
-#: ../properties/nm-openswan-dialog.ui.h:8
+#: ../properties/nm-libreswan-dialog.ui.h:8
msgid "<b>Optional</b>"
msgstr "<b>Valfri</b>"
-#: ../properties/nm-openswan-dialog.ui.h:9
+#: ../properties/nm-libreswan-dialog.ui.h:9
msgid "User name:"
msgstr "Användarnamn:"
-#: ../properties/nm-openswan-dialog.ui.h:10
+#: ../properties/nm-libreswan-dialog.ui.h:10
msgid "Phase1 Algorithms:"
msgstr "Phase1-algoritmer:"
-#: ../properties/nm-openswan-dialog.ui.h:11
+#: ../properties/nm-libreswan-dialog.ui.h:11
msgid "Phase2 Algorithms:"
msgstr "Phase2-algoritmer"
-#: ../properties/nm-openswan-dialog.ui.h:12
+#: ../properties/nm-libreswan-dialog.ui.h:12
msgid "Domain:"
msgstr "Domän:"
-#: ../src/nm-openswan-service.c:910
+#: ../src/nm-libreswan-service.c:910
msgid "A password is required."
msgstr "Ett lösenord krävs."
-#: ../src/nm-openswan-service.c:1286
+#: ../src/nm-libreswan-service.c:1286
msgid ""
"Could not process the request because the VPN connection settings were "
"invalid."
@@ -134,19 +134,19 @@ msgstr ""
"Kunde inte bearbeta begäran eftersom VPN-anslutningsalternativen var "
"ogiltiga."
-#: ../src/nm-openswan-service.c:1300
+#: ../src/nm-libreswan-service.c:1300
msgid "Unhandled pending authentication."
msgstr "Ohanterad väntande autentisering."
-#: ../src/nm-openswan-service.c:1395
+#: ../src/nm-libreswan-service.c:1395
msgid "Don't quit when VPN connection terminates"
msgstr "Avsluta inte när VPN-anslutningen avslutar"
-#: ../src/nm-openswan-service.c:1396
+#: ../src/nm-libreswan-service.c:1396
msgid "Enable verbose debug logging (may expose passwords)"
msgstr "Aktivera utförlig loggning (kan avslöja lösenord)"
-#: ../src/nm-openswan-service.c:1419
+#: ../src/nm-libreswan-service.c:1419
msgid ""
"This service provides integrated IPsec VPN capability to NetworkManager."
msgstr ""
@@ -175,10 +175,10 @@ msgstr ""
#~ msgstr "Cisco-kompatibel VPN (vpnc)"
#~ msgid ""
-#~ "Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-"
+#~ "Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-"
#~ "based VPN gateways."
#~ msgstr ""
-#~ "Kompatibel med olika Cisco, Juniper, Netscreen och Sonicwall IPSec-"
+#~ "Kompatibel med olika Cisco, Juniper, Netscreen och Sonicwall IPsec-"
#~ "baserade VPN-gateway."
#~ msgid "Secure (default)"
diff --git a/po/ta.po b/po/ta.po
index d7edaa1..7235bc6 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -68,9 +68,9 @@ msgstr "Cisco ஏற்ற VPN (vpnc)"
#: ../properties/nm-vpnc.c:54
msgid ""
-"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based "
+"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-based "
"VPN gateways."
-msgstr "பல்வேறு Cisco, Juniper, Netscreen, மற்றுப் Sonicwall IPSec-அடிப்படையான VPN கேட்வேகளுடன் ஏற்றது."
+msgstr "பல்வேறு Cisco, Juniper, Netscreen, மற்றுப் Sonicwall IPsec-அடிப்படையான VPN கேட்வேகளுடன் ஏற்றது."
#: ../properties/nm-vpnc.c:339
msgid "Saved"
diff --git a/po/te.po b/po/te.po
index 0d4265a..f4e7d4f 100644
--- a/po/te.po
+++ b/po/te.po
@@ -65,10 +65,10 @@ msgstr "Cisco సారూప్య VPN (vpnc)"
#: ../properties/nm-vpnc.c:54
msgid ""
-"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based "
+"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-based "
"VPN gateways."
msgstr ""
-"Cisco, Juniper, Netscreen, మరియు Sonicwall IPSec-ఆధారిత "
+"Cisco, Juniper, Netscreen, మరియు Sonicwall IPsec-ఆధారిత "
"VPN గేట్వేలతో సారూప్యము."
#: ../properties/nm-vpnc.c:339
diff --git a/po/tr.po b/po/tr.po
index 2a9024f..4158d62 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,13 +1,13 @@
-# Turkish translation for network-manager-openswan.
-# Copyright (C) 2014 network-manager-openswan's COPYRIGHT HOLDER
-# This file is distributed under the same license as the network-manager-openswan package.
+# Turkish translation for network-manager-libreswan.
+# Copyright (C) 2014 network-manager-libreswan's COPYRIGHT HOLDER
+# This file is distributed under the same license as the network-manager-libreswan package.
# Necdet Yücel <necdetyucel gmail com>, 2014.
#
msgid ""
msgstr ""
-"Project-Id-Version: network-manager-openswan master\n"
+"Project-Id-Version: network-manager-libreswan master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product";
-"=network-manager-openswan&keywords=I18N+L10N&component=general\n"
+"=network-manager-libreswan&keywords=I18N+L10N&component=general\n"
"POT-Creation-Date: 2014-12-26 11:12+0000\n"
"PO-Revision-Date: 2014-12-27 19:08+0000\n"
"Last-Translator: Necdet Yücel <necdetyucel gmail com>\n"
@@ -46,107 +46,107 @@ msgstr "_Grup Parolası:"
msgid "You need to authenticate to access the Virtual Private Network '%s'."
msgstr "'%s' Sanal Özel Ağına erişmek için kimlik kanıtlaması yapmanız gerekir."
-#: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:1
+#: ../auth-dialog/nm-libreswan-auth-dialog.desktop.in.in.h:1
msgid "Network"
msgstr "Ağ"
-#: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:2
+#: ../auth-dialog/nm-libreswan-auth-dialog.desktop.in.in.h:2
msgid "Request VPN authentication"
msgstr "VPN kimlik doğrulaması iste"
-#: ../properties/nm-openswan.c:47
+#: ../properties/nm-libreswan.c:47
msgid "IPsec based VPN"
msgstr "IPsec tabanlı VPN"
-#: ../properties/nm-openswan.c:48
+#: ../properties/nm-libreswan.c:48
msgid "IPsec, IKEv1, IKEv2 based VPN"
msgstr "IPsec, IKEv1, IKEv2 tabanlı VPN"
-#: ../properties/nm-openswan.c:303
+#: ../properties/nm-libreswan.c:303
msgid "Saved"
msgstr "Kaydedildi"
-#: ../properties/nm-openswan.c:310
+#: ../properties/nm-libreswan.c:310
msgid "Always Ask"
msgstr "Daima Sor"
-#: ../properties/nm-openswan.c:317
+#: ../properties/nm-libreswan.c:317
msgid "Not Required"
msgstr "Gerekli Değil"
-#: ../properties/nm-openswan-dialog.ui.h:1
+#: ../properties/nm-libreswan-dialog.ui.h:1
msgid " "
msgstr " "
-#: ../properties/nm-openswan-dialog.ui.h:2
+#: ../properties/nm-libreswan-dialog.ui.h:2
msgid "<b>General</b>"
msgstr "<b>Genel</b>"
-#: ../properties/nm-openswan-dialog.ui.h:3
+#: ../properties/nm-libreswan-dialog.ui.h:3
msgid "Show passwords"
msgstr "Parolaları göster"
-#: ../properties/nm-openswan-dialog.ui.h:4
+#: ../properties/nm-libreswan-dialog.ui.h:4
msgid "Gro_up password:"
msgstr "Gr_up parolası:"
-#: ../properties/nm-openswan-dialog.ui.h:5
+#: ../properties/nm-libreswan-dialog.ui.h:5
msgid "_Gateway:"
msgstr "_Ağ geçidi:"
-#: ../properties/nm-openswan-dialog.ui.h:6
+#: ../properties/nm-libreswan-dialog.ui.h:6
msgid "G_roup name:"
msgstr "G_rup ismi:"
-#: ../properties/nm-openswan-dialog.ui.h:7
+#: ../properties/nm-libreswan-dialog.ui.h:7
msgid "_User password:"
msgstr "_Kullanıcı parolası:"
-#: ../properties/nm-openswan-dialog.ui.h:8
+#: ../properties/nm-libreswan-dialog.ui.h:8
msgid "<b>Optional</b>"
msgstr "<b>İsteğe Bağlı</b>"
-#: ../properties/nm-openswan-dialog.ui.h:9
+#: ../properties/nm-libreswan-dialog.ui.h:9
msgid "User name:"
msgstr "Kullanıcı adı:"
-#: ../properties/nm-openswan-dialog.ui.h:10
+#: ../properties/nm-libreswan-dialog.ui.h:10
msgid "Phase1 Algorithms:"
msgstr "Faz1 Algoritması:"
-#: ../properties/nm-openswan-dialog.ui.h:11
+#: ../properties/nm-libreswan-dialog.ui.h:11
msgid "Phase2 Algorithms:"
msgstr "Faz2 Algoritması:"
-#: ../properties/nm-openswan-dialog.ui.h:12
+#: ../properties/nm-libreswan-dialog.ui.h:12
msgid "Domain:"
msgstr "Alan:"
-#: ../src/nm-openswan-service.c:831
+#: ../src/nm-libreswan-service.c:831
msgid "A password is required."
msgstr "Parola gerekli."
-#: ../src/nm-openswan-service.c:1197
+#: ../src/nm-libreswan-service.c:1197
msgid ""
"Could not process the request because the VPN connection settings were "
"invalid."
msgstr "VPN bağlantı ayarları geçersiz olduğundan istek işlenemedi."
-#: ../src/nm-openswan-service.c:1211
+#: ../src/nm-libreswan-service.c:1211
msgid "Unhandled pending authentication."
msgstr "İşlenmemiş bekleyen kimlik doğrulaması."
-#: ../src/nm-openswan-service.c:1297
+#: ../src/nm-libreswan-service.c:1297
msgid "Don't quit when VPN connection terminates"
msgstr "VPN bağlantısı sonlandığında çıkma"
-#: ../src/nm-openswan-service.c:1298
+#: ../src/nm-libreswan-service.c:1298
msgid "Enable verbose debug logging (may expose passwords)"
msgstr ""
"Ayrıntılı hata ayıklama günlüklemesini etkinleştir (parolaları görünür "
"yapabilir)"
-#: ../src/nm-openswan-service.c:1321
+#: ../src/nm-libreswan-service.c:1321
msgid ""
"This service provides integrated IPsec VPN capability to NetworkManager."
msgstr "Bu servis NetworkManager için tümleşik IPsec VPN yeterliliğini sağlar."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e4a9388..f8eb4a7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -64,10 +64,10 @@ msgstr "Cisco 兼容 VPN (vpnc)"
#: ../properties/nm-vpnc.c:54
msgid ""
-"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based "
+"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-based "
"VPN gateways."
msgstr ""
-"与多种 Cisco, Juniper, Netscreen 以及 Sonicwall 的基于 IPSec 的 VPN 网关兼"
+"与多种 Cisco, Juniper, Netscreen 以及 Sonicwall 的基于 IPsec 的 VPN 网关兼"
"容。"
#: ../properties/nm-vpnc.c:339
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 88e4eae..e690966 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -60,9 +60,9 @@ msgstr "Cisco 兼容 VPN (vpnc)"
#: ../properties/nm-vpnc.c:54
msgid ""
-"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based "
+"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-based "
"VPN gateways."
-msgstr "兼容於各式 Cisco、Juniper、Netscreen和 Sonicwall 基於 IPSec 的 VPN 通訊閘。"
+msgstr "兼容於各式 Cisco、Juniper、Netscreen和 Sonicwall 基於 IPsec 的 VPN 通訊閘。"
#: ../properties/nm-vpnc.c:339
msgid "Saved"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index bf6330d..49007c2 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -60,10 +60,10 @@ msgstr "Cisco 相容 VPN (vpnc)"
#: ../properties/nm-vpnc.c:54
msgid ""
-"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based "
+"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-based "
"VPN gateways."
msgstr ""
-"相容於各式 Cisco、Juniper、Netscreen和 Sonicwall 基於 IPSec 的 VPN 通訊閘。"
+"相容於各式 Cisco、Juniper、Netscreen和 Sonicwall 基於 IPsec 的 VPN 通訊閘。"
#: ../properties/nm-vpnc.c:339
msgid "Saved"
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 631e37e..66ddee8 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -1,7 +1,7 @@
plugindir = $(libdir)/NetworkManager
-plugin_LTLIBRARIES = libnm-vpn-plugin-openswan.la
+plugin_LTLIBRARIES = libnm-vpn-plugin-libreswan.la
if WITH_LIBNM_GLIB
-plugin_LTLIBRARIES += libnm-openswan-properties.la
+plugin_LTLIBRARIES += libnm-libreswan-properties.la
endif
common_CFLAGS = \
@@ -12,38 +12,38 @@ common_CFLAGS = \
-DUIDIR=\""$(uidir)"\" \
-DLOCALEDIR=\"$(datadir)/locale\"
-libnm_vpn_plugin_openswan_la_CFLAGS = \
+libnm_vpn_plugin_libreswan_la_CFLAGS = \
$(common_CFLAGS) \
$(LIBNM_CFLAGS)
-libnm_openswan_properties_la_CFLAGS = \
- -DNM_OPENSWAN_OLD \
+libnm_libreswan_properties_la_CFLAGS = \
+ -DNM_LIBRESWAN_OLD \
$(common_CFLAGS) \
$(LIBNM_GLIB_CFLAGS)
-libnm_vpn_plugin_openswan_la_SOURCES = \
- nm-openswan.c \
- nm-openswan.h
+libnm_vpn_plugin_libreswan_la_SOURCES = \
+ nm-libreswan.c \
+ nm-libreswan.h
-libnm_openswan_properties_la_SOURCES = \
- $(libnm_vpn_plugin_openswan_la_SOURCES)
+libnm_libreswan_properties_la_SOURCES = \
+ $(libnm_vpn_plugin_libreswan_la_SOURCES)
-libnm_vpn_plugin_openswan_la_LIBADD = \
+libnm_vpn_plugin_libreswan_la_LIBADD = \
$(GTK_LIBS) \
$(LIBNM_LIBS)
-libnm_openswan_properties_la_LIBADD = \
+libnm_libreswan_properties_la_LIBADD = \
$(GTK_LIBS) \
$(LIBNM_GLIB_LIBS)
-libnm_vpn_plugin_openswan_la_LDFLAGS = \
+libnm_vpn_plugin_libreswan_la_LDFLAGS = \
-avoid-version
-libnm_openswan_properties_la_LDFLAGS = \
- $(libnm_vpn_plugin_openswan_la_LDFLAGS)
+libnm_libreswan_properties_la_LDFLAGS = \
+ $(libnm_vpn_plugin_libreswan_la_LDFLAGS)
-uidir = $(datadir)/gnome-vpn-properties/openswan
-ui_DATA = nm-openswan-dialog.ui
+uidir = $(datadir)/gnome-vpn-properties/libreswan
+ui_DATA = nm-libreswan-dialog.ui
CLEANFILES = *.bak *~
diff --git a/properties/nm-openswan-dialog.ui b/properties/nm-libreswan-dialog.ui
similarity index 99%
rename from properties/nm-openswan-dialog.ui
rename to properties/nm-libreswan-dialog.ui
index 4dcedd0..56f6816 100644
--- a/properties/nm-openswan-dialog.ui
+++ b/properties/nm-libreswan-dialog.ui
@@ -24,7 +24,7 @@
</row>
</data>
</object>
- <object class="GtkVBox" id="openswan-vbox">
+ <object class="GtkVBox" id="libreswan-vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
diff --git a/properties/nm-openswan.c b/properties/nm-libreswan.c
similarity index 75%
rename from properties/nm-openswan.c
rename to properties/nm-libreswan.c
index 5ef37b8..7e8ce48 100644
--- a/properties/nm-openswan.c
+++ b/properties/nm-libreswan.c
@@ -1,6 +1,6 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
/***************************************************************************
- * nm-openswan.c : GNOME UI dialogs for configuring openswan VPN connections
+ * nm-libreswan.c : GNOME UI dialogs for configuring libreswan VPN connections
*
* Copyright (C) 2005 David Zeuthen, <davidz redhat com>
* Copyright (C) 2005 - 2008 Dan Williams, <dcbw redhat com>
@@ -34,29 +34,29 @@
#include <string.h>
#include <gtk/gtk.h>
-#ifdef NM_OPENSWAN_OLD
+#ifdef NM_LIBRESWAN_OLD
#define NM_VPN_LIBNM_COMPAT
#include <nm-vpn-plugin-ui-interface.h>
#include <nm-setting-vpn.h>
#include <nm-setting-connection.h>
#include <nm-setting-ip4-config.h>
-#define OPENSWAN_EDITOR_PLUGIN_ERROR NM_SETTING_VPN_ERROR
-#define OPENSWAN_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY NM_SETTING_VPN_ERROR_INVALID_PROPERTY
+#define LIBRESWAN_EDITOR_PLUGIN_ERROR NM_SETTING_VPN_ERROR
+#define LIBRESWAN_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY NM_SETTING_VPN_ERROR_INVALID_PROPERTY
-#else /* !NM_OPENSWAN_OLD */
+#else /* !NM_LIBRESWAN_OLD */
#include <NetworkManager.h>
-#define OPENSWAN_EDITOR_PLUGIN_ERROR NM_CONNECTION_ERROR
-#define OPENSWAN_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY NM_CONNECTION_ERROR_INVALID_PROPERTY
+#define LIBRESWAN_EDITOR_PLUGIN_ERROR NM_CONNECTION_ERROR
+#define LIBRESWAN_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY NM_CONNECTION_ERROR_INVALID_PROPERTY
#endif
-#include "nm-openswan-service.h"
-#include "nm-openswan.h"
+#include "nm-libreswan-service.h"
+#include "nm-libreswan.h"
-#define OPENSWAN_PLUGIN_NAME _("IPsec based VPN")
-#define OPENSWAN_PLUGIN_DESC _("IPsec, IKEv1, IKEv2 based VPN")
+#define LIBRESWAN_PLUGIN_NAME _("IPsec based VPN")
+#define LIBRESWAN_PLUGIN_DESC _("IPsec, IKEv1, IKEv2 based VPN")
#define ENC_TYPE_SECURE 0
#define ENC_TYPE_WEAK 1
@@ -75,33 +75,33 @@ enum {
PROP_SERVICE
};
-static void openswan_editor_plugin_interface_init (NMVpnEditorPluginInterface *iface_class);
+static void libreswan_editor_plugin_interface_init (NMVpnEditorPluginInterface *iface_class);
-G_DEFINE_TYPE_EXTENDED (OpenswanEditorPlugin, openswan_editor_plugin, G_TYPE_OBJECT, 0,
+G_DEFINE_TYPE_EXTENDED (LibreswanEditorPlugin, libreswan_editor_plugin, G_TYPE_OBJECT, 0,
G_IMPLEMENT_INTERFACE (NM_TYPE_VPN_EDITOR_PLUGIN,
- openswan_editor_plugin_interface_init))
+ libreswan_editor_plugin_interface_init))
/************** UI widget class **************/
-static void openswan_editor_interface_init (NMVpnEditorInterface *iface_class);
+static void libreswan_editor_interface_init (NMVpnEditorInterface *iface_class);
-G_DEFINE_TYPE_EXTENDED (OpenswanEditor, openswan_editor, G_TYPE_OBJECT, 0,
+G_DEFINE_TYPE_EXTENDED (LibreswanEditor, libreswan_editor, G_TYPE_OBJECT, 0,
G_IMPLEMENT_INTERFACE (NM_TYPE_VPN_EDITOR,
- openswan_editor_interface_init))
+ libreswan_editor_interface_init))
-#define OPENSWAN_EDITOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), OPENSWAN_TYPE_EDITOR,
OpenswanEditorPrivate))
+#define LIBRESWAN_EDITOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), LIBRESWAN_TYPE_EDITOR,
LibreswanEditorPrivate))
typedef struct {
GtkBuilder *builder;
GtkWidget *widget;
GtkSizeGroup *group;
-} OpenswanEditorPrivate;
+} LibreswanEditorPrivate;
static gboolean
-check_validity (OpenswanEditor *self, GError **error)
+check_validity (LibreswanEditor *self, GError **error)
{
- OpenswanEditorPrivate *priv = OPENSWAN_EDITOR_GET_PRIVATE (self);
+ LibreswanEditorPrivate *priv = LIBRESWAN_EDITOR_GET_PRIVATE (self);
GtkWidget *widget;
char *str;
@@ -109,9 +109,9 @@ check_validity (OpenswanEditor *self, GError **error)
str = (char *) gtk_entry_get_text (GTK_ENTRY (widget));
if (!str || !strlen (str) || strstr (str, " ") || strstr (str, "\t")) {
g_set_error (error,
- OPENSWAN_EDITOR_PLUGIN_ERROR,
- OPENSWAN_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY,
- NM_OPENSWAN_RIGHT);
+ LIBRESWAN_EDITOR_PLUGIN_ERROR,
+ LIBRESWAN_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY,
+ NM_LIBRESWAN_RIGHT);
return FALSE;
}
@@ -119,9 +119,9 @@ check_validity (OpenswanEditor *self, GError **error)
str = (char *) gtk_entry_get_text (GTK_ENTRY (widget));
if (!str || !strlen (str)) {
g_set_error (error,
- OPENSWAN_EDITOR_PLUGIN_ERROR,
- OPENSWAN_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY,
- NM_OPENSWAN_LEFTID);
+ LIBRESWAN_EDITOR_PLUGIN_ERROR,
+ LIBRESWAN_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY,
+ NM_LIBRESWAN_LEFTID);
return FALSE;
}
@@ -131,17 +131,17 @@ check_validity (OpenswanEditor *self, GError **error)
static void
stuff_changed_cb (GtkWidget *widget, gpointer user_data)
{
- g_signal_emit_by_name (OPENSWAN_EDITOR (user_data), "changed");
+ g_signal_emit_by_name (LIBRESWAN_EDITOR (user_data), "changed");
}
static void
-setup_password_widget (OpenswanEditor *self,
+setup_password_widget (LibreswanEditor *self,
const char *entry_name,
NMSettingVpn *s_vpn,
const char *secret_name,
gboolean new_connection)
{
- OpenswanEditorPrivate *priv = OPENSWAN_EDITOR_GET_PRIVATE (self);
+ LibreswanEditorPrivate *priv = LIBRESWAN_EDITOR_GET_PRIVATE (self);
NMSettingSecretFlags secret_flags = NM_SETTING_SECRET_FLAG_NONE;
GtkWidget *widget;
const char *value;
@@ -165,9 +165,9 @@ setup_password_widget (OpenswanEditor *self,
}
static void
-show_toggled_cb (GtkCheckButton *button, OpenswanEditor *self)
+show_toggled_cb (GtkCheckButton *button, LibreswanEditor *self)
{
- OpenswanEditorPrivate *priv = OPENSWAN_EDITOR_GET_PRIVATE (self);
+ LibreswanEditorPrivate *priv = LIBRESWAN_EDITOR_GET_PRIVATE (self);
GtkWidget *widget;
gboolean visible;
@@ -183,9 +183,9 @@ show_toggled_cb (GtkCheckButton *button, OpenswanEditor *self)
}
static void
-pw_type_changed_helper (OpenswanEditor *self, GtkWidget *combo)
+pw_type_changed_helper (LibreswanEditor *self, GtkWidget *combo)
{
- OpenswanEditorPrivate *priv = OPENSWAN_EDITOR_GET_PRIVATE (self);
+ LibreswanEditorPrivate *priv = LIBRESWAN_EDITOR_GET_PRIVATE (self);
const char *entry = NULL;
GtkWidget *widget;
@@ -221,7 +221,7 @@ pw_type_changed_helper (OpenswanEditor *self, GtkWidget *combo)
static void
pw_type_combo_changed_cb (GtkWidget *combo, gpointer user_data)
{
- OpenswanEditor *self = OPENSWAN_EDITOR (user_data);
+ LibreswanEditor *self = LIBRESWAN_EDITOR (user_data);
pw_type_changed_helper (self, combo);
stuff_changed_cb (combo, self);
@@ -234,23 +234,23 @@ secret_flags_to_pw_type (NMSettingVpn *s_vpn, const char *key)
if (nm_setting_get_secret_flags (NM_SETTING (s_vpn), key, &flags, NULL)) {
if (flags & NM_SETTING_SECRET_FLAG_NOT_REQUIRED)
- return NM_OPENSWAN_PW_TYPE_UNUSED;
+ return NM_LIBRESWAN_PW_TYPE_UNUSED;
if (flags & NM_SETTING_SECRET_FLAG_NOT_SAVED)
- return NM_OPENSWAN_PW_TYPE_ASK;
- return NM_OPENSWAN_PW_TYPE_SAVE;
+ return NM_LIBRESWAN_PW_TYPE_ASK;
+ return NM_LIBRESWAN_PW_TYPE_SAVE;
}
return NULL;
}
static void
-init_one_pw_combo (OpenswanEditor *self,
+init_one_pw_combo (LibreswanEditor *self,
NMSettingVpn *s_vpn,
const char *combo_name,
const char *secret_key,
const char *type_key,
const char *entry_name)
{
- OpenswanEditorPrivate *priv = OPENSWAN_EDITOR_GET_PRIVATE (self);
+ LibreswanEditorPrivate *priv = LIBRESWAN_EDITOR_GET_PRIVATE (self);
int active = -1;
GtkWidget *widget;
GtkListStore *store;
@@ -280,21 +280,21 @@ init_one_pw_combo (OpenswanEditor *self,
gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter, 0, _("Saved"), -1);
if ((active < 0) && value) {
- if (!strcmp (value, NM_OPENSWAN_PW_TYPE_SAVE))
+ if (!strcmp (value, NM_LIBRESWAN_PW_TYPE_SAVE))
active = 0;
}
gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter, 0, _("Always Ask"), -1);
if ((active < 0) && value) {
- if (!strcmp (value, NM_OPENSWAN_PW_TYPE_ASK))
+ if (!strcmp (value, NM_LIBRESWAN_PW_TYPE_ASK))
active = 1;
}
gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter, 0, _("Not Required"), -1);
if ((active < 0) && value) {
- if (!strcmp (value, NM_OPENSWAN_PW_TYPE_UNUSED))
+ if (!strcmp (value, NM_LIBRESWAN_PW_TYPE_UNUSED))
active = 2;
}
@@ -310,12 +310,12 @@ init_one_pw_combo (OpenswanEditor *self,
static gboolean
-init_editor_plugin (OpenswanEditor *self,
+init_editor_plugin (LibreswanEditor *self,
NMConnection *connection,
gboolean new_connection,
GError **error)
{
- OpenswanEditorPrivate *priv = OPENSWAN_EDITOR_GET_PRIVATE (self);
+ LibreswanEditorPrivate *priv = LIBRESWAN_EDITOR_GET_PRIVATE (self);
NMSettingVpn *s_vpn = NULL;
GtkWidget *widget;
const char *value = NULL;
@@ -328,7 +328,7 @@ init_editor_plugin (OpenswanEditor *self,
g_return_val_if_fail (widget != NULL, FALSE);
gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget));
if (s_vpn) {
- value = nm_setting_vpn_get_data_item (s_vpn, NM_OPENSWAN_RIGHT);
+ value = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_RIGHT);
if (value && strlen (value))
gtk_entry_set_text (GTK_ENTRY (widget), value);
}
@@ -338,7 +338,7 @@ init_editor_plugin (OpenswanEditor *self,
g_return_val_if_fail (widget != NULL, FALSE);
gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget));
if (s_vpn) {
- value = nm_setting_vpn_get_data_item (s_vpn, NM_OPENSWAN_LEFTID);
+ value = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_LEFTID);
if (value && strlen (value))
gtk_entry_set_text (GTK_ENTRY (widget), value);
}
@@ -350,32 +350,32 @@ init_editor_plugin (OpenswanEditor *self,
setup_password_widget (self,
"user_password_entry",
s_vpn,
- NM_OPENSWAN_XAUTH_PASSWORD,
+ NM_LIBRESWAN_XAUTH_PASSWORD,
new_connection);
setup_password_widget (self,
"group_password_entry",
s_vpn,
- NM_OPENSWAN_PSK_VALUE,
+ NM_LIBRESWAN_PSK_VALUE,
new_connection);
init_one_pw_combo (self,
s_vpn,
"user_pass_type_combo",
- NM_OPENSWAN_XAUTH_PASSWORD,
- NM_OPENSWAN_XAUTH_PASSWORD_INPUT_MODES,
+ NM_LIBRESWAN_XAUTH_PASSWORD,
+ NM_LIBRESWAN_XAUTH_PASSWORD_INPUT_MODES,
"user_password_entry");
init_one_pw_combo (self,
s_vpn,
"group_pass_type_combo",
- NM_OPENSWAN_PSK_VALUE,
- NM_OPENSWAN_PSK_INPUT_MODES,
+ NM_LIBRESWAN_PSK_VALUE,
+ NM_LIBRESWAN_PSK_INPUT_MODES,
"group_password_entry");
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "user_entry"));
g_return_val_if_fail (widget != NULL, FALSE);
gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget));
if (s_vpn) {
- value = nm_setting_vpn_get_data_item (s_vpn, NM_OPENSWAN_LEFTXAUTHUSER);
+ value = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_LEFTXAUTHUSER);
if (value && strlen (value))
gtk_entry_set_text (GTK_ENTRY (widget), value);
}
@@ -386,7 +386,7 @@ init_editor_plugin (OpenswanEditor *self,
g_return_val_if_fail (widget != NULL, FALSE);
gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget));
if (s_vpn) {
- value = nm_setting_vpn_get_data_item (s_vpn, NM_OPENSWAN_IKE);
+ value = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_IKE);
if (value && strlen (value))
gtk_entry_set_text (GTK_ENTRY (widget), value);
}
@@ -397,7 +397,7 @@ init_editor_plugin (OpenswanEditor *self,
g_return_val_if_fail (widget != NULL, FALSE);
gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget));
if (s_vpn) {
- value = nm_setting_vpn_get_data_item (s_vpn, NM_OPENSWAN_ESP);
+ value = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_ESP);
if (value && strlen (value))
gtk_entry_set_text (GTK_ENTRY (widget), value);
}
@@ -407,7 +407,7 @@ init_editor_plugin (OpenswanEditor *self,
g_return_val_if_fail (widget != NULL, FALSE);
gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget));
if (s_vpn) {
- value = nm_setting_vpn_get_data_item (s_vpn, NM_OPENSWAN_DOMAIN);
+ value = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_DOMAIN);
if (value && strlen (value))
gtk_entry_set_text (GTK_ENTRY (widget), value);
}
@@ -425,8 +425,8 @@ init_editor_plugin (OpenswanEditor *self,
static GObject *
get_widget (NMVpnEditor *iface)
{
- OpenswanEditor *self = OPENSWAN_EDITOR (iface);
- OpenswanEditorPrivate *priv = OPENSWAN_EDITOR_GET_PRIVATE (self);
+ LibreswanEditor *self = LIBRESWAN_EDITOR (iface);
+ LibreswanEditorPrivate *priv = LIBRESWAN_EDITOR_GET_PRIVATE (self);
return G_OBJECT (priv->widget);
}
@@ -452,15 +452,15 @@ save_one_password (NMSettingVpn *s_vpn,
password = gtk_entry_get_text (GTK_ENTRY (entry));
if (password && strlen (password))
nm_setting_vpn_add_secret (s_vpn, secret_key, password);
- data_val = NM_OPENSWAN_PW_TYPE_SAVE;
+ data_val = NM_LIBRESWAN_PW_TYPE_SAVE;
break;
case PW_TYPE_UNUSED:
- data_val = NM_OPENSWAN_PW_TYPE_UNUSED;
+ data_val = NM_LIBRESWAN_PW_TYPE_UNUSED;
flags |= NM_SETTING_SECRET_FLAG_NOT_REQUIRED;
break;
case PW_TYPE_ASK:
default:
- data_val = NM_OPENSWAN_PW_TYPE_ASK;
+ data_val = NM_LIBRESWAN_PW_TYPE_ASK;
flags |= NM_SETTING_SECRET_FLAG_NOT_SAVED;
break;
}
@@ -475,8 +475,8 @@ update_connection (NMVpnEditor *iface,
NMConnection *connection,
GError **error)
{
- OpenswanEditor *self = OPENSWAN_EDITOR (iface);
- OpenswanEditorPrivate *priv = OPENSWAN_EDITOR_GET_PRIVATE (self);
+ LibreswanEditor *self = LIBRESWAN_EDITOR (iface);
+ LibreswanEditorPrivate *priv = LIBRESWAN_EDITOR_GET_PRIVATE (self);
NMSettingVpn *s_vpn;
GtkWidget *widget;
char *str;
@@ -485,56 +485,56 @@ update_connection (NMVpnEditor *iface,
return FALSE;
s_vpn = NM_SETTING_VPN (nm_setting_vpn_new ());
- g_object_set (s_vpn, NM_SETTING_VPN_SERVICE_TYPE, NM_DBUS_SERVICE_OPENSWAN, NULL);
+ g_object_set (s_vpn, NM_SETTING_VPN_SERVICE_TYPE, NM_DBUS_SERVICE_LIBRESWAN, NULL);
/* Gateway */
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "gateway_entry"));
str = (char *) gtk_entry_get_text (GTK_ENTRY (widget));
if (str && strlen (str))
- nm_setting_vpn_add_data_item (s_vpn, NM_OPENSWAN_RIGHT, str);
+ nm_setting_vpn_add_data_item (s_vpn, NM_LIBRESWAN_RIGHT, str);
/* Group name */
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "group_entry"));
str = (char *) gtk_entry_get_text (GTK_ENTRY (widget));
if (str && strlen (str))
- nm_setting_vpn_add_data_item (s_vpn, NM_OPENSWAN_LEFTID, str);
+ nm_setting_vpn_add_data_item (s_vpn, NM_LIBRESWAN_LEFTID, str);
/* User name*/
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "user_entry"));
str = (char *) gtk_entry_get_text (GTK_ENTRY (widget));
if (str && strlen (str))
- nm_setting_vpn_add_data_item (s_vpn, NM_OPENSWAN_LEFTXAUTHUSER, str);
+ nm_setting_vpn_add_data_item (s_vpn, NM_LIBRESWAN_LEFTXAUTHUSER, str);
/* Phase 1 Algorithms: ike */
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "phase1_entry"));
str = (char *) gtk_entry_get_text (GTK_ENTRY (widget));
if (str && strlen (str))
- nm_setting_vpn_add_data_item (s_vpn, NM_OPENSWAN_IKE, str);
+ nm_setting_vpn_add_data_item (s_vpn, NM_LIBRESWAN_IKE, str);
/* Phase 2 Algorithms: esp */
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "phase2_entry"));
str = (char *) gtk_entry_get_text (GTK_ENTRY (widget));
if (str && strlen (str))
- nm_setting_vpn_add_data_item (s_vpn, NM_OPENSWAN_ESP, str);
+ nm_setting_vpn_add_data_item (s_vpn, NM_LIBRESWAN_ESP, str);
/* Domain entry */
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "domain_entry"));
str = (char *) gtk_entry_get_text (GTK_ENTRY (widget));
if (str && strlen (str))
- nm_setting_vpn_add_data_item (s_vpn, NM_OPENSWAN_DOMAIN, str);
+ nm_setting_vpn_add_data_item (s_vpn, NM_LIBRESWAN_DOMAIN, str);
save_one_password (s_vpn,
priv->builder,
"user_password_entry",
"user_pass_type_combo",
- NM_OPENSWAN_XAUTH_PASSWORD,
- NM_OPENSWAN_XAUTH_PASSWORD_INPUT_MODES);
+ NM_LIBRESWAN_XAUTH_PASSWORD,
+ NM_LIBRESWAN_XAUTH_PASSWORD_INPUT_MODES);
save_one_password (s_vpn,
priv->builder,
"group_password_entry",
"group_pass_type_combo",
- NM_OPENSWAN_PSK_VALUE,
- NM_OPENSWAN_PSK_INPUT_MODES);
+ NM_LIBRESWAN_PSK_VALUE,
+ NM_LIBRESWAN_PSK_INPUT_MODES);
nm_connection_add_setting (connection, NM_SETTING (s_vpn));
return TRUE;
@@ -553,7 +553,7 @@ static NMVpnEditor *
nm_vpn_editor_interface_new (NMConnection *connection, GError **error)
{
NMVpnEditor *object;
- OpenswanEditorPrivate *priv;
+ LibreswanEditorPrivate *priv;
char *ui_file;
NMSettingVpn *s_vpn;
gboolean is_new = TRUE;
@@ -561,15 +561,15 @@ nm_vpn_editor_interface_new (NMConnection *connection, GError **error)
if (error)
g_return_val_if_fail (*error == NULL, NULL);
- object = g_object_new (OPENSWAN_TYPE_EDITOR, NULL);
+ object = g_object_new (LIBRESWAN_TYPE_EDITOR, NULL);
if (!object) {
- g_set_error (error, OPENSWAN_EDITOR_PLUGIN_ERROR, 0, "could not create openswan object");
+ g_set_error (error, LIBRESWAN_EDITOR_PLUGIN_ERROR, 0, "could not create libreswan object");
return NULL;
}
- priv = OPENSWAN_EDITOR_GET_PRIVATE (object);
+ priv = LIBRESWAN_EDITOR_GET_PRIVATE (object);
- ui_file = g_strdup_printf ("%s/%s", UIDIR, "nm-openswan-dialog.ui");
+ ui_file = g_strdup_printf ("%s/%s", UIDIR, "nm-libreswan-dialog.ui");
priv->builder = gtk_builder_new ();
g_assert (priv->builder);
@@ -579,7 +579,7 @@ nm_vpn_editor_interface_new (NMConnection *connection, GError **error)
g_warning ("Couldn't load builder file: %s",
error && *error ? (*error)->message : "(unknown)");
g_clear_error (error);
- g_set_error (error, OPENSWAN_EDITOR_PLUGIN_ERROR, 0,
+ g_set_error (error, LIBRESWAN_EDITOR_PLUGIN_ERROR, 0,
"could not load required resources at %s", ui_file);
g_free (ui_file);
g_object_unref (object);
@@ -587,9 +587,9 @@ nm_vpn_editor_interface_new (NMConnection *connection, GError **error)
}
g_free (ui_file);
- priv->widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "openswan-vbox"));
+ priv->widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "libreswan-vbox"));
if (!priv->widget) {
- g_set_error (error, OPENSWAN_EDITOR_PLUGIN_ERROR, 0, "could not load UI widget");
+ g_set_error (error, LIBRESWAN_EDITOR_PLUGIN_ERROR, 0, "could not load UI widget");
g_object_unref (object);
return NULL;
}
@@ -599,7 +599,7 @@ nm_vpn_editor_interface_new (NMConnection *connection, GError **error)
if (s_vpn)
nm_setting_vpn_foreach_data_item (s_vpn, is_new_func, &is_new);
- if (!init_editor_plugin (OPENSWAN_EDITOR (object), connection, is_new, error)) {
+ if (!init_editor_plugin (LIBRESWAN_EDITOR (object), connection, is_new, error)) {
g_object_unref (object);
return NULL;
}
@@ -610,8 +610,8 @@ nm_vpn_editor_interface_new (NMConnection *connection, GError **error)
static void
dispose (GObject *object)
{
- OpenswanEditor *plugin = OPENSWAN_EDITOR (object);
- OpenswanEditorPrivate *priv = OPENSWAN_EDITOR_GET_PRIVATE (plugin);
+ LibreswanEditor *plugin = LIBRESWAN_EDITOR (object);
+ LibreswanEditorPrivate *priv = LIBRESWAN_EDITOR_GET_PRIVATE (plugin);
if (priv->group)
g_object_unref (priv->group);
@@ -622,26 +622,26 @@ dispose (GObject *object)
if (priv->builder)
g_object_unref (priv->builder);
- G_OBJECT_CLASS (openswan_editor_parent_class)->dispose (object);
+ G_OBJECT_CLASS (libreswan_editor_parent_class)->dispose (object);
}
static void
-openswan_editor_class_init (OpenswanEditorClass *req_class)
+libreswan_editor_class_init (LibreswanEditorClass *req_class)
{
GObjectClass *object_class = G_OBJECT_CLASS (req_class);
- g_type_class_add_private (req_class, sizeof (OpenswanEditorPrivate));
+ g_type_class_add_private (req_class, sizeof (LibreswanEditorPrivate));
object_class->dispose = dispose;
}
static void
-openswan_editor_init (OpenswanEditor *plugin)
+libreswan_editor_init (LibreswanEditor *plugin)
{
}
static void
-openswan_editor_interface_init (NMVpnEditorInterface *iface_class)
+libreswan_editor_interface_init (NMVpnEditorInterface *iface_class)
{
/* interface implementation */
iface_class->get_widget = get_widget;
@@ -666,13 +666,13 @@ get_property (GObject *object, guint prop_id,
{
switch (prop_id) {
case PROP_NAME:
- g_value_set_string (value, OPENSWAN_PLUGIN_NAME);
+ g_value_set_string (value, LIBRESWAN_PLUGIN_NAME);
break;
case PROP_DESC:
- g_value_set_string (value, OPENSWAN_PLUGIN_DESC);
+ g_value_set_string (value, LIBRESWAN_PLUGIN_DESC);
break;
case PROP_SERVICE:
- g_value_set_string (value, NM_DBUS_SERVICE_OPENSWAN);
+ g_value_set_string (value, NM_DBUS_SERVICE_LIBRESWAN);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -681,7 +681,7 @@ get_property (GObject *object, guint prop_id,
}
static void
-openswan_editor_plugin_class_init (OpenswanEditorPluginClass *req_class)
+libreswan_editor_plugin_class_init (LibreswanEditorPluginClass *req_class)
{
GObjectClass *object_class = G_OBJECT_CLASS (req_class);
@@ -701,12 +701,12 @@ openswan_editor_plugin_class_init (OpenswanEditorPluginClass *req_class)
}
static void
-openswan_editor_plugin_init (OpenswanEditorPlugin *plugin)
+libreswan_editor_plugin_init (LibreswanEditorPlugin *plugin)
{
}
static void
-openswan_editor_plugin_interface_init (NMVpnEditorPluginInterface *iface_class)
+libreswan_editor_plugin_interface_init (NMVpnEditorPluginInterface *iface_class)
{
/* interface implementation */
iface_class->get_editor = get_editor;
@@ -726,6 +726,6 @@ nm_vpn_editor_plugin_factory (GError **error)
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
- return g_object_new (OPENSWAN_TYPE_EDITOR_PLUGIN, NULL);
+ return g_object_new (LIBRESWAN_TYPE_EDITOR_PLUGIN, NULL);
}
diff --git a/properties/nm-libreswan.h b/properties/nm-libreswan.h
new file mode 100644
index 0000000..e26ff97
--- /dev/null
+++ b/properties/nm-libreswan.h
@@ -0,0 +1,71 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/***************************************************************************
+ * nm-libreswan.h : GNOME UI dialogs for configuring libreswan VPN connections
+ *
+ * Copyright (C) 2008 Dan Williams, <dcbw redhat com>
+ * Copyright (C) 2010 Avesh Agarwal, <avagarwa redhat com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ **************************************************************************/
+
+#ifndef _NM_LIBRESWAN_H_
+#define _NM_LIBRESWAN_H_
+
+#include <glib-object.h>
+
+#define LIBRESWAN_TYPE_EDITOR_PLUGIN (libreswan_editor_plugin_get_type ())
+#define LIBRESWAN_EDITOR_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
LIBRESWAN_TYPE_EDITOR_PLUGIN, LibreswanEditorPlugin))
+#define LIBRESWAN_EDITOR_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),
LIBRESWAN_TYPE_EDITOR_PLUGIN, LibreswanEditorPluginClass))
+#define LIBRESWAN_IS_EDITOR_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
LIBRESWAN_TYPE_EDITOR_PLUGIN))
+#define LIBRESWAN_IS_EDITOR_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj),
LIBRESWAN_TYPE_EDITOR_PLUGIN))
+#define LIBRESWAN_EDITOR_PLUGIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),
LIBRESWAN_TYPE_EDITOR_PLUGIN, LibreswanEditorPluginClass))
+
+typedef struct _LibreswanEditorPlugin LibreswanEditorPlugin;
+typedef struct _LibreswanEditorPluginClass LibreswanEditorPluginClass;
+
+struct _LibreswanEditorPlugin {
+ GObject parent;
+};
+
+struct _LibreswanEditorPluginClass {
+ GObjectClass parent;
+};
+
+GType libreswan_editor_plugin_get_type (void);
+
+
+#define LIBRESWAN_TYPE_EDITOR (libreswan_editor_get_type ())
+#define LIBRESWAN_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIBRESWAN_TYPE_EDITOR,
LibreswanEditor))
+#define LIBRESWAN_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LIBRESWAN_TYPE_EDITOR,
LibreswanEditorClass))
+#define LIBRESWAN_IS_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIBRESWAN_TYPE_EDITOR))
+#define LIBRESWAN_IS_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), LIBRESWAN_TYPE_EDITOR))
+#define LIBRESWAN_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LIBRESWAN_TYPE_EDITOR,
LibreswanEditorClass))
+
+typedef struct _LibreswanEditor LibreswanEditor;
+typedef struct _LibreswanEditorClass LibreswanEditorClass;
+
+struct _LibreswanEditor {
+ GObject parent;
+};
+
+struct _LibreswanEditorClass {
+ GObjectClass parent;
+};
+
+GType libreswan_editor_get_type (void);
+
+#endif /* _NM_LIBRESWAN_H_ */
+
diff --git a/src/Makefile.am b/src/Makefile.am
index bb41a43..189e090 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,32 +9,32 @@ AM_CPPFLAGS = \
-DLIBEXECDIR=\""$(libexecdir)"\" \
-DLOCALSTATEDIR=\""$(localstatedir)"\" \
-DDATADIR=\"$(datadir)\" \
- -DNM_OPENSWAN_LOCALEDIR=\"$(datadir)/locale\"
+ -DNM_LIBRESWAN_LOCALEDIR=\"$(datadir)/locale\"
-libexec_PROGRAMS = nm-openswan-service nm-openswan-service-helper
+libexec_PROGRAMS = nm-libreswan-service nm-libreswan-service-helper
-nm_openswan_service_SOURCES = \
- nm-openswan-service.c \
- nm-openswan-service.h
+nm_libreswan_service_SOURCES = \
+ nm-libreswan-service.c \
+ nm-libreswan-service.h
-nm_openswan_service_LDADD = \
+nm_libreswan_service_LDADD = \
$(GLIB_LIBS) \
$(LIBNM_LIBS) \
-lutil
-nm_openswan_service_helper_SOURCES = \
- nm-openswan-service-helper.c
+nm_libreswan_service_helper_SOURCES = \
+ nm-libreswan-service-helper.c
-nm_openswan_service_helper_LDADD = \
+nm_libreswan_service_helper_LDADD = \
$(LIBNM_LIBS) \
$(LIBNL_LIBS)
install-exec-hook:
- $(LN_S) -f $(DESTDIR)$(libexecdir)/nm-openswan-service-helper \
- $(DESTDIR)$(libexecdir)/nm-libreswan-service-helper
+ $(LN_S) -f nm-libreswan-service-helper \
+ $(DESTDIR)$(libexecdir)/nm-openswan-service-helper
uninstall-hook:
- rm -f $(DESTDIR)$(libexecdir)/nm-libreswan-service-helper
+ rm -f $(DESTDIR)$(libexecdir)/nm-openswan-service-helper
noinst_PROGRAMS = show-xfrm
diff --git a/src/nm-openswan-service-helper.c b/src/nm-libreswan-service-helper.c
similarity index 93%
rename from src/nm-openswan-service-helper.c
rename to src/nm-libreswan-service-helper.c
index cc2d175..ccde230 100644
--- a/src/nm-openswan-service-helper.c
+++ b/src/nm-libreswan-service-helper.c
@@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* nm-openswan-service-helper - openswan integration with NetworkManager
+/* nm-libreswan-service-helper - libreswan integration with NetworkManager
*
* Dan Williams <dcbw redhat com>
* Avesh Agarwal <avagarwa redhat com>
@@ -41,7 +41,7 @@
#include <NetworkManager.h>
#include <nm-vpn-service-plugin.h>
-#include "nm-openswan-service.h"
+#include "nm-libreswan-service.h"
#include "nm-utils.h"
static void
@@ -49,7 +49,7 @@ helper_failed (GDBusProxy *proxy, const char *reason)
{
GError *err = NULL;
- g_warning ("This helper did not receive a valid %s from the IPSec daemon", reason);
+ g_warning ("This helper did not receive a valid %s from the IPsec daemon", reason);
if (!g_dbus_proxy_call_sync (proxy, "SetFailure",
g_variant_new ("(s)", reason),
@@ -84,7 +84,7 @@ send_ip4_config (GDBusProxy *proxy, GVariant *config)
* specific subnets to be routed over the VPN (eg, CISCO_SPLIT_INC).
* This is what we need to automatically determine 'never-default' behavior.
* Instead, we have to inspect the kernel's SAD (Security Assocation Database)
- * for IPSec-secured routes pointing to the VPN gateway.
+ * for IPsec-secured routes pointing to the VPN gateway.
*/
typedef struct {
@@ -324,12 +324,12 @@ main (int argc, char *argv[])
g_type_init ();
#endif
- /* The IPSec service gives us a "reason" code. If we are given one,
+ /* The IPsec service gives us a "reason" code. If we are given one,
* don't proceed unless its "connect".
*/
- tmp = getenv ("openswan_reason");
+ tmp = getenv ("libreswan_reason");
if (!tmp)
- tmp = getenv ("libreswan_reason");
+ tmp = getenv ("openswan_reason");
if (g_strcmp0 (tmp, "connect") != 0)
exit (0);
@@ -337,7 +337,7 @@ main (int argc, char *argv[])
proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
G_DBUS_PROXY_FLAGS_NONE,
NULL,
- NM_DBUS_SERVICE_OPENSWAN,
+ NM_DBUS_SERVICE_LIBRESWAN,
NM_VPN_DBUS_PLUGIN_PATH,
NM_VPN_DBUS_PLUGIN_INTERFACE,
NULL, &err);
@@ -384,20 +384,20 @@ main (int argc, char *argv[])
g_variant_builder_add (&config, "{sv}", NM_VPN_PLUGIN_IP4_CONFIG_PREFIX, val);
/* DNS */
- val = addr4_list_to_gvariant (getenv ("PLUTO_CISCO_DNS_INFO"));
+ val = addr4_list_to_gvariant (getenv ("PLUTO_PEER_DNS_INFO"));
if (!val) {
- /* libreswan value */
- val = addr4_list_to_gvariant (getenv ("PLUTO_PEER_DNS_INFO"));
+ /* openswan value */
+ val = addr4_list_to_gvariant (getenv ("PLUTO_CISCO_DNS_INFO"));
}
if (val)
g_variant_builder_add (&config, "{sv}", NM_VPN_PLUGIN_IP4_CONFIG_DNS, val);
/* Default domain */
- val = str_to_gvariant (getenv ("PLUTO_CISCO_DOMAIN_INFO"), TRUE);
+ val = str_to_gvariant (getenv ("PLUTO_PEER_DOMAIN_INFO"), TRUE);
if (!val) {
- /* libreswan value */
- val = str_to_gvariant (getenv ("PLUTO_PEER_DOMAIN_INFO"), TRUE);
+ /* openswan value */
+ val = str_to_gvariant (getenv ("PLUTO_CISCO_DOMAIN_INFO"), TRUE);
}
if (val)
g_variant_builder_add (&config, "{sv}", NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN, val);
diff --git a/src/nm-openswan-service.c b/src/nm-libreswan-service.c
similarity index 82%
rename from src/nm-openswan-service.c
rename to src/nm-libreswan-service.c
index 9f459fe..98173e1 100644
--- a/src/nm-openswan-service.c
+++ b/src/nm-libreswan-service.c
@@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* NetworkManager-openswan -- Network Manager Openswan plugin
+/* NetworkManager-libreswan -- Network Manager Libreswan plugin
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -37,22 +37,22 @@
#include <NetworkManager.h>
#include <nm-vpn-service-plugin.h>
-#include "nm-openswan-service.h"
+#include "nm-libreswan-service.h"
#include "nm-utils.h"
#if !defined(DIST_VERSION)
# define DIST_VERSION VERSION
#endif
-#define NM_TYPE_OPENSWAN_PLUGIN (nm_openswan_plugin_get_type ())
-#define NM_OPENSWAN_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_OPENSWAN_PLUGIN,
NMOpenSwanPlugin))
+#define NM_TYPE_LIBRESWAN_PLUGIN (nm_libreswan_plugin_get_type ())
+#define NM_LIBRESWAN_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_LIBRESWAN_PLUGIN,
NMLibreswanPlugin))
-typedef NMVpnServicePlugin NMOpenSwanPlugin;
-typedef NMVpnServicePluginClass NMOpenSwanPluginClass;
+typedef NMVpnServicePlugin NMLibreswanPlugin;
+typedef NMVpnServicePluginClass NMLibreswanPluginClass;
-static GType nm_openswan_plugin_get_type (void);
+static GType nm_libreswan_plugin_get_type (void);
-G_DEFINE_TYPE (NMOpenSwanPlugin, nm_openswan_plugin, NM_TYPE_VPN_SERVICE_PLUGIN)
+G_DEFINE_TYPE (NMLibreswanPlugin, nm_libreswan_plugin, NM_TYPE_VPN_SERVICE_PLUGIN)
/************************************************************/
@@ -83,7 +83,7 @@ typedef struct {
const char *whack_path;
char *secrets_path;
- gboolean libreswan;
+ gboolean openswan;
gboolean interactive;
gboolean pending_auth;
gboolean managed;
@@ -102,16 +102,16 @@ typedef struct {
Pipe out;
Pipe err;
-} NMOpenSwanPluginPrivate;
+} NMLibreswanPluginPrivate;
-#define NM_OPENSWAN_PLUGIN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_OPENSWAN_PLUGIN,
NMOpenSwanPluginPrivate))
+#define NM_LIBRESWAN_PLUGIN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_LIBRESWAN_PLUGIN,
NMLibreswanPluginPrivate))
/* NOTE: the helper is currently called explicitly by the ipsec up/down
* script /usr/libexec/ipsec/_updown.netkey when the configuration contains
* "nm_configured=yes". Eventually we want to somehow pass the helper
* directly to pluto/whack with the --updown option.
*/
-#define NM_OPENSWAN_HELPER_PATH LIBEXECDIR"/nm-openswan-service-helper"
+#define NM_LIBRESWAN_HELPER_PATH LIBEXECDIR"/nm-libreswan-service-helper"
#define DEBUG(...) \
G_STMT_START { \
@@ -130,27 +130,27 @@ typedef struct {
} ValidProperty;
static ValidProperty valid_properties[] = {
- { NM_OPENSWAN_RIGHT, G_TYPE_STRING, 0, 0 },
- { NM_OPENSWAN_LEFTID, G_TYPE_STRING, 0, 0 },
- { NM_OPENSWAN_LEFTXAUTHUSER, G_TYPE_STRING, 0, 0 },
- { NM_OPENSWAN_DOMAIN, G_TYPE_STRING, 0, 0 },
- { NM_OPENSWAN_DHGROUP, G_TYPE_STRING, 0, 0 },
- { NM_OPENSWAN_PFSGROUP, G_TYPE_STRING, 0, 0 },
- { NM_OPENSWAN_DPDTIMEOUT, G_TYPE_INT, 0, 86400 },
- { NM_OPENSWAN_IKE, G_TYPE_STRING, 0, 0 },
- { NM_OPENSWAN_ESP, G_TYPE_STRING, 0, 0 },
- { NM_OPENSWAN_VENDOR, G_TYPE_STRING, 0, 0 },
+ { NM_LIBRESWAN_RIGHT, G_TYPE_STRING, 0, 0 },
+ { NM_LIBRESWAN_LEFTID, G_TYPE_STRING, 0, 0 },
+ { NM_LIBRESWAN_LEFTXAUTHUSER, G_TYPE_STRING, 0, 0 },
+ { NM_LIBRESWAN_DOMAIN, G_TYPE_STRING, 0, 0 },
+ { NM_LIBRESWAN_DHGROUP, G_TYPE_STRING, 0, 0 },
+ { NM_LIBRESWAN_PFSGROUP, G_TYPE_STRING, 0, 0 },
+ { NM_LIBRESWAN_DPDTIMEOUT, G_TYPE_INT, 0, 86400 },
+ { NM_LIBRESWAN_IKE, G_TYPE_STRING, 0, 0 },
+ { NM_LIBRESWAN_ESP, G_TYPE_STRING, 0, 0 },
+ { NM_LIBRESWAN_VENDOR, G_TYPE_STRING, 0, 0 },
/* Ignored option for internal use */
- { NM_OPENSWAN_PSK_INPUT_MODES, G_TYPE_NONE, 0, 0 },
- { NM_OPENSWAN_XAUTH_PASSWORD_INPUT_MODES, G_TYPE_NONE, 0, 0 },
- { NM_OPENSWAN_PSK_VALUE "-flags", G_TYPE_STRING, 0, 0 },
- { NM_OPENSWAN_XAUTH_PASSWORD "-flags", G_TYPE_STRING, 0, 0 },
+ { NM_LIBRESWAN_PSK_INPUT_MODES, G_TYPE_NONE, 0, 0 },
+ { NM_LIBRESWAN_XAUTH_PASSWORD_INPUT_MODES, G_TYPE_NONE, 0, 0 },
+ { NM_LIBRESWAN_PSK_VALUE "-flags", G_TYPE_STRING, 0, 0 },
+ { NM_LIBRESWAN_XAUTH_PASSWORD "-flags", G_TYPE_STRING, 0, 0 },
{ NULL, G_TYPE_NONE, 0, 0 }
};
static ValidProperty valid_secrets[] = {
- { NM_OPENSWAN_PSK_VALUE, G_TYPE_STRING, 0, 0 },
- { NM_OPENSWAN_XAUTH_PASSWORD, G_TYPE_STRING, 0, 0 },
+ { NM_LIBRESWAN_PSK_VALUE, G_TYPE_STRING, 0, 0 },
+ { NM_LIBRESWAN_XAUTH_PASSWORD, G_TYPE_STRING, 0, 0 },
{ NULL, G_TYPE_NONE, 0, 0 }
};
@@ -230,7 +230,7 @@ validate_one_property (const char *key, const char *value, gpointer user_data)
}
static gboolean
-nm_openswan_properties_validate (NMSettingVpn *s_vpn, GError **error)
+nm_libreswan_properties_validate (NMSettingVpn *s_vpn, GError **error)
{
ValidateInfo info = { &valid_properties[0], error, FALSE };
@@ -247,7 +247,7 @@ nm_openswan_properties_validate (NMSettingVpn *s_vpn, GError **error)
}
static gboolean
-nm_openswan_secrets_validate (NMSettingVpn *s_vpn, GError **error)
+nm_libreswan_secrets_validate (NMSettingVpn *s_vpn, GError **error)
{
GError *validate_error = NULL;
ValidateInfo info = { &valid_secrets[0], &validate_error, FALSE };
@@ -262,7 +262,7 @@ nm_openswan_secrets_validate (NMSettingVpn *s_vpn, GError **error)
/****************************************************************/
-static gboolean connect_step (NMOpenSwanPlugin *self, GError **error);
+static gboolean connect_step (NMLibreswanPlugin *self, GError **error);
static gboolean pr_cb (GIOChannel *source, GIOCondition condition, gpointer user_data);
static const char *
@@ -357,9 +357,9 @@ pipe_cleanup (Pipe *pipe)
}
static void
-connect_cleanup (NMOpenSwanPlugin *self)
+connect_cleanup (NMLibreswanPlugin *self)
{
- NMOpenSwanPluginPrivate *priv = NM_OPENSWAN_PLUGIN_GET_PRIVATE (self);
+ NMLibreswanPluginPrivate *priv = NM_LIBRESWAN_PLUGIN_GET_PRIVATE (self);
priv->connect_step = CONNECT_STEP_FIRST;
priv->pending_auth = FALSE;
@@ -399,9 +399,9 @@ connect_cleanup (NMOpenSwanPlugin *self)
}
static void
-delete_secrets_file (NMOpenSwanPlugin *self)
+delete_secrets_file (NMLibreswanPlugin *self)
{
- NMOpenSwanPluginPrivate *priv = NM_OPENSWAN_PLUGIN_GET_PRIVATE (self);
+ NMLibreswanPluginPrivate *priv = NM_LIBRESWAN_PLUGIN_GET_PRIVATE (self);
if (priv->secrets_path) {
unlink (priv->secrets_path);
@@ -410,9 +410,9 @@ delete_secrets_file (NMOpenSwanPlugin *self)
}
static gboolean
-ipsec_stop (NMOpenSwanPlugin *self, GError **error)
+ipsec_stop (NMLibreswanPlugin *self, GError **error)
{
- NMOpenSwanPluginPrivate *priv = NM_OPENSWAN_PLUGIN_GET_PRIVATE (self);
+ NMLibreswanPluginPrivate *priv = NM_LIBRESWAN_PLUGIN_GET_PRIVATE (self);
const char *argv[5];
guint i = 0;
@@ -428,26 +428,26 @@ ipsec_stop (NMOpenSwanPlugin *self, GError **error)
argv[i++] = "--delete";
argv[i++] = nm_connection_get_uuid (priv->connection);
argv[i++] = NULL;
- } else if (priv->libreswan) {
- argv[i++] = priv->whack_path;
- argv[i++] = "--shutdown";
- argv[i++] = NULL;
- } else {
+ } else if (priv->openswan) {
argv[i++] = priv->ipsec_path;
argv[i++] = "setup";
argv[i++] = "stop";
argv[i++] = NULL;
+ } else {
+ argv[i++] = priv->whack_path;
+ argv[i++] = "--shutdown";
+ argv[i++] = NULL;
}
return g_spawn_sync (NULL, (char **) argv, NULL, 0, NULL, NULL, NULL, NULL, NULL, error);
}
static void
-connect_failed (NMOpenSwanPlugin *self,
+connect_failed (NMLibreswanPlugin *self,
GError *error,
NMVpnConnectionStateReason reason)
{
- NMOpenSwanPluginPrivate *priv = NM_OPENSWAN_PLUGIN_GET_PRIVATE (self);
+ NMLibreswanPluginPrivate *priv = NM_LIBRESWAN_PLUGIN_GET_PRIVATE (self);
if (error) {
g_warning ("Connect failed: (%s/%d) %s",
@@ -464,8 +464,8 @@ connect_failed (NMOpenSwanPlugin *self,
static void
check_running_cb (GPid pid, gint status, gpointer user_data)
{
- NMOpenSwanPlugin *self = NM_OPENSWAN_PLUGIN (user_data);
- NMOpenSwanPluginPrivate *priv = NM_OPENSWAN_PLUGIN_GET_PRIVATE (self);
+ NMLibreswanPlugin *self = NM_LIBRESWAN_PLUGIN (user_data);
+ NMLibreswanPluginPrivate *priv = NM_LIBRESWAN_PLUGIN_GET_PRIVATE (self);
guint ret = 1;
GError *error = NULL;
@@ -500,8 +500,8 @@ check_running_cb (GPid pid, gint status, gpointer user_data)
static gboolean
retry_cb (gpointer user_data)
{
- NMOpenSwanPlugin *self = NM_OPENSWAN_PLUGIN (user_data);
- NMOpenSwanPluginPrivate *priv = NM_OPENSWAN_PLUGIN_GET_PRIVATE (self);
+ NMLibreswanPlugin *self = NM_LIBRESWAN_PLUGIN (user_data);
+ NMLibreswanPluginPrivate *priv = NM_LIBRESWAN_PLUGIN_GET_PRIVATE (self);
GError *error = NULL;
priv->retry_id = 0;
@@ -516,8 +516,8 @@ retry_cb (gpointer user_data)
static void
child_watch_cb (GPid pid, gint status, gpointer user_data)
{
- NMOpenSwanPlugin *self = NM_OPENSWAN_PLUGIN (user_data);
- NMOpenSwanPluginPrivate *priv = NM_OPENSWAN_PLUGIN_GET_PRIVATE (self);
+ NMLibreswanPlugin *self = NM_LIBRESWAN_PLUGIN (user_data);
+ NMLibreswanPluginPrivate *priv = NM_LIBRESWAN_PLUGIN_GET_PRIVATE (self);
guint ret = 1;
GError *error = NULL;
@@ -638,18 +638,19 @@ write_config_option (int fd, const char *format, ...)
g_print ("Config: %s", string);
if ( write (fd, string, strlen (string)) == -1)
- g_warning ("nm-openswan: error in write_config_option");
+ g_warning ("nm-libreswan: error in write_config_option");
g_free (string);
va_end (args);
}
static void
-nm_openswan_config_write (gint fd,
- NMConnection *connection,
- gboolean libreswan,
- GError **error)
+nm_libreswan_config_write (NMLibreswanPlugin *self,
+ gint fd,
+ NMConnection *connection,
+ GError **error)
{
+ NMLibreswanPluginPrivate *priv = NM_LIBRESWAN_PLUGIN_GET_PRIVATE (self);
NMSettingVpn *s_vpn = nm_connection_get_setting_vpn (connection);
const char *con_name = nm_connection_get_uuid (connection);
const char *props_username;
@@ -665,30 +666,30 @@ nm_openswan_config_write (gint fd,
write_config_option (fd, " aggrmode=yes\n");
write_config_option (fd, " authby=secret\n");
write_config_option (fd, " left=%%defaultroute\n");
- write_config_option (fd, " leftid= %s\n", nm_setting_vpn_get_data_item (s_vpn, NM_OPENSWAN_LEFTID));
+ write_config_option (fd, " leftid= %s\n", nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_LEFTID));
write_config_option (fd, " leftxauthclient=yes\n");
write_config_option (fd, " leftmodecfgclient=yes\n");
default_username = nm_setting_vpn_get_user_name (s_vpn);
- props_username = nm_setting_vpn_get_data_item (s_vpn, NM_OPENSWAN_LEFTXAUTHUSER);
+ props_username = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_LEFTXAUTHUSER);
if ( default_username && strlen (default_username)
&& (!props_username || !strlen (props_username)))
write_config_option (fd, " leftxauthusername=%s\n", default_username);
else
write_config_option (fd, " leftxauthusername=%s\n", props_username);
- write_config_option (fd, " right=%s\n", nm_setting_vpn_get_data_item (s_vpn, NM_OPENSWAN_RIGHT));
+ write_config_option (fd, " right=%s\n", nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_RIGHT));
write_config_option (fd, " remote_peer_type=cisco\n");
write_config_option (fd, " rightxauthserver=yes\n");
write_config_option (fd, " rightmodecfgserver=yes\n");
- phase1_alg_str = nm_setting_vpn_get_data_item (s_vpn, NM_OPENSWAN_IKE);
+ phase1_alg_str = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_IKE);
if (!phase1_alg_str || !strlen (phase1_alg_str))
write_config_option (fd, " ike=aes-sha1\n");
else
write_config_option (fd, " ike=%s\n", phase1_alg_str);
- phase2_alg_str = nm_setting_vpn_get_data_item (s_vpn, NM_OPENSWAN_ESP);
+ phase2_alg_str = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_ESP);
if (!phase2_alg_str || !strlen (phase2_alg_str))
write_config_option (fd, " esp=aes-sha1;modp1024\n");
else
@@ -699,7 +700,7 @@ nm_openswan_config_write (gint fd,
write_config_option (fd, " salifetime=24h\n");
write_config_option (fd, " ikelifetime=24h\n");
write_config_option (fd, " keyingtries=1\n");
- if (libreswan && g_strcmp0 (nm_setting_vpn_get_data_item (s_vpn, NM_OPENSWAN_VENDOR), "Cisco") == 0)
+ if (!priv->openswan && g_strcmp0 (nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_VENDOR), "Cisco")
== 0)
write_config_option (fd, " cisco-unity=yes\n");
write_config_option (fd, " auto=add");
@@ -707,26 +708,26 @@ nm_openswan_config_write (gint fd,
* libreswan fails parsing the configuration if you include the \n.
* WTF?
*/
- if (!libreswan)
+ if (priv->openswan)
(void) write (fd, "\n", 1);
if (debug)
g_print ("\n");
}
static gboolean
-nm_openswan_config_psk_write (NMSettingVpn *s_vpn,
- const char *secrets_path,
- GError **error)
+nm_libreswan_config_psk_write (NMSettingVpn *s_vpn,
+ const char *secrets_path,
+ GError **error)
{
const char *pw_type, *psk, *leftid;
int fd;
/* Check for ignored group password */
- pw_type = nm_setting_vpn_get_data_item (s_vpn, NM_OPENSWAN_PSK_INPUT_MODES);
- if (pw_type && !strcmp (pw_type, NM_OPENSWAN_PW_TYPE_UNUSED))
+ pw_type = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_PSK_INPUT_MODES);
+ if (pw_type && !strcmp (pw_type, NM_LIBRESWAN_PW_TYPE_UNUSED))
return TRUE;
- psk = nm_setting_vpn_get_secret (s_vpn, NM_OPENSWAN_PSK_VALUE);
+ psk = nm_setting_vpn_get_secret (s_vpn, NM_LIBRESWAN_PSK_VALUE);
if (!psk)
return TRUE;
@@ -742,7 +743,7 @@ nm_openswan_config_psk_write (NMSettingVpn *s_vpn,
return FALSE;
}
- leftid = nm_setting_vpn_get_data_item (s_vpn, NM_OPENSWAN_LEFTID);
+ leftid = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_LEFTID);
g_assert (leftid);
write_config_option (fd, "@%s: PSK \"%s\"\n", leftid, psk);
@@ -873,9 +874,9 @@ spawn_pty (int *out_stdout,
#define PASSPHRASE_REQUEST "Enter passphrase: "
static gboolean
-handle_auth (NMOpenSwanPlugin *self, const char **out_message, const char **out_hint)
+handle_auth (NMLibreswanPlugin *self, const char **out_message, const char **out_hint)
{
- NMOpenSwanPluginPrivate *priv = NM_OPENSWAN_PLUGIN_GET_PRIVATE (self);
+ NMLibreswanPluginPrivate *priv = NM_LIBRESWAN_PLUGIN_GET_PRIVATE (self);
GError *error = NULL;
gsize bytes_written;
@@ -906,7 +907,7 @@ handle_auth (NMOpenSwanPlugin *self, const char **out_message, const char **out_
g_free (priv->password);
priv->password = NULL;
} else {
- *out_hint = NM_OPENSWAN_XAUTH_PASSWORD;
+ *out_hint = NM_LIBRESWAN_XAUTH_PASSWORD;
*out_message = _("A password is required.");
}
@@ -916,8 +917,8 @@ handle_auth (NMOpenSwanPlugin *self, const char **out_message, const char **out_
static gboolean
io_cb (GIOChannel *source, GIOCondition condition, gpointer user_data)
{
- NMOpenSwanPlugin *self = NM_OPENSWAN_PLUGIN (user_data);
- NMOpenSwanPluginPrivate *priv = NM_OPENSWAN_PLUGIN_GET_PRIVATE (self);
+ NMLibreswanPlugin *self = NM_LIBRESWAN_PLUGIN (user_data);
+ NMLibreswanPluginPrivate *priv = NM_LIBRESWAN_PLUGIN_GET_PRIVATE (self);
char buf[256];
GIOStatus status;
gsize bytes_read = 0;
@@ -1031,9 +1032,9 @@ pr_cb (GIOChannel *source, GIOCondition condition, gpointer user_data)
}
static gboolean
-connect_step (NMOpenSwanPlugin *self, GError **error)
+connect_step (NMLibreswanPlugin *self, GError **error)
{
- NMOpenSwanPluginPrivate *priv = NM_OPENSWAN_PLUGIN_GET_PRIVATE (self);
+ NMLibreswanPluginPrivate *priv = NM_LIBRESWAN_PLUGIN_GET_PRIVATE (self);
const char *uuid;
int fd = -1, up_stdout = -1, up_stderr = -1, up_pty = -1;
gboolean success = FALSE;
@@ -1060,14 +1061,14 @@ connect_step (NMOpenSwanPlugin *self, GError **error)
return TRUE;
case CONNECT_STEP_STACK_INIT:
- if (priv->libreswan) {
+ if (!priv->openswan) {
const char *stackman_path;
stackman_path = find_helper_libexec ("_stackmanager", error);
if (!stackman_path)
return FALSE;
- /* Ensure the right IPSec kernel stack is loaded */
+ /* Ensure the right IPsec kernel stack is loaded */
success = do_spawn (&priv->pid, NULL, NULL, error, stackman_path, "start", NULL);
if (success)
priv->watch_id = g_child_watch_add (priv->pid, child_watch_cb, self);
@@ -1077,13 +1078,14 @@ connect_step (NMOpenSwanPlugin *self, GError **error)
priv->connect_step++;
case CONNECT_STEP_IPSEC_START:
- /* Start the IPSec service */
- if (priv->libreswan) {
+ /* Start the IPsec service */
+ if (priv->openswan)
+ success = do_spawn (&priv->pid, NULL, NULL, error, priv->ipsec_path, "setup",
"start", NULL);
+ else {
success = do_spawn (&priv->pid, NULL, NULL, error,
priv->pluto_path, "--config", SYSCONFDIR "/ipsec.conf",
NULL);
- } else
- success = do_spawn (&priv->pid, NULL, NULL, error, priv->ipsec_path, "setup",
"start", NULL);
+ }
if (success) {
priv->managed = TRUE;
priv->watch_id = g_child_watch_add (priv->pid, child_watch_cb, self);
@@ -1103,7 +1105,7 @@ connect_step (NMOpenSwanPlugin *self, GError **error)
"auto", "--replace", "--config", "-", uuid, NULL))
return FALSE;
priv->watch_id = g_child_watch_add (priv->pid, child_watch_cb, self);
- nm_openswan_config_write (fd, priv->connection, priv->libreswan, error);
+ nm_libreswan_config_write (self, fd, priv->connection, error);
close (fd);
return TRUE;
@@ -1137,17 +1139,17 @@ connect_step (NMOpenSwanPlugin *self, GError **error)
}
static gboolean
-is_libreswan (const char *path)
+is_openswan (const char *path)
{
const char *argv[] = { path, NULL };
- gboolean libreswan = FALSE;
+ gboolean openswan = FALSE;
char *output = NULL;
if (g_spawn_sync (NULL, (char **) argv, NULL, 0, NULL, NULL, &output, NULL, NULL, NULL)) {
- libreswan = output && strcasestr (output, " Libreswan ");
+ openswan = output && strcasestr (output, " Openswan ");
g_free (output);
}
- return libreswan;
+ return openswan;
}
static gboolean
@@ -1156,8 +1158,8 @@ _connect_common (NMVpnServicePlugin *plugin,
GVariant *details,
GError **error)
{
- NMOpenSwanPlugin *self = NM_OPENSWAN_PLUGIN (plugin);
- NMOpenSwanPluginPrivate *priv = NM_OPENSWAN_PLUGIN_GET_PRIVATE (self);
+ NMLibreswanPlugin *self = NM_LIBRESWAN_PLUGIN (plugin);
+ NMLibreswanPluginPrivate *priv = NM_LIBRESWAN_PLUGIN_GET_PRIVATE (self);
NMSettingVpn *s_vpn;
const char *con_name = nm_connection_get_uuid (connection);
@@ -1168,8 +1170,8 @@ _connect_common (NMVpnServicePlugin *plugin,
if (!priv->ipsec_path)
return FALSE;
- priv->libreswan = is_libreswan (priv->ipsec_path);
- if (priv->libreswan) {
+ priv->openswan = is_openswan (priv->ipsec_path);
+ if (!priv->openswan) {
priv->pluto_path = find_helper_libexec ("pluto", error);
if (!priv->pluto_path)
return FALSE;
@@ -1183,10 +1185,10 @@ _connect_common (NMVpnServicePlugin *plugin,
s_vpn = nm_connection_get_setting_vpn (connection);
g_assert (s_vpn);
- if (!nm_openswan_properties_validate (s_vpn, error))
+ if (!nm_libreswan_properties_validate (s_vpn, error))
return FALSE;
- if (!nm_openswan_secrets_validate (s_vpn, error))
+ if (!nm_libreswan_secrets_validate (s_vpn, error))
return FALSE;
if (priv->connect_step != CONNECT_STEP_FIRST) {
@@ -1197,13 +1199,13 @@ _connect_common (NMVpnServicePlugin *plugin,
return FALSE;
}
- priv->password = g_strdup (nm_setting_vpn_get_secret (s_vpn, NM_OPENSWAN_XAUTH_PASSWORD));
+ priv->password = g_strdup (nm_setting_vpn_get_secret (s_vpn, NM_LIBRESWAN_XAUTH_PASSWORD));
- /* Write the IPSec secret (group password); *SWAN always requires this and
+ /* Write the IPsec secret (group password); *SWAN always requires this and
* doesn't ask for it interactively.
*/
priv->secrets_path = g_strdup_printf (SYSCONFDIR "/ipsec.d/ipsec-%s.secrets", con_name);
- if (!nm_openswan_config_psk_write (s_vpn, priv->secrets_path, error))
+ if (!nm_libreswan_config_psk_write (s_vpn, priv->secrets_path, error))
return FALSE;
priv->connection = g_object_ref (connection);
@@ -1229,7 +1231,7 @@ real_connect_interactive (NMVpnServicePlugin *plugin,
if (!_connect_common (plugin, connection, details, error))
return FALSE;
- NM_OPENSWAN_PLUGIN_GET_PRIVATE (plugin)->interactive = TRUE;
+ NM_LIBRESWAN_PLUGIN_GET_PRIVATE (plugin)->interactive = TRUE;
return TRUE;
}
@@ -1254,17 +1256,17 @@ real_need_secrets (NMVpnServicePlugin *plugin,
return FALSE;
}
- pw_type = nm_setting_vpn_get_data_item (s_vpn, NM_OPENSWAN_PSK_INPUT_MODES);
- if (!pw_type || strcmp (pw_type, NM_OPENSWAN_PW_TYPE_UNUSED)) {
- if (!nm_setting_vpn_get_secret (s_vpn, NM_OPENSWAN_PSK_VALUE)) {
+ pw_type = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_PSK_INPUT_MODES);
+ if (!pw_type || strcmp (pw_type, NM_LIBRESWAN_PW_TYPE_UNUSED)) {
+ if (!nm_setting_vpn_get_secret (s_vpn, NM_LIBRESWAN_PSK_VALUE)) {
*setting_name = NM_SETTING_VPN_SETTING_NAME;
return TRUE;
}
}
- pw_type = nm_setting_vpn_get_data_item (s_vpn, NM_OPENSWAN_XAUTH_PASSWORD_INPUT_MODES);
- if (!pw_type || strcmp (pw_type, NM_OPENSWAN_PW_TYPE_UNUSED)) {
- if (!nm_setting_vpn_get_secret (s_vpn, NM_OPENSWAN_XAUTH_PASSWORD)) {
+ pw_type = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_XAUTH_PASSWORD_INPUT_MODES);
+ if (!pw_type || strcmp (pw_type, NM_LIBRESWAN_PW_TYPE_UNUSED)) {
+ if (!nm_setting_vpn_get_secret (s_vpn, NM_LIBRESWAN_XAUTH_PASSWORD)) {
*setting_name = NM_SETTING_VPN_SETTING_NAME;
return TRUE;
}
@@ -1278,8 +1280,8 @@ real_new_secrets (NMVpnServicePlugin *plugin,
NMConnection *connection,
GError **error)
{
- NMOpenSwanPlugin *self = NM_OPENSWAN_PLUGIN (plugin);
- NMOpenSwanPluginPrivate *priv = NM_OPENSWAN_PLUGIN_GET_PRIVATE (self);
+ NMLibreswanPlugin *self = NM_LIBRESWAN_PLUGIN (plugin);
+ NMLibreswanPluginPrivate *priv = NM_LIBRESWAN_PLUGIN_GET_PRIVATE (self);
NMSettingVpn *s_vpn;
const char *message = NULL;
const char *hints[] = { NULL, NULL };
@@ -1296,7 +1298,7 @@ real_new_secrets (NMVpnServicePlugin *plugin,
DEBUG ("VPN received new secrets; sending to ipsec");
g_free (priv->password);
- priv->password = g_strdup (nm_setting_vpn_get_secret (s_vpn, NM_OPENSWAN_XAUTH_PASSWORD));
+ priv->password = g_strdup (nm_setting_vpn_get_secret (s_vpn, NM_LIBRESWAN_XAUTH_PASSWORD));
g_warn_if_fail (priv->pending_auth);
if (!handle_auth (self, &message, &hints[0])) {
@@ -1319,39 +1321,39 @@ real_new_secrets (NMVpnServicePlugin *plugin,
static gboolean
real_disconnect (NMVpnServicePlugin *plugin, GError **error)
{
- NMOpenSwanPluginPrivate *priv = NM_OPENSWAN_PLUGIN_GET_PRIVATE (plugin);
+ NMLibreswanPluginPrivate *priv = NM_LIBRESWAN_PLUGIN_GET_PRIVATE (plugin);
gboolean ret;
- ret = ipsec_stop (NM_OPENSWAN_PLUGIN (plugin), error);
+ ret = ipsec_stop (NM_LIBRESWAN_PLUGIN (plugin), error);
g_clear_object (&priv->connection);
return ret;
}
static void
-nm_openswan_plugin_init (NMOpenSwanPlugin *plugin)
+nm_libreswan_plugin_init (NMLibreswanPlugin *plugin)
{
}
static void
finalize (GObject *object)
{
- NMOpenSwanPluginPrivate *priv = NM_OPENSWAN_PLUGIN_GET_PRIVATE (object);
+ NMLibreswanPluginPrivate *priv = NM_LIBRESWAN_PLUGIN_GET_PRIVATE (object);
- delete_secrets_file (NM_OPENSWAN_PLUGIN (object));
- connect_cleanup (NM_OPENSWAN_PLUGIN (object));
+ delete_secrets_file (NM_LIBRESWAN_PLUGIN (object));
+ connect_cleanup (NM_LIBRESWAN_PLUGIN (object));
g_clear_object (&priv->connection);
- G_OBJECT_CLASS (nm_openswan_plugin_parent_class)->finalize (object);
+ G_OBJECT_CLASS (nm_libreswan_plugin_parent_class)->finalize (object);
}
static void
-nm_openswan_plugin_class_init (NMOpenSwanPluginClass *openswan_class)
+nm_libreswan_plugin_class_init (NMLibreswanPluginClass *libreswan_class)
{
- GObjectClass *object_class = G_OBJECT_CLASS (openswan_class);
- NMVpnServicePluginClass *parent_class = NM_VPN_SERVICE_PLUGIN_CLASS (openswan_class);
+ GObjectClass *object_class = G_OBJECT_CLASS (libreswan_class);
+ NMVpnServicePluginClass *parent_class = NM_VPN_SERVICE_PLUGIN_CLASS (libreswan_class);
- g_type_class_add_private (object_class, sizeof (NMOpenSwanPluginPrivate));
+ g_type_class_add_private (object_class, sizeof (NMLibreswanPluginPrivate));
/* virtual methods */
object_class->finalize = finalize;
@@ -1384,7 +1386,7 @@ setup_signals (void)
}
static void
-quit_mainloop (NMOpenSwanPlugin *plugin, gpointer user_data)
+quit_mainloop (NMLibreswanPlugin *plugin, gpointer user_data)
{
g_main_loop_quit ((GMainLoop *) user_data);
}
@@ -1392,7 +1394,7 @@ quit_mainloop (NMOpenSwanPlugin *plugin, gpointer user_data)
int
main (int argc, char *argv[])
{
- NMOpenSwanPlugin *plugin;
+ NMLibreswanPlugin *plugin;
gboolean persist = FALSE;
GOptionContext *opt_ctx = NULL;
GError *error = NULL;
@@ -1410,7 +1412,7 @@ main (int argc, char *argv[])
/* locale will be set according to environment LC_* variables */
setlocale (LC_ALL, "");
- bindtextdomain (GETTEXT_PACKAGE, NM_OPENSWAN_LOCALEDIR);
+ bindtextdomain (GETTEXT_PACKAGE, NM_LIBRESWAN_LOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
@@ -1427,14 +1429,14 @@ main (int argc, char *argv[])
g_option_context_parse (opt_ctx, &argc, &argv, NULL);
g_option_context_free (opt_ctx);
- if (getenv ("OPENSWAN_DEBUG") || getenv ("IPSEC_DEBUG"))
+ if (getenv ("LIBRESWAN_DEBUG") || getenv ("IPSEC_DEBUG"))
debug = TRUE;
if (debug)
g_message ("%s (version " DIST_VERSION ") starting...", argv[0]);
- plugin = g_initable_new (NM_TYPE_OPENSWAN_PLUGIN, NULL, &error,
- NM_VPN_SERVICE_PLUGIN_DBUS_SERVICE_NAME, NM_DBUS_SERVICE_OPENSWAN,
+ plugin = g_initable_new (NM_TYPE_LIBRESWAN_PLUGIN, NULL, &error,
+ NM_VPN_SERVICE_PLUGIN_DBUS_SERVICE_NAME, NM_DBUS_SERVICE_LIBRESWAN,
NULL);
if (!plugin) {
g_warning ("Failed to initialize a plugin instance: %s", error->message);
diff --git a/src/nm-libreswan-service.h b/src/nm-libreswan-service.h
new file mode 100644
index 0000000..d5c50bc
--- /dev/null
+++ b/src/nm-libreswan-service.h
@@ -0,0 +1,54 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* NetworkManager-libreswan -- libreswan plugin for Network manager
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * (C) Copyright 2010 Red Hat, Inc.
+ */
+
+#ifndef NM_LIBRESWAN_PLUGIN_H
+#define NM_LIBRESWAN_PLUGIN_H
+
+#include <glib.h>
+#include <glib-object.h>
+
+#define NM_DBUS_SERVICE_LIBRESWAN "org.freedesktop.NetworkManager.libreswan"
+#define NM_DBUS_INTERFACE_LIBRESWAN "org.freedesktop.NetworkManager.libreswan"
+#define NM_DBUS_PATH_LIBRESWAN "/org/freedesktop/NetworkManager/libreswan"
+
+#define NM_LIBRESWAN_RIGHT "right"
+#define NM_LIBRESWAN_LEFTID "leftid"
+#define NM_LIBRESWAN_PSK_VALUE "pskvalue"
+#define NM_LIBRESWAN_PSK_INPUT_MODES "pskinputmodes"
+#define NM_LIBRESWAN_LEFTXAUTHUSER "leftxauthusername"
+#define NM_LIBRESWAN_XAUTH_PASSWORD "xauthpassword"
+#define NM_LIBRESWAN_XAUTH_PASSWORD_INPUT_MODES "xauthpasswordinputmodes"
+#define NM_LIBRESWAN_DOMAIN "Domain"
+#define NM_LIBRESWAN_DHGROUP "dhgroup"
+#define NM_LIBRESWAN_PFSGROUP "pfsgroup"
+#define NM_LIBRESWAN_DPDTIMEOUT "dpdtimeout"
+#define NM_LIBRESWAN_IKE "ike"
+#define NM_LIBRESWAN_ESP "esp"
+#define NM_LIBRESWAN_VENDOR "vendor"
+
+#define NM_LIBRESWAN_PW_TYPE_SAVE "save"
+#define NM_LIBRESWAN_PW_TYPE_ASK "ask"
+#define NM_LIBRESWAN_PW_TYPE_UNUSED "unused"
+
+#ifndef NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV_NONE
+#define NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV_NONE "_none_"
+#endif
+
+#endif /* NM_LIBRESWAN_PLUGIN_H */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
