diff -Nru network-manager-vpnc-0.7/auth-dialog/gnome-two-password-dialog.c /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/auth-dialog/gnome-two-password-dialog.c --- network-manager-vpnc-0.7/auth-dialog/gnome-two-password-dialog.c 2008-11-28 17:31:07.000000000 +0000 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/auth-dialog/gnome-two-password-dialog.c 2009-04-09 00:48:29.000000000 +0100 @@ -14,44 +14,30 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. - You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + 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. Authors: Ramiro Estrugo */ #include -//#include "gnome-i18nP.h" #include "gnome-two-password-dialog.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include +#include "src/nm-vpnc-service.h" -struct GnomeTwoPasswordDialogDetails -{ - /* Attributes */ - gboolean readonly_username; - gboolean readonly_domain; +G_DEFINE_TYPE (VpnPasswordDialog, vpn_password_dialog, GTK_TYPE_DIALOG) - gboolean show_username; - gboolean show_domain; +#define VPN_PASSWORD_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \ + VPN_TYPE_PASSWORD_DIALOG, \ + VpnPasswordDialogPrivate)) + +typedef struct { + /* Attributes */ gboolean show_password; gboolean show_password_secondary; @@ -60,131 +46,74 @@ char *remember_label_text; /* Internal widgetry and flags */ - GtkWidget *username_entry; GtkWidget *password_entry; GtkWidget *password_entry_secondary; - GtkWidget *domain_entry; + GtkWidget *show_passwords_checkbox; GtkWidget *table_alignment; GtkWidget *table; + GtkSizeGroup *group; GtkWidget *remember_session_button; GtkWidget *remember_forever_button; - GtkWidget *radio_vbox; - GtkWidget *connect_with_no_userpass_button; - GtkWidget *connect_with_userpass_button; - - gboolean anon_support_on; - char *secondary_password_label; -}; - -/* Caption table rows indices */ -static const guint CAPTION_TABLE_USERNAME_ROW = 0; -static const guint CAPTION_TABLE_PASSWORD_ROW = 1; - -/* GnomeTwoPasswordDialogClass methods */ -static void gnome_two_password_dialog_class_init (GnomeTwoPasswordDialogClass *password_dialog_class); -static void gnome_two_password_dialog_init (GnomeTwoPasswordDialog *password_dialog); - -/* GObjectClass methods */ -static void gnome_two_password_dialog_finalize (GObject *object); +} VpnPasswordDialogPrivate; +/* VpnPasswordDialogClass methods */ +static void vpn_password_dialog_class_init (VpnPasswordDialogClass *password_dialog_class); +static void vpn_password_dialog_init (VpnPasswordDialog *password_dialog); /* GtkDialog callbacks */ -static void dialog_show_callback (GtkWidget *widget, - gpointer callback_data); -static void dialog_close_callback (GtkWidget *widget, - gpointer callback_data); - -static gpointer parent_class; - -GType -gnome_two_password_dialog_get_type (void) -{ - static GType type = 0; - - if (!type) { - static const GTypeInfo info = { - sizeof (GnomeTwoPasswordDialogClass), - NULL, NULL, - (GClassInitFunc) gnome_two_password_dialog_class_init, - NULL, NULL, - sizeof (GnomeTwoPasswordDialog), 0, - (GInstanceInitFunc) gnome_two_password_dialog_init, - NULL - }; - - type = g_type_register_static (gtk_dialog_get_type(), - "GnomeTwoPasswordDialog", - &info, 0); - - parent_class = g_type_class_ref (gtk_dialog_get_type()); - } - - return type; -} - +static void dialog_show_callback (GtkWidget *widget, gpointer callback_data); +static void dialog_close_callback (GtkWidget *widget, gpointer callback_data); static void -gnome_two_password_dialog_class_init (GnomeTwoPasswordDialogClass * klass) +finalize (GObject *object) { - G_OBJECT_CLASS (klass)->finalize = gnome_two_password_dialog_finalize; + VpnPasswordDialogPrivate *priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (object); + + g_object_unref (priv->password_entry); + g_object_unref (priv->password_entry_secondary); + g_object_unref (priv->group); + + g_free (priv->remember_label_text); + g_free (priv->secondary_password_label); + + G_OBJECT_CLASS (vpn_password_dialog_parent_class)->finalize (object); } static void -gnome_two_password_dialog_init (GnomeTwoPasswordDialog *password_dialog) +vpn_password_dialog_class_init (VpnPasswordDialogClass *klass) { - password_dialog->details = g_new0 (GnomeTwoPasswordDialogDetails, 1); - password_dialog->details->show_username = TRUE; - password_dialog->details->show_password = TRUE; - password_dialog->details->show_password_secondary = TRUE; - password_dialog->details->anon_support_on = FALSE; + GObjectClass *object_class = G_OBJECT_CLASS (klass); - password_dialog->details->secondary_password_label = g_strdup ( _("_Secondary Password:") ); + g_type_class_add_private (object_class, sizeof (VpnPasswordDialogPrivate)); + + object_class->finalize = finalize; } -/* GObjectClass methods */ static void -gnome_two_password_dialog_finalize (GObject *object) +vpn_password_dialog_init (VpnPasswordDialog *dialog) { - GnomeTwoPasswordDialog *password_dialog; - - password_dialog = GNOME_TWO_PASSWORD_DIALOG (object); + VpnPasswordDialogPrivate *priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog); - g_object_unref (password_dialog->details->username_entry); - g_object_unref (password_dialog->details->domain_entry); - g_object_unref (password_dialog->details->password_entry); - g_object_unref (password_dialog->details->password_entry_secondary); - - g_free (password_dialog->details->remember_label_text); - g_free (password_dialog->details->secondary_password_label); - g_free (password_dialog->details); - - if (G_OBJECT_CLASS (parent_class)->finalize != NULL) - (* G_OBJECT_CLASS (parent_class)->finalize) (object); + priv->show_password = TRUE; + priv->show_password_secondary = TRUE; + priv->secondary_password_label = g_strdup ( _("_Secondary Password:") ); } /* GtkDialog callbacks */ static void dialog_show_callback (GtkWidget *widget, gpointer callback_data) { - GnomeTwoPasswordDialog *password_dialog; - - password_dialog = GNOME_TWO_PASSWORD_DIALOG (callback_data); + VpnPasswordDialog *dialog = VPN_PASSWORD_DIALOG (callback_data); + VpnPasswordDialogPrivate *priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog); - if (GTK_WIDGET_VISIBLE (password_dialog->details->username_entry) && - !password_dialog->details->readonly_username) { - gtk_widget_grab_focus (password_dialog->details->username_entry); - } else if (GTK_WIDGET_VISIBLE (password_dialog->details->domain_entry) && - !password_dialog->details->readonly_domain) { - gtk_widget_grab_focus (password_dialog->details->domain_entry); - } else if (GTK_WIDGET_VISIBLE (password_dialog->details->password_entry)) { - gtk_widget_grab_focus (password_dialog->details->password_entry); - } else if (GTK_WIDGET_VISIBLE (password_dialog->details->password_entry_secondary)) { - gtk_widget_grab_focus (password_dialog->details->password_entry_secondary); - } + if (GTK_WIDGET_VISIBLE (priv->password_entry)) + gtk_widget_grab_focus (priv->password_entry); + else if (GTK_WIDGET_VISIBLE (priv->password_entry_secondary)) + gtk_widget_grab_focus (priv->password_entry_secondary); } static void @@ -194,23 +123,6 @@ } static void -userpass_radio_button_clicked (GtkWidget *widget, gpointer callback_data) -{ - GnomeTwoPasswordDialog *password_dialog; - - password_dialog = GNOME_TWO_PASSWORD_DIALOG (callback_data); - - if (widget == password_dialog->details->connect_with_no_userpass_button) { - gtk_widget_set_sensitive ( - password_dialog->details->table, FALSE); - } - else { /* the other button */ - gtk_widget_set_sensitive ( - password_dialog->details->table, TRUE); - } -} - -static void add_row (GtkWidget *table, int row, const char *label_text, GtkWidget *entry) { GtkWidget *label; @@ -218,10 +130,8 @@ label = gtk_label_new_with_mnemonic (label_text); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_table_attach_defaults (GTK_TABLE (table), label, - 0, 1, row, row + 1); - gtk_table_attach_defaults (GTK_TABLE (table), entry, - 1, 2, row, row + 1); + gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, row, row + 1); + gtk_table_attach_defaults (GTK_TABLE (table), entry, 1, 2, row, row + 1); gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry); } @@ -233,86 +143,49 @@ } static void -add_table_rows (GnomeTwoPasswordDialog *password_dialog) +add_table_rows (VpnPasswordDialog *dialog) { + VpnPasswordDialogPrivate *priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog); int row; - GtkWidget *table; - int offset; - - if (password_dialog->details->anon_support_on) { - offset = 12; - } - else { - offset = 0; - } + int offset = 0; - gtk_alignment_set_padding (GTK_ALIGNMENT (password_dialog->details->table_alignment), - 0, 0, offset, 0); + gtk_alignment_set_padding (GTK_ALIGNMENT (priv->table_alignment), 0, 0, offset, 0); - table = password_dialog->details->table; /* This will not kill the entries, since they are ref:ed */ - gtk_container_foreach (GTK_CONTAINER (table), - (GtkCallback)remove_child, table); + gtk_container_foreach (GTK_CONTAINER (priv->table), (GtkCallback) remove_child, priv->table); row = 0; - if (password_dialog->details->show_username) - add_row (table, row++, _("_Username:"), password_dialog->details->username_entry); - if (password_dialog->details->show_domain) - add_row (table, row++, _("_Domain:"), password_dialog->details->domain_entry); - if (password_dialog->details->show_password) - add_row (table, row++, _("_Password:"), password_dialog->details->password_entry); - if (password_dialog->details->show_password_secondary) - add_row (table, row++, password_dialog->details->secondary_password_label, - password_dialog->details->password_entry_secondary); + if (priv->show_password) + add_row (priv->table, row++, _("_Password:"), priv->password_entry); + if (priv->show_password_secondary) + add_row (priv->table, row++, priv->secondary_password_label, priv->password_entry_secondary); - gtk_widget_show_all (table); -} - -static void -username_entry_activate (GtkWidget *widget, GtkWidget *dialog) -{ - GnomeTwoPasswordDialog *password_dialog; + gtk_table_attach_defaults (GTK_TABLE (priv->table), priv->show_passwords_checkbox, 1, 2, row, row + 1); - password_dialog = GNOME_TWO_PASSWORD_DIALOG (dialog); - - if (GTK_WIDGET_VISIBLE (password_dialog->details->domain_entry) && - GTK_WIDGET_SENSITIVE (password_dialog->details->domain_entry)) - gtk_widget_grab_focus (password_dialog->details->domain_entry); - else if (GTK_WIDGET_VISIBLE (password_dialog->details->password_entry) && - GTK_WIDGET_SENSITIVE (password_dialog->details->password_entry)) - gtk_widget_grab_focus (password_dialog->details->password_entry); - else if (GTK_WIDGET_VISIBLE (password_dialog->details->password_entry_secondary) && - GTK_WIDGET_SENSITIVE (password_dialog->details->password_entry_secondary)) - gtk_widget_grab_focus (password_dialog->details->password_entry_secondary); + gtk_widget_show_all (priv->table); } static void -domain_entry_activate (GtkWidget *widget, GtkWidget *dialog) +show_passwords_toggled_cb (GtkWidget *widget, gpointer user_data) { - GnomeTwoPasswordDialog *password_dialog; + VpnPasswordDialog *dialog = VPN_PASSWORD_DIALOG (user_data); + VpnPasswordDialogPrivate *priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog); + gboolean visible; - password_dialog = GNOME_TWO_PASSWORD_DIALOG (dialog); - - if (GTK_WIDGET_VISIBLE (password_dialog->details->password_entry) && - GTK_WIDGET_SENSITIVE (password_dialog->details->password_entry)) - gtk_widget_grab_focus (password_dialog->details->password_entry); - else if (GTK_WIDGET_VISIBLE (password_dialog->details->password_entry_secondary) && - GTK_WIDGET_SENSITIVE (password_dialog->details->password_entry_secondary)) - gtk_widget_grab_focus (password_dialog->details->password_entry_secondary); -} + visible = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)); + gtk_entry_set_visibility (GTK_ENTRY (priv->password_entry), visible); + gtk_entry_set_visibility (GTK_ENTRY (priv->password_entry_secondary), visible); +} -/* Public GnomeTwoPasswordDialog methods */ +/* Public VpnPasswordDialog methods */ GtkWidget * -gnome_two_password_dialog_new (const char *dialog_title, - const char *message, - const char *username, - const char *password, - gboolean readonly_username) +vpn_password_dialog_new (const char *title, + const char *message, + const char *password) { - GnomeTwoPasswordDialog *password_dialog; - GtkDialog *dialog; - GtkWidget *table; + GtkWidget *dialog; + VpnPasswordDialogPrivate *priv; GtkLabel *message_label; GtkWidget *hbox; GtkWidget *vbox; @@ -320,110 +193,83 @@ GtkWidget *dialog_icon; GSList *group; - password_dialog = GNOME_TWO_PASSWORD_DIALOG (gtk_widget_new (gnome_two_password_dialog_get_type (), NULL)); - dialog = GTK_DIALOG (password_dialog); + dialog = gtk_widget_new (VPN_TYPE_PASSWORD_DIALOG, NULL); + if (!dialog) + return NULL; + priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog); - gtk_window_set_title (GTK_WINDOW (password_dialog), dialog_title); + gtk_window_set_title (GTK_WINDOW (dialog), title); gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); - gtk_dialog_add_buttons (dialog, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_OK, - NULL); - gtk_dialog_set_default_response (GTK_DIALOG (password_dialog), GTK_RESPONSE_OK); + gtk_dialog_add_buttons (GTK_DIALOG (dialog), + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OK, GTK_RESPONSE_OK, + NULL); + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); /* Setup the dialog */ - gtk_dialog_set_has_separator (dialog, FALSE); - gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); - gtk_box_set_spacing (GTK_BOX (dialog->vbox), 2); /* 2 * 5 + 2 = 12 */ - gtk_container_set_border_width (GTK_CONTAINER (dialog->action_area), 5); - gtk_box_set_spacing (GTK_BOX (dialog->action_area), 6); - - gtk_window_set_position (GTK_WINDOW (password_dialog), GTK_WIN_POS_CENTER); - gtk_window_set_modal (GTK_WINDOW (password_dialog), TRUE); - - g_signal_connect (password_dialog, "show", - G_CALLBACK (dialog_show_callback), password_dialog); - g_signal_connect (password_dialog, "close", - G_CALLBACK (dialog_close_callback), password_dialog); - - /* the radio buttons for anonymous login */ - password_dialog->details->connect_with_no_userpass_button = - gtk_radio_button_new_with_mnemonic (NULL, _("Connect _anonymously")); - group = gtk_radio_button_get_group ( - GTK_RADIO_BUTTON (password_dialog->details->connect_with_no_userpass_button)); - password_dialog->details->connect_with_userpass_button = - gtk_radio_button_new_with_mnemonic ( - group, _("Connect as _user:")); - - if (username != NULL && *username != 0) { - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->connect_with_userpass_button), TRUE); - } else { - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->connect_with_no_userpass_button), TRUE); - } - - password_dialog->details->radio_vbox = gtk_vbox_new (FALSE, 6); - gtk_box_pack_start (GTK_BOX (password_dialog->details->radio_vbox), - password_dialog->details->connect_with_no_userpass_button, - FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (password_dialog->details->radio_vbox), - password_dialog->details->connect_with_userpass_button, - FALSE, FALSE, 0); - g_signal_connect (password_dialog->details->connect_with_no_userpass_button, "clicked", - G_CALLBACK (userpass_radio_button_clicked), password_dialog); - g_signal_connect (password_dialog->details->connect_with_userpass_button, "clicked", - G_CALLBACK (userpass_radio_button_clicked), password_dialog); + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); + gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); + gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 2); /* 2 * 5 + 2 = 12 */ + gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 5); + gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->action_area), 6); + + gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER); + gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); + + g_signal_connect (dialog, "show", + G_CALLBACK (dialog_show_callback), + dialog); + g_signal_connect (dialog, "close", + G_CALLBACK (dialog_close_callback), + dialog); /* The table that holds the captions */ - password_dialog->details->table_alignment = gtk_alignment_new (0.0, 0.0, 0.0, 0.0); + priv->table_alignment = gtk_alignment_new (0.0, 0.0, 0.0, 0.0); + + priv->group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); - password_dialog->details->table = table = gtk_table_new (3, 2, FALSE); - gtk_table_set_col_spacings (GTK_TABLE (table), 12); - gtk_table_set_row_spacings (GTK_TABLE (table), 6); - gtk_container_add (GTK_CONTAINER (password_dialog->details->table_alignment), table); - - password_dialog->details->username_entry = gtk_entry_new (); - password_dialog->details->domain_entry = gtk_entry_new (); - password_dialog->details->password_entry = gtk_entry_new (); - password_dialog->details->password_entry_secondary = gtk_entry_new (); + priv->table = gtk_table_new (4, 2, FALSE); + gtk_table_set_col_spacings (GTK_TABLE (priv->table), 12); + gtk_table_set_row_spacings (GTK_TABLE (priv->table), 6); + gtk_container_add (GTK_CONTAINER (priv->table_alignment), priv->table); + + priv->password_entry = gtk_entry_new (); + priv->password_entry_secondary = gtk_entry_new (); + + priv->show_passwords_checkbox = gtk_check_button_new_with_mnemonic (_("Sh_ow passwords")); /* We want to hold on to these during the table rearrangement */ #if GLIB_CHECK_VERSION (2, 10, 0) - g_object_ref_sink (password_dialog->details->username_entry); - g_object_ref_sink (password_dialog->details->domain_entry); - g_object_ref_sink (password_dialog->details->password_entry); - g_object_ref_sink (password_dialog->details->password_entry_secondary); + g_object_ref_sink (priv->password_entry); + g_object_ref_sink (priv->password_entry_secondary); + g_object_ref_sink (priv->show_passwords_checkbox); #else - g_object_ref (password_dialog->details->username_entry); - gtk_object_sink (GTK_OBJECT (password_dialog->details->username_entry)); - g_object_ref (password_dialog->details->domain_entry); - gtk_object_sink (GTK_OBJECT (password_dialog->details->domain_entry)); - g_object_ref (password_dialog->details->password_entry); - gtk_object_sink (GTK_OBJECT (password_dialog->details->password_entry)); - g_object_ref (password_dialog->details->password_entry_secondary); - gtk_object_sink (GTK_OBJECT (password_dialog->details->password_entry_secondary)); + g_object_ref (priv->password_entry); + gtk_object_sink (GTK_OBJECT (priv->password_entry)); + + g_object_ref (priv->password_entry_secondary); + gtk_object_sink (GTK_OBJECT (priv->password_entry_secondary)); + + g_object_ref (priv->show_passwords_checkbox); + gtk_object_sink (GTK_OBJECT (priv->show_passwords_checkbox)); #endif - gtk_entry_set_visibility (GTK_ENTRY (password_dialog->details->password_entry), FALSE); - gtk_entry_set_visibility (GTK_ENTRY (password_dialog->details->password_entry_secondary), FALSE); + gtk_entry_set_visibility (GTK_ENTRY (priv->password_entry), FALSE); + gtk_entry_set_visibility (GTK_ENTRY (priv->password_entry_secondary), FALSE); + + g_signal_connect_swapped (priv->password_entry, "activate", + G_CALLBACK (gtk_window_activate_default), + dialog); + g_signal_connect_swapped (priv->password_entry_secondary, "activate", + G_CALLBACK (gtk_window_activate_default), + dialog); + + g_signal_connect (priv->show_passwords_checkbox, "toggled", + G_CALLBACK (show_passwords_toggled_cb), + dialog); - g_signal_connect (password_dialog->details->username_entry, - "activate", - G_CALLBACK (username_entry_activate), - password_dialog); - g_signal_connect (password_dialog->details->domain_entry, - "activate", - G_CALLBACK (domain_entry_activate), - password_dialog); - g_signal_connect_swapped (password_dialog->details->password_entry, - "activate", - G_CALLBACK (gtk_window_activate_default), - password_dialog); - g_signal_connect_swapped (password_dialog->details->password_entry_secondary, - "activate", - G_CALLBACK (gtk_window_activate_default), - password_dialog); - add_table_rows (password_dialog); + add_table_rows (VPN_PASSWORD_DIALOG (dialog)); /* Adds some eye-candy to the dialog */ hbox = gtk_hbox_new (FALSE, 12); @@ -439,326 +285,224 @@ message_label = GTK_LABEL (gtk_label_new (message)); gtk_label_set_justify (message_label, GTK_JUSTIFY_LEFT); gtk_label_set_line_wrap (message_label, TRUE); - - gtk_box_pack_start (GTK_BOX (main_vbox), GTK_WIDGET (message_label), - FALSE, FALSE, 0); + gtk_size_group_add_widget (priv->group, GTK_WIDGET (message_label)); + gtk_box_pack_start (GTK_BOX (main_vbox), GTK_WIDGET (message_label), FALSE, FALSE, 0); + gtk_size_group_add_widget (priv->group, priv->table_alignment); } vbox = gtk_vbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (main_vbox), vbox, FALSE, FALSE, 0); - - gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->radio_vbox, - FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->table_alignment, - FALSE, FALSE, 0); - + gtk_box_pack_start (GTK_BOX (vbox), priv->table_alignment, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), main_vbox, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, FALSE, FALSE, 0); + gtk_widget_show_all (GTK_DIALOG (dialog)->vbox); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (password_dialog)->vbox), - hbox, - TRUE, /* expand */ - TRUE, /* fill */ - 0); /* padding */ - - gtk_widget_show_all (GTK_DIALOG (password_dialog)->vbox); + priv->remember_session_button = gtk_check_button_new_with_mnemonic (_("_Remember passwords for this session")); + priv->remember_forever_button = gtk_check_button_new_with_mnemonic (_("_Save passwords in keyring")); - password_dialog->details->remember_session_button = - gtk_check_button_new_with_mnemonic (_("_Remember passwords for this session")); - password_dialog->details->remember_forever_button = - gtk_check_button_new_with_mnemonic (_("_Save passwords in keyring")); - - gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_session_button, - FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_forever_button, - FALSE, FALSE, 0); - - gnome_two_password_dialog_set_username (password_dialog, username); - gnome_two_password_dialog_set_password (password_dialog, password); - gnome_two_password_dialog_set_readonly_domain (password_dialog, readonly_username); + gtk_box_pack_start (GTK_BOX (vbox), priv->remember_session_button, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox), priv->remember_forever_button, FALSE, FALSE, 0); + + vpn_password_dialog_set_password (VPN_PASSWORD_DIALOG (dialog), password); - return GTK_WIDGET (password_dialog); + return GTK_WIDGET (dialog); } gboolean -gnome_two_password_dialog_run_and_block (GnomeTwoPasswordDialog *password_dialog) +vpn_password_dialog_run_and_block (VpnPasswordDialog *dialog) { gint button_clicked; - g_return_val_if_fail (password_dialog != NULL, FALSE); - g_return_val_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog), FALSE); + g_return_val_if_fail (dialog != NULL, FALSE); + g_return_val_if_fail (VPN_IS_PASSWORD_DIALOG (dialog), FALSE); - button_clicked = gtk_dialog_run (GTK_DIALOG (password_dialog)); - gtk_widget_hide (GTK_WIDGET (password_dialog)); + button_clicked = gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_hide (GTK_WIDGET (dialog)); return button_clicked == GTK_RESPONSE_OK; } void -gnome_two_password_dialog_set_username (GnomeTwoPasswordDialog *password_dialog, - const char *username) +vpn_password_dialog_set_password (VpnPasswordDialog *dialog, + const char *password) { - g_return_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog)); - g_return_if_fail (password_dialog->details->username_entry != NULL); + VpnPasswordDialogPrivate *priv; - gtk_entry_set_text (GTK_ENTRY (password_dialog->details->username_entry), - username?username:""); -} + g_return_if_fail (VPN_IS_PASSWORD_DIALOG (dialog)); -void -gnome_two_password_dialog_set_password (GnomeTwoPasswordDialog *password_dialog, - const char *password) -{ - g_return_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog)); - - gtk_entry_set_text (GTK_ENTRY (password_dialog->details->password_entry), - password ? password : ""); + priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog); + gtk_entry_set_text (GTK_ENTRY (priv->password_entry), password ? password : ""); } void -gnome_two_password_dialog_set_password_secondary (GnomeTwoPasswordDialog *password_dialog, - const char *password_secondary) +vpn_password_dialog_set_password_secondary (VpnPasswordDialog *dialog, + const char *password_secondary) { - g_return_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog)); - - gtk_entry_set_text (GTK_ENTRY (password_dialog->details->password_entry_secondary), - password_secondary ? password_secondary : ""); -} + VpnPasswordDialogPrivate *priv; -void -gnome_two_password_dialog_set_domain (GnomeTwoPasswordDialog *password_dialog, - const char *domain) -{ - g_return_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog)); - g_return_if_fail (password_dialog->details->domain_entry != NULL); + g_return_if_fail (VPN_IS_PASSWORD_DIALOG (dialog)); - gtk_entry_set_text (GTK_ENTRY (password_dialog->details->domain_entry), - domain ? domain : ""); + priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog); + gtk_entry_set_text (GTK_ENTRY (priv->password_entry_secondary), + password_secondary ? password_secondary : ""); } - void -gnome_two_password_dialog_set_show_username (GnomeTwoPasswordDialog *password_dialog, - gboolean show) +vpn_password_dialog_set_show_password (VpnPasswordDialog *dialog, gboolean show) { - g_return_if_fail (password_dialog != NULL); - g_return_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog)); + VpnPasswordDialogPrivate *priv; - show = !!show; - if (password_dialog->details->show_username != show) { - password_dialog->details->show_username = show; - add_table_rows (password_dialog); - } -} + g_return_if_fail (dialog != NULL); + g_return_if_fail (VPN_IS_PASSWORD_DIALOG (dialog)); -void -gnome_two_password_dialog_set_show_domain (GnomeTwoPasswordDialog *password_dialog, - gboolean show) -{ - g_return_if_fail (password_dialog != NULL); - g_return_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog)); + priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog); show = !!show; - if (password_dialog->details->show_domain != show) { - password_dialog->details->show_domain = show; - add_table_rows (password_dialog); + if (priv->show_password != show) { + priv->show_password = show; + add_table_rows (dialog); } } void -gnome_two_password_dialog_set_show_password (GnomeTwoPasswordDialog *password_dialog, - gboolean show) +vpn_password_dialog_set_show_password_secondary (VpnPasswordDialog *dialog, + gboolean show) { - g_return_if_fail (password_dialog != NULL); - g_return_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog)); + VpnPasswordDialogPrivate *priv; - show = !!show; - if (password_dialog->details->show_password != show) { - password_dialog->details->show_password = show; - add_table_rows (password_dialog); - } -} + g_return_if_fail (dialog != NULL); + g_return_if_fail (VPN_IS_PASSWORD_DIALOG (dialog)); -void -gnome_two_password_dialog_set_show_password_secondary (GnomeTwoPasswordDialog *password_dialog, - gboolean show) -{ - g_return_if_fail (password_dialog != NULL); - g_return_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog)); + priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog); show = !!show; - if (password_dialog->details->show_password_secondary != show) { - password_dialog->details->show_password_secondary = show; - add_table_rows (password_dialog); + if (priv->show_password_secondary != show) { + priv->show_password_secondary = show; + add_table_rows (dialog); } } void -gnome_two_password_dialog_focus_password (GnomeTwoPasswordDialog *password_dialog) +vpn_password_dialog_focus_password (VpnPasswordDialog *dialog) { - g_return_if_fail (password_dialog != NULL); - g_return_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog)); - - if (password_dialog->details->show_password) - gtk_widget_grab_focus (password_dialog->details->password_entry); -} + VpnPasswordDialogPrivate *priv; -void -gnome_two_password_dialog_focus_password_secondary (GnomeTwoPasswordDialog *password_dialog) -{ - g_return_if_fail (password_dialog != NULL); - g_return_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog)); + g_return_if_fail (dialog != NULL); + g_return_if_fail (VPN_IS_PASSWORD_DIALOG (dialog)); - if (password_dialog->details->show_password_secondary) - gtk_widget_grab_focus (password_dialog->details->password_entry_secondary); + priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog); + if (priv->show_password) + gtk_widget_grab_focus (priv->password_entry); } void -gnome_two_password_dialog_set_readonly_username (GnomeTwoPasswordDialog *password_dialog, - gboolean readonly) +vpn_password_dialog_focus_password_secondary (VpnPasswordDialog *dialog) { - g_return_if_fail (password_dialog != NULL); - g_return_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog)); + VpnPasswordDialogPrivate *priv; - password_dialog->details->readonly_username = readonly; + g_return_if_fail (dialog != NULL); + g_return_if_fail (VPN_IS_PASSWORD_DIALOG (dialog)); - gtk_widget_set_sensitive (password_dialog->details->username_entry, - !readonly); + priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog); + if (priv->show_password_secondary) + gtk_widget_grab_focus (priv->password_entry_secondary); } -void -gnome_two_password_dialog_set_readonly_domain (GnomeTwoPasswordDialog *password_dialog, - gboolean readonly) +const char * +vpn_password_dialog_get_password (VpnPasswordDialog *dialog) { - g_return_if_fail (password_dialog != NULL); - g_return_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog)); + VpnPasswordDialogPrivate *priv; - password_dialog->details->readonly_domain = readonly; + g_return_val_if_fail (VPN_IS_PASSWORD_DIALOG (dialog), NULL); - gtk_widget_set_sensitive (password_dialog->details->domain_entry, - !readonly); + priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog); + return gtk_entry_get_text (GTK_ENTRY (priv->password_entry)); } -char * -gnome_two_password_dialog_get_username (GnomeTwoPasswordDialog *password_dialog) +const char * +vpn_password_dialog_get_password_secondary (VpnPasswordDialog *dialog) { - g_return_val_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog), NULL); + VpnPasswordDialogPrivate *priv; - return g_strdup (gtk_entry_get_text (GTK_ENTRY (password_dialog->details->username_entry))); -} + g_return_val_if_fail (VPN_IS_PASSWORD_DIALOG (dialog), NULL); -char * -gnome_two_password_dialog_get_domain (GnomeTwoPasswordDialog *password_dialog) -{ - g_return_val_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog), NULL); - - return g_strdup (gtk_entry_get_text (GTK_ENTRY (password_dialog->details->domain_entry))); -} - -char * -gnome_two_password_dialog_get_password (GnomeTwoPasswordDialog *password_dialog) -{ - g_return_val_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog), NULL); - - return gnome_keyring_memory_strdup (gtk_entry_get_text (GTK_ENTRY (password_dialog->details->password_entry))); -} - -char * -gnome_two_password_dialog_get_password_secondary (GnomeTwoPasswordDialog *password_dialog) -{ - g_return_val_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog), NULL); - - return gnome_keyring_memory_strdup (gtk_entry_get_text (GTK_ENTRY (password_dialog->details->password_entry_secondary))); + priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog); + return gtk_entry_get_text (GTK_ENTRY (priv->password_entry_secondary)); } void -gnome_two_password_dialog_set_show_userpass_buttons (GnomeTwoPasswordDialog *password_dialog, - gboolean show_userpass_buttons) +vpn_password_dialog_set_show_remember (VpnPasswordDialog *dialog, + gboolean show_remember) { - if (show_userpass_buttons) { - password_dialog->details->anon_support_on = TRUE; - gtk_widget_show (password_dialog->details->radio_vbox); - if (gtk_toggle_button_get_active ( - GTK_TOGGLE_BUTTON (password_dialog->details->connect_with_no_userpass_button))) { - gtk_widget_set_sensitive (password_dialog->details->table, FALSE); - } - else { - gtk_widget_set_sensitive (password_dialog->details->table, TRUE); - } - } else { - password_dialog->details->anon_support_on = FALSE; - gtk_widget_hide (password_dialog->details->radio_vbox); - gtk_widget_set_sensitive (password_dialog->details->table, TRUE); - } - - add_table_rows (password_dialog); -} + VpnPasswordDialogPrivate *priv; -gboolean -gnome_two_password_dialog_anon_selected (GnomeTwoPasswordDialog *password_dialog) -{ - return password_dialog->details->anon_support_on && - gtk_toggle_button_get_active ( - GTK_TOGGLE_BUTTON ( - password_dialog->details->connect_with_no_userpass_button)); -} + g_return_if_fail (VPN_IS_PASSWORD_DIALOG (dialog)); -void -gnome_two_password_dialog_set_show_remember (GnomeTwoPasswordDialog *password_dialog, - gboolean show_remember) -{ + priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog); if (show_remember) { - gtk_widget_show (password_dialog->details->remember_session_button); - gtk_widget_show (password_dialog->details->remember_forever_button); + gtk_widget_show (priv->remember_session_button); + gtk_widget_show (priv->remember_forever_button); } else { - gtk_widget_hide (password_dialog->details->remember_session_button); - gtk_widget_hide (password_dialog->details->remember_forever_button); + gtk_widget_hide (priv->remember_session_button); + gtk_widget_hide (priv->remember_forever_button); } } void -gnome_two_password_dialog_set_remember (GnomeTwoPasswordDialog *password_dialog, - GnomeTwoPasswordDialogRemember remember) +vpn_password_dialog_set_remember (VpnPasswordDialog *dialog, + VpnPasswordRemember remember) { - gboolean session, forever; + VpnPasswordDialogPrivate *priv; + gboolean session = FALSE, forever = FALSE; + + g_return_if_fail (VPN_IS_PASSWORD_DIALOG (dialog)); - session = FALSE; - forever = FALSE; - if (remember == GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION) { + priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog); + + if (remember == VPN_PASSWORD_REMEMBER_SESSION) session = TRUE; - } else if (remember == GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER){ + else if (remember == VPN_PASSWORD_REMEMBER_FOREVER) forever = TRUE; - } - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_session_button), - session); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_forever_button), - forever); + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->remember_session_button), session); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->remember_forever_button), forever); } -GnomeTwoPasswordDialogRemember -gnome_two_password_dialog_get_remember (GnomeTwoPasswordDialog *password_dialog) +VpnPasswordRemember +vpn_password_dialog_get_remember (VpnPasswordDialog *dialog) { + VpnPasswordDialogPrivate *priv; gboolean session, forever; - session = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_session_button)); - forever = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_forever_button)); - if (forever) { - return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER; - } else if (session) { - return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION; - } - return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING; + g_return_val_if_fail (dialog != NULL, VPN_PASSWORD_REMEMBER_NOTHING); + g_return_val_if_fail (VPN_IS_PASSWORD_DIALOG (dialog), VPN_PASSWORD_REMEMBER_NOTHING); + + priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog); + + session = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->remember_session_button)); + forever = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->remember_forever_button)); + if (forever) + return VPN_PASSWORD_REMEMBER_FOREVER; + else if (session) + return VPN_PASSWORD_REMEMBER_SESSION; + + return VPN_PASSWORD_REMEMBER_NOTHING; } -void gnome_two_password_dialog_set_password_secondary_label (GnomeTwoPasswordDialog *password_dialog, - const char *password_secondary_label) +void vpn_password_dialog_set_password_secondary_label (VpnPasswordDialog *dialog, + const char *label) { - g_return_if_fail (password_dialog != NULL); - g_return_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog)); + VpnPasswordDialogPrivate *priv; - g_free (password_dialog->details->secondary_password_label); - password_dialog->details->secondary_password_label = g_strdup (password_secondary_label); + g_return_if_fail (dialog != NULL); + g_return_if_fail (VPN_IS_PASSWORD_DIALOG (dialog)); - if (password_dialog->details->show_password_secondary) { - add_table_rows (password_dialog); - } + priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog); + + g_free (priv->secondary_password_label); + priv->secondary_password_label = g_strdup (label); + + if (priv->show_password_secondary) + add_table_rows (dialog); } + diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/auth-dialog/gnome-two-password-dialog.h /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/auth-dialog/gnome-two-password-dialog.h --- network-manager-vpnc-0.7/auth-dialog/gnome-two-password-dialog.h 2008-11-28 17:31:07.000000000 +0000 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/auth-dialog/gnome-two-password-dialog.h 2009-04-09 00:48:29.000000000 +0100 @@ -17,102 +17,77 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. - You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + 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. Authors: Ramiro Estrugo */ -#ifndef GNOME_TWO_PASSWORD_DIALOG_H -#define GNOME_TWO_PASSWORD_DIALOG_H +#ifndef VPN_PASSWORD_DIALOG_H +#define VPN_PASSWORD_DIALOG_H -#include +#include G_BEGIN_DECLS -#define GNOME_TYPE_TWO_PASSWORD_DIALOG (gnome_two_password_dialog_get_type ()) -#define GNOME_TWO_PASSWORD_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_TWO_PASSWORD_DIALOG, GnomeTwoPasswordDialog)) -#define GNOME_TWO_PASSWORD_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_TWO_PASSWORD_DIALOG, GnomeTwoPasswordDialogClass)) -#define GNOME_IS_TWO_PASSWORD_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_TWO_PASSWORD_DIALOG)) -#define GNOME_IS_TWO_PASSWORD_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_TWO_PASSWORD_DIALOG)) - -typedef struct GnomeTwoPasswordDialog GnomeTwoPasswordDialog; -typedef struct GnomeTwoPasswordDialogClass GnomeTwoPasswordDialogClass; -typedef struct GnomeTwoPasswordDialogDetails GnomeTwoPasswordDialogDetails; - -struct GnomeTwoPasswordDialog -{ - GtkDialog gtk_dialog; +#define VPN_TYPE_PASSWORD_DIALOG (vpn_password_dialog_get_type ()) +#define VPN_PASSWORD_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VPN_TYPE_PASSWORD_DIALOG, VpnPasswordDialog)) +#define VPN_PASSWORD_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), VPN_TYPE_PASSWORD_DIALOG, VpnPasswordDialogClass)) +#define VPN_IS_PASSWORD_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VPN_TYPE_PASSWORD_DIALOG)) +#define VPN_IS_PASSWORD_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VPN_TYPE_PASSWORD_DIALOG)) - GnomeTwoPasswordDialogDetails *details; +typedef struct VpnPasswordDialog VpnPasswordDialog; +typedef struct VpnPasswordDialogClass VpnPasswordDialogClass; + +struct VpnPasswordDialog { + GtkDialog parent; }; -struct GnomeTwoPasswordDialogClass -{ +struct VpnPasswordDialogClass { GtkDialogClass parent_class; }; typedef enum { - GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING, - GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION, - GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER -} GnomeTwoPasswordDialogRemember; + VPN_PASSWORD_REMEMBER_NOTHING, + VPN_PASSWORD_REMEMBER_SESSION, + VPN_PASSWORD_REMEMBER_FOREVER +} VpnPasswordRemember; -GType gnome_two_password_dialog_get_type (void); -GtkWidget* gnome_two_password_dialog_new (const char *dialog_title, - const char *message, - const char *username, - const char *password, - gboolean readonly_username); +GType vpn_password_dialog_get_type (void); +GtkWidget* vpn_password_dialog_new (const char *title, + const char *message, + const char *password); -gboolean gnome_two_password_dialog_run_and_block (GnomeTwoPasswordDialog *password_dialog); +gboolean vpn_password_dialog_run_and_block (VpnPasswordDialog *dialog); /* Attribute mutators */ -void gnome_two_password_dialog_set_show_username (GnomeTwoPasswordDialog *password_dialog, - gboolean show); -void gnome_two_password_dialog_set_show_domain (GnomeTwoPasswordDialog *password_dialog, - gboolean show); -void gnome_two_password_dialog_set_show_password (GnomeTwoPasswordDialog *password_dialog, - gboolean show); -void gnome_two_password_dialog_focus_password (GnomeTwoPasswordDialog *password_dialog); -void gnome_two_password_dialog_set_show_password_secondary (GnomeTwoPasswordDialog *password_dialog, - gboolean show); -void gnome_two_password_dialog_focus_password_secondary (GnomeTwoPasswordDialog *password_dialog); -void gnome_two_password_dialog_set_username (GnomeTwoPasswordDialog *password_dialog, - const char *username); -void gnome_two_password_dialog_set_domain (GnomeTwoPasswordDialog *password_dialog, - const char *domain); -void gnome_two_password_dialog_set_password (GnomeTwoPasswordDialog *password_dialog, - const char *password); -void gnome_two_password_dialog_set_password_secondary (GnomeTwoPasswordDialog *password_dialog, - const char *password_secondary); -void gnome_two_password_dialog_set_readonly_username (GnomeTwoPasswordDialog *password_dialog, - gboolean readonly); -void gnome_two_password_dialog_set_readonly_domain (GnomeTwoPasswordDialog *password_dialog, - gboolean readonly); - -void gnome_two_password_dialog_set_password_secondary_label (GnomeTwoPasswordDialog *password_dialog, - const char *password_secondary_description); - -void gnome_two_password_dialog_set_show_remember (GnomeTwoPasswordDialog *password_dialog, - gboolean show_remember); -void gnome_two_password_dialog_set_remember (GnomeTwoPasswordDialog *password_dialog, - GnomeTwoPasswordDialogRemember remember); -GnomeTwoPasswordDialogRemember gnome_two_password_dialog_get_remember (GnomeTwoPasswordDialog *password_dialog); -void gnome_two_password_dialog_set_show_userpass_buttons (GnomeTwoPasswordDialog *password_dialog, - gboolean show_userpass_buttons); +void vpn_password_dialog_set_show_password (VpnPasswordDialog *dialog, + gboolean show); +void vpn_password_dialog_focus_password (VpnPasswordDialog *dialog); +void vpn_password_dialog_set_password (VpnPasswordDialog *dialog, + const char *password); + +void vpn_password_dialog_set_show_password_secondary (VpnPasswordDialog *dialog, + gboolean show); +void vpn_password_dialog_focus_password_secondary (VpnPasswordDialog *dialog); +void vpn_password_dialog_set_password_secondary (VpnPasswordDialog *dialog, + const char *password_secondary); +void vpn_password_dialog_set_password_secondary_label (VpnPasswordDialog *dialog, + const char *label); + +void vpn_password_dialog_set_show_remember (VpnPasswordDialog *dialog, + gboolean show_remember); +void vpn_password_dialog_set_remember (VpnPasswordDialog *dialog, + VpnPasswordRemember remember); +VpnPasswordRemember vpn_password_dialog_get_remember (VpnPasswordDialog *dialog); /* Attribute accessors */ -char * gnome_two_password_dialog_get_username (GnomeTwoPasswordDialog *password_dialog); -char * gnome_two_password_dialog_get_domain (GnomeTwoPasswordDialog *password_dialog); -char * gnome_two_password_dialog_get_password (GnomeTwoPasswordDialog *password_dialog); -char * gnome_two_password_dialog_get_password_secondary (GnomeTwoPasswordDialog *password_dialog); +const char *vpn_password_dialog_get_password (VpnPasswordDialog *dialog); -gboolean gnome_two_password_dialog_anon_selected (GnomeTwoPasswordDialog *password_dialog); +const char *vpn_password_dialog_get_password_secondary (VpnPasswordDialog *dialog); G_END_DECLS -#endif /* GNOME_TWO_PASSWORD_DIALOG_H */ +#endif /* VPN_PASSWORD_DIALOG_H */ diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/auth-dialog/main.c /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/auth-dialog/main.c --- network-manager-vpnc-0.7/auth-dialog/main.c 2008-11-28 17:31:07.000000000 +0000 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/auth-dialog/main.c 2009-04-09 00:48:29.000000000 +0100 @@ -42,6 +42,64 @@ #define KEYRING_SN_TAG "setting-name" #define KEYRING_SK_TAG "setting-key" +static char * +find_connection_path (const char *vpn_uuid) +{ + char *key, *str, *connection_path = NULL; + GConfClient *gconf_client = NULL; + GSList *conf_list; + GSList *iter; + + /* FIXME: This whole thing sucks: we should not go around poking gconf + directly, but there's nothing that does it for us right now */ + + gconf_client = gconf_client_get_default (); + + conf_list = gconf_client_all_dirs (gconf_client, "/system/networking/connections", NULL); + if (!conf_list) + return NULL; + + for (iter = conf_list; iter; iter = iter->next) { + const char *path = (const char *) iter->data; + + key = g_strdup_printf ("%s/%s/%s", + path, + NM_SETTING_CONNECTION_SETTING_NAME, + NM_SETTING_CONNECTION_TYPE); + str = gconf_client_get_string (gconf_client, key, NULL); + g_free (key); + + if (!str || strcmp (str, "vpn")) { + g_free (str); + continue; + } + g_free (str); + + key = g_strdup_printf ("%s/%s/%s", + path, + NM_SETTING_CONNECTION_SETTING_NAME, + NM_SETTING_CONNECTION_UUID); + str = gconf_client_get_string (gconf_client, key, NULL); + g_free (key); + + if (!str || strcmp (str, vpn_uuid)) { + g_free (str); + continue; + } + g_free (str); + + /* Woo, found the connection */ + connection_path = g_strdup (path); + break; + } + + g_slist_foreach (conf_list, (GFunc) g_free, NULL); + g_slist_free (conf_list); + + g_object_unref (gconf_client); + return connection_path; +} + static gboolean get_secrets (const char *vpn_uuid, const char *vpn_name, @@ -51,7 +109,7 @@ char **gpw, const char *gpw_type) { - GnomeTwoPasswordDialog *dialog; + VpnPasswordDialog *dialog; gboolean is_session = TRUE; gboolean found_upw = FALSE; gboolean found_gpw = FALSE; @@ -65,19 +123,26 @@ g_return_val_if_fail (gpw != NULL, FALSE); g_return_val_if_fail (*gpw == NULL, FALSE); - /* Default to 'save' to keep same behavior as previous versions before - * password types were added. + /* If a password type wasn't present in the VPN connection details, then + * default to saving the password if it was found in the keyring. But if + * it wasn't found in the keyring, default to always asking for the password. */ - if (!upw_type) - upw_type = NM_VPNC_PW_TYPE_SAVE; - if (!gpw_type) - gpw_type = NM_VPNC_PW_TYPE_SAVE; - if (strcmp (upw_type, NM_VPNC_PW_TYPE_ASK)) - found_upw = keyring_helpers_get_one_secret (vpn_uuid, VPNC_USER_PASSWORD, upw, &is_session); + found_upw = keyring_helpers_get_one_secret (vpn_uuid, VPNC_USER_PASSWORD, upw, &is_session); + if (!upw_type) + upw_type = found_upw ? NM_VPNC_PW_TYPE_SAVE : NM_VPNC_PW_TYPE_ASK; + else if (!strcmp (upw_type, NM_VPNC_PW_TYPE_UNUSED)) { + gnome_keyring_memory_free (*upw); + *upw = NULL; + } - if (strcmp (gpw_type, NM_VPNC_PW_TYPE_ASK)) - found_gpw = keyring_helpers_get_one_secret (vpn_uuid, VPNC_GROUP_PASSWORD, gpw, &is_session); + found_gpw = keyring_helpers_get_one_secret (vpn_uuid, VPNC_GROUP_PASSWORD, gpw, &is_session); + if (!gpw_type) + gpw_type = found_gpw ? NM_VPNC_PW_TYPE_SAVE : NM_VPNC_PW_TYPE_ASK; + else if (!strcmp (gpw_type, NM_VPNC_PW_TYPE_UNUSED)) { + gnome_keyring_memory_free (*gpw); + *gpw = NULL; + } if (!retry) { gboolean need_upw = TRUE, need_gpw = TRUE; @@ -103,57 +168,66 @@ } prompt = g_strdup_printf (_("You need to authenticate to access the Virtual Private Network '%s'."), vpn_name); - dialog = GNOME_TWO_PASSWORD_DIALOG (gnome_two_password_dialog_new (_("Authenticate VPN"), prompt, NULL, NULL, FALSE)); + dialog = VPN_PASSWORD_DIALOG (vpn_password_dialog_new (_("Authenticate VPN"), prompt, NULL)); g_free (prompt); - gnome_two_password_dialog_set_show_username (dialog, FALSE); - gnome_two_password_dialog_set_show_userpass_buttons (dialog, FALSE); - gnome_two_password_dialog_set_show_domain (dialog, FALSE); - gnome_two_password_dialog_set_show_remember (dialog, FALSE); - gnome_two_password_dialog_set_password_secondary_label (dialog, _("_Group Password:")); + vpn_password_dialog_set_show_remember (dialog, FALSE); + vpn_password_dialog_set_password_secondary_label (dialog, _("_Group Password:")); if (!strcmp (upw_type, NM_VPNC_PW_TYPE_UNUSED)) - gnome_two_password_dialog_set_show_password (dialog, FALSE); + vpn_password_dialog_set_show_password (dialog, FALSE); else if (!retry && found_upw && strcmp (upw_type, NM_VPNC_PW_TYPE_ASK)) - gnome_two_password_dialog_set_show_password (dialog, FALSE); + vpn_password_dialog_set_show_password (dialog, FALSE); if (!strcmp (gpw_type, NM_VPNC_PW_TYPE_UNUSED)) - gnome_two_password_dialog_set_show_password_secondary (dialog, FALSE); + vpn_password_dialog_set_show_password_secondary (dialog, FALSE); else if (!retry && found_gpw && strcmp (gpw_type, NM_VPNC_PW_TYPE_ASK)) - gnome_two_password_dialog_set_show_password_secondary (dialog, FALSE); + vpn_password_dialog_set_show_password_secondary (dialog, FALSE); /* On reprompt the first entry of type 'ask' gets the focus */ if (retry) { if (!strcmp (upw_type, NM_VPNC_PW_TYPE_ASK)) - gnome_two_password_dialog_focus_password (dialog); + vpn_password_dialog_focus_password (dialog); else if (!strcmp (gpw_type, NM_VPNC_PW_TYPE_ASK)) - gnome_two_password_dialog_focus_password_secondary (dialog); + vpn_password_dialog_focus_password_secondary (dialog); } /* if retrying, pre-fill dialog with the password */ if (*upw) { - gnome_two_password_dialog_set_password (dialog, *upw); + vpn_password_dialog_set_password (dialog, *upw); gnome_keyring_memory_free (*upw); *upw = NULL; } if (*gpw) { - gnome_two_password_dialog_set_password_secondary (dialog, *gpw); + vpn_password_dialog_set_password_secondary (dialog, *gpw); gnome_keyring_memory_free (*gpw); *gpw = NULL; } gtk_widget_show (GTK_WIDGET (dialog)); - success = gnome_two_password_dialog_run_and_block (dialog); + success = vpn_password_dialog_run_and_block (dialog); if (success) { - *upw = gnome_two_password_dialog_get_password (dialog); - *gpw = gnome_two_password_dialog_get_password_secondary (dialog); + *upw = gnome_keyring_memory_strdup (vpn_password_dialog_get_password (dialog)); + *gpw = gnome_keyring_memory_strdup (vpn_password_dialog_get_password_secondary (dialog)); - if (!strcmp (upw_type, NM_VPNC_PW_TYPE_SAVE)) - keyring_helpers_save_secret (vpn_uuid, vpn_name, NULL, VPNC_USER_PASSWORD, *upw); + if (!strcmp (upw_type, NM_VPNC_PW_TYPE_SAVE)) { + if (*upw) + keyring_helpers_save_secret (vpn_uuid, vpn_name, NULL, VPNC_USER_PASSWORD, *upw); + } else if ( !strcmp (upw_type, NM_VPNC_PW_TYPE_ASK) + || !strcmp (upw_type, NM_VPNC_PW_TYPE_UNUSED)) { + /* Clear the password from the keyring */ + keyring_helpers_delete_secret (vpn_uuid, VPNC_USER_PASSWORD); + } - if (!strcmp (gpw_type, NM_VPNC_PW_TYPE_SAVE)) - keyring_helpers_save_secret (vpn_uuid, vpn_name, NULL, VPNC_GROUP_PASSWORD, *gpw); + if (!strcmp (gpw_type, NM_VPNC_PW_TYPE_SAVE)) { + if (*gpw) + keyring_helpers_save_secret (vpn_uuid, vpn_name, NULL, VPNC_GROUP_PASSWORD, *gpw); + } else if ( !strcmp (gpw_type, NM_VPNC_PW_TYPE_ASK) + || !strcmp (gpw_type, NM_VPNC_PW_TYPE_UNUSED)) { + /* Clear the password from the keyring */ + keyring_helpers_delete_secret (vpn_uuid, VPNC_GROUP_PASSWORD); + } } gtk_widget_hide (GTK_WIDGET (dialog)); @@ -163,67 +237,26 @@ } static gboolean -get_password_types (const char *vpn_uuid, - char **out_upw_type, - char **out_gpw_type) +get_connection_info (const char *vpn_uuid, + char **out_name, + char **out_upw_type, + char **out_gpw_type) { - GConfClient *gconf_client = NULL; - GSList *conf_list; - GSList *iter; - char *key; - char *str; + char *key, *str; char *connection_path = NULL; - gboolean success = FALSE; char *upw_type = NULL, *gpw_type = NULL; + GConfClient *gconf_client; - /* FIXME: This whole thing sucks: we should not go around poking gconf - directly, but there's nothing that does it for us right now */ + connection_path = find_connection_path (vpn_uuid); + if (!connection_path) + return FALSE; gconf_client = gconf_client_get_default (); - - conf_list = gconf_client_all_dirs (gconf_client, "/system/networking/connections", NULL); - if (!conf_list) - goto out; - - for (iter = conf_list; iter; iter = iter->next) { - const char *path = (const char *) iter->data; - - key = g_strdup_printf ("%s/%s/%s", - path, - NM_SETTING_CONNECTION_SETTING_NAME, - NM_SETTING_CONNECTION_TYPE); - str = gconf_client_get_string (gconf_client, key, NULL); - g_free (key); - - if (!str || strcmp (str, "vpn")) { - g_free (str); - continue; - } - g_free (str); - - key = g_strdup_printf ("%s/%s/%s", - path, - NM_SETTING_CONNECTION_SETTING_NAME, - NM_SETTING_CONNECTION_UUID); - str = gconf_client_get_string (gconf_client, key, NULL); - g_free (key); - - if (!str || strcmp (str, vpn_uuid)) { - g_free (str); - continue; - } - g_free (str); - - /* Woo, found the connection */ - connection_path = g_strdup (path); - break; - } - - g_slist_foreach (conf_list, (GFunc) g_free, NULL); - g_slist_free (conf_list); - - if (!connection_path) - goto out; + key = g_strdup_printf ("%s/%s/%s", connection_path, + NM_SETTING_CONNECTION_SETTING_NAME, + NM_SETTING_CONNECTION_ID); + *out_name = gconf_client_get_string (gconf_client, key, NULL); + g_free (key); key = g_strdup_printf ("%s/%s/%s", connection_path, NM_SETTING_VPN_SETTING_NAME, @@ -238,20 +271,16 @@ g_free (key); g_free (connection_path); - success = TRUE; - -out: g_object_unref (gconf_client); - return success; + return TRUE; } int main (int argc, char *argv[]) { gboolean retry = FALSE; - gchar *vpn_name = NULL; - gchar *vpn_uuid = NULL; - gchar *vpn_service = NULL; + char *vpn_name = NULL, *vpn_uuid = NULL, *vpn_service = NULL; + char *ignored; char *password = NULL, *group_password = NULL; char *upw_type = NULL, *gpw_type = NULL; char buf[1]; @@ -261,7 +290,7 @@ GOptionEntry entries[] = { { "reprompt", 'r', 0, G_OPTION_ARG_NONE, &retry, "Reprompt for passwords", NULL}, { "uuid", 'u', 0, G_OPTION_ARG_STRING, &vpn_uuid, "UUID of VPN connection", NULL}, - { "name", 'n', 0, G_OPTION_ARG_STRING, &vpn_name, "Name of VPN connection", NULL}, + { "name", 'n', 0, G_OPTION_ARG_STRING, &ignored, "Name of VPN connection", NULL}, { "service", 's', 0, G_OPTION_ARG_STRING, &vpn_service, "VPN service type", NULL}, { NULL } }; @@ -282,8 +311,8 @@ g_option_context_free (context); - if (vpn_uuid == NULL || vpn_name == NULL || vpn_service == NULL) { - fprintf (stderr, "Have to supply UUID, name, and service\n"); + if (vpn_uuid == NULL || vpn_service == NULL) { + fprintf (stderr, "A connection UUID and VPN plugin service name are required.\n"); return 1; } @@ -292,10 +321,11 @@ return 1; } - if (!get_password_types (vpn_uuid, &upw_type, &gpw_type)) { + if (!get_connection_info (vpn_uuid, &vpn_name, &upw_type, &gpw_type)) { g_free (upw_type); g_free (gpw_type); - fprintf (stderr, "This VPN connection '%s' (%s) could not be found in GConf.", vpn_name, vpn_uuid); + fprintf (stderr, "This VPN connection '%s' (%s) could not be found in GConf.", + vpn_name ? vpn_name : "(unknown)", vpn_uuid); return 1; } diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/ChangeLog /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/ChangeLog --- network-manager-vpnc-0.7/ChangeLog 2008-11-28 17:31:07.000000000 +0000 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/ChangeLog 2009-04-09 00:48:29.000000000 +0100 @@ -1,3 +1,76 @@ +2009-03-04 Dan Williams + + * Tag 0.7.1-rc3 (0.7.0.99) + +2009-02-18 Dan Williams + + * Tag 0.7.1-rc1 + +2009-02-13 Dan Williams + + * nm-vpnc-service.conf + - Clean up dbus permissions; retain deny for compat with older dbus + +2009-02-05 Dan Williams + + * configure.in + - Add configure-time option for running test cases on 'make check' + + * properties/pcf-file.c + properties/pcf-file.h + - (pcf_file_lookup_string, pcf_file_lookup_bool, pcf_file_lookup_int): + add helper functions to look up specific value types + + * properties/nm-vpnc.c + - (import): use new value types helper functions; fix interpretation of + "EnableNat" and ensure default is Cisco NAT traversal; import + "DHGroup" + - (export): export "DHGroup" and "SaveUserPassword"; fix export of + static routes + + * properties/tests/* + nm-test-helpers.h + Makefile.am + - Add testcases for .pcf file import/export + +2009-02-05 Dan Williams + + * properties/nm-vpnc.c + - (import): handle "SaveUserPassword" and "EnableLocalLAN" + +2009-01-20 Przemysław Grzegorczyk + + * src/nm-vpnc-service.h: + * auth-dialog/gnome-two-password-dialog.c: + * auth-dialog/gnome-two-password-dialog.h: Cleared up gtk and glib includes + to use only toplevel headers. Bug #564376. + +2008-12-11 Dan Williams + + * Split into separate repository + +2008-12-05 Dan Williams + + * auth-dialog/gnome-two-password-dialog.c + auth-dialog/gnome-two-password-dialog.h + - Simplify to only what the VPN plugin actually needs + + * auth-dialog/main.c + - (find_connection_path): split out into separate function + - (get_secrets): be more intelligent about requesting password when + the password type cannot be found in the VPN details; use new VPN + password dialog stuff + - (get_connection_info): rename from get_password_types(); get + connection name too + - (main): don't require a connection name too; it's pointless + + * properties/nm-vpnc.c + - (init_one_pw_combo): if the password was found, but the password type + wasn't, default to saving the password in the keyring. Otherwise + if both the type and the password couldn't be found, default to + always asking for it. + - (init_plugin_ui): get VPN passwords before setting up the type combos + 2008-11-14 Dan Williams * src/nm-vpnc-service.c diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/configure.in /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/configure.in --- network-manager-vpnc-0.7/configure.in 2008-09-08 13:37:25.000000000 +0100 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/configure.in 2009-04-09 00:48:29.000000000 +0100 @@ -1,6 +1,6 @@ AC_PREREQ(2.52) -AC_INIT(NetworkManager-vpnc, 0.7.0, dcbw@redhat.com, NetworkManager-vpnc) +AC_INIT(NetworkManager-vpnc, 0.7.0.99, dcbw@redhat.com, NetworkManager-vpnc) AC_CONFIG_AUX_DIR(.) AM_INIT_AUTOMAKE([subdir-objects]) AM_MAINTAINER_MODE @@ -115,11 +115,27 @@ AC_MSG_RESULT(no) fi +dnl +dnl Tests +dnl +AC_ARG_WITH(tests, AC_HELP_STRING([--with-tests], [Build NetworkManager tests])) +AM_CONDITIONAL(WITH_TESTS, test "x$with_tests" = "xyes") +case $with_tests in + yes) + with_tests=yes + ;; + *) + with_tests=no + ;; +esac + AC_OUTPUT([ Makefile src/Makefile common-gnome/Makefile auth-dialog/Makefile properties/Makefile +properties/tests/Makefile +properties/tests/pcf/Makefile po/Makefile.in ]) diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/COPYING /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/COPYING --- network-manager-vpnc-0.7/COPYING 1970-01-01 01:00:00.000000000 +0100 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/COPYING 2009-04-09 00:48:29.000000000 +0100 @@ -0,0 +1,347 @@ +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. + + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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 + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. + diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/.cvsignore /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/.cvsignore --- network-manager-vpnc-0.7/.cvsignore 2008-05-27 21:50:05.000000000 +0100 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/.cvsignore 1970-01-01 01:00:00.000000000 +0100 @@ -1,32 +0,0 @@ -Makefile -Makefile.in -NetworkManager-vpnc*.tar.gz -aclocal.m4 -autom4te.cache -compile -configure -config.guess -config.h.in -config.h -config.log -config.status -config.sub -depcomp -install-sh -intltool-extract.in -intltool-extract -intltool-merge.in -intltool-merge -intltool-update.in -intltool-update -libtool -ltmain.sh -missing -mkinstalldirs -nm-vpnc.desktop -nm-vpnc-service -nm-vpnc-service-vpnc-helper -nm-vpnc-service.name -stamp-h1 -COPYING -INSTALL diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/debian/changelog /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/debian/changelog --- network-manager-vpnc-0.7/debian/changelog 2009-04-29 18:48:24.000000000 +0100 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/debian/changelog 2009-04-29 18:48:25.000000000 +0100 @@ -1,9 +1,40 @@ -network-manager-vpnc (0.7-0ubuntu1~nm1~hardy1) hardy; urgency=low +network-manager-vpnc (0.7.1~rc4.20090316+bzr21-0ubuntu2~hardy1) hardy; urgency=low + + * 0.7.1 respin for hardy + + -- Alexander Sack Wed, 29 Apr 2009 15:58:33 +0200 + +network-manager-vpnc (0.7.1~rc4.20090316+bzr21-0ubuntu2) jaunty; urgency=low + + * add missing build dependency (libglade2-dev) to fix build failures + - update control + + -- Alexander Sack Thu, 09 Apr 2009 02:04:17 +0200 + +network-manager-vpnc (0.7.1~rc4.20090316+bzr21-0ubuntu1) jaunty; urgency=low + + * New 0.7.1 pre snapshot Mar 16, 2009 aka bzr 21 from + http://bzr-playground.gnome.org/network-manager-vpnc/branches/NETWORKMANAGER_0_7/ + - add .bzr-builddeb/default.conf + + -- Alexander Sack Thu, 09 Apr 2009 01:46:17 +0200 + +network-manager-vpnc (0.7.1~20090213+bzr13-0ubuntu1) jaunty; urgency=low + + * New 0.7.1 pre snapshot Feb 13, 2009 aka bzr 13 from + http://bzr-playground.gnome.org/network-manager-vpnc/branches/NETWORKMANAGER_0_7/ + - add .bzr-builddeb/default.conf + * bump lower bound for network-manager build-depends to >= 0.7.1~ + - update control + + -- Alexander Sack Tue, 17 Feb 2009 11:01:09 +0100 + +network-manager-vpnc (0.7-0ubuntu1) jaunty; urgency=low * New upstream release 0.7 final - debian/control: adjust lower bound for nm -dev build-depends to >= 0.7~ - -- Alexander Sack Sat, 27 Dec 2008 06:28:24 +0100 + -- Alexander Sack Mon, 12 Jan 2009 13:37:20 +0100 network-manager-vpnc (0.7~~svn20081015t024626-0ubuntu1) intrepid; urgency=low diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/debian/control /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/debian/control --- network-manager-vpnc-0.7/debian/control 2009-04-29 18:48:24.000000000 +0100 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/debian/control 2009-04-29 18:48:25.000000000 +0100 @@ -4,14 +4,15 @@ Maintainer: Ubuntu MOTU Developers Build-Depends: cdbs, debhelper (>= 5), - network-manager-dev (>= 0.7~), - libnm-glib-dev (>= 0.7~), + network-manager-dev (>= 0.7.1~), + libnm-glib-dev (>= 0.7.1~), automake1.9, gnome-common, intltool, libgnomeui-dev, libdbus-glib-1-dev, - patchutils + patchutils, + libglade2-dev Standards-Version: 3.7.2 Package: network-manager-vpnc diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/debian/patches/nm-vpnc-service.name.patch /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/debian/patches/nm-vpnc-service.name.patch --- network-manager-vpnc-0.7/debian/patches/nm-vpnc-service.name.patch 1970-01-01 01:00:00.000000000 +0100 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/debian/patches/nm-vpnc-service.name.patch 2009-04-29 18:48:25.000000000 +0100 @@ -0,0 +1,9 @@ +--- network-manager-vpnc-0.7.orig/nm-vpnc-service.name.in ++++ network-manager-vpnc-0.7/nm-vpnc-service.name.in +@@ -4,5 +4,5 @@ + program=@LIBEXECDIR@/nm-vpnc-service + + [GNOME] +-auth-dialog=nm-vpnc-auth-dialog ++auth-dialog=@LIBEXECDIR@/nm-vpnc-auth-dialog + properties=libnm-vpnc-properties diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/MAINTAINERS /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/MAINTAINERS --- network-manager-vpnc-0.7/MAINTAINERS 1970-01-01 01:00:00.000000000 +0100 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/MAINTAINERS 2009-04-09 00:48:29.000000000 +0100 @@ -0,0 +1,4 @@ +Dan Williams +E-mail: dcbw redhat com +Userid: dcbw + diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/Makefile.am /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/Makefile.am --- network-manager-vpnc-0.7/Makefile.am 2008-09-08 13:37:25.000000000 +0100 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/Makefile.am 2009-04-09 00:48:29.000000000 +0100 @@ -31,7 +31,8 @@ $(icon_DATA) \ intltool-extract.in \ intltool-merge.in \ - intltool-update.in + intltool-update.in \ + nm-test-helpers.h CLEANFILES = $(nmvpnservice_DATA) $(desktop_DATA) *~ DISTCLEANFILES = intltool-extract intltool-merge intltool-update diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/nm-test-helpers.h /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/nm-test-helpers.h --- network-manager-vpnc-0.7/nm-test-helpers.h 1970-01-01 01:00:00.000000000 +0100 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/nm-test-helpers.h 2009-04-09 00:48:29.000000000 +0100 @@ -0,0 +1,51 @@ +/* NetworkManager -- Network link manager + * + * Dan Williams + * + * 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 2008 Red Hat, Inc. + */ + +#ifndef NM_TEST_HELPERS_H +#define NM_TEST_HELPERS_H + +#include +#include +#include + +static void +FAIL(const char *test_name, const char *fmt, ...) +{ + va_list args; + char buf[500]; + + snprintf (buf, 500, "FAIL: (%s) %s\n", test_name, fmt); + + va_start (args, fmt); + vfprintf (stderr, buf, args); + va_end (args); + _exit (1); +} + +#define ASSERT(x, test_name, fmt, ...) \ +{ \ + if (!(x)) { \ + FAIL (test_name, fmt, ## __VA_ARGS__); \ + } \ +} + +#endif /* NM_TEST_HELPERS_H */ + diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/nm-vpnc-service.conf /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/nm-vpnc-service.conf --- network-manager-vpnc-0.7/nm-vpnc-service.conf 2008-05-27 21:50:05.000000000 +0100 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/nm-vpnc-service.conf 2009-04-09 00:48:29.000000000 +0100 @@ -5,12 +5,10 @@ - - diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/nm-vpnc-service.name.in /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/nm-vpnc-service.name.in --- network-manager-vpnc-0.7/nm-vpnc-service.name.in 2009-04-29 18:48:24.000000000 +0100 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/nm-vpnc-service.name.in 2009-04-09 00:48:29.000000000 +0100 @@ -4,5 +4,5 @@ program=@LIBEXECDIR@/nm-vpnc-service [GNOME] -auth-dialog=@LIBEXECDIR@/nm-vpnc-auth-dialog +auth-dialog=nm-vpnc-auth-dialog properties=libnm-vpnc-properties diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/po/ca.po /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/ca.po --- network-manager-vpnc-0.7/po/ca.po 2008-05-27 21:56:42.000000000 +0100 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/ca.po 2009-04-09 00:48:29.000000000 +0100 @@ -3,61 +3,50 @@ # This file is distributed under the same license as the # NetworkManager-vpnc package. # Gil Forcada , 2006. +# David Planella , 2009 # msgid "" msgstr "" "Project-Id-Version: NetworkManager-vpnc\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-28 16:38+0100\n" -"PO-Revision-Date: 2008-02-28 16:39+0100\n" -"Last-Translator: Gil Forcada \n" +"POT-Creation-Date: 2009-01-26 21:13+0100\n" +"PO-Revision-Date: 2009-01-18 16:32+0100\n" +"Last-Translator: David Planella \n" "Language-Team: Catalan \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../auth-dialog/gnome-two-password-dialog.c:144 +#: ../auth-dialog/gnome-two-password-dialog.c:103 msgid "_Secondary Password:" msgstr "Contrasenya _secundària:" -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "Nom d'_usuari:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "_Domini:" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 +#: ../auth-dialog/gnome-two-password-dialog.c:159 msgid "_Password:" msgstr "_Contrasenya:" -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "Connecta _anònimament" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "Connecta com a _usuari:" +#: ../auth-dialog/gnome-two-password-dialog.c:240 +msgid "Sh_ow passwords" +msgstr "_Mostra les contrasenyes" -#: ../auth-dialog/gnome-two-password-dialog.c:465 +#: ../auth-dialog/gnome-two-password-dialog.c:300 msgid "_Remember passwords for this session" -msgstr "_Recorda la contrasenya per aquesta sessió" +msgstr "_Recorda les contrasenyes per aquesta sessió" -#: ../auth-dialog/gnome-two-password-dialog.c:467 +#: ../auth-dialog/gnome-two-password-dialog.c:301 msgid "_Save passwords in keyring" -msgstr "_Desa la contrasenya a l'anell de claus" +msgstr "_Desa les contrasenyes a l'anell de claus" -#: ../auth-dialog/main.c:172 +#: ../auth-dialog/main.c:170 #, c-format msgid "You need to authenticate to access the Virtual Private Network '%s'." msgstr "Us heu d'autenticar per poder accedir a la xarxa privada virtual «%s»." -#: ../auth-dialog/main.c:173 +#: ../auth-dialog/main.c:171 msgid "Authenticate VPN" msgstr "Autentica la VPN" -#: ../auth-dialog/main.c:180 +#: ../auth-dialog/main.c:175 msgid "_Group Password:" msgstr "Contrasenya de _grup:" @@ -69,68 +58,59 @@ msgid "VPN Connection Manager (vpnc)" msgstr "Gestor de connexions VPN (vpnc)" -#: ../properties/nm-vpnc.c:98 -msgid "Compatible Cisco VPN client (vpnc)" -msgstr "Client VPN compatible amb Cisco (vpnc)" - -#: ../properties/nm-vpnc.c:543 -msgid "The following vpnc VPN connection will be created:" -msgstr "Es crearà la següent connexió VPN de vpnc:" - -#: ../properties/nm-vpnc.c:545 -#, c-format -msgid "Name: %s" -msgstr "Nom: %s" - -#: ../properties/nm-vpnc.c:548 -#, c-format -msgid "Gateway: %s" -msgstr "Passarel·la: %s" - -#: ../properties/nm-vpnc.c:550 -#, c-format -msgid "Group Name: %s" -msgstr "Nom del grup: %s" - -#: ../properties/nm-vpnc.c:554 -#, c-format -msgid "Username: %s" -msgstr "Nom d'usuari: %s" +#: ../properties/nm-vpnc.c:53 +msgid "Cisco Compatible VPN (vpnc)" +msgstr "VPN compatible amb Cisco (vpnc)" -#: ../properties/nm-vpnc.c:559 -#, c-format -msgid "Domain: %s" -msgstr "Domini: %s" - -#: ../properties/nm-vpnc.c:564 -#, c-format -msgid "Routes: %s" -msgstr "Rutes: %s" - -#: ../properties/nm-vpnc.c:568 -#, c-format -msgid "NAT-Keepalive packet interval: %s" -msgstr "Interval del paquet NAT-Keepalive: %s" - -#: ../properties/nm-vpnc.c:572 -#, c-format -msgid "Enable Single DES" -msgstr "Habilita el DES únic" - -#: ../properties/nm-vpnc.c:576 -#, c-format -msgid "Disable NAT Traversal" -msgstr "Inhabilita el NAT transversal" +#: ../properties/nm-vpnc.c:54 +msgid "" +"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." -#: ../properties/nm-vpnc.c:580 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "Els detalls de la connexió es poden canviar amb el botó «Edita»." +#: ../properties/nm-vpnc.c:339 +msgid "Saved" +msgstr "Desat" + +#: ../properties/nm-vpnc.c:346 +msgid "Always Ask" +msgstr "Demana-ho sempre" + +#: ../properties/nm-vpnc.c:353 +msgid "Not Required" +msgstr "No necessària" + +#: ../properties/nm-vpnc.c:412 +msgid "Secure (default)" +msgstr "Segura (predeterminat)" + +#: ../properties/nm-vpnc.c:415 +msgid "Weak (use with caution)" +msgstr "Dèbil (utilitzeu amb compte)" + +#: ../properties/nm-vpnc.c:423 +msgid "None (completely insecure)" +msgstr "Cap (completament insegura)" + +#: ../properties/nm-vpnc.c:471 +msgid "Cisco UDP (default)" +msgstr "Cisco UDP (predeterminat)" + +#: ../properties/nm-vpnc.c:478 +msgid "NAT-T" +msgstr "NAT-T" + +#: ../properties/nm-vpnc.c:485 +msgid "Disabled" +msgstr "Inhabilitat" -#: ../properties/nm-vpnc.c:665 +#: ../properties/nm-vpnc.c:1104 msgid "TCP tunneling not supported" -msgstr "No està implementat els túnels TCP" +msgstr "No estan implementats els túnels TCP" -#: ../properties/nm-vpnc.c:667 +#: ../properties/nm-vpnc.c:1106 #, c-format msgid "" "The VPN settings file '%s' specifies that VPN traffic should be tunneled " @@ -146,134 +126,181 @@ "Tot i això es pot crear la connexió, amb el túnel a través de TCP " "inhabilitat, tanmateix segurament no funcionarà com s'espera." -#: ../properties/nm-vpnc.c:687 -msgid "Settings import incomplete" -msgstr "No s'han pogut importar els paràmetres" - -#: ../properties/nm-vpnc.c:689 -#, c-format -msgid "" -"The VPN settings file '%s' is incomplete. You may not be able to connect " -"without providing further information." -msgstr "" -"El fitxer de configuració de la VPN «%s» no és complet. No us podreu " -"connectar si no proporcioneu més informació." - -#: ../properties/nm-vpnc.c:709 -msgid "Cannot import settings" -msgstr "No es poden importar els paràmetres" - -#: ../properties/nm-vpnc.c:711 -#, c-format -msgid "The VPN settings file '%s' could not be read or is invalid." -msgstr "" -"No s'ha pogut llegir el fitxer de configuració de la VPN «%s» o no és vàlid." - -#: ../properties/nm-vpnc.c:726 -msgid "Select file to import" -msgstr "Seleccioneu el fitxer a importar" - -#: ../properties/nm-vpnc.c:908 -msgid "Save as..." -msgstr "Anomena i desa..." - -#: ../properties/nm-vpnc.c:937 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "Ja existeix un fitxer anomenat «%s»." - -#: ../properties/nm-vpnc.c:940 -msgid "Do you want to replace it with the one you are saving?" -msgstr "Voleu reemplaçar-lo amb el que voleu desar?" - -#: ../properties/nm-vpnc.c:954 -msgid "Failed to export configuration" -msgstr "No s'ha pogut exportar la configuració" - -#: ../properties/nm-vpnc.c:956 -#, c-format -msgid "Failed to save file %s" -msgstr "No s'ha pogut desar el fitxer %s" - #: ../properties/nm-vpnc-dialog.glade.h:1 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "exemple: 172.16.0.0/16 10.11.12.0/24" +msgid " " +msgstr " " #: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "Connection na_me:" -msgstr "No_m de la connexió:" +msgid "General" +msgstr "General" #: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "Disable NAT _traversal" -msgstr "Inhabilita el NAT _transversal" +msgid "Optional" +msgstr "Opcional" +# FIXME això queda molt macabre (dpm) #: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "Enable _weak single DES encryption" -msgstr "Habilita el xifratge DES únic _fluix" +msgid "Disable Dead Peer Detection" +msgstr "Inhabilita la detecció de l'homòleg mort" #: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "G_roup name:" -msgstr "Nom del g_rup:" +msgid "Domain:" +msgstr "Domini:" #: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "Import _Saved Configuration..." -msgstr "Importa la configuració _desada..." +msgid "Encryption method:" +msgstr "Mètode d'encriptació:" #: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "Interval:" -msgstr "Interval:" +msgid "G_roup name:" +msgstr "Nom del g_rup:" #: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "" -"Name used to identify the connection to the private network, e.g. \"Campus " -"VPN\" or \"Corporate Network\"" -msgstr "" -"Nom utilitzat per identificar la connexió a la xarxa privada, per exemple " -"«VPN del Campus» o «Xarxa Corporativa»" +msgid "Gro_up password:" +msgstr "Contrasenya del _grup:" #: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "Optional" -msgstr "Opcional" +msgid "NAT traversal:" +msgstr "Travessament del NAT:" #: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "Override _user name" -msgstr "Sobreescriu el nom d'_usuari" +msgid "Show passwords" +msgstr "Mostra les contrasenyes" #: ../properties/nm-vpnc-dialog.glade.h:11 -msgid "" -"Please enter the information provided by your system administrator below. Do " -"not enter your password here as you will be prompted when connecting." -msgstr "" -"Entreu la informació proporcionada pel vostre administrador de sistema. No " -"hi entreu la vostra contrasenya, ja es demanarà en connectar." +msgid "User name:" +msgstr "Nom d'usuari:" #: ../properties/nm-vpnc-dialog.glade.h:12 -msgid "" -"Please note that the file you import is not a Cisco VPN or VPNC " -"configuration file. Ask your adminstrator for the file." -msgstr "" -"Tingueu en compte que el fitxer que heu importat no és un fitxer de " -"configuració Cisco VPN o VPNC. Demaneu el fitxer al vostre administrador." +msgid "_Gateway:" +msgstr "_Passarel·la:" #: ../properties/nm-vpnc-dialog.glade.h:13 -msgid "Required" -msgstr "Necessària" +msgid "_User password:" +msgstr "_Contrasenya d'usuari:" -#: ../properties/nm-vpnc-dialog.glade.h:14 -msgid "Use NAT _keepalive packets" -msgstr "Utilitza els paquets NAT _keepalive" - -#: ../properties/nm-vpnc-dialog.glade.h:15 -msgid "Use _domain for authentication" -msgstr "Utilitzeu el _domini per l'autenticació" +#~ msgid "Connect _anonymously" +#~ msgstr "Connecta _anònimament" -#: ../properties/nm-vpnc-dialog.glade.h:16 -msgid "_Gateway:" -msgstr "_Passarel·la:" +#~ msgid "Connect as _user:" +#~ msgstr "Connecta com a _usuari:" + +#~ msgid "The following vpnc VPN connection will be created:" +#~ msgstr "Es crearà la següent connexió VPN de vpnc:" + +#~ msgid "Name: %s" +#~ msgstr "Nom: %s" + +#~ msgid "Gateway: %s" +#~ msgstr "Passarel·la: %s" + +#~ msgid "Group Name: %s" +#~ msgstr "Nom del grup: %s" + +#~ msgid "Username: %s" +#~ msgstr "Nom d'usuari: %s" + +#~ msgid "Domain: %s" +#~ msgstr "Domini: %s" + +#~ msgid "Routes: %s" +#~ msgstr "Rutes: %s" + +#~ msgid "NAT-Keepalive packet interval: %s" +#~ msgstr "Interval del paquet NAT-Keepalive: %s" + +#~ msgid "Enable Single DES" +#~ msgstr "Habilita el DES únic" + +#~ msgid "Disable NAT Traversal" +#~ msgstr "Inhabilita el NAT transversal" + +#~ msgid "The connection details can be changed using the \"Edit\" button." +#~ msgstr "Els detalls de la connexió es poden canviar amb el botó «Edita»." + +#~ msgid "Settings import incomplete" +#~ msgstr "No s'han pogut importar els paràmetres" + +#~ msgid "" +#~ "The VPN settings file '%s' is incomplete. You may not be able to connect " +#~ "without providing further information." +#~ msgstr "" +#~ "El fitxer de configuració de la VPN «%s» no és complet. No us podreu " +#~ "connectar si no proporcioneu més informació." + +#~ msgid "Cannot import settings" +#~ msgstr "No es poden importar els paràmetres" + +#~ msgid "The VPN settings file '%s' could not be read or is invalid." +#~ msgstr "" +#~ "No s'ha pogut llegir el fitxer de configuració de la VPN «%s» o no és " +#~ "vàlid." + +#~ msgid "Select file to import" +#~ msgstr "Seleccioneu el fitxer a importar" + +#~ msgid "Save as..." +#~ msgstr "Anomena i desa..." + +#~ msgid "A file named \"%s\" already exists." +#~ msgstr "Ja existeix un fitxer anomenat «%s»." + +#~ msgid "Do you want to replace it with the one you are saving?" +#~ msgstr "Voleu reemplaçar-lo amb el que voleu desar?" + +#~ msgid "Failed to export configuration" +#~ msgstr "No s'ha pogut exportar la configuració" + +#~ msgid "Failed to save file %s" +#~ msgstr "No s'ha pogut desar el fitxer %s" + +#~ msgid "example: 172.16.0.0/16 10.11.12.0/24" +#~ msgstr "exemple: 172.16.0.0/16 10.11.12.0/24" + +#~ msgid "Connection na_me:" +#~ msgstr "No_m de la connexió:" + +#~ msgid "Enable _weak single DES encryption" +#~ msgstr "Habilita el xifratge DES únic _fluix" + +#~ msgid "Import _Saved Configuration..." +#~ msgstr "Importa la configuració _desada..." + +#~ msgid "Interval:" +#~ msgstr "Interval:" + +#~ msgid "" +#~ "Name used to identify the connection to the private network, e.g. " +#~ "\"Campus VPN\" or \"Corporate Network\"" +#~ msgstr "" +#~ "Nom utilitzat per identificar la connexió a la xarxa privada, per exemple " +#~ "«VPN del Campus» o «Xarxa Corporativa»" + +#~ msgid "Override _user name" +#~ msgstr "Sobreescriu el nom d'_usuari" + +#~ msgid "" +#~ "Please enter the information provided by your system administrator below. " +#~ "Do not enter your password here as you will be prompted when connecting." +#~ msgstr "" +#~ "Entreu la informació proporcionada pel vostre administrador de sistema. " +#~ "No hi entreu la vostra contrasenya, ja es demanarà en connectar." + +#~ msgid "" +#~ "Please note that the file you import is not a Cisco VPN or VPNC " +#~ "configuration file. Ask your adminstrator for the file." +#~ msgstr "" +#~ "Tingueu en compte que el fitxer que heu importat no és un fitxer de " +#~ "configuració Cisco VPN o VPNC. Demaneu el fitxer al vostre administrador." + +#~ msgid "Use NAT _keepalive packets" +#~ msgstr "Utilitza els paquets NAT _keepalive" + +#~ msgid "Use _domain for authentication" +#~ msgstr "Utilitzeu el _domini per l'autenticació" -#: ../properties/nm-vpnc-dialog.glade.h:17 -msgid "_Only use VPN connection for these addresses" -msgstr "_Fes servir només la connexió VPN per aquestes adreces" +#~ msgid "_Only use VPN connection for these addresses" +#~ msgstr "_Fes servir només la connexió VPN per aquestes adreces" #~ msgid "Connection Information" #~ msgstr "Informació de la connexió" diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/po/ChangeLog /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/ChangeLog --- network-manager-vpnc-0.7/po/ChangeLog 2008-11-28 17:31:08.000000000 +0000 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/ChangeLog 2009-04-09 00:48:29.000000000 +0100 @@ -1,3 +1,81 @@ +2009-03-14 Duarte Loreto + + * pt.po: Updated Portuguese translation by Filipe Gomes + . + +2009-03-12 Andre Klapper + + * cs.po: Updated Czech translation by Zdeněk Hataš. + +2009-03-12 Gintautas Miliauskas + + * lt.po: Updated Lithuanian translation. + +2009-03-10 Claude Paroz + + * fr.po: Updated French translation. + +2009-03-08 Milo Casagrande + + * it.po: Updated Italian translation by Francesco Marletta. + +2009-03-06 Sandeep Shedmake + + * mr.po: Added Marathi Translations. + +2009-02-24 Kenneth Nielsen + + * da.po: Updated Danish translation by Mads Lundby + +2009-02-20 Nickolay V. Shmyrev + + * ru.po: Updated Russian translation by Artem Popov. + +2009-02-17 Tomasz Dominikowski + + * pl.po: Updated Polish translation + +2009-02-11 Priit Laes + + * et.po: Translation updated by Mattias Põldaru + +2009-01-26 Gil Forcada + + * ca.po: Updated Catalan translation by David Planella. + +2008-12-27 Jorge Gonzalez + + * es.po: Updated Spanish translation. + +2008-12-19 Daniel Nylander + + * sv.po: Updated Swedish translation. + +2008-12-16 Gabor Kelemen + + * hu.po: Translation updated. + +2008-12-14 Leonardo Ferreira Fontenelle + + * pt_BR.po: Updated Brazilian Portuguese translation. Contributed by + Henrique P. Machado (translation) and Vladimir Melo (revision). + +2008-12-07 Simos Xenitellis + + * el.po: Updated Greek translation by Evgenia Petoumenou. + +2008-12-06 Mario Blättermann + + * de.po: Updated German translation. + +2008-11-28 Mario Blättermann + + * de.po: Updated German translation. + +2008-11-27 Daniel Nylander + + * sv.po: Updated Swedish translation. + 2008-11-19 Tomasz Dominikowski * pl.po: Updated Polish translation diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/po/cs.po /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/cs.po --- network-manager-vpnc-0.7/po/cs.po 2008-09-29 13:14:15.000000000 +0100 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/cs.po 2009-04-09 00:48:29.000000000 +0100 @@ -3,62 +3,52 @@ # This file is distributed under the same license as the NetworkManager-vpnc package. # Jakub Friedl , 2006. # Jiří Eischmann , 2008. +# Zdeněk Hataš , 2009. # msgid "" msgstr "" "Project-Id-Version: NetworkManager-vpnc\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-17 22:22+0200\n" -"PO-Revision-Date: 2008-09-16 23:11+0100\n" -"Last-Translator: Jiří Eischmann \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=NetworkManager&component=VPN: vpnc\n" +"POT-Creation-Date: 2009-03-10 09:46+0000\n" +"PO-Revision-Date: 2009-03-08 10:27+0100\n" +"Last-Translator: Zdeněk Hataš \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: ../auth-dialog/gnome-two-password-dialog.c:145 +#: ../auth-dialog/gnome-two-password-dialog.c:103 msgid "_Secondary Password:" msgstr "Ověření _hesla:" -#: ../auth-dialog/gnome-two-password-dialog.c:259 -msgid "_Username:" -msgstr "_Uživ. jméno:" - -#: ../auth-dialog/gnome-two-password-dialog.c:261 -msgid "_Domain:" -msgstr "_Doména:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 +#: ../auth-dialog/gnome-two-password-dialog.c:159 msgid "_Password:" msgstr "_Heslo:" -#: ../auth-dialog/gnome-two-password-dialog.c:352 -msgid "Connect _anonymously" -msgstr "Připojit _anonymně" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect as _user:" -msgstr "Připojit jako _uživatel:" +#: ../auth-dialog/gnome-two-password-dialog.c:240 +msgid "Sh_ow passwords" +msgstr "Z_obrazit hesla" -#: ../auth-dialog/gnome-two-password-dialog.c:466 +#: ../auth-dialog/gnome-two-password-dialog.c:300 msgid "_Remember passwords for this session" msgstr "_Zapamatovat si hesla pro toto sezení" -#: ../auth-dialog/gnome-two-password-dialog.c:468 +#: ../auth-dialog/gnome-two-password-dialog.c:301 msgid "_Save passwords in keyring" msgstr "_Uložit hesla do svazku klíčů" -#: ../auth-dialog/main.c:66 +#: ../auth-dialog/main.c:170 #, c-format msgid "You need to authenticate to access the Virtual Private Network '%s'." msgstr "Pro přístup do VPN '%s' se musíte autentizovat." -#: ../auth-dialog/main.c:67 +#: ../auth-dialog/main.c:171 msgid "Authenticate VPN" msgstr "Ověřování VPN" -#: ../auth-dialog/main.c:74 +#: ../auth-dialog/main.c:175 msgid "_Group Password:" msgstr "Heslo _skupiny:" @@ -82,35 +72,47 @@ "Kompatibilní s různými VPN bránami založenými na IPSec od Cisco, Juniper, " "Netscreen a Sonicwall." -#: ../properties/nm-vpnc.c:282 +#: ../properties/nm-vpnc.c:339 +msgid "Saved" +msgstr "Uloženo" + +#: ../properties/nm-vpnc.c:346 +msgid "Always Ask" +msgstr "Vždy se ptát" + +#: ../properties/nm-vpnc.c:353 +msgid "Not Required" +msgstr "Není vyžadováno" + +#: ../properties/nm-vpnc.c:412 msgid "Secure (default)" msgstr "Zabezpečené (výchozí)" -#: ../properties/nm-vpnc.c:285 +#: ../properties/nm-vpnc.c:415 msgid "Weak (use with caution)" msgstr "Slabé (používejte obezřetně)" -#: ../properties/nm-vpnc.c:293 +#: ../properties/nm-vpnc.c:423 msgid "None (completely insecure)" msgstr "Žádné (kompletně nezabezpečené)" -#: ../properties/nm-vpnc.c:331 -msgid "NAT-T (default)" -msgstr "NAT-T (výchozí)" - -#: ../properties/nm-vpnc.c:338 -msgid "Cisco UDP" -msgstr "Cisco UDP" +#: ../properties/nm-vpnc.c:471 +msgid "Cisco UDP (default)" +msgstr "Cisco UDP (výchozí)" + +#: ../properties/nm-vpnc.c:478 +msgid "NAT-T" +msgstr "NAT-T" -#: ../properties/nm-vpnc.c:345 +#: ../properties/nm-vpnc.c:485 msgid "Disabled" msgstr "Zakázáno" -#: ../properties/nm-vpnc.c:809 +#: ../properties/nm-vpnc.c:1116 msgid "TCP tunneling not supported" msgstr "TCP tunelování není podporováno" -#: ../properties/nm-vpnc.c:811 +#: ../properties/nm-vpnc.c:1118 #, c-format msgid "" "The VPN settings file '%s' specifies that VPN traffic should be tunneled " @@ -139,7 +141,7 @@ #: ../properties/nm-vpnc-dialog.glade.h:4 msgid "Disable Dead Peer Detection" -msgstr "Zakázaná Dead Peer Detection" +msgstr "Zakázat Dead Peer Detection" #: ../properties/nm-vpnc-dialog.glade.h:5 msgid "Domain:" @@ -176,3 +178,18 @@ #: ../properties/nm-vpnc-dialog.glade.h:13 msgid "_User password:" msgstr "_Uživ. heslo:" + +#~ msgid "_Username:" +#~ msgstr "_Uživ. jméno:" + +#~ msgid "_Domain:" +#~ msgstr "_Doména:" + +#~ msgid "Connect _anonymously" +#~ msgstr "Připojit _anonymně" + +#~ msgid "Connect as _user:" +#~ msgstr "Připojit jako _uživatel:" + +#~ msgid "NAT-T (default)" +#~ msgstr "NAT-T (výchozí)" diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/po/da.po /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/da.po --- network-manager-vpnc-0.7/po/da.po 2008-05-27 21:50:05.000000000 +0100 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/da.po 2009-04-09 00:48:29.000000000 +0100 @@ -1,68 +1,56 @@ # Danish translation of NetworkManager-vpnc -# Copyright (C) 2005-2007 +# Copyright (C) 2005-2009 # This file is distributed under the same license as the NetworkManager-vpnc package. # David Zeuthen , 2005. # Lasse Bang Mikkelsen , 2006, 07. +# Mads Bille Lundby \n" +"POT-Creation-Date: 2009-02-24 23:54+0100\n" +"PO-Revision-Date: 2009-02-24 17:35+0100\n" +"Last-Translator: Mads Lundby \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../auth-dialog/gnome-two-password-dialog.c:144 +#: ../auth-dialog/gnome-two-password-dialog.c:103 msgid "_Secondary Password:" msgstr "_Sekundær adgangskode:" -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "_Brugernavn:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "_Domæne:" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 +#: ../auth-dialog/gnome-two-password-dialog.c:159 msgid "_Password:" msgstr "_Adgangskode:" -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "Tilslut _anonymt" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "Tilslut som _bruger:" +#: ../auth-dialog/gnome-two-password-dialog.c:240 +msgid "Sh_ow passwords" +msgstr "_Vis adgangskoder" -#: ../auth-dialog/gnome-two-password-dialog.c:465 +#: ../auth-dialog/gnome-two-password-dialog.c:300 msgid "_Remember passwords for this session" msgstr "_Husk adgangskoder for denne session" -#: ../auth-dialog/gnome-two-password-dialog.c:467 +#: ../auth-dialog/gnome-two-password-dialog.c:301 msgid "_Save passwords in keyring" msgstr "_Gem adgangskoder i nøglering" -#: ../auth-dialog/main.c:161 +#: ../auth-dialog/main.c:170 #, c-format msgid "You need to authenticate to access the Virtual Private Network '%s'." msgstr "" -"Brugerverifikation er påkrævet for at tilslutte til det virtuelle private " -"netværk '%s'." +"Du skal opnå godkendelse for at tilgå det virtuelle private netværk \"%s\"." -#: ../auth-dialog/main.c:162 +#: ../auth-dialog/main.c:171 msgid "Authenticate VPN" -msgstr "VPN-brugerverifikation" +msgstr "VPN-godkendelse" -#: ../auth-dialog/main.c:169 +#: ../auth-dialog/main.c:175 msgid "_Group Password:" -msgstr "_Gruppe-adgangskode:" +msgstr "_Gruppeadgangskode:" #: ../nm-vpnc.desktop.in.h:1 msgid "Add, Remove, and Edit VPN Connections" @@ -71,55 +59,61 @@ # #: ../nm-vpnc.desktop.in.h:2 msgid "VPN Connection Manager (vpnc)" -msgstr "VPN-forbindelser (vpnc)" - -#: ../properties/nm-vpnc.c:84 -msgid "Compatible Cisco VPN client (vpnc)" -msgstr "Kompatibel Cisco VPN-klient (vpnc)" - -#: ../properties/nm-vpnc.c:448 -msgid "The following vpnc VPN connection will be created:" -msgstr "Følgende vpnc VPN-forbindelse vil blive oprettet:" - -#: ../properties/nm-vpnc.c:450 -#, c-format -msgid "Name: %s" -msgstr "Navn: %s" - -#: ../properties/nm-vpnc.c:453 -#, c-format -msgid "Gateway: %s" -msgstr "Ad_gangspunkt: %s" - -#: ../properties/nm-vpnc.c:455 -#, c-format -msgid "Group Name: %s" -msgstr "Gruppenavn: %s" +msgstr "Håndtering af VPN-forbindelser (vpnc)" -#: ../properties/nm-vpnc.c:459 -#, c-format -msgid "Username: %s" -msgstr "Brugernavn: %s" - -#: ../properties/nm-vpnc.c:464 -#, c-format -msgid "Domain: %s" -msgstr "Domæne: %s" +#: ../properties/nm-vpnc.c:53 +msgid "Cisco Compatible VPN (vpnc)" +msgstr "Cisco-kompatibelt VPN (vpnc)" -#: ../properties/nm-vpnc.c:469 -#, c-format -msgid "Routes: %s" -msgstr "Ruter: %s" +#: ../properties/nm-vpnc.c:54 +msgid "" +"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based " +"VPN gateways." +msgstr "" +"Kompatibel med forskellige Cisco, Juniper, Netscreen, og Sonicwall IPSec-" +"baserede VPN-adgangspunkter." -#: ../properties/nm-vpnc.c:473 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "Forbindelsens detaljer kan ændres ved at bruge knappen \"Redigér\"." +#: ../properties/nm-vpnc.c:339 +msgid "Saved" +msgstr "Gemt" + +#: ../properties/nm-vpnc.c:346 +msgid "Always Ask" +msgstr "Spørg altid" + +#: ../properties/nm-vpnc.c:353 +msgid "Not Required" +msgstr "Ikke påkrævet" + +#: ../properties/nm-vpnc.c:412 +msgid "Secure (default)" +msgstr "Sikker (standard)" + +#: ../properties/nm-vpnc.c:415 +msgid "Weak (use with caution)" +msgstr "Svag (anvend med forsigtighed)" + +#: ../properties/nm-vpnc.c:423 +msgid "None (completely insecure)" +msgstr "Ingen (fuldstændig usikker)" + +#: ../properties/nm-vpnc.c:471 +msgid "Cisco UDP (default)" +msgstr "Cisco-UDP (standard)" + +#: ../properties/nm-vpnc.c:478 +msgid "NAT-T" +msgstr "NAT-T" + +#: ../properties/nm-vpnc.c:485 +msgid "Disabled" +msgstr "Deaktiveret" -#: ../properties/nm-vpnc.c:542 +#: ../properties/nm-vpnc.c:1116 msgid "TCP tunneling not supported" msgstr "TCP-tunnel er ikke understøttet" -#: ../properties/nm-vpnc.c:544 +#: ../properties/nm-vpnc.c:1118 #, c-format msgid "" "The VPN settings file '%s' specifies that VPN traffic should be tunneled " @@ -128,149 +122,187 @@ "The connection can still be created, with TCP tunneling disabled, however it " "may not work as expected." msgstr "" -"VPN-opsætningsfilen '%s' angiver at VPN-trafikken skal sendes igennem en TCP-" -"tunnel, som i øjeblikket ikke er understøttet i vpnc-programmet.\n" +"VPN-opsætningsfilen \"%s\" angiver, at VPN-trafikken skal sendes gennem en " +"TCP-tunnel, som i øjeblikket ikke er understøttet i vpnc-programmet.\n" "\n" "Forbindelsen kan stadig oprettes uden TCP-tunnel, men vil muligvis ikke " "fungere som forventet." -#: ../properties/nm-vpnc.c:565 -msgid "Cannot import settings" -msgstr "Kan ikke importere opsætning" - -#: ../properties/nm-vpnc.c:567 -#, c-format -msgid "The VPN settings file '%s' does not contain valid data." -msgstr "VPN-opsætningsfilen '%s' indeholder ikke gyldige data." - -#: ../properties/nm-vpnc.c:584 -msgid "Select file to import" -msgstr "Vælg fil der skal importeres" - -#. printf ("in impl_export\n"); -#: ../properties/nm-vpnc.c:744 -msgid "Save as..." -msgstr "Gem som..." - -#: ../properties/nm-vpnc.c:774 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "En fil med navnet \"%s\" eksisterer allerede." - -#: ../properties/nm-vpnc.c:777 -msgid "Do you want to replace it with the one you are saving?" -msgstr "Vil du erstatte den med den du gemmer?" - -#: ../properties/nm-vpnc.c:791 -msgid "Failed to export configuration" -msgstr "Kunne ikke eksportere konfiguration" - -#: ../properties/nm-vpnc.c:793 -#, c-format -msgid "Failed to save file %s" -msgstr "Kunne ikke gemme fil %s" - #: ../properties/nm-vpnc-dialog.glade.h:1 -msgid "Connection Information" -msgstr "Information om forbindelse" +msgid " " +msgstr " " #: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "Connection Name" -msgstr "Navn på forbindelse" +msgid "General" +msgstr "Generelt" #: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "Required" -msgstr "Påkrævet" +msgid "Optional" +msgstr "Valgfri" #: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "eksempel: 172.16.0.0/16 10.11.12.0/24" +msgid "Disable Dead Peer Detection" +msgstr "Deaktivér genkendelse af døde ligemænd (peers)" #: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "Connection Name" -msgstr "Navn på forbindelse" +msgid "Domain:" +msgstr "Domæne:" #: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "G_roup Name:" -msgstr "G_ruppenavn:" +msgid "Encryption method:" +msgstr "Krypteringsmetode:" #: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "" -"Name used to identify the connection to the private network, e.g. \"Campus " -"VPN\" or \"Corporate Network\"" -msgstr "" -"Navn brugt til at identificere forbindelsen til det private netværk, f.eks. " -"\"Universitets VPN\" eller \"Virksomhedens netværk\"" +msgid "G_roup name:" +msgstr "G_ruppenavn:" #: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "Optional" -msgstr "Valgfri" +msgid "Gro_up password:" +msgstr "Gr_uppeadgangskode:" #: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "Override _user name" -msgstr "Overskriv br_ugernavn" +msgid "NAT traversal:" +msgstr "NAT-krydsning:" #: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "" -"Please enter the information provided by your system administrator below. Do " -"not enter your password here as you will be prompted when connecting." -msgstr "" -"Indtast oplysninger fra din systemadministrator nedenfor. Du skal ikke " -"indtaste din adgangskode her, da du bliver spurgt om den ved tilslutning." +msgid "Show passwords" +msgstr "Vis adgangskoder" #: ../properties/nm-vpnc-dialog.glade.h:11 -msgid "" -"Please note that the file you import is not a Cisco VPN or VPNC " -"configuration file. Ask your adminstrator for the file." -msgstr "" -"Bemærk venligst at filen du importerer ikke er en Cisco VPN eller VPNC " -"konfigurationsfil. Spørg din administrator efter filen." +msgid "User name:" +msgstr "Brugernavn:" #: ../properties/nm-vpnc-dialog.glade.h:12 -msgid "Use _domain for authentication" -msgstr "Brug _domæne til brugerverifikation" - -#: ../properties/nm-vpnc-dialog.glade.h:13 msgid "_Gateway:" msgstr "Ad_gangspunkt:" -#: ../properties/nm-vpnc-dialog.glade.h:14 -msgid "_Import Saved Configuration..." -msgstr "_Importér gemt konfiguration..." - -#: ../properties/nm-vpnc-dialog.glade.h:15 -msgid "_Only use VPN connection for these addresses" -msgstr "_Brug kun VPN-forbindelse til flg. adresser" +#: ../properties/nm-vpnc-dialog.glade.h:13 +msgid "_User password:" +msgstr "Br_ugeradgangskode:" + +#~ msgid "Connect _anonymously" +#~ msgstr "Tilslut _anonymt" -#: ../src/nm-vpnc-service.c:119 -msgid "" -"The VPN login failed because the user name and password were not accepted." -msgstr "VPN-tjenesten fejlede fordi brugernavn og adgangskode blev afvist." +#~ msgid "Connect as _user:" +#~ msgstr "Tilslut som _bruger:" -#: ../src/nm-vpnc-service.c:121 -msgid "The VPN login failed because the VPN program could not be started." -msgstr "VPN-tjenesten fejlede fordi VPN-programmet ikke kunne startes." +#~ msgid "The following vpnc VPN connection will be created:" +#~ msgstr "Følgende vpnc VPN-forbindelse vil blive oprettet:" -#: ../src/nm-vpnc-service.c:123 -msgid "" -"The VPN login failed because the VPN program could not connect to the VPN " -"server." -msgstr "" -"VPN-tjenesten fejlede fordi VPN-programmet ikke kunne forbinde til VPN-" -"serveren." +#~ msgid "Name: %s" +#~ msgstr "Navn: %s" -#: ../src/nm-vpnc-service.c:125 -msgid "" -"The VPN login failed because the VPN configuration options were invalid." -msgstr "VPN-tjenesten fejlede fordi VPN-konfigurationen var ugyldig." +#~ msgid "Gateway: %s" +#~ msgstr "Ad_gangspunkt: %s" -#: ../src/nm-vpnc-service.c:127 -msgid "" -"The VPN login failed because the VPN program received an invalid " -"configuration from the VPN server." -msgstr "" -"VPN-tjenesten fejlede fordi VPN-programmet modtog en ugyldig konfiguration " -"fra VPN-serveren." +#~ msgid "Group Name: %s" +#~ msgstr "Gruppenavn: %s" + +#~ msgid "Username: %s" +#~ msgstr "Brugernavn: %s" + +#~ msgid "Domain: %s" +#~ msgstr "Domæne: %s" + +#~ msgid "Routes: %s" +#~ msgstr "Ruter: %s" + +#~ msgid "The connection details can be changed using the \"Edit\" button." +#~ msgstr "Forbindelsens detaljer kan ændres ved at bruge knappen \"Redigér\"." + +#~ msgid "Cannot import settings" +#~ msgstr "Kan ikke importere opsætning" + +#~ msgid "The VPN settings file '%s' does not contain valid data." +#~ msgstr "VPN-opsætningsfilen '%s' indeholder ikke gyldige data." + +#~ msgid "Select file to import" +#~ msgstr "Vælg fil der skal importeres" + +#~ msgid "Save as..." +#~ msgstr "Gem som..." + +#~ msgid "A file named \"%s\" already exists." +#~ msgstr "En fil med navnet \"%s\" eksisterer allerede." + +#~ msgid "Do you want to replace it with the one you are saving?" +#~ msgstr "Vil du erstatte den med den du gemmer?" + +#~ msgid "Failed to export configuration" +#~ msgstr "Kunne ikke eksportere konfiguration" + +#~ msgid "Failed to save file %s" +#~ msgstr "Kunne ikke gemme fil %s" + +#~ msgid "Connection Information" +#~ msgstr "Information om forbindelse" + +#~ msgid "Connection Name" +#~ msgstr "Navn på forbindelse" + +#~ msgid "example: 172.16.0.0/16 10.11.12.0/24" +#~ msgstr "eksempel: 172.16.0.0/16 10.11.12.0/24" + +#~ msgid "Connection Name" +#~ msgstr "Navn på forbindelse" + +#~ msgid "" +#~ "Name used to identify the connection to the private network, e.g. " +#~ "\"Campus VPN\" or \"Corporate Network\"" +#~ msgstr "" +#~ "Navn brugt til at identificere forbindelsen til det private netværk, f." +#~ "eks. \"Universitets VPN\" eller \"Virksomhedens netværk\"" + +#~ msgid "Override _user name" +#~ msgstr "Overskriv br_ugernavn" + +#~ msgid "" +#~ "Please enter the information provided by your system administrator below. " +#~ "Do not enter your password here as you will be prompted when connecting." +#~ msgstr "" +#~ "Indtast oplysninger fra din systemadministrator nedenfor. Du skal ikke " +#~ "indtaste din adgangskode her, da du bliver spurgt om den ved tilslutning." + +#~ msgid "" +#~ "Please note that the file you import is not a Cisco VPN or VPNC " +#~ "configuration file. Ask your adminstrator for the file." +#~ msgstr "" +#~ "Bemærk venligst at filen du importerer ikke er en Cisco VPN eller VPNC " +#~ "konfigurationsfil. Spørg din administrator efter filen." + +#~ msgid "Use _domain for authentication" +#~ msgstr "Brug _domæne til brugerverifikation" + +#~ msgid "_Import Saved Configuration..." +#~ msgstr "_Importér gemt konfiguration..." + +#~ msgid "_Only use VPN connection for these addresses" +#~ msgstr "_Brug kun VPN-forbindelse til flg. adresser" + +#~ msgid "" +#~ "The VPN login failed because the user name and password were not accepted." +#~ msgstr "VPN-tjenesten fejlede fordi brugernavn og adgangskode blev afvist." + +#~ msgid "The VPN login failed because the VPN program could not be started." +#~ msgstr "VPN-tjenesten fejlede fordi VPN-programmet ikke kunne startes." + +#~ msgid "" +#~ "The VPN login failed because the VPN program could not connect to the VPN " +#~ "server." +#~ msgstr "" +#~ "VPN-tjenesten fejlede fordi VPN-programmet ikke kunne forbinde til VPN-" +#~ "serveren." + +#~ msgid "" +#~ "The VPN login failed because the VPN configuration options were invalid." +#~ msgstr "VPN-tjenesten fejlede fordi VPN-konfigurationen var ugyldig." + +#~ msgid "" +#~ "The VPN login failed because the VPN program received an invalid " +#~ "configuration from the VPN server." +#~ msgstr "" +#~ "VPN-tjenesten fejlede fordi VPN-programmet modtog en ugyldig " +#~ "konfiguration fra VPN-serveren." #~ msgid "O_ptional Information" #~ msgstr "Yderligere oplysninger" diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/po/de.po /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/de.po --- network-manager-vpnc-0.7/po/de.po 2008-08-11 23:12:19.000000000 +0100 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/de.po 2009-04-09 00:48:29.000000000 +0100 @@ -1,66 +1,55 @@ -# Language =de translations for PACKAGE package. +# German translations for NetworkManager-vpnc package. # Copyright (C) 2007 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Thomas Gier , 2007. +# Mario Blättermann , 2008. # msgid "" msgstr "" -"Project-Id-Version: NetworkManager HEAD \n" +"Project-Id-Version: NetworkManager HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-03-10 15:23+0100\n" -"PO-Revision-Date: 2008-07-21 11:28+0200\n" -"Last-Translator: Hendrik Richter \n" +"POT-Creation-Date: 2008-12-06 21:11+0100\n" +"PO-Revision-Date: 2008-12-06 21:12+0100\n" +"Last-Translator: Mario Blättermann \n" "Language-Team: de \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../auth-dialog/gnome-two-password-dialog.c:144 +#: ../auth-dialog/gnome-two-password-dialog.c:118 msgid "_Secondary Password:" -msgstr "_Zweitkennwort:" +msgstr "_Zweitpasswort:" -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "_Benutzername:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "_Domäne:" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 +#: ../auth-dialog/gnome-two-password-dialog.c:174 msgid "_Password:" -msgstr "_Kennwort:" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "_Anonym verbinden" +msgstr "_Passwort:" -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "Als Ben_utzer verbinden:" +#: ../auth-dialog/gnome-two-password-dialog.c:255 +msgid "Sh_ow passwords" +msgstr "Passwörter an_zeigen" -#: ../auth-dialog/gnome-two-password-dialog.c:465 +#: ../auth-dialog/gnome-two-password-dialog.c:315 msgid "_Remember passwords for this session" -msgstr "Kennwo_rt für diese Sitzung behalten" +msgstr "Passwo_rt für diese Sitzung behalten" -#: ../auth-dialog/gnome-two-password-dialog.c:467 +#: ../auth-dialog/gnome-two-password-dialog.c:316 msgid "_Save passwords in keyring" -msgstr "Kennwort im _Schlüsselbund speichern" +msgstr "Passwort im _Schlüsselbund speichern" -#: ../auth-dialog/main.c:161 +#: ../auth-dialog/main.c:170 #, c-format msgid "You need to authenticate to access the Virtual Private Network '%s'." msgstr "" -"Sie müssen sich authentifizieren, um auf das Virtual Private Netzwerk »%s« " +"Sie müssen sich legitimieren, um auf das Virtuelle private Netzwerk »%s« " "zugreifen zu können." -#: ../auth-dialog/main.c:162 +#: ../auth-dialog/main.c:171 msgid "Authenticate VPN" -msgstr "VPN authentifizieren" +msgstr "VPN legitimieren" -#: ../auth-dialog/main.c:169 +#: ../auth-dialog/main.c:175 msgid "_Group Password:" -msgstr "_Gruppenkennwort:" +msgstr "_Gruppenpasswort:" #: ../nm-vpnc.desktop.in.h:1 msgid "Add, Remove, and Edit VPN Connections" @@ -70,55 +59,59 @@ msgid "VPN Connection Manager (vpnc)" msgstr "VPN-Verbindungsmanager (vpnc)" -#: ../properties/nm-vpnc.c:84 -msgid "Compatible Cisco VPN client (vpnc)" -msgstr "Kompatibler Cisco VPN-Client (vpnc)" - -#: ../properties/nm-vpnc.c:448 -msgid "The following vpnc VPN connection will be created:" -msgstr "Folgende vpnc-VPN-Verbindung wird erzeugt:" +#: ../properties/nm-vpnc.c:53 +msgid "Cisco Compatible VPN (vpnc)" +msgstr "Cisco-kompatibler VPN-Client (vpnc)" -#: ../properties/nm-vpnc.c:450 -#, c-format -msgid "Name: %s" -msgstr "Name: »%s«" +#: ../properties/nm-vpnc.c:54 +msgid "" +"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)." -#: ../properties/nm-vpnc.c:453 -#, c-format -msgid "Gateway: %s" -msgstr "Gateway: »%s«" +#: ../properties/nm-vpnc.c:339 +msgid "Saved" +msgstr "Gespeichert" -#: ../properties/nm-vpnc.c:455 -#, c-format -msgid "Group Name: %s" -msgstr "Gruppenname: »%s«" +#: ../properties/nm-vpnc.c:346 +msgid "Always Ask" +msgstr "Immer fragen" -#: ../properties/nm-vpnc.c:459 -#, c-format -msgid "Username: %s" -msgstr "Benutzername: »%s«" +#: ../properties/nm-vpnc.c:353 +msgid "Not Required" +msgstr "Nicht notwendig" -#: ../properties/nm-vpnc.c:464 -#, c-format -msgid "Domain: %s" -msgstr "Domäne: »%s«" +#: ../properties/nm-vpnc.c:412 +msgid "Secure (default)" +msgstr "Sicher (Vorgabe)" -#: ../properties/nm-vpnc.c:469 -#, c-format -msgid "Routes: %s" -msgstr "Routen: »%s«" +#: ../properties/nm-vpnc.c:415 +msgid "Weak (use with caution)" +msgstr "Weich (mit Vorsicht zu verwenden)" -#: ../properties/nm-vpnc.c:473 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "" -"Die Verbindungsdetails können mit Hilfe des »Bearbeiten«-Knopfes geändert " -"werden." +#: ../properties/nm-vpnc.c:423 +msgid "None (completely insecure)" +msgstr "Keine (komplett unsicher)" + +#: ../properties/nm-vpnc.c:471 +msgid "Cisco UDP (default)" +msgstr "Cisco-UDP (Vorgabe)" + +#: ../properties/nm-vpnc.c:478 +msgid "NAT-T" +msgstr "NAT-T" + +#: ../properties/nm-vpnc.c:485 +msgid "Disabled" +msgstr "Deaktiviert" -#: ../properties/nm-vpnc.c:542 +#: ../properties/nm-vpnc.c:1104 msgid "TCP tunneling not supported" -msgstr "TCP-Tuneling wird nicht unterstützt" +msgstr "TCP-Tunneling wird nicht unterstützt" -#: ../properties/nm-vpnc.c:544 +#: ../properties/nm-vpnc.c:1106 #, c-format msgid "" "The VPN settings file '%s' specifies that VPN traffic should be tunneled " @@ -127,154 +120,200 @@ "The connection can still be created, with TCP tunneling disabled, however it " "may not work as expected." msgstr "" -"Die VPN-Einstellungendatei »%s« legt fest, dass VPN-Verkehr über TCP " -"getunnelt werden soll, was jedoch zur Zeit nicht in der vpnc-Software " -"unterstütz wird.\n" +"Die VPN-Einstellungsdatei »%s« legt fest, dass VPN-Verkehr über TCP getunnelt " +"werden soll, was jedoch zur Zeit nicht in der vpnc-Software unterstützt " +"wird.\n" "\n" "Die Verbindung kann dennoch mit unterdrücktem TCP-Tunneling erzeugt werden, " "allerdings besteht die Möglichkeit, dass sie nicht wie erwartet funktioniert." -#: ../properties/nm-vpnc.c:565 -msgid "Cannot import settings" -msgstr "Einstellungen können nicht importiert werden" - -#: ../properties/nm-vpnc.c:567 -#, c-format -msgid "The VPN settings file '%s' does not contain valid data." -msgstr "Die VPN-Einstellungendatei »%s« enthält keine gültigen Daten." - -#: ../properties/nm-vpnc.c:584 -msgid "Select file to import" -msgstr "Datei zum Import auswählen" - -#. printf ("in impl_export\n"); -#: ../properties/nm-vpnc.c:744 -msgid "Save as..." -msgstr "Speichern unter …" - -#: ../properties/nm-vpnc.c:774 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "Eine Datei mit dem Namen »%s« existiert bereits." - -#: ../properties/nm-vpnc.c:777 -msgid "Do you want to replace it with the one you are saving?" -msgstr "Möchten Sie sie mit der aktuellen Datei ersetzen?" - -#: ../properties/nm-vpnc.c:791 -msgid "Failed to export configuration" -msgstr "Export der Konfiguration gescheitert" - -#: ../properties/nm-vpnc.c:793 -#, c-format -msgid "Failed to save file %s" -msgstr "Speichern der Datei »%s« gescheitert" - #: ../properties/nm-vpnc-dialog.glade.h:1 -msgid "Connection Information" -msgstr "Verbindungsinformationen" +msgid " " +msgstr " " #: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "Connection Name" -msgstr "Verbindungsname" +msgid "General" +msgstr "Allgemein" #: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "Required" -msgstr "Notwendig" +msgid "Optional" +msgstr "Optional" #: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "Beispiel: 172.16.0.0/16 10.11.12.0/24" +msgid "Disable Dead Peer Detection" +msgstr "Peer-To-Peer-Erkennung deaktivieren" #: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "Connection Name" -msgstr "Verbindungsname" +msgid "Domain:" +msgstr "Domäne:" #: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "G_roup Name:" -msgstr "G_ruppenname:" +msgid "Encryption method:" +msgstr "Verschlüsselungsmethode:" #: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "" -"Name used to identify the connection to the private network, e.g. \"Campus " -"VPN\" or \"Corporate Network\"" -msgstr "" -"Name, der zur Identifikation der Verbindung zum privaten Netzwerk verwendet " -"wird, z.B. »Campus VPN« oder »Firmennetzwerk«" +msgid "G_roup name:" +msgstr "G_ruppenname:" #: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "Optional" -msgstr "Optional" +msgid "Gro_up password:" +msgstr "_Gruppenpasswort:" #: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "Override _user name" -msgstr "Ben_utzernamen außer Kraft setzen" +msgid "NAT traversal:" +msgstr "NAT-Traversal:" #: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "" -"Please enter the information provided by your system administrator below. Do " -"not enter your password here as you will be prompted when connecting." -msgstr "" -"Bitte tragen Sie die Informationen, die Sie von Ihrem Systemadministrator " -"erhalten haben unten ein. Geben Sie Ihr Kennwort nicht ein, da Sie beim " -"Verbinden danach gefragt werden." +msgid "Show passwords" +msgstr "Passwörter anzeigen" #: ../properties/nm-vpnc-dialog.glade.h:11 -msgid "" -"Please note that the file you import is not a Cisco VPN or VPNC " -"configuration file. Ask your adminstrator for the file." -msgstr "" -"Beachten Sie bitte, dass die Datei, die Sie importieren, keine Cisco VPN " -"oder VPNC-Konfigurationsdatei ist. Wenden Sie sich an Ihren Administrator." +msgid "User name:" +msgstr "Benutzername:" #: ../properties/nm-vpnc-dialog.glade.h:12 -msgid "Use _domain for authentication" -msgstr "_Domäne zur Authentifikation verwenden" - -#: ../properties/nm-vpnc-dialog.glade.h:13 msgid "_Gateway:" msgstr "_Gateway:" -#: ../properties/nm-vpnc-dialog.glade.h:14 -msgid "_Import Saved Configuration..." -msgstr "Gespeicherte Konfiguration importieren …" - -#: ../properties/nm-vpnc-dialog.glade.h:15 -msgid "_Only use VPN connection for these addresses" -msgstr "_VPN-Verbindung nur für diese Adressen verwenden" +#: ../properties/nm-vpnc-dialog.glade.h:13 +msgid "_User password:" +msgstr "Ben_utzerpasswort:" -#: ../src/nm-vpnc-service.c:119 -msgid "" -"The VPN login failed because the user name and password were not accepted." -msgstr "" -"Die VPN-Anmeldung scheiterte, da Benutzername und Kennwort nicht akzeptiert " -"wurden." +#~ msgid "_Username:" +#~ msgstr "_Benutzername:" -#: ../src/nm-vpnc-service.c:121 -msgid "The VPN login failed because the VPN program could not be started." -msgstr "" -"Die VPN-Anmeldung scheiterte, weil das VPN-Porgramm nicht gestartet werden " -"konnte." +#~ msgid "_Domain:" +#~ msgstr "_Domäne:" -#: ../src/nm-vpnc-service.c:123 -msgid "" -"The VPN login failed because the VPN program could not connect to the VPN " -"server." -msgstr "" -"Die VPN-Anmeldung scheiterte, weil das VPN-Programm sich nicht mit dem VPN-" -"Server verbinden konnte." +#~ msgid "Connect _anonymously" +#~ msgstr "_Anonym verbinden" -#: ../src/nm-vpnc-service.c:125 -msgid "" -"The VPN login failed because the VPN configuration options were invalid." -msgstr "" -"Die VPN-Anmeldung scheiterte, weil die VPN-Konfigurationsoptionen ungültig " -"waren." +#~ msgid "Connect as _user:" +#~ msgstr "Als Ben_utzer verbinden:" -#: ../src/nm-vpnc-service.c:127 -msgid "" -"The VPN login failed because the VPN program received an invalid " -"configuration from the VPN server." -msgstr "" -"Die VPN-Anmeldung scheiterte, weil das VPN-Programm eine ungültige " -"Konfiguration vom VPN-Server erhielt." +#~ msgid "The following vpnc VPN connection will be created:" +#~ msgstr "Folgende vpnc-VPN-Verbindung wird erzeugt:" + +#~ msgid "Name: %s" +#~ msgstr "Name: »%s«" + +#~ msgid "Gateway: %s" +#~ msgstr "Gateway: »%s«" + +#~ msgid "Group Name: %s" +#~ msgstr "Gruppenname: »%s«" + +#~ msgid "Username: %s" +#~ msgstr "Benutzername: »%s«" + +#~ msgid "Domain: %s" +#~ msgstr "Domäne: »%s«" + +#~ msgid "Routes: %s" +#~ msgstr "Routen: »%s«" + +#~ msgid "The connection details can be changed using the \"Edit\" button." +#~ msgstr "" +#~ "Die Verbindungsdetails können mit Hilfe des »Bearbeiten«-Knopfes geändert " +#~ "werden." + +#~ msgid "Cannot import settings" +#~ msgstr "Einstellungen können nicht importiert werden" + +#~ msgid "The VPN settings file '%s' does not contain valid data." +#~ msgstr "Die VPN-Einstellungendatei »%s« enthält keine gültigen Daten." + +#~ msgid "Select file to import" +#~ msgstr "Datei zum Import auswählen" + +#~ msgid "Save as..." +#~ msgstr "Speichern unter …" + +#~ msgid "A file named \"%s\" already exists." +#~ msgstr "Eine Datei mit dem Namen »%s« existiert bereits." + +#~ msgid "Do you want to replace it with the one you are saving?" +#~ msgstr "Möchten Sie sie mit der aktuellen Datei ersetzen?" + +#~ msgid "Failed to export configuration" +#~ msgstr "Export der Konfiguration gescheitert" + +#~ msgid "Failed to save file %s" +#~ msgstr "Speichern der Datei »%s« gescheitert" + +#~ msgid "Connection Information" +#~ msgstr "Verbindungsinformationen" + +#~ msgid "Connection Name" +#~ msgstr "Verbindungsname" + +#~ msgid "example: 172.16.0.0/16 10.11.12.0/24" +#~ msgstr "Beispiel: 172.16.0.0/16 10.11.12.0/24" + +#~ msgid "Connection Name" +#~ msgstr "Verbindungsname" + +#~ msgid "" +#~ "Name used to identify the connection to the private network, e.g. \"Campus " +#~ "VPN\" or \"Corporate Network\"" +#~ msgstr "" +#~ "Name, der zur Identifikation der Verbindung zum privaten Netzwerk " +#~ "verwendet wird, z.B. »Campus VPN« oder »Firmennetzwerk«" + +#~ msgid "Override _user name" +#~ msgstr "Ben_utzernamen außer Kraft setzen" + +#~ msgid "" +#~ "Please enter the information provided by your system administrator below. " +#~ "Do not enter your password here as you will be prompted when connecting." +#~ msgstr "" +#~ "Bitte tragen Sie die Informationen, die Sie von Ihrem Systemadministrator " +#~ "erhalten haben unten ein. Geben Sie Ihr Kennwort nicht ein, da Sie beim " +#~ "Verbinden danach gefragt werden." + +#~ msgid "" +#~ "Please note that the file you import is not a Cisco VPN or VPNC " +#~ "configuration file. Ask your adminstrator for the file." +#~ msgstr "" +#~ "Beachten Sie bitte, dass die Datei, die Sie importieren, keine Cisco VPN " +#~ "oder VPNC-Konfigurationsdatei ist. Wenden Sie sich an Ihren Administrator." + +#~ msgid "Use _domain for authentication" +#~ msgstr "_Domäne zur Authentifikation verwenden" + +#~ msgid "_Import Saved Configuration..." +#~ msgstr "Gespeicherte Konfiguration importieren …" + +#~ msgid "_Only use VPN connection for these addresses" +#~ msgstr "_VPN-Verbindung nur für diese Adressen verwenden" + +#~ msgid "" +#~ "The VPN login failed because the user name and password were not accepted." +#~ msgstr "" +#~ "Die VPN-Anmeldung scheiterte, da Benutzername und Kennwort nicht " +#~ "akzeptiert wurden." + +#~ msgid "The VPN login failed because the VPN program could not be started." +#~ msgstr "" +#~ "Die VPN-Anmeldung scheiterte, weil das VPN-Porgramm nicht gestartet werden " +#~ "konnte." + +#~ msgid "" +#~ "The VPN login failed because the VPN program could not connect to the VPN " +#~ "server." +#~ msgstr "" +#~ "Die VPN-Anmeldung scheiterte, weil das VPN-Programm sich nicht mit dem VPN-" +#~ "Server verbinden konnte." + +#~ msgid "" +#~ "The VPN login failed because the VPN configuration options were invalid." +#~ msgstr "" +#~ "Die VPN-Anmeldung scheiterte, weil die VPN-Konfigurationsoptionen ungültig " +#~ "waren." + +#~ msgid "" +#~ "The VPN login failed because the VPN program received an invalid " +#~ "configuration from the VPN server." +#~ msgstr "" +#~ "Die VPN-Anmeldung scheiterte, weil das VPN-Programm eine ungültige " +#~ "Konfiguration vom VPN-Server erhielt." diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/po/el.po /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/el.po --- network-manager-vpnc-0.7/po/el.po 2008-05-27 21:50:05.000000000 +0100 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/el.po 2009-04-09 00:48:29.000000000 +0100 @@ -1,66 +1,57 @@ -# translation of el.po to Greek +# translation of NetworkManager-vpnc.HEAD.po to # Copyright (C) 2007 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # # Kostas Papadimas , 2007. +# Jennie Petoumenou , 2008. msgid "" msgstr "" -"Project-Id-Version: el\n" +"Project-Id-Version: NetworkManager-vpnc.HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-15 13:17+0300\n" -"PO-Revision-Date: 2007-08-15 13:17+0300\n" -"Last-Translator: Kostas Papadimas \n" +"POT-Creation-Date: 2008-12-07 15:57+0000\n" +"PO-Revision-Date: 2008-12-07 01:08+0200\n" +"Last-Translator: Jennie Petoumenou \n" "Language-Team: Greek \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 0.2\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../auth-dialog/gnome-two-password-dialog.c:144 +#: ../auth-dialog/gnome-two-password-dialog.c:118 msgid "_Secondary Password:" -msgstr "_Δευτερεύων κωδικός πρόσβασης:" +msgstr "_Δευτερεύον συνθηματικό:" -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "Ό_νομα χρήστη:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "_Τομέας:" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 +#: ../auth-dialog/gnome-two-password-dialog.c:174 msgid "_Password:" -msgstr "_Κωδικός:" +msgstr "_Συνθηματικό:" -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "_Ανώνυμη σύνδεση" +#: ../auth-dialog/gnome-two-password-dialog.c:255 +msgid "Sh_ow passwords" +msgstr "Εμ_φάνιση συνθηματικών" -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "Σύνδεση ως _χρήστης:" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 +#: ../auth-dialog/gnome-two-password-dialog.c:315 msgid "_Remember passwords for this session" -msgstr "Απο_μνημόνευση κωδικών για αυτή τη συνεδρία" +msgstr "Απο_μνημόνευση συνθηματικών για αυτή τη συνεδρία" -#: ../auth-dialog/gnome-two-password-dialog.c:467 +#: ../auth-dialog/gnome-two-password-dialog.c:316 msgid "_Save passwords in keyring" -msgstr "Απο_θήκευση κωδικών στο keyring" +msgstr "Απο_θήκευση συνθηματικών στην κλειδοθήκη" -#: ../auth-dialog/main.c:161 +#: ../auth-dialog/main.c:170 #, c-format msgid "You need to authenticate to access the Virtual Private Network '%s'." msgstr "" -"Χρειάζεστε πιστοποίηση για να έχετε πρόσβαση στο Ιδιωτικό Εικονικό Δίκτυο " -"(VPN) '%s'." +"Χρειάζεστε πιστοποίηση για να αποκτήσετε πρόσβαση στο Ιδιωτικό Εικονικό " +"Δίκτυο (VPN) '%s'." -#: ../auth-dialog/main.c:162 +#: ../auth-dialog/main.c:171 msgid "Authenticate VPN" msgstr "Πιστοποίηση VPN" -#: ../auth-dialog/main.c:169 +#: ../auth-dialog/main.c:175 msgid "_Group Password:" -msgstr "Κωδικός πρόσβασης ο_μάδας:" +msgstr "Συνθηματικό ο_μάδας:" #: ../nm-vpnc.desktop.in.h:1 msgid "Add, Remove, and Edit VPN Connections" @@ -70,68 +61,59 @@ msgid "VPN Connection Manager (vpnc)" msgstr "Διαχείριση σύνδεσης VPN (vpnc)" -#: ../properties/nm-vpnc.c:91 -msgid "Compatible Cisco VPN client (vpnc)" -msgstr "Συμβατός Cisco VPN client (vpnc)" - -#: ../properties/nm-vpnc.c:510 -msgid "The following vpnc VPN connection will be created:" -msgstr "Θα δημιουργηθεί η ακόλουθη σύνδεση vpnc VPN" +#: ../properties/nm-vpnc.c:53 +msgid "Cisco Compatible VPN (vpnc)" +msgstr "Συμβατός με Cisco πελάτης VPN (vpnc)" -#: ../properties/nm-vpnc.c:512 -#, c-format -msgid "Name: %s" -msgstr "Όνομα: %s" +#: ../properties/nm-vpnc.c:54 +msgid "" +"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based " +"VPN gateways." +msgstr "" +"Συμβατός με διάφορες βασισμένες στο IPSec πύλες VPN των Cisco, Juniper, " +"Netscreen και Sonicwall." -#: ../properties/nm-vpnc.c:515 -#, c-format -msgid "Gateway: %s" -msgstr "Gateway: %s" +#: ../properties/nm-vpnc.c:339 +msgid "Saved" +msgstr "Αποθηκευμένη" -#: ../properties/nm-vpnc.c:517 -#, c-format -msgid "Group Name: %s" -msgstr "Όνομα ομάδας: %s" +#: ../properties/nm-vpnc.c:346 +msgid "Always Ask" +msgstr "Να γίνεται πάντα ερώτηση" -#: ../properties/nm-vpnc.c:521 -#, c-format -msgid "Username: %s" -msgstr "Όνομα Χρήστη: %s" +#: ../properties/nm-vpnc.c:353 +msgid "Not Required" +msgstr "Δεν απαιτείται" -#: ../properties/nm-vpnc.c:526 -#, c-format -msgid "Domain: %s" -msgstr "Τομέας: %s" +#: ../properties/nm-vpnc.c:412 +msgid "Secure (default)" +msgstr "Ασφαλής (προεπιλογή)" -#: ../properties/nm-vpnc.c:531 -#, c-format -msgid "Routes: %s" -msgstr "Διαδρομές: %s" +#: ../properties/nm-vpnc.c:415 +msgid "Weak (use with caution)" +msgstr "Ασθενής (να χρησιμοποιείται με προσοχή)" -#: ../properties/nm-vpnc.c:535 -#, c-format -msgid "NAT-Keepalive packet interval: %s" -msgstr "Διάστημα πακέτου NAT-Keepalive: %s" +#: ../properties/nm-vpnc.c:423 +msgid "None (completely insecure)" +msgstr "Καμία (καθόλου ασφάλεια)" -#: ../properties/nm-vpnc.c:539 -msgid "Enable Single DES" -msgstr "Ενεργοποίηση Single DES" - -#: ../properties/nm-vpnc.c:543 -msgid "Disable NAT Traversal" -msgstr "Απενεργοποίηση NAT Traversal" +#: ../properties/nm-vpnc.c:471 +msgid "Cisco UDP (default)" +msgstr "Cisco UDP (προεπιλογή)" -#: ../properties/nm-vpnc.c:547 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "" -"Οι ρυθμίσεις σύνδεσης μπορούν να τροποποιηθούν με τη χρήση του κουμπιού " -"\"Επεξεργασία\"." +#: ../properties/nm-vpnc.c:478 +msgid "NAT-T" +msgstr "NAT-T" -#: ../properties/nm-vpnc.c:625 +#: ../properties/nm-vpnc.c:485 +msgid "Disabled" +msgstr "Απενεργοποιημένη" + +#: ../properties/nm-vpnc.c:1104 msgid "TCP tunneling not supported" msgstr "Το TCP tunneling δεν υποστηρίζεται" -#: ../properties/nm-vpnc.c:627 +#: ../properties/nm-vpnc.c:1106 #, c-format msgid "" "The VPN settings file '%s' specifies that VPN traffic should be tunneled " @@ -141,167 +123,72 @@ "may not work as expected." msgstr "" "Το αρχείο ρυθμίσεων VPN '%s' καθορίζει ότι η κυκλοφορία VPN θα πρέπει να " -"δρομολογηθεί μέσω TCP το οποίο δεν υποστηρίζεται αυτή τη στιγμή μέσω " -"λογισμικού vpnc.\n" -"\n" -"Η σύνδεση μπορεί ακόμα να δημιουργηθεί, αλλά με το TCP tunneling " -"απενεργοποιημένο και πιθανώς να μην λειτουργεί σωστά. " - -#: ../properties/nm-vpnc.c:648 -msgid "Cannot import settings" -msgstr "Αδυναμία εισαγωγής ρυθμίσεων" - -#: ../properties/nm-vpnc.c:650 -#, c-format -msgid "The VPN settings file '%s' does not contain valid data." -msgstr "Το αρχείο ρυθμίσεων VPN '%s' δεν περιέχει έγκυρα δεδομένα." - -#: ../properties/nm-vpnc.c:667 -msgid "Select file to import" -msgstr "Επιλογή αρχείου για εισαγωγή" - -#. printf ("in impl_export\n"); -#: ../properties/nm-vpnc.c:840 -msgid "Save as..." -msgstr "Αποθήκευση ως..." - -#: ../properties/nm-vpnc.c:870 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "Ένα αρχείο με το όνομα \"%s\" υπάρχει ήδη." - -#: ../properties/nm-vpnc.c:873 -msgid "Do you want to replace it with the one you are saving?" -msgstr "Θέλετε να το αντικαταστήσετε με αυτό που αποθηκεύετε;" - -#: ../properties/nm-vpnc.c:887 -msgid "Failed to export configuration" -msgstr "Αποτυχία εξαγωγής ρύθμισης" - -#: ../properties/nm-vpnc.c:889 -#, c-format -msgid "Failed to save file %s" -msgstr "Αποτυχία αποθήκευσης αρχείου %s" +"δρομολογηθεί μέσω TCP, κάτι που δεν υποστηρίζεται αυτή τη στιγμή από το " +"λογισμικό vpnc.\n" +"
\n" +"Παρόλ' αυτά η σύνδεση μπορεί να δημιουργηθεί, αλλά με το TCP tunneling " +"απενεργοποιημένο. Ενδέχεται, όμως, να μη λειτουργήσει σωστά. " #: ../properties/nm-vpnc-dialog.glade.h:1 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "παράδειγμα: 172.16.0.0/16 10.11.12.0/24" +msgid " " +msgstr " " #: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "Connection na_me:" -msgstr "Ό_νομα σύνδεσης:" +msgid "General" +msgstr "Γενικά" #: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "Disable NAT _traversal" -msgstr "Απενεργοποίηση NAT _traversal" +msgid "Optional" +msgstr "Προαιρετικά" #: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "Enable _weak single DES encryption" -msgstr "Ενεργοποίηση α_σθενούς κρυπτογράφησης απλού DES" +msgid "Disable Dead Peer Detection" +msgstr "Απενεργοποίηση του Dead Peer Detection " #: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "G_roup name:" -msgstr "Όνομα ομά_δας:" +msgid "Domain:" +msgstr "Τομέας:" #: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "Import _Saved Configuration..." -msgstr "Ε_ισαγωγή αποθηκευμένης ρύθμισης..." +msgid "Encryption method:" +msgstr "Μέθοδος κρυπτογράφησης:" #: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "Interval:" -msgstr "Διάστημα:" +msgid "G_roup name:" +msgstr "Όνομα ομά_δας:" #: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "" -"Name used to identify the connection to the private network, e.g. \"Campus " -"VPN\" or \"Corporate Network\"" -msgstr "" -"Το όνομα που χρησιμοποιείται για την ταυτοποίηση της σύνδεσης στο ιδιωτικό " -"δίκτυο, π.χ. \"Campus VPN\" ή \"Corporate Network\"" +msgid "Gro_up password:" +msgstr "Συνθηματικό ο_μάδας:" #: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "Optional" -msgstr "Προαιρετιές" +msgid "NAT traversal:" +msgstr "Διάβαση μέσα από NAT:" #: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "Override _user name" -msgstr "Παράκαμψη ονόματος _χρήστη" +msgid "Show passwords" +msgstr "Εμφάνιση συνθηματικών" #: ../properties/nm-vpnc-dialog.glade.h:11 -msgid "" -"Please enter the information provided by your system administrator below. Do " -"not enter your password here as you will be prompted when connecting." -msgstr "" -"Παρακαλώ εισάγετε παρακάτω τις πληροφορίες που σας παρέχονται από τον " -"διαχειριστή του συστήματος σας. Μην εισάγετε τον κωδικό σας εδώ αλλά όταν " -"σας ζητηθεί." +msgid "User name:" +msgstr "Όνομα χρήστη:" #: ../properties/nm-vpnc-dialog.glade.h:12 -msgid "" -"Please note that the file you import is not a Cisco VPN or VPNC " -"configuration file. Ask your adminstrator for the file." -msgstr "" -"Παρακαλώ σημειώστε ότι το αρχείο που εισάγετε δεν είναι ένα αρχείο ρύθμισης " -"Cisco VPN ή VPNC. Ρωτήστε τον διαχειριστή του συστήματος σας για αυτό το " -"αρχείο. " - -#: ../properties/nm-vpnc-dialog.glade.h:13 -msgid "Required" -msgstr "Απαιτείται" - -#: ../properties/nm-vpnc-dialog.glade.h:14 -msgid "Use NAT _keepalive packets" -msgstr "Χρήση πακέτων NAT _keepalive" - -#: ../properties/nm-vpnc-dialog.glade.h:15 -msgid "Use _domain for authentication" -msgstr "Χρήση _τομέα για πιστοποίηση " - -#: ../properties/nm-vpnc-dialog.glade.h:16 msgid "_Gateway:" -msgstr "_Gateway:" - -#: ../properties/nm-vpnc-dialog.glade.h:17 -msgid "_Only use VPN connection for these addresses" -msgstr "Να γίνεται _χρήση σύνδεσης VPN μόνο για αυτές τις διευθύνσεις" +msgstr "_Πύλη:" -#: ../src/nm-vpnc-service.c:119 -msgid "" -"The VPN login failed because the user name and password were not accepted." -msgstr "" -"Αποτυχία σύνδεσης VPN λόγω του ότι το όνομα χρήση και ο κωδικός δεν έγιναν " -"δεκτά." - -#: ../src/nm-vpnc-service.c:121 -msgid "The VPN login failed because the VPN program could not be started." -msgstr "" -"Αποτυχία σύνδεσης VPN λόγω του ότι το πρόγραμμα δεν μπορεί να ξεκινήσει." - -#: ../src/nm-vpnc-service.c:123 -msgid "" -"The VPN login failed because the VPN program could not connect to the VPN " -"server." -msgstr "" -"Αποτυχία σύνδεσης VPN λόγω του ότι το πρόγραμμα δεν μπορεί να συνδεθεί με " -"τον εξυπηρετητή VPN." +#: ../properties/nm-vpnc-dialog.glade.h:13 +msgid "_User password:" +msgstr "_Συνθηματικό χρήστη:" -#: ../src/nm-vpnc-service.c:125 -msgid "" -"The VPN login failed because the VPN configuration options were invalid." -msgstr "" -"Αποτυχία σύνδεσης VPN λόγω του ότι οι ρυθμίσεις επιλογών VPN δεν είναι " -"έγκυρες." +#~ msgid "_Username:" +#~ msgstr "Ό_νομα χρήστη:" -#: ../src/nm-vpnc-service.c:127 -msgid "" -"The VPN login failed because the VPN program received an invalid " -"configuration from the VPN server." -msgstr "" -"Αποτυχία σύνδεσης VPN λόγω του ότι το πρόγραμμα VPN έλαβε μια μη έγκυρη " -"ρύθμιση από τον εξυπηρετητή VPN." +#~ msgid "_Domain:" +#~ msgstr "_Τομέας:" -#~ msgid "Required Information" -#~ msgstr "Απαιτούμενες πληροφορίες" +#~ msgid "Connect _anonymously" +#~ msgstr "_Ανώνυμη σύνδεση" -#~ msgid "O_ptional Information" -#~ msgstr "Προαι_ρετικές πληροφορίες" +#~ msgid "Connect as _user:" +#~ msgstr "Σύνδεση ως _χρήστης:" diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/po/es.po /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/es.po --- network-manager-vpnc-0.7/po/es.po 2008-11-28 17:31:08.000000000 +0000 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/es.po 2009-04-09 00:48:29.000000000 +0100 @@ -13,9 +13,9 @@ msgstr "" "Project-Id-Version: NetworkManager-vpnc.HEAD\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=NetworkManager&component=general\n" -"POT-Creation-Date: 2008-11-14 17:04+0000\n" -"PO-Revision-Date: 2008-11-14 20:24+0100\n" +"product=NetworkManager&component=VPN: vpnc\n" +"POT-Creation-Date: 2008-12-15 17:05+0000\n" +"PO-Revision-Date: 2008-12-27 15:14+0100\n" "Last-Translator: Jorge González \n" "Language-Team: Español \n" "MIME-Version: 1.0\n" @@ -24,55 +24,39 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.11.4\n" -#: ../auth-dialog/gnome-two-password-dialog.c:145 +#: ../auth-dialog/gnome-two-password-dialog.c:118 msgid "_Secondary Password:" msgstr "Contraseña _secundaria:" -#: ../auth-dialog/gnome-two-password-dialog.c:259 -msgid "_Username:" -msgstr "Nombre de _usuario:" - -#: ../auth-dialog/gnome-two-password-dialog.c:261 -msgid "_Domain:" -msgstr "_Dominio:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 +#: ../auth-dialog/gnome-two-password-dialog.c:174 msgid "_Password:" msgstr "_Contraseña:" -# include/printconf/dialogs.ycp:150 -#: ../auth-dialog/gnome-two-password-dialog.c:352 -msgid "Connect _anonymously" -msgstr "Conectar _anónimamente" - -# include/scanner/scanner_overview.ycp:85 -# include/scanner/scanner_overview.ycp:85 -# include/scanner/scanner_overview.ycp:85 -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect as _user:" -msgstr "Conectar como _usuario:" +#: ../auth-dialog/gnome-two-password-dialog.c:255 +msgid "Sh_ow passwords" +msgstr "M_ostrar contraseñas" # include/partitioning/custom_part_dialogs.ycp:67 # include/partitioning/custom_part_dialogs.ycp:67 # include/partitioning/custom_part_dialogs.ycp:67 include/partitioning/custom_part_dialogs.ycp:197 -#: ../auth-dialog/gnome-two-password-dialog.c:466 +#: ../auth-dialog/gnome-two-password-dialog.c:315 msgid "_Remember passwords for this session" msgstr "_Recordar contraseñas para esta sesión" -#: ../auth-dialog/gnome-two-password-dialog.c:468 +#: ../auth-dialog/gnome-two-password-dialog.c:316 msgid "_Save passwords in keyring" msgstr "_Guardar contraseñas en el depósito de claves" -#: ../auth-dialog/main.c:105 +#: ../auth-dialog/main.c:170 #, c-format 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/main.c:106 +#: ../auth-dialog/main.c:171 msgid "Authenticate VPN" msgstr "Autenticación VPN" -#: ../auth-dialog/main.c:113 +#: ../auth-dialog/main.c:175 msgid "_Group Password:" msgstr "Contraseña del _grupo:" @@ -97,47 +81,47 @@ "Compatible con varias puertas de enlace VPN basadas en IpSec como Cisco, " "Juniper, Netscreen y Sonicwall." -#: ../properties/nm-vpnc.c:325 +#: ../properties/nm-vpnc.c:339 msgid "Saved" msgstr "Guardado" -#: ../properties/nm-vpnc.c:332 +#: ../properties/nm-vpnc.c:346 msgid "Always Ask" msgstr "Preguntar siempre" -#: ../properties/nm-vpnc.c:339 +#: ../properties/nm-vpnc.c:353 msgid "Not Required" msgstr "No requerido" -#: ../properties/nm-vpnc.c:398 +#: ../properties/nm-vpnc.c:412 msgid "Secure (default)" msgstr "Seguro (predeterminado)" -#: ../properties/nm-vpnc.c:401 +#: ../properties/nm-vpnc.c:415 msgid "Weak (use with caution)" msgstr "Débil (usar con cautela)" -#: ../properties/nm-vpnc.c:409 +#: ../properties/nm-vpnc.c:423 msgid "None (completely insecure)" msgstr "Ninguno (completamente inseguro)" -#: ../properties/nm-vpnc.c:450 +#: ../properties/nm-vpnc.c:471 msgid "Cisco UDP (default)" msgstr "Cisco UDP (predeterminado)" -#: ../properties/nm-vpnc.c:457 +#: ../properties/nm-vpnc.c:478 msgid "NAT-T" msgstr "NAT-T" -#: ../properties/nm-vpnc.c:464 +#: ../properties/nm-vpnc.c:485 msgid "Disabled" msgstr "Desactivado" -#: ../properties/nm-vpnc.c:1085 +#: ../properties/nm-vpnc.c:1104 msgid "TCP tunneling not supported" msgstr "No se soporta el túnel por TCP" -#: ../properties/nm-vpnc.c:1087 +#: ../properties/nm-vpnc.c:1106 #, c-format msgid "" "The VPN settings file '%s' specifies that VPN traffic should be tunneled " @@ -208,5 +192,21 @@ msgid "_User password:" msgstr "Contraseña del _usuario:" +#~ msgid "_Username:" +#~ msgstr "Nombre de _usuario:" + +#~ msgid "_Domain:" +#~ msgstr "_Dominio:" + +# include/printconf/dialogs.ycp:150 +#~ msgid "Connect _anonymously" +#~ msgstr "Conectar _anónimamente" + +# include/scanner/scanner_overview.ycp:85 +# include/scanner/scanner_overview.ycp:85 +# include/scanner/scanner_overview.ycp:85 +#~ msgid "Connect as _user:" +#~ msgstr "Conectar como _usuario:" + #~ msgid "NAT-T (default)" #~ msgstr "NAT-T (predeterminado)" diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/po/et.po /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/et.po --- network-manager-vpnc-0.7/po/et.po 2008-10-10 13:10:56.000000000 +0100 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/et.po 2009-04-09 00:48:29.000000000 +0100 @@ -6,62 +6,50 @@ # # Priit Laes , 2007. # Ivar Smolin , 2007. -# Mattias Põldaru , 2007-2008. +# Mattias Põldaru , 2007-2009. # msgid "" msgstr "" "Project-Id-Version: NetworkManager-vpnc\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-03 21:00+0000\n" -"PO-Revision-Date: 2008-09-28 03:25+0300\n" -"Last-Translator: Mattias Põldaru \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&component=VPN: vpnc\n" +"POT-Creation-Date: 2008-12-15 17:05+0000\n" +"PO-Revision-Date: 2009-02-09 01:04+0300\n" +"Last-Translator: Mattias Põldaru \n" "Language-Team: Estonian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../auth-dialog/gnome-two-password-dialog.c:145 +#: ../auth-dialog/gnome-two-password-dialog.c:118 msgid "_Secondary Password:" msgstr "_Teisene parool:" -#: ../auth-dialog/gnome-two-password-dialog.c:259 -msgid "_Username:" -msgstr "_Kasutajanimi:" - -#: ../auth-dialog/gnome-two-password-dialog.c:261 -msgid "_Domain:" -msgstr "_Domeen:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 +#: ../auth-dialog/gnome-two-password-dialog.c:174 msgid "_Password:" msgstr "_Parool:" -#: ../auth-dialog/gnome-two-password-dialog.c:352 -msgid "Connect _anonymously" -msgstr "Ühendu _anonüümselt" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect as _user:" -msgstr "Ühendu ka_sutajana:" +#: ../auth-dialog/gnome-two-password-dialog.c:255 +msgid "Sh_ow passwords" +msgstr "_Paroole näidatakse" -#: ../auth-dialog/gnome-two-password-dialog.c:466 +#: ../auth-dialog/gnome-two-password-dialog.c:315 msgid "_Remember passwords for this session" msgstr "_Jäta selle seansi jaoks parool meelde" -#: ../auth-dialog/gnome-two-password-dialog.c:468 +#: ../auth-dialog/gnome-two-password-dialog.c:316 msgid "_Save passwords in keyring" msgstr "_Salvesta parool võtmerõngasse" -#: ../auth-dialog/main.c:67 +#: ../auth-dialog/main.c:170 #, c-format msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Virtuaalse eravõrguga '%s' ühendumiseks pead end autentima." +msgstr "Virtuaalse privaatvõrguga '%s' ühendumiseks pead end autentima." -#: ../auth-dialog/main.c:68 +#: ../auth-dialog/main.c:171 msgid "Authenticate VPN" msgstr "VPN-i autentimine" -#: ../auth-dialog/main.c:75 +#: ../auth-dialog/main.c:175 msgid "_Group Password:" msgstr "_Grupiparool:" @@ -81,42 +69,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." -#: ../properties/nm-vpnc.c:265 +#: ../properties/nm-vpnc.c:339 +msgid "Saved" +msgstr "Salvestatud" + +#: ../properties/nm-vpnc.c:346 +msgid "Always Ask" +msgstr "Alati küsitakse" + +#: ../properties/nm-vpnc.c:353 +msgid "Not Required" +msgstr "Pole vajalik" + +#: ../properties/nm-vpnc.c:412 msgid "Secure (default)" msgstr "Turvaline (vaikimisi)" -#: ../properties/nm-vpnc.c:268 +#: ../properties/nm-vpnc.c:415 msgid "Weak (use with caution)" msgstr "Nõrk (kasuta ettevaatlikult)" -#: ../properties/nm-vpnc.c:276 +#: ../properties/nm-vpnc.c:423 msgid "None (completely insecure)" msgstr "Pole (täiesti turvamata)" -#: ../properties/nm-vpnc.c:314 -msgid "NAT-T (default)" -msgstr "NAT-T (vaikimisi)" - -#: ../properties/nm-vpnc.c:321 -msgid "Cisco UDP" -msgstr "Cisco UDP" +#: ../properties/nm-vpnc.c:471 +msgid "Cisco UDP (default)" +msgstr "Cisco UDP (vaikimisi)" + +#: ../properties/nm-vpnc.c:478 +msgid "NAT-T" +msgstr "NAT-T" -#: ../properties/nm-vpnc.c:328 +#: ../properties/nm-vpnc.c:485 msgid "Disabled" msgstr "Keelatud" -#: ../properties/nm-vpnc.c:724 +#: ../properties/nm-vpnc.c:1104 msgid "TCP tunneling not supported" msgstr "TCP-tunneldamine pole toetatud" -#: ../properties/nm-vpnc.c:726 +#: ../properties/nm-vpnc.c:1106 #, c-format msgid "" "The VPN settings file '%s' specifies that VPN traffic should be tunneled through TCP which is currently not supported in the vpnc software.\n" "\n" "The connection can still be created, with TCP tunneling disabled, however it may not work as expected." msgstr "" -"VPN-i seadete fail '%s' määrab, et VPN liikluse tunnel tuleks teha TCP kaudu. Kahjuks ei toeta seda vpnc tarkvara.\n" +"VPN-i sätete fail '%s' määrab, et VPN liikluse tunnel tuleks teha TCP kaudu. Kahjuks ei toeta seda vpnc tarkvara.\n" "\n" "Siiski saab tekitada ilma TCP tunnelita ühenduse, kuid see ei pruugi toimida soovitud viisil." @@ -133,9 +133,8 @@ msgstr "Valikuline" #: ../properties/nm-vpnc-dialog.glade.h:4 -#, fuzzy msgid "Disable Dead Peer Detection" -msgstr "Keela surnud masina tuvastamine" +msgstr "Surnud masina tuvastamise (DPD) keelamine" #: ../properties/nm-vpnc-dialog.glade.h:5 msgid "Domain:" @@ -159,7 +158,7 @@ #: ../properties/nm-vpnc-dialog.glade.h:10 msgid "Show passwords" -msgstr "Näita paroole" +msgstr "Paroole näidatakse" #: ../properties/nm-vpnc-dialog.glade.h:11 msgid "User name:" @@ -173,6 +172,16 @@ msgid "_User password:" msgstr "_Kasutaja parool:" +#~ msgid "_Username:" +#~ msgstr "_Kasutajanimi:" +#~ msgid "_Domain:" +#~ msgstr "_Domeen:" +#~ msgid "Connect _anonymously" +#~ msgstr "Ühendu _anonüümselt" +#~ msgid "Connect as _user:" +#~ msgstr "Ühendu ka_sutajana:" +#~ msgid "NAT-T (default)" +#~ msgstr "NAT-T (vaikimisi)" #~ msgid "The following vpnc VPN connection will be created:" #~ msgstr "Luuakse alljärgnev VPN ühendus:" #~ msgid "Name: %s" @@ -240,8 +249,6 @@ #~ msgstr "" #~ "Võta teadmiseks, et imporditav fail ei ole ei Cisco VPN-i ega VPNC " #~ "seadistamise fail. Küsi õiget faili oma administraatorilt." -#~ msgid "Required" -#~ msgstr "Vajalik" #~ msgid "Use NAT _keepalive packets" #~ msgstr "_NAT-keepalive pakettide kasutamine" #~ msgid "Use _domain for authentication" diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/po/fi.po /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/fi.po --- network-manager-vpnc-0.7/po/fi.po 2008-09-29 13:14:15.000000000 +0100 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/fi.po 2009-04-09 00:48:29.000000000 +0100 @@ -1,4 +1,4 @@ -# Finnish messages for NetworkManager-openvpn. +# Finnish messages for network-manager-vpnc. # Copyright (C) 2006-2008 Free Software Foundation, Inc. # Ilkka Tuohela , 2006-2008. # @@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: NetworkManager-openvpn\n" +"Project-Id-Version: network-manager-vpnc\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-18 14:16+0300\n" -"PO-Revision-Date: 2008-09-18 14:00+0300\n" +"POT-Creation-Date: 2008-11-29 20:22+0300\n" +"PO-Revision-Date: 2008-11-29 20:25+0300\n" "Last-Translator: Ilkka Tuohela \n" "Language-Team: Finnish \n" "MIME-Version: 1.0\n" @@ -49,16 +49,16 @@ msgid "_Save passwords in keyring" msgstr "_Tallenna salasana avainrenkaaseen" -#: ../auth-dialog/main.c:66 +#: ../auth-dialog/main.c:105 #, c-format msgid "You need to authenticate to access the Virtual Private Network '%s'." msgstr "Yhteydenotto VPN-verkkoon \"%s\" vaatii kirjautumista." -#: ../auth-dialog/main.c:67 +#: ../auth-dialog/main.c:106 msgid "Authenticate VPN" msgstr "Todenna VPN-yhteyden avaus" -#: ../auth-dialog/main.c:74 +#: ../auth-dialog/main.c:113 msgid "_Group Password:" msgstr "_Ryhmän salasana:" @@ -82,35 +82,47 @@ "Yhteensopiva useiden esimerkiksi Ciscon, Juniperin, Netscreenin ja " "Sonicwallin valmistamien IPSec-pohjaisten VPN-yhdyskäytävien kanssa." -#: ../properties/nm-vpnc.c:282 +#: ../properties/nm-vpnc.c:325 +msgid "Saved" +msgstr "Tallennettu" + +#: ../properties/nm-vpnc.c:332 +msgid "Always Ask" +msgstr "Kysy aina" + +#: ../properties/nm-vpnc.c:339 +msgid "Not Required" +msgstr "Ei vaadittu" + +#: ../properties/nm-vpnc.c:398 msgid "Secure (default)" msgstr "Turvallinen (oletus)" -#: ../properties/nm-vpnc.c:285 +#: ../properties/nm-vpnc.c:401 msgid "Weak (use with caution)" msgstr "Heikko (käytä varoen)" -#: ../properties/nm-vpnc.c:293 +#: ../properties/nm-vpnc.c:409 msgid "None (completely insecure)" msgstr "Ei salausta (täysin turvaton)" -#: ../properties/nm-vpnc.c:331 -msgid "NAT-T (default)" -msgstr "NAT-T (oletus)" - -#: ../properties/nm-vpnc.c:338 -msgid "Cisco UDP" -msgstr "Cisco UDP" +#: ../properties/nm-vpnc.c:450 +msgid "Cisco UDP (default)" +msgstr "Cisco UDP (oletus)" + +#: ../properties/nm-vpnc.c:457 +msgid "NAT-T" +msgstr "NAT-T" -#: ../properties/nm-vpnc.c:345 +#: ../properties/nm-vpnc.c:464 msgid "Disabled" msgstr "Ei käytössä" -#: ../properties/nm-vpnc.c:809 +#: ../properties/nm-vpnc.c:1085 msgid "TCP tunneling not supported" msgstr "TCP-tunnelointi ei ole tuettu" -#: ../properties/nm-vpnc.c:811 +#: ../properties/nm-vpnc.c:1087 #, c-format msgid "" "The VPN settings file '%s' specifies that VPN traffic should be tunneled " @@ -177,3 +189,5 @@ msgid "_User password:" msgstr "_Käyttäjän salasana:" +#~ msgid "NAT-T (default)" +#~ msgstr "NAT-T (oletus)" diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/po/fr.po /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/fr.po --- network-manager-vpnc-0.7/po/fr.po 2008-09-29 13:14:15.000000000 +0100 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/fr.po 2009-04-09 00:48:29.000000000 +0100 @@ -1,17 +1,17 @@ # French translation of NetworkManager-vpnc. -# Copyright (C) 2007-2008 Free Software Foundation, Inc. +# Copyright (C) 2007-2009 Free Software Foundation, Inc. # This file is distributed under the same license as the NetworkManager package. # # Jonathan Ernst , 2007. -# Claude Paroz , 2007-2008. +# Claude Paroz , 2007-2009. # Robert-André Mauchin , 2007-2008. # msgid "" msgstr "" "Project-Id-Version: NetworkManager-vpnc\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-25 22:56+0200\n" -"PO-Revision-Date: 2008-09-25 22:58+0200\n" +"POT-Creation-Date: 2009-03-10 10:43+0100\n" +"PO-Revision-Date: 2009-03-10 10:47+0100\n" "Last-Translator: Claude Paroz \n" "Language-Team: GNOME French Team \n" "MIME-Version: 1.0\n" @@ -19,49 +19,37 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" -#: ../auth-dialog/gnome-two-password-dialog.c:145 +#: ../auth-dialog/gnome-two-password-dialog.c:103 msgid "_Secondary Password:" msgstr "Mot de passe _secondaire :" -#: ../auth-dialog/gnome-two-password-dialog.c:259 -msgid "_Username:" -msgstr "Nom d'_utilisateur :" - -#: ../auth-dialog/gnome-two-password-dialog.c:261 -msgid "_Domain:" -msgstr "_Domaine :" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 +#: ../auth-dialog/gnome-two-password-dialog.c:159 msgid "_Password:" msgstr "Mot de _passe :" -#: ../auth-dialog/gnome-two-password-dialog.c:352 -msgid "Connect _anonymously" -msgstr "Se connecter _anonymement" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect as _user:" -msgstr "Se connecter en _tant que :" +#: ../auth-dialog/gnome-two-password-dialog.c:240 +msgid "Sh_ow passwords" +msgstr "Afficher les _mots de passe" -#: ../auth-dialog/gnome-two-password-dialog.c:466 +#: ../auth-dialog/gnome-two-password-dialog.c:300 msgid "_Remember passwords for this session" msgstr "_Conserver les mots de passe pour cette session" -#: ../auth-dialog/gnome-two-password-dialog.c:468 +#: ../auth-dialog/gnome-two-password-dialog.c:301 msgid "_Save passwords in keyring" msgstr "_Enregistrer les mots de passe dans le trousseau" -#: ../auth-dialog/main.c:66 +#: ../auth-dialog/main.c:170 #, c-format msgid "You need to authenticate to access the Virtual Private Network '%s'." msgstr "" "Vous devez vous authentifier pour accéder au réseau privé virtuel « %s »." -#: ../auth-dialog/main.c:67 +#: ../auth-dialog/main.c:171 msgid "Authenticate VPN" msgstr "Authentifier le VPN" -#: ../auth-dialog/main.c:74 +#: ../auth-dialog/main.c:175 msgid "_Group Password:" msgstr "Mot de passe du _groupe :" @@ -85,35 +73,47 @@ "Compatible avec de nombreuses passerelles VPN basées sur IPSec de Cisco, " "Juniper, Netscreen et Sonicwall." -#: ../properties/nm-vpnc.c:282 +#: ../properties/nm-vpnc.c:339 +msgid "Saved" +msgstr "Enregistré" + +#: ../properties/nm-vpnc.c:346 +msgid "Always Ask" +msgstr "Toujours demander" + +#: ../properties/nm-vpnc.c:353 +msgid "Not Required" +msgstr "Pas nécessaire" + +#: ../properties/nm-vpnc.c:412 msgid "Secure (default)" msgstr "Sécurisé (par défaut)" -#: ../properties/nm-vpnc.c:285 +#: ../properties/nm-vpnc.c:415 msgid "Weak (use with caution)" msgstr "Faible (à utiliser avec précaution)" -#: ../properties/nm-vpnc.c:293 +#: ../properties/nm-vpnc.c:423 msgid "None (completely insecure)" msgstr "Aucun (complètement non sécurisé)" -#: ../properties/nm-vpnc.c:331 -msgid "NAT-T (default)" -msgstr "NAT-T (par défaut)" - -#: ../properties/nm-vpnc.c:338 -msgid "Cisco UDP" -msgstr "UDP Cisco" +#: ../properties/nm-vpnc.c:471 +msgid "Cisco UDP (default)" +msgstr "UDP Cisco (par défaut)" + +#: ../properties/nm-vpnc.c:478 +msgid "NAT-T" +msgstr "NAT-T" -#: ../properties/nm-vpnc.c:345 +#: ../properties/nm-vpnc.c:485 msgid "Disabled" msgstr "Désactivé" -#: ../properties/nm-vpnc.c:809 +#: ../properties/nm-vpnc.c:1116 msgid "TCP tunneling not supported" msgstr "Utilisation d'un tunnel TCP non pris en charge" -#: ../properties/nm-vpnc.c:811 +#: ../properties/nm-vpnc.c:1118 #, c-format msgid "" "The VPN settings file '%s' specifies that VPN traffic should be tunneled " diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/po/hu.po /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/hu.po --- network-manager-vpnc-0.7/po/hu.po 2008-09-29 13:14:15.000000000 +0100 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/hu.po 2009-04-09 00:48:29.000000000 +0100 @@ -6,9 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: NetworkManager-vpnc HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-03 21:00+0000\n" -"PO-Revision-Date: 2008-09-25 23:22+0200\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&component=VPN: vpnc\n" +"POT-Creation-Date: 2008-12-15 17:05+0000\n" +"PO-Revision-Date: 2008-12-16 21:07+0100\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" "MIME-Version: 1.0\n" @@ -17,48 +17,36 @@ "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../auth-dialog/gnome-two-password-dialog.c:145 +#: ../auth-dialog/gnome-two-password-dialog.c:118 msgid "_Secondary Password:" msgstr "Jelszó _még egyszer:" -#: ../auth-dialog/gnome-two-password-dialog.c:259 -msgid "_Username:" -msgstr "_Felhasználónév:" - -#: ../auth-dialog/gnome-two-password-dialog.c:261 -msgid "_Domain:" -msgstr "_Tartomány:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 +#: ../auth-dialog/gnome-two-password-dialog.c:174 msgid "_Password:" msgstr "_Jelszó:" -#: ../auth-dialog/gnome-two-password-dialog.c:352 -msgid "Connect _anonymously" -msgstr "Kapcsolódás _névtelenül" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect as _user:" -msgstr "Csatlakozás _mint:" +#: ../auth-dialog/gnome-two-password-dialog.c:255 +msgid "Sh_ow passwords" +msgstr "_Jelszavak megjelenítése" -#: ../auth-dialog/gnome-two-password-dialog.c:466 +#: ../auth-dialog/gnome-two-password-dialog.c:315 msgid "_Remember passwords for this session" msgstr "_Jelszavak megjegyzése erre a munkamenetre" -#: ../auth-dialog/gnome-two-password-dialog.c:468 +#: ../auth-dialog/gnome-two-password-dialog.c:316 msgid "_Save passwords in keyring" msgstr "Jelszavak mentése a k_ulcstartóra" -#: ../auth-dialog/main.c:67 +#: ../auth-dialog/main.c:170 #, c-format 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/main.c:68 +#: ../auth-dialog/main.c:171 msgid "Authenticate VPN" msgstr "VPN azonosítás" -#: ../auth-dialog/main.c:75 +#: ../auth-dialog/main.c:175 msgid "_Group Password:" msgstr "_Csoportjelszó:" @@ -78,37 +66,51 @@ msgid "" "Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based " "VPN gateways." -msgstr "Kompatibilis számos Cisco, Juniper, Netscreen és Sonicwall IPSec-alapú VPN átjáróval." +msgstr "" +"Kompatibilis számos Cisco, Juniper, Netscreen és Sonicwall IPSec-alapú VPN " +"átjáróval." + +#: ../properties/nm-vpnc.c:339 +msgid "Saved" +msgstr "Mentett" + +#: ../properties/nm-vpnc.c:346 +msgid "Always Ask" +msgstr "Kérdés mindig" + +#: ../properties/nm-vpnc.c:353 +msgid "Not Required" +msgstr "Nem szükséges" -#: ../properties/nm-vpnc.c:265 +#: ../properties/nm-vpnc.c:412 msgid "Secure (default)" msgstr "Biztonságos (alapértelmezett)" -#: ../properties/nm-vpnc.c:268 +#: ../properties/nm-vpnc.c:415 msgid "Weak (use with caution)" msgstr "Gyenge (óvatosan használja)" -#: ../properties/nm-vpnc.c:276 +#: ../properties/nm-vpnc.c:423 msgid "None (completely insecure)" msgstr "Nincs (nem biztonságos)" -#: ../properties/nm-vpnc.c:314 -msgid "NAT-T (default)" -msgstr "NAT-T (alapértelmezett)" - -#: ../properties/nm-vpnc.c:321 -msgid "Cisco UDP" -msgstr "Cisco UDP" +#: ../properties/nm-vpnc.c:471 +msgid "Cisco UDP (default)" +msgstr "Cisco UDP (alapértelmezett)" + +#: ../properties/nm-vpnc.c:478 +msgid "NAT-T" +msgstr "NAT-T" -#: ../properties/nm-vpnc.c:328 +#: ../properties/nm-vpnc.c:485 msgid "Disabled" msgstr "Tiltva" -#: ../properties/nm-vpnc.c:724 +#: ../properties/nm-vpnc.c:1104 msgid "TCP tunneling not supported" msgstr "A TCP alagutazás nem támogatott" -#: ../properties/nm-vpnc.c:726 +#: ../properties/nm-vpnc.c:1106 #, c-format msgid "" "The VPN settings file '%s' specifies that VPN traffic should be tunneled " diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/po/it.po /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/it.po --- network-manager-vpnc-0.7/po/it.po 2008-09-29 13:14:15.000000000 +0100 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/it.po 2009-04-09 00:48:29.000000000 +0100 @@ -1,14 +1,15 @@ -# Italian translation of NetworkManager-VPNC. -# Copyright (C) 2008 THE NetworkManager-VPNC'S COPYRIGHT HOLDER +# Italian translation of NetworkManager-VPNC. +# Copyright (C) 2006, 2007, 2008, 2009 the NetworkManager-VPNC'S COPYRIGHT HOLDER # This file is distributed under the same license as the NetworkManager-VPNC package. -# Francesco Marletta , 2006-2008. +# Francesco Marletta , 2006, 2007, 2008, 2009. # msgid "" msgstr "" -"Project-Id-Version: NetworkManager-VPNC 0.7\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-17 04:41+0000\n" -"PO-Revision-Date: 2008-09-17 15:29-0400\n" +"Project-Id-Version: NetworkManager-VPNC 0.7.1\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=NetworkManager&component=VPN: vpnc\n" +"POT-Creation-Date: 2009-03-06 05:45+0000\n" +"PO-Revision-Date: 2009-03-07 23:31+0100\n" "Last-Translator: Francesco Marletta \n" "Language-Team: italian \n" "MIME-Version: 1.0\n" @@ -16,49 +17,38 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../auth-dialog/gnome-two-password-dialog.c:145 +#: ../auth-dialog/gnome-two-password-dialog.c:103 msgid "_Secondary Password:" msgstr "Password _secondaria:" -#: ../auth-dialog/gnome-two-password-dialog.c:259 -msgid "_Username:" -msgstr "Nome _utente:" - -#: ../auth-dialog/gnome-two-password-dialog.c:261 -msgid "_Domain:" -msgstr "_Dominio:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 +#: ../auth-dialog/gnome-two-password-dialog.c:159 msgid "_Password:" msgstr "_Password:" -#: ../auth-dialog/gnome-two-password-dialog.c:352 -msgid "Connect _anonymously" -msgstr "Connessione _anonima" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect as _user:" -msgstr "Connessione come _utente:" +#: ../auth-dialog/gnome-two-password-dialog.c:240 +msgid "Sh_ow passwords" +msgstr "M_ostra le password" -#: ../auth-dialog/gnome-two-password-dialog.c:466 +#: ../auth-dialog/gnome-two-password-dialog.c:300 msgid "_Remember passwords for this session" -msgstr "_Ricorda la password per questa sessione" +msgstr "_Ricorda le password per questa sessione" -#: ../auth-dialog/gnome-two-password-dialog.c:468 +#: ../auth-dialog/gnome-two-password-dialog.c:301 msgid "_Save passwords in keyring" -msgstr "_Salva la password nel portachiavi" +msgstr "_Salva le password nel portachiavi" -#: ../auth-dialog/main.c:66 +#: ../auth-dialog/main.c:170 #, c-format msgid "You need to authenticate to access the Virtual Private Network '%s'." msgstr "" -"È necessario autenticarsi per accedere alla Rete Privata Virtuale (VPN) '%s'." +"È necessario autenticarsi per accedere alla Rete Privata Virtuale (VPN) \"%s" +"\"." -#: ../auth-dialog/main.c:67 +#: ../auth-dialog/main.c:171 msgid "Authenticate VPN" msgstr "Autenticazione VPN" -#: ../auth-dialog/main.c:74 +#: ../auth-dialog/main.c:175 msgid "_Group Password:" msgstr "Password di _gruppo:" @@ -72,45 +62,60 @@ #: ../properties/nm-vpnc.c:53 msgid "Cisco Compatible VPN (vpnc)" -msgstr "Compatibile con VPN Cisco (vpnc)" +msgstr "VPN compatibile con Cisco (vpnc)" +# NdT: ho cercato in rete, e tutti questi sono partner del consorzio VPNC +# ()www.wpnc.org) +# NdT 2: SonicWALL è il nome corretto che appare sul sito. #: ../properties/nm-vpnc.c:54 msgid "" "Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based " "VPN gateways." msgstr "" -"Compatibile con vari gateway VPN Cisco, Juniper, Netscreen e basati su IPSec " -"Sonicwall." +"Compatibile con vari gateway VPN basati su IPSec di Cisco, Juniper, " +"Netscreen e SonicWALL." + +#: ../properties/nm-vpnc.c:339 +msgid "Saved" +msgstr "Salvato" + +#: ../properties/nm-vpnc.c:346 +msgid "Always Ask" +msgstr "Chiedi sempre" + +#: ../properties/nm-vpnc.c:353 +msgid "Not Required" +msgstr "Non richiesto" -#: ../properties/nm-vpnc.c:282 +#: ../properties/nm-vpnc.c:412 msgid "Secure (default)" msgstr "Sicuro (predefinito)" -#: ../properties/nm-vpnc.c:285 +#: ../properties/nm-vpnc.c:415 msgid "Weak (use with caution)" msgstr "Debole (usare con cautela)" -#: ../properties/nm-vpnc.c:293 +#: ../properties/nm-vpnc.c:423 msgid "None (completely insecure)" msgstr "Nessuno (completamente insicuro)" -#: ../properties/nm-vpnc.c:331 -msgid "NAT-T (default)" -msgstr "NAT-T (predefinito)" - -#: ../properties/nm-vpnc.c:338 -msgid "Cisco UDP" -msgstr "UDP Cisco" +#: ../properties/nm-vpnc.c:471 +msgid "Cisco UDP (default)" +msgstr "UDP Cisco (predefinito)" + +#: ../properties/nm-vpnc.c:478 +msgid "NAT-T" +msgstr "NAT-T" -#: ../properties/nm-vpnc.c:345 +#: ../properties/nm-vpnc.c:485 msgid "Disabled" msgstr "Disabilitato" -#: ../properties/nm-vpnc.c:809 +#: ../properties/nm-vpnc.c:1116 msgid "TCP tunneling not supported" msgstr "Tunnel TCP non supportato" -#: ../properties/nm-vpnc.c:811 +#: ../properties/nm-vpnc.c:1118 #, c-format msgid "" "The VPN settings file '%s' specifies that VPN traffic should be tunneled " @@ -119,8 +124,9 @@ "The connection can still be created, with TCP tunneling disabled, however it " "may not work as expected." msgstr "" -"Il file di impostazioni VPN “%s” specifica the il traffico VPN deve passare " -"in un tunnel TCP che non è attualmente supportato dal software vpnc.\n" +"Il file di impostazioni VPN \"%s\" specifica the il traffico VPN deve " +"passare attraverso un tunnel TCP, cosa che non è attualmente supportata dal " +"software vpnc.\n" "\n" "La connessione può essere creata lo stesso, con il tunnel TCP disabilitato, " "comunque potrebbe non funzionare come ci si aspetta." diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/po/LINGUAS /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/LINGUAS --- network-manager-vpnc-0.7/po/LINGUAS 2008-09-29 13:14:15.000000000 +0100 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/LINGUAS 2009-04-09 00:48:29.000000000 +0100 @@ -21,6 +21,7 @@ ko lt mk +mr nb nl pa diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/po/lt.po /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/lt.po --- network-manager-vpnc-0.7/po/lt.po 2008-09-29 13:14:15.000000000 +0100 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/lt.po 2009-04-09 00:48:29.000000000 +0100 @@ -2,14 +2,15 @@ # Copyright (C) 2008 Free Software Foundation, Inc. # This file is distributed under the same license as the NetworkManager package. # Žygimantas Beručka , 2008. +# Gintautas Miliauskas , 2009. # # msgid "" msgstr "" "Project-Id-Version: NetworkManager-vpnc HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-25 00:32+0300\n" -"PO-Revision-Date: 2008-09-25 00:32+0300\n" +"POT-Creation-Date: 2009-03-12 13:38+0200\n" +"PO-Revision-Date: 2009-03-12 13:38+0200\n" "Last-Translator: Žygimantas Beručka \n" "Language-Team: Lithuanian \n" "MIME-Version: 1.0\n" @@ -18,50 +19,38 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%" "100<10 || n%100>=20) ? 1 : 2);\n" -#: ../auth-dialog/gnome-two-password-dialog.c:145 +#: ../auth-dialog/gnome-two-password-dialog.c:103 msgid "_Secondary Password:" msgstr "_Antrinis slaptažodis:" -#: ../auth-dialog/gnome-two-password-dialog.c:259 -msgid "_Username:" -msgstr "_Naudotojo vardas:" - -#: ../auth-dialog/gnome-two-password-dialog.c:261 -msgid "_Domain:" -msgstr "S_ritis:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 +#: ../auth-dialog/gnome-two-password-dialog.c:159 msgid "_Password:" msgstr "_Slaptažodis:" -#: ../auth-dialog/gnome-two-password-dialog.c:352 -msgid "Connect _anonymously" -msgstr "Jungtis an_onimiškai" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect as _user:" -msgstr "Prisijungti kaip na_udotojas:" +#: ../auth-dialog/gnome-two-password-dialog.c:240 +msgid "Sh_ow passwords" +msgstr "_Rodyti slaptažodžius:" -#: ../auth-dialog/gnome-two-password-dialog.c:466 +#: ../auth-dialog/gnome-two-password-dialog.c:300 msgid "_Remember passwords for this session" msgstr "_Atsiminti slaptažodžius šiam seansui" -#: ../auth-dialog/gnome-two-password-dialog.c:468 +#: ../auth-dialog/gnome-two-password-dialog.c:301 msgid "_Save passwords in keyring" msgstr "Iš_saugoti slaptažodius raktinėje" -#: ../auth-dialog/main.c:66 +#: ../auth-dialog/main.c:170 #, c-format msgid "You need to authenticate to access the Virtual Private Network '%s'." msgstr "" "Norint gauti prieigą prie Virtualiojo Privačiojo Tinklo „%s“, reikia " "nustatyti jūsų tapatybę." -#: ../auth-dialog/main.c:67 +#: ../auth-dialog/main.c:171 msgid "Authenticate VPN" msgstr "Nustatyti tapatybę VPN" -#: ../auth-dialog/main.c:74 +#: ../auth-dialog/main.c:175 msgid "_Group Password:" msgstr "_Grupės slaptažodis:" @@ -85,35 +74,47 @@ "Suderinamas su įvairiais Cisco, Juniper, Netscreen ir Sonicwall IPSec " "pagrįstais VPN šliuzais." -#: ../properties/nm-vpnc.c:282 +#: ../properties/nm-vpnc.c:339 +msgid "Saved" +msgstr "Įrašyta" + +#: ../properties/nm-vpnc.c:346 +msgid "Always Ask" +msgstr "Visada klausti" + +#: ../properties/nm-vpnc.c:353 +msgid "Not Required" +msgstr "Nereikia" + +#: ../properties/nm-vpnc.c:412 msgid "Secure (default)" msgstr "Saugus (numatytasis)" -#: ../properties/nm-vpnc.c:285 +#: ../properties/nm-vpnc.c:415 msgid "Weak (use with caution)" msgstr "Silpnas (naudokite atsargiai)" -#: ../properties/nm-vpnc.c:293 +#: ../properties/nm-vpnc.c:423 msgid "None (completely insecure)" msgstr "Nėra (visiškai nesaugu)" -#: ../properties/nm-vpnc.c:331 -msgid "NAT-T (default)" -msgstr "NAT-T (numatytasis)" - -#: ../properties/nm-vpnc.c:338 -msgid "Cisco UDP" -msgstr "Cisco UDP" +#: ../properties/nm-vpnc.c:471 +msgid "Cisco UDP (default)" +msgstr "Cisco UDP (numatytasis)" + +#: ../properties/nm-vpnc.c:478 +msgid "NAT-T" +msgstr "NAT-T" -#: ../properties/nm-vpnc.c:345 +#: ../properties/nm-vpnc.c:485 msgid "Disabled" msgstr "Išjungta" -#: ../properties/nm-vpnc.c:809 +#: ../properties/nm-vpnc.c:1116 msgid "TCP tunneling not supported" msgstr "TCP tuneliavimas nepalaikomas" -#: ../properties/nm-vpnc.c:811 +#: ../properties/nm-vpnc.c:1118 #, c-format msgid "" "The VPN settings file '%s' specifies that VPN traffic should be tunneled " @@ -179,3 +180,18 @@ #: ../properties/nm-vpnc-dialog.glade.h:13 msgid "_User password:" msgstr "_Naudotojo slaptažodis:" + +#~ msgid "_Username:" +#~ msgstr "_Naudotojo vardas:" + +#~ msgid "_Domain:" +#~ msgstr "S_ritis:" + +#~ msgid "Connect _anonymously" +#~ msgstr "Jungtis an_onimiškai" + +#~ msgid "Connect as _user:" +#~ msgstr "Prisijungti kaip na_udotojas:" + +#~ msgid "NAT-T (default)" +#~ msgstr "NAT-T (numatytasis)" diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/po/mr.po /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/mr.po --- network-manager-vpnc-0.7/po/mr.po 1970-01-01 01:00:00.000000000 +0100 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/mr.po 2009-04-09 00:48:29.000000000 +0100 @@ -0,0 +1,178 @@ +# translation of network-manager-vpnc.HEAD.po to marathi +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Sandeep Shedmake , 2009. +msgid "" +msgstr "" +"Project-Id-Version: network-manager-vpnc.HEAD\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&component=VPN: vpnc\n" +"POT-Creation-Date: 2009-02-24 22:55+0000\n" +"PO-Revision-Date: 2009-03-04 19:28+0530\n" +"Last-Translator: Sandeep Shedmake \n" +"Language-Team: marathi\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" + +#: ../auth-dialog/gnome-two-password-dialog.c:103 +msgid "_Secondary Password:" +msgstr "दुय्यम परवलीचा शब्द (_S):" + +#: ../auth-dialog/gnome-two-password-dialog.c:159 +msgid "_Password:" +msgstr "परवलीचा शब्द (_P):" + +#: ../auth-dialog/gnome-two-password-dialog.c:240 +msgid "Sh_ow passwords" +msgstr "परवलीचा शब्द दाखवा (_o)" + +#: ../auth-dialog/gnome-two-password-dialog.c:300 +msgid "_Remember passwords for this session" +msgstr "या सत्र करीता परवलीचा शब्द लक्षात ठेवा (_R)" + +#: ../auth-dialog/gnome-two-password-dialog.c:301 +msgid "_Save passwords in keyring" +msgstr "किरींग अंतर्गत परवलीचा शब्द साठवा (_S)" + +#: ../auth-dialog/main.c:170 +#, c-format +msgid "You need to authenticate to access the Virtual Private Network '%s'." +msgstr "Virtual Private Network '%s' करीता प्रवेशसाठी तुम्हाला ओळख पटवावी लागेल." + +#: ../auth-dialog/main.c:171 +msgid "Authenticate VPN" +msgstr "VPN करीता ओळख पटवा" + +#: ../auth-dialog/main.c:175 +msgid "_Group Password:" +msgstr "परवलीचा शब्द (_G):" + +#: ../nm-vpnc.desktop.in.h:1 +msgid "Add, Remove, and Edit VPN Connections" +msgstr "VPN जुळवणी समावेष करा, काढूण टाका, व संपादीत करा" + +#: ../nm-vpnc.desktop.in.h:2 +msgid "VPN Connection Manager (vpnc)" +msgstr "VPN जुळवणी व्यवस्थापक (vpnc)" + +#: ../properties/nm-vpnc.c:53 +msgid "Cisco Compatible VPN (vpnc)" +msgstr "Cisco सहत्व VPN (vpnc)" + +#: ../properties/nm-vpnc.c:54 +msgid "" +"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based " +"VPN gateways." +msgstr "" +"विविध Cisco, Juniper, Netscreen, व Sonicwall IPSec-आधारीत " +"VPN गेटवे सह सहत्व." + +#: ../properties/nm-vpnc.c:339 +msgid "Saved" +msgstr "साठवले" + +#: ../properties/nm-vpnc.c:346 +msgid "Always Ask" +msgstr "नेहमी विचारा" + +#: ../properties/nm-vpnc.c:353 +msgid "Not Required" +msgstr "आवश्यक नाही" + +#: ../properties/nm-vpnc.c:412 +msgid "Secure (default)" +msgstr "सुरक्षा (मुलभूत)" + +#: ../properties/nm-vpnc.c:415 +msgid "Weak (use with caution)" +msgstr "दोष (सावधगिरीने वापरा)" + +#: ../properties/nm-vpnc.c:423 +msgid "None (completely insecure)" +msgstr "काहिच नाही (पूर्णतया असुरक्षीत)" + +#: ../properties/nm-vpnc.c:471 +msgid "Cisco UDP (default)" +msgstr "Cisco UDP (मुलभूत)" + +#: ../properties/nm-vpnc.c:478 +msgid "NAT-T" +msgstr "NAT-T" + +#: ../properties/nm-vpnc.c:485 +msgid "Disabled" +msgstr "अकार्यान्वीत" + +#: ../properties/nm-vpnc.c:1116 +msgid "TCP tunneling not supported" +msgstr "TCP tunneling समर्थीत नाही" + +#: ../properties/nm-vpnc.c:1118 +#, c-format +msgid "" +"The VPN settings file '%s' specifies that VPN traffic should be tunneled " +"through TCP which is currently not supported in the vpnc software.\n" +"\n" +"The connection can still be created, with TCP tunneling disabled, however it " +"may not work as expected." +msgstr "" +"VPN संयोजना फाइल '%s' असे निर्देशीत करते की VPN भार vpnc सॉफ्टवेअर अंतर्गत वर्तमाक्षणी समर्थीत " +"नसलेल्या TCP मार्गाद्वारे कार्यरत व्हावे.\n" +"\n" +"जुळवणी स्थापीत करणे तरी सुद्धा, TCP tunneling अकार्यान्वीत करून शकय आहे, परंतु ते योग्य नुरूप कार्य करेल असे अपेक्षीत नाही." + +#: ../properties/nm-vpnc-dialog.glade.h:1 +msgid " " +msgstr " " + +#: ../properties/nm-vpnc-dialog.glade.h:2 +msgid "General" +msgstr "सर्वसाधारण" + +#: ../properties/nm-vpnc-dialog.glade.h:3 +msgid "Optional" +msgstr "वैक्लपिक" + +#: ../properties/nm-vpnc-dialog.glade.h:4 +msgid "Disable Dead Peer Detection" +msgstr "Dead Peer Detection अकार्यान्वीत करा" + +#: ../properties/nm-vpnc-dialog.glade.h:5 +msgid "Domain:" +msgstr "क्षेत्र:" + +#: ../properties/nm-vpnc-dialog.glade.h:6 +msgid "Encryption method:" +msgstr "एनक्रिपशन पद्धत:" + +#: ../properties/nm-vpnc-dialog.glade.h:7 +msgid "G_roup name:" +msgstr "गटाचे नाव (_r):" + +#: ../properties/nm-vpnc-dialog.glade.h:8 +msgid "Gro_up password:" +msgstr "गटाचे परवलीचा शब्द (_u):" + +#: ../properties/nm-vpnc-dialog.glade.h:9 +msgid "NAT traversal:" +msgstr "NAT मार्ग:" + +#: ../properties/nm-vpnc-dialog.glade.h:10 +msgid "Show passwords" +msgstr "परवलीचा शब्द दाखवा" + +#: ../properties/nm-vpnc-dialog.glade.h:11 +msgid "User name:" +msgstr "वापकर्ता नाव:" + +#: ../properties/nm-vpnc-dialog.glade.h:12 +msgid "_Gateway:" +msgstr "गेटवे (_G):" + +#: ../properties/nm-vpnc-dialog.glade.h:13 +msgid "_User password:" +msgstr "वापरकर्ता परवलीचा शब्द (_U):" + diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/po/pl.po /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/pl.po --- network-manager-vpnc-0.7/po/pl.po 2008-11-28 17:31:08.000000000 +0000 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/pl.po 2009-04-09 00:48:29.000000000 +0100 @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: NetworkManager-vpnc\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-19 20:20+0100\n" -"PO-Revision-Date: 2008-11-19 20:21+0100\n" +"POT-Creation-Date: 2009-02-17 02:48+0100\n" +"PO-Revision-Date: 2009-02-17 02:49+0100\n" "Last-Translator: Tomasz Dominikowski \n" "Language-Team: Aviary.pl \n" "MIME-Version: 1.0\n" @@ -21,48 +21,36 @@ "X-Poedit-Language: Polish\n" "X-Poedit-Country: Poland\n" -#: ../auth-dialog/gnome-two-password-dialog.c:145 +#: ../auth-dialog/gnome-two-password-dialog.c:103 msgid "_Secondary Password:" msgstr "Hasło _dodatkowe:" -#: ../auth-dialog/gnome-two-password-dialog.c:259 -msgid "_Username:" -msgstr "Nazwa _użytkownika:" - -#: ../auth-dialog/gnome-two-password-dialog.c:261 -msgid "_Domain:" -msgstr "_Domena:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 +#: ../auth-dialog/gnome-two-password-dialog.c:159 msgid "_Password:" msgstr "_Hasło:" -#: ../auth-dialog/gnome-two-password-dialog.c:352 -msgid "Connect _anonymously" -msgstr "Połączenie _anonimowe" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect as _user:" -msgstr "Połączenie jako _użytkownik:" +#: ../auth-dialog/gnome-two-password-dialog.c:240 +msgid "Sh_ow passwords" +msgstr "_Wyświetlanie haseł" -#: ../auth-dialog/gnome-two-password-dialog.c:466 +#: ../auth-dialog/gnome-two-password-dialog.c:300 msgid "_Remember passwords for this session" msgstr "Zapamiętanie _hasła na czas tej sesji" -#: ../auth-dialog/gnome-two-password-dialog.c:468 +#: ../auth-dialog/gnome-two-password-dialog.c:301 msgid "_Save passwords in keyring" msgstr "_Zapamiętanie hasła w bazie kluczy" -#: ../auth-dialog/main.c:105 +#: ../auth-dialog/main.c:170 #, c-format msgid "You need to authenticate to access the Virtual Private Network '%s'." msgstr "Aby uzyskać dostęp do wirtualnej sieci prywatnej \"%s\", należy dokonać uwierzytelnienia." -#: ../auth-dialog/main.c:106 +#: ../auth-dialog/main.c:171 msgid "Authenticate VPN" msgstr "Uwierzytelnianie VPN" -#: ../auth-dialog/main.c:113 +#: ../auth-dialog/main.c:175 msgid "_Group Password:" msgstr "Hasło g_rupy:" @@ -82,47 +70,47 @@ msgid "Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based VPN gateways." msgstr "Kompatybilny z wieloma bramami VPN IPSec, jak Cisco, Juniper, Netscreen i Sonicwall." -#: ../properties/nm-vpnc.c:325 +#: ../properties/nm-vpnc.c:339 msgid "Saved" msgstr "Zapisano" -#: ../properties/nm-vpnc.c:332 +#: ../properties/nm-vpnc.c:346 msgid "Always Ask" msgstr "Pytanie zawsze" -#: ../properties/nm-vpnc.c:339 +#: ../properties/nm-vpnc.c:353 msgid "Not Required" msgstr "Niewymagane" -#: ../properties/nm-vpnc.c:398 +#: ../properties/nm-vpnc.c:412 msgid "Secure (default)" msgstr "Bezpieczne (domyślne)" -#: ../properties/nm-vpnc.c:401 +#: ../properties/nm-vpnc.c:415 msgid "Weak (use with caution)" msgstr "Słabe (używać z ostrożnością)" -#: ../properties/nm-vpnc.c:409 +#: ../properties/nm-vpnc.c:423 msgid "None (completely insecure)" msgstr "Brak (całkowity brak zabezpieczeń)" -#: ../properties/nm-vpnc.c:450 +#: ../properties/nm-vpnc.c:471 msgid "Cisco UDP (default)" msgstr "Cisco UDP (domyślne)" -#: ../properties/nm-vpnc.c:457 +#: ../properties/nm-vpnc.c:478 msgid "NAT-T" msgstr "NAT-T" -#: ../properties/nm-vpnc.c:464 +#: ../properties/nm-vpnc.c:485 msgid "Disabled" msgstr "Wyłączone" -#: ../properties/nm-vpnc.c:1085 +#: ../properties/nm-vpnc.c:1116 msgid "TCP tunneling not supported" msgstr "Tunelowanie TCP nie jest obsługiwane" -#: ../properties/nm-vpnc.c:1087 +#: ../properties/nm-vpnc.c:1118 #, c-format msgid "" "The VPN settings file '%s' specifies that VPN traffic should be tunneled through TCP which is currently not supported in the vpnc software.\n" @@ -185,6 +173,14 @@ msgid "_User password:" msgstr "Hasło _użytkownika:" +#~ msgid "_Username:" +#~ msgstr "Nazwa _użytkownika:" +#~ msgid "_Domain:" +#~ msgstr "_Domena:" +#~ msgid "Connect _anonymously" +#~ msgstr "Połączenie _anonimowe" +#~ msgid "Connect as _user:" +#~ msgstr "Połączenie jako _użytkownik:" #~ msgid "NAT-T (default)" #~ msgstr "NAT-T (domyślne)" #~ msgid "The following vpnc VPN connection will be created:" diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/po/pt_BR.po /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/pt_BR.po --- network-manager-vpnc-0.7/po/pt_BR.po 2008-07-21 12:25:32.000000000 +0100 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/pt_BR.po 2009-04-09 00:48:29.000000000 +0100 @@ -4,14 +4,16 @@ # Raphael Higino (In Memoriam), 2007. # Luiz Armesto , 2007. # Fábio Nogueira +# Henrique P Machado , 2008 # msgid "" msgstr "" "Project-Id-Version: NetworkManager-vpnc\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-06-17 17:49+0000\n" -"PO-Revision-Date: 2008-07-04 00:56-0300\n" -"Last-Translator: Fábio Nogueira \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=NetworkManager&component=general\n" +"POT-Creation-Date: 2008-12-11 20:04+0000\n" +"PO-Revision-Date: 2008-12-04 17:30-0300\n" +"Last-Translator: Henrique P Machado \n" "Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,65 +21,53 @@ "X-Poedit-Language: Portuguese\n" "X-Poedit-Country: BRAZIL\n" -#: ../auth-dialog/gnome-two-password-dialog.c:144 +#: ../auth-dialog/gnome-two-password-dialog.c:118 msgid "_Secondary Password:" msgstr "_Senha secundária:" -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "Nome do _usuário:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "_Domínio:" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 +#: ../auth-dialog/gnome-two-password-dialog.c:174 msgid "_Password:" msgstr "_Senha:" -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "Conectar _anonimamente" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "Conectar como o _usuário:" +#: ../auth-dialog/gnome-two-password-dialog.c:255 +msgid "Sh_ow passwords" +msgstr "M_ostrar senhas" -#: ../auth-dialog/gnome-two-password-dialog.c:465 +#: ../auth-dialog/gnome-two-password-dialog.c:315 msgid "_Remember passwords for this session" msgstr "_Lembrar senhas para esta sessão" -#: ../auth-dialog/gnome-two-password-dialog.c:467 +#: ../auth-dialog/gnome-two-password-dialog.c:316 msgid "_Save passwords in keyring" msgstr "_Salvar senhas no chaveiro" -#: ../auth-dialog/main.c:182 +#: ../auth-dialog/main.c:170 #, c-format 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/main.c:183 +#: ../auth-dialog/main.c:171 msgid "Authenticate VPN" msgstr "Autenticar VPN" -#: ../auth-dialog/main.c:190 +#: ../auth-dialog/main.c:175 msgid "_Group Password:" msgstr "Senha do _grupo:" #: ../nm-vpnc.desktop.in.h:1 msgid "Add, Remove, and Edit VPN Connections" -msgstr "Adiciona, Remove e Edita Conexões VPN" +msgstr "Adicione, remova e edite conexões VPN" #: ../nm-vpnc.desktop.in.h:2 msgid "VPN Connection Manager (vpnc)" msgstr "Gerenciador de Conexões VPN (vpnc)" -#: ../properties/nm-vpnc.c:51 +#: ../properties/nm-vpnc.c:53 msgid "Cisco Compatible VPN (vpnc)" msgstr "Cliente VPN compatível com Cisco (vpnc)" -#: ../properties/nm-vpnc.c:52 +#: ../properties/nm-vpnc.c:54 msgid "" "Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based " "VPN gateways." @@ -85,35 +75,47 @@ "Compatível com vários VPN gateways Cisco, Juniper, NetScreen e SonicWALL " "baseado em IPSec." -#: ../properties/nm-vpnc.c:194 +#: ../properties/nm-vpnc.c:339 +msgid "Saved" +msgstr "Salvo" + +#: ../properties/nm-vpnc.c:346 +msgid "Always Ask" +msgstr "Sempre perguntar" + +#: ../properties/nm-vpnc.c:353 +msgid "Not Required" +msgstr "Não requerido" + +#: ../properties/nm-vpnc.c:412 msgid "Secure (default)" msgstr "Seguro (padrão)" -#: ../properties/nm-vpnc.c:197 +#: ../properties/nm-vpnc.c:415 msgid "Weak (use with caution)" -msgstr "Fraco (utilize com precaução)" +msgstr "Fraco (use com precaução)" -#: ../properties/nm-vpnc.c:205 +#: ../properties/nm-vpnc.c:423 msgid "None (completely insecure)" msgstr "Nenhum (completamente inseguro)" -#: ../properties/nm-vpnc.c:247 -msgid "NAT-T (default)" -msgstr "NAT-T (padrão)" - -#: ../properties/nm-vpnc.c:254 -msgid "Cisco UDP" -msgstr "Cisco UDP" +#: ../properties/nm-vpnc.c:471 +msgid "Cisco UDP (default)" +msgstr "Cisco UDP (padrão)" + +#: ../properties/nm-vpnc.c:478 +msgid "NAT-T" +msgstr "NAT-T" -#: ../properties/nm-vpnc.c:261 +#: ../properties/nm-vpnc.c:485 msgid "Disabled" msgstr "Desabilitado" -#: ../properties/nm-vpnc.c:681 +#: ../properties/nm-vpnc.c:1104 msgid "TCP tunneling not supported" msgstr "Não há suporte a encapsulamento TCP" -#: ../properties/nm-vpnc.c:683 +#: ../properties/nm-vpnc.c:1106 #, c-format msgid "" "The VPN settings file '%s' specifies that VPN traffic should be tunneled " @@ -122,8 +124,8 @@ "The connection can still be created, with TCP tunneling disabled, however it " "may not work as expected." msgstr "" -"O arquivo de configurações de VPN \"%s\" especifica que o tráfico VPN deve " -"ser encapsulado por TCP que, atualmente, não é suportado pelo software " +"O arquivo de configurações de VPN \"%s\" especifica que o tráfego VPN deve " +"ser encapsulado por TCP que, atualmente, não tem suporte pelo software " "vpnc.\n" "\n" "A conexão ainda pode ser criada, com encapsulamento por TCP desativado, mas " @@ -150,25 +152,52 @@ msgstr "Domínio:" #: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "Encryption Method:" +msgid "Encryption method:" msgstr "Método de criptografia:" #: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "G_roup Name:" +msgid "G_roup name:" msgstr "Nome do g_rupo:" #: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "NAT Traversal:" -msgstr "NAT Traversal:" +msgid "Gro_up password:" +msgstr "Senha do _grupo:" #: ../properties/nm-vpnc-dialog.glade.h:9 +msgid "NAT traversal:" +msgstr "NAT Traversal:" + +#: ../properties/nm-vpnc-dialog.glade.h:10 +msgid "Show passwords" +msgstr "Mostrar senhas" + +#: ../properties/nm-vpnc-dialog.glade.h:11 msgid "User name:" msgstr "Nome do usuário:" -#: ../properties/nm-vpnc-dialog.glade.h:10 +#: ../properties/nm-vpnc-dialog.glade.h:12 msgid "_Gateway:" msgstr "_Gateway:" +#: ../properties/nm-vpnc-dialog.glade.h:13 +msgid "_User password:" +msgstr "Senha de _usuário:" + +#~ msgid "_Username:" +#~ msgstr "Nome do _usuário:" + +#~ msgid "_Domain:" +#~ msgstr "_Domínio:" + +#~ msgid "Connect _anonymously" +#~ msgstr "Conectar _anonimamente" + +#~ msgid "Connect as _user:" +#~ msgstr "Conectar como _usuário:" + +#~ msgid "NAT-T (default)" +#~ msgstr "NAT-T (padrão)" + #~ msgid "The following vpnc VPN connection will be created:" #~ msgstr "A seguinte conexão VPN vpnc será criada:" @@ -278,9 +307,6 @@ #~ "configuração Cisco VPN ou VPNC. Pergunte ao seu administrador pelo " #~ "arquivo." -#~ msgid "Required" -#~ msgstr "Requerido" - #~ msgid "Use NAT _keepalive packets" #~ msgstr "Usar pacotes NAT _keepalive" diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/po/pt.po /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/pt.po --- network-manager-vpnc-0.7/po/pt.po 2008-05-27 21:50:05.000000000 +0100 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/pt.po 2009-04-09 00:48:29.000000000 +0100 @@ -1,62 +1,51 @@ # NetworkManager-vpnc's Portuguese translation. -# Copyright © 2007 NetworkManager-vpnc +# Copyright © 2007, 2009 NetworkManager-vpnc # This file is distributed under the same license as the NetworkManager-vpnc package. # Duarte Loreto , 2007. +# Filipe Gomes , 2009. # msgid "" msgstr "" -"Project-Id-Version: 2.18\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-25 17:09+0000\n" -"PO-Revision-Date: 2007-02-25 17:15+0000\n" -"Last-Translator: Duarte Loreto \n" +"Project-Id-Version: 2.26\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?\n" +"POT-Creation-Date: 2008-12-15 17:05+0000\n" +"PO-Revision-Date: 2009-03-13 18:49+0000\n" +"Last-Translator: Filipe Gomes \n" "Language-Team: Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Transfer-Encoding: 8bit" -#: ../auth-dialog/gnome-two-password-dialog.c:144 +#: ../auth-dialog/gnome-two-password-dialog.c:118 msgid "_Secondary Password:" -msgstr "Sen_ha Secundária:" +msgstr "_Senha Secundária:" -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "_Utilizador:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "_Domínio:" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 +#: ../auth-dialog/gnome-two-password-dialog.c:174 msgid "_Password:" msgstr "_Senha:" -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "Ligar-se _anonimamente" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "Ligar-se como o _utilizador:" +#: ../auth-dialog/gnome-two-password-dialog.c:255 +msgid "Sh_ow passwords" +msgstr "A_presentar senhas" -#: ../auth-dialog/gnome-two-password-dialog.c:465 +#: ../auth-dialog/gnome-two-password-dialog.c:315 msgid "_Remember passwords for this session" msgstr "_Recordar as senhas durante esta sessão" -#: ../auth-dialog/gnome-two-password-dialog.c:467 +#: ../auth-dialog/gnome-two-password-dialog.c:316 msgid "_Save passwords in keyring" msgstr "_Gravar as senhas no chaveiro" -#: ../auth-dialog/main.c:161 +#: ../auth-dialog/main.c:170 #, c-format msgid "You need to authenticate to access the Virtual Private Network '%s'." msgstr "Tem de se autenticar para aceder à Rede Privada Virtual (VPN) '%s'." -#: ../auth-dialog/main.c:162 +#: ../auth-dialog/main.c:171 msgid "Authenticate VPN" msgstr "Autenticar na VPN" -#: ../auth-dialog/main.c:169 +#: ../auth-dialog/main.c:175 msgid "_Group Password:" msgstr "Senha de _Grupo:" @@ -68,54 +57,57 @@ msgid "VPN Connection Manager (vpnc)" msgstr "Gestor de Ligações VPN (vpnc)" -#: ../properties/nm-vpnc.c:84 -msgid "Compatible Cisco VPN client (vpnc)" -msgstr "Cliente VPN compatível com Cisco (vpnc)" - -#: ../properties/nm-vpnc.c:448 -msgid "The following vpnc VPN connection will be created:" -msgstr "Serão criadas as seguintes ligações VPN vpnc:" - -#: ../properties/nm-vpnc.c:450 -#, c-format -msgid "Name: %s" -msgstr "Nome: %s" - -#: ../properties/nm-vpnc.c:453 -#, c-format -msgid "Gateway: %s" -msgstr "Gateway: %s" - -#: ../properties/nm-vpnc.c:455 -#, c-format -msgid "Group Name: %s" -msgstr "Nome do Grupo: %s" - -#: ../properties/nm-vpnc.c:459 -#, c-format -msgid "Username: %s" -msgstr "Utilizador: %s" +#: ../properties/nm-vpnc.c:53 +msgid "Cisco Compatible VPN (vpnc)" +msgstr "VPN Compatível com Cisco (vpnc)" -#: ../properties/nm-vpnc.c:464 -#, c-format -msgid "Domain: %s" -msgstr "Domínio: %s" - -#: ../properties/nm-vpnc.c:469 -#, c-format -msgid "Routes: %s" -msgstr "Rotas: %s" - -#: ../properties/nm-vpnc.c:473 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "" -"Os detalhes da ligação poder ser alterados utilizando o botão \"Edit\"." +#: ../properties/nm-vpnc.c:54 +msgid "" +"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." + +#: ../properties/nm-vpnc.c:339 +msgid "Saved" +msgstr "Gravado" + +#: ../properties/nm-vpnc.c:346 +msgid "Always Ask" +msgstr "Perguntar Sempre" + +#: ../properties/nm-vpnc.c:353 +msgid "Not Required" +msgstr "Não Necessário" + +#: ../properties/nm-vpnc.c:412 +msgid "Secure (default)" +msgstr "Seguro (omissão)" + +#: ../properties/nm-vpnc.c:415 +msgid "Weak (use with caution)" +msgstr "Fraco (utilizar com cuidado)" + +#: ../properties/nm-vpnc.c:423 +msgid "None (completely insecure)" +msgstr "Nenhum (completamente inseguro)" + +#: ../properties/nm-vpnc.c:471 +msgid "Cisco UDP (default)" +msgstr "UDP Cisco (omissão)" + +#: ../properties/nm-vpnc.c:478 +msgid "NAT-T" +msgstr "NAT-T" + +#: ../properties/nm-vpnc.c:485 +msgid "Disabled" +msgstr "Desactivado" -#: ../properties/nm-vpnc.c:542 +#: ../properties/nm-vpnc.c:1104 msgid "TCP tunneling not supported" msgstr "Tunneling TCP não suportado" -#: ../properties/nm-vpnc.c:544 +#: ../properties/nm-vpnc.c:1106 #, c-format msgid "" "The VPN settings file '%s' specifies that VPN traffic should be tunneled " @@ -131,148 +123,189 @@ "A ligação pode ainda ser criada, com o tunneling TCP desactivado, poderá no " "entanto não funcionar como esperado." -#: ../properties/nm-vpnc.c:565 -msgid "Cannot import settings" -msgstr "Incapaz de importar as definições" - -#: ../properties/nm-vpnc.c:567 -#, c-format -msgid "The VPN settings file '%s' does not contain valid data." -msgstr "O ficheiro de definições VPN '%s' não contém dados válidos." - -#: ../properties/nm-vpnc.c:584 -msgid "Select file to import" -msgstr "Seleccionar o ficheiro a importar" - -#. printf ("in impl_export\n"); -#: ../properties/nm-vpnc.c:744 -msgid "Save as..." -msgstr "Gravar como..." - -#: ../properties/nm-vpnc.c:774 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "Já existe um ficheiro denominado \"%s\"." - -#: ../properties/nm-vpnc.c:777 -msgid "Do you want to replace it with the one you are saving?" -msgstr "Deseja substituí-lo pelo que está a gravar?" - -#: ../properties/nm-vpnc.c:791 -msgid "Failed to export configuration" -msgstr "Falha ao exportar a configuração" - -#: ../properties/nm-vpnc.c:793 -#, c-format -msgid "Failed to save file %s" -msgstr "Falha ao gravar o ficheiro %s" - #: ../properties/nm-vpnc-dialog.glade.h:1 -msgid "Connection Information" -msgstr "Informação de Ligação" +msgid " " +msgstr " " #: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "Connection Name" -msgstr "Nome da Ligação" +msgid "General" +msgstr "Geral" #: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "Required" -msgstr "Necessária" +msgid "Optional" +msgstr "Opcional" #: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "exemplo: 172.16.0.0/16 10.11.12.0/24" +msgid "Disable Dead Peer Detection" +msgstr "Desactivar Detecção de Par Morto" #: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "Connection Name" -msgstr "Nome da Ligação" +msgid "Domain:" +msgstr "Domínio:" #: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "G_roup Name:" -msgstr "Nome do G_rupo:" +msgid "Encryption method:" +msgstr "Método de encriptação:" #: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "" -"Name used to identify the connection to the private network, e.g. \"Campus " -"VPN\" or \"Corporate Network\"" -msgstr "" -"Nome utilizado para identificar a ligação à rede privada, por. ex. \"VPN da " -"Universidade\" ou \"Rede da Empresa\"" +msgid "G_roup name:" +msgstr "Nome do G_rupo:" #: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "Optional" -msgstr "Opcional" +msgid "Gro_up password:" +msgstr "Senha de Gr_upo:" #: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "Override _user name" -msgstr "Ignorar o nome do _utilizador" +msgid "NAT traversal:" +msgstr "NAT traversal:" #: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "" -"Please enter the information provided by your system administrator below. Do " -"not enter your password here as you will be prompted when connecting." -msgstr "" -"Introduza abaixo a informação disponibilizada pelo administrador do seu " -"sistema. Não introduza aqui a sua senha pois essa ser-lhe-á pedida quando se " -"ligar." +msgid "Show passwords" +msgstr "Apresentar senhas" #: ../properties/nm-vpnc-dialog.glade.h:11 -msgid "" -"Please note that the file you import is not a Cisco VPN or VPNC " -"configuration file. Ask your adminstrator for the file." -msgstr "" -"Note que o ficheiro que importou não é um ficheiro de configuração " -"de VPN ou VPNC Cisco. Peça o ficheiro ao administrador da sua rede." +msgid "User name:" +msgstr "Nome do _utilizador:" #: ../properties/nm-vpnc-dialog.glade.h:12 -msgid "Use _domain for authentication" -msgstr "Utilizar o _domínio para a autenticação" - -#: ../properties/nm-vpnc-dialog.glade.h:13 msgid "_Gateway:" msgstr "_Gateway:" -#: ../properties/nm-vpnc-dialog.glade.h:14 -msgid "_Import Saved Configuration..." -msgstr "_Importar a Configuração Gravada..." - -#: ../properties/nm-vpnc-dialog.glade.h:15 -msgid "_Only use VPN connection for these addresses" -msgstr "_Apenas utilizar ligação VPN para estes endereços" +#: ../properties/nm-vpnc-dialog.glade.h:13 +msgid "_User password:" +msgstr "Senha do _utlizador:" -#: ../src/nm-vpnc-service.c:119 -msgid "" -"The VPN login failed because the user name and password were not accepted." -msgstr "" -"O início de sessão VPN falhou porque o utilizador e senha não foram aceites." +#~ msgid "Connect _anonymously" +#~ msgstr "Ligar-se _anonimamente" -#: ../src/nm-vpnc-service.c:121 -msgid "The VPN login failed because the VPN program could not be started." -msgstr "" -"O início de sessão VPN falhou porque não foi possível iniciar a aplicação de " -"VPN." +#~ msgid "Connect as _user:" +#~ msgstr "Ligar-se como o _utilizador:" -#: ../src/nm-vpnc-service.c:123 -msgid "" -"The VPN login failed because the VPN program could not connect to the VPN " -"server." -msgstr "" -"O início de sessão VPN falhou porque a aplicação de VPN foi incapaz de se " -"ligar ao servidor de VPN." +#~ msgid "The following vpnc VPN connection will be created:" +#~ msgstr "Serão criadas as seguintes ligações VPN vpnc:" -#: ../src/nm-vpnc-service.c:125 -msgid "" -"The VPN login failed because the VPN configuration options were invalid." -msgstr "" -"O início de sessão VPN falhou porque as opções de configuração são inválidas." +#~ msgid "Name: %s" +#~ msgstr "Nome: %s" -#: ../src/nm-vpnc-service.c:127 -msgid "" -"The VPN login failed because the VPN program received an invalid " -"configuration from the VPN server." -msgstr "" -"O início de sessão VPN falhou porque a aplicação de VPN recebeu uma " -"configuração inválida do servidor de VPN." +#~ msgid "Gateway: %s" +#~ msgstr "Gateway: %s" + +#~ msgid "Group Name: %s" +#~ msgstr "Nome do Grupo: %s" + +#~ msgid "Username: %s" +#~ msgstr "Utilizador: %s" + +#~ msgid "Domain: %s" +#~ msgstr "Domínio: %s" + +#~ msgid "Routes: %s" +#~ msgstr "Rotas: %s" + +#~ msgid "The connection details can be changed using the \"Edit\" button." +#~ msgstr "" +#~ "Os detalhes da ligação poder ser alterados utilizando o botão \"Edit\"." + +#~ msgid "Cannot import settings" +#~ msgstr "Incapaz de importar as definições" + +#~ msgid "The VPN settings file '%s' does not contain valid data." +#~ msgstr "O ficheiro de definições VPN '%s' não contém dados válidos." + +#~ msgid "Select file to import" +#~ msgstr "Seleccionar o ficheiro a importar" + +#~ msgid "Save as..." +#~ msgstr "Gravar como..." + +#~ msgid "A file named \"%s\" already exists." +#~ msgstr "Já existe um ficheiro denominado \"%s\"." + +#~ msgid "Do you want to replace it with the one you are saving?" +#~ msgstr "Deseja substituí-lo pelo que está a gravar?" + +#~ msgid "Failed to export configuration" +#~ msgstr "Falha ao exportar a configuração" + +#~ msgid "Failed to save file %s" +#~ msgstr "Falha ao gravar o ficheiro %s" + +#~ msgid "Connection Information" +#~ msgstr "Informação de Ligação" + +#~ msgid "Connection Name" +#~ msgstr "Nome da Ligação" + +#~ msgid "example: 172.16.0.0/16 10.11.12.0/24" +#~ msgstr "exemplo: 172.16.0.0/16 10.11.12.0/24" + +#~ msgid "Connection Name" +#~ msgstr "Nome da Ligação" + +#~ msgid "" +#~ "Name used to identify the connection to the private network, e.g. " +#~ "\"Campus VPN\" or \"Corporate Network\"" +#~ msgstr "" +#~ "Nome utilizado para identificar a ligação à rede privada, por. ex. \"VPN " +#~ "da Universidade\" ou \"Rede da Empresa\"" + +#~ msgid "Override _user name" +#~ msgstr "Ignorar o nome do _utilizador" + +#~ msgid "" +#~ "Please enter the information provided by your system administrator below. " +#~ "Do not enter your password here as you will be prompted when connecting." +#~ msgstr "" +#~ "Introduza abaixo a informação disponibilizada pelo administrador do seu " +#~ "sistema. Não introduza aqui a sua senha pois essa ser-lhe-á pedida quando " +#~ "se ligar." + +#~ msgid "" +#~ "Please note that the file you import is not a Cisco VPN or VPNC " +#~ "configuration file. Ask your adminstrator for the file." +#~ msgstr "" +#~ "Note que o ficheiro que importou não é um ficheiro de configuração de VPN " +#~ "ou VPNC Cisco. Peça o ficheiro ao administrador da sua rede." + +#~ msgid "Use _domain for authentication" +#~ msgstr "Utilizar o _domínio para a autenticação" + +#~ msgid "_Import Saved Configuration..." +#~ msgstr "_Importar a Configuração Gravada..." + +#~ msgid "_Only use VPN connection for these addresses" +#~ msgstr "_Apenas utilizar ligação VPN para estes endereços" + +#~ msgid "" +#~ "The VPN login failed because the user name and password were not accepted." +#~ msgstr "" +#~ "O início de sessão VPN falhou porque o utilizador e senha não foram " +#~ "aceites." + +#~ msgid "The VPN login failed because the VPN program could not be started." +#~ msgstr "" +#~ "O início de sessão VPN falhou porque não foi possível iniciar a aplicação " +#~ "de VPN." + +#~ msgid "" +#~ "The VPN login failed because the VPN program could not connect to the VPN " +#~ "server." +#~ msgstr "" +#~ "O início de sessão VPN falhou porque a aplicação de VPN foi incapaz de se " +#~ "ligar ao servidor de VPN." + +#~ msgid "" +#~ "The VPN login failed because the VPN configuration options were invalid." +#~ msgstr "" +#~ "O início de sessão VPN falhou porque as opções de configuração são " +#~ "inválidas." + +#~ msgid "" +#~ "The VPN login failed because the VPN program received an invalid " +#~ "configuration from the VPN server." +#~ msgstr "" +#~ "O início de sessão VPN falhou porque a aplicação de VPN recebeu uma " +#~ "configuração inválida do servidor de VPN." #~ msgid "O_ptional Information" #~ msgstr "Informação O_pcional" diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/po/ru.po /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/ru.po --- network-manager-vpnc-0.7/po/ru.po 2008-08-13 09:42:55.000000000 +0100 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/ru.po 2009-04-09 00:48:29.000000000 +0100 @@ -1,69 +1,57 @@ # translation of ru.po to Russian -# translation of ru.po to -# Ukrainian translation of NetworkManager openvpn +# Russian translation of NetworkManager vpnc # Copyright (C) Free Software Foundation, 2005 # This file is distributed under the same license as the NetworkManager package. # # Maxim Dziumanenko , 2005-2007. # Leonid Kanter , 2007, 2008. +# Артём Попов , 2009. msgid "" msgstr "" "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-08 15:14+0300\n" -"PO-Revision-Date: 2008-08-08 15:19+0300\n" -"Last-Translator: Leonid Kanter \n" -"Language-Team: Russian \n" +"POT-Creation-Date: 2009-02-20 10:34+0300\n" +"PO-Revision-Date: 2009-02-12 16:57+0600\n" +"Last-Translator: Артём Попов \n" +"Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ../auth-dialog/gnome-two-password-dialog.c:144 +#: ../auth-dialog/gnome-two-password-dialog.c:103 msgid "_Secondary Password:" msgstr "_Вторичный пароль:" -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "_Имя пользователя:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "_Домен:" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 +#: ../auth-dialog/gnome-two-password-dialog.c:159 msgid "_Password:" msgstr "_Пароль:" -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "Подключаться _анонимно" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "_Подключаться как пользователь:" +#: ../auth-dialog/gnome-two-password-dialog.c:240 +msgid "Sh_ow passwords" +msgstr "П_оказать пароли" -#: ../auth-dialog/gnome-two-password-dialog.c:465 +#: ../auth-dialog/gnome-two-password-dialog.c:300 msgid "_Remember passwords for this session" msgstr "_Запомнить пароли для этого сеанса" -#: ../auth-dialog/gnome-two-password-dialog.c:467 +#: ../auth-dialog/gnome-two-password-dialog.c:301 msgid "_Save passwords in keyring" msgstr "_Сохранить пароли на брелоке" -#: ../auth-dialog/main.c:182 +#: ../auth-dialog/main.c:170 #, c-format msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Для доступа к виртуальной частной сети '%s' требуется аутентификация." +msgstr "Для доступа к виртуальной частной сети «%s» требуется аутентификация." -#: ../auth-dialog/main.c:183 +#: ../auth-dialog/main.c:171 msgid "Authenticate VPN" msgstr "Аутентификация VPN" -#: ../auth-dialog/main.c:190 +#: ../auth-dialog/main.c:175 msgid "_Group Password:" -msgstr "_Пароль группы:" +msgstr "Пароль _группы:" #: ../nm-vpnc.desktop.in.h:1 msgid "Add, Remove, and Edit VPN Connections" @@ -73,45 +61,57 @@ msgid "VPN Connection Manager (vpnc)" msgstr "Менеджер соединений VPN (vpnc)" -#: ../properties/nm-vpnc.c:51 +#: ../properties/nm-vpnc.c:53 msgid "Cisco Compatible VPN (vpnc)" -msgstr "Cisco-совместимый VPN (vpnc)" +msgstr "Cisco-совместимая VPN (vpnc)" -#: ../properties/nm-vpnc.c:52 +#: ../properties/nm-vpnc.c:54 msgid "" "Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based " "VPN gateways." msgstr "Совместим с различными роутерами Cisco, Juniper, Netscreen, Sonicwall." -#: ../properties/nm-vpnc.c:204 +#: ../properties/nm-vpnc.c:339 +msgid "Saved" +msgstr "Сохранённый" + +#: ../properties/nm-vpnc.c:346 +msgid "Always Ask" +msgstr "Всегда спрашивать" + +#: ../properties/nm-vpnc.c:353 +msgid "Not Required" +msgstr "Не требуется" + +#: ../properties/nm-vpnc.c:412 msgid "Secure (default)" msgstr "Строгое (по умолчанию)" -#: ../properties/nm-vpnc.c:207 +#: ../properties/nm-vpnc.c:415 msgid "Weak (use with caution)" msgstr "Слабое (использовать с осторожностью)" -#: ../properties/nm-vpnc.c:215 +#: ../properties/nm-vpnc.c:423 msgid "None (completely insecure)" msgstr "Нет (без шифрования)" -#: ../properties/nm-vpnc.c:260 -msgid "NAT-T (default)" -msgstr "NAT-T (по умолчанию)" - -#: ../properties/nm-vpnc.c:267 -msgid "Cisco UDP" -msgstr "Cisco UDP" +#: ../properties/nm-vpnc.c:471 +msgid "Cisco UDP (default)" +msgstr "Cisco UDP (по умолчанию)" + +#: ../properties/nm-vpnc.c:478 +msgid "NAT-T" +msgstr "NAT-T" -#: ../properties/nm-vpnc.c:274 +#: ../properties/nm-vpnc.c:485 msgid "Disabled" msgstr "Выключено" -#: ../properties/nm-vpnc.c:697 +#: ../properties/nm-vpnc.c:1116 msgid "TCP tunneling not supported" msgstr "Туннелирование TCP не поддерживается" -#: ../properties/nm-vpnc.c:699 +#: ../properties/nm-vpnc.c:1118 #, c-format msgid "" "The VPN settings file '%s' specifies that VPN traffic should be tunneled " @@ -148,22 +148,48 @@ msgstr "Домен:" #: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "Encryption Method:" +msgid "Encryption method:" msgstr "Метод шифрования:" #: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "G_roup Name:" +msgid "G_roup name:" msgstr "Имя г_руппы:" #: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "NAT Traversal:" -msgstr "Traversal NAT:" +msgid "Gro_up password:" +msgstr "Пароль гр_уппы:" #: ../properties/nm-vpnc-dialog.glade.h:9 +msgid "NAT traversal:" +msgstr "Обход NAT:" + +#: ../properties/nm-vpnc-dialog.glade.h:10 +msgid "Show passwords" +msgstr "Показать пароли" + +#: ../properties/nm-vpnc-dialog.glade.h:11 msgid "User name:" msgstr "Имя пользователя:" -#: ../properties/nm-vpnc-dialog.glade.h:10 +#: ../properties/nm-vpnc-dialog.glade.h:12 msgid "_Gateway:" msgstr "_Шлюз:" +#: ../properties/nm-vpnc-dialog.glade.h:13 +msgid "_User password:" +msgstr "Пароль _пользователя:" + +#~ msgid "_Username:" +#~ msgstr "_Имя пользователя:" + +#~ msgid "_Domain:" +#~ msgstr "_Домен:" + +#~ msgid "Connect _anonymously" +#~ msgstr "Подключаться _анонимно" + +#~ msgid "Connect as _user:" +#~ msgstr "_Подключаться как пользователь:" + +#~ msgid "NAT-T (default)" +#~ msgstr "NAT-T (по умолчанию)" diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/po/sv.po /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/sv.po --- network-manager-vpnc-0.7/po/sv.po 2008-09-08 13:37:25.000000000 +0100 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/sv.po 2009-04-09 00:48:29.000000000 +0100 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: NetworkManager-vpnc\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-05 00:51+0200\n" -"PO-Revision-Date: 2008-09-05 00:52+0100\n" +"POT-Creation-Date: 2008-12-19 00:20+0100\n" +"PO-Revision-Date: 2008-12-19 00:20+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" @@ -18,48 +18,36 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../auth-dialog/gnome-two-password-dialog.c:145 +#: ../auth-dialog/gnome-two-password-dialog.c:118 msgid "_Secondary Password:" msgstr "_Sekundärt lösenord:" -#: ../auth-dialog/gnome-two-password-dialog.c:259 -msgid "_Username:" -msgstr "_Användarnamn:" - -#: ../auth-dialog/gnome-two-password-dialog.c:261 -msgid "_Domain:" -msgstr "_Domän:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 +#: ../auth-dialog/gnome-two-password-dialog.c:174 msgid "_Password:" msgstr "_Lösenord:" -#: ../auth-dialog/gnome-two-password-dialog.c:352 -msgid "Connect _anonymously" -msgstr "Anslut anon_ymt" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect as _user:" -msgstr "Anslut som _användare:" +#: ../auth-dialog/gnome-two-password-dialog.c:255 +msgid "Sh_ow passwords" +msgstr "Visa lösen_ord" -#: ../auth-dialog/gnome-two-password-dialog.c:466 +#: ../auth-dialog/gnome-two-password-dialog.c:315 msgid "_Remember passwords for this session" msgstr "_Kom ihåg lösenord för denna session" -#: ../auth-dialog/gnome-two-password-dialog.c:468 +#: ../auth-dialog/gnome-two-password-dialog.c:316 msgid "_Save passwords in keyring" msgstr "_Spara lösenord i nyckelring" -#: ../auth-dialog/main.c:67 +#: ../auth-dialog/main.c:170 #, c-format msgid "You need to authenticate to access the Virtual Private Network '%s'." msgstr "Du måsta autentisera för att komma åt VPN-nätverket \"%s\"." -#: ../auth-dialog/main.c:68 +#: ../auth-dialog/main.c:171 msgid "Authenticate VPN" msgstr "Autentisera VPN" -#: ../auth-dialog/main.c:75 +#: ../auth-dialog/main.c:175 msgid "_Group Password:" msgstr "_Grupplösenord:" @@ -79,35 +67,47 @@ msgid "Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based VPN gateways." msgstr "Kompatibel med olika Cisco, Juniper, Netscreen och Sonicwall IPSec-baserade VPN-gateway." -#: ../properties/nm-vpnc.c:265 +#: ../properties/nm-vpnc.c:339 +msgid "Saved" +msgstr "Sparat" + +#: ../properties/nm-vpnc.c:346 +msgid "Always Ask" +msgstr "Fråga alltid" + +#: ../properties/nm-vpnc.c:353 +msgid "Not Required" +msgstr "Krävs inte" + +#: ../properties/nm-vpnc.c:412 msgid "Secure (default)" msgstr "Säker (standard)" -#: ../properties/nm-vpnc.c:268 +#: ../properties/nm-vpnc.c:415 msgid "Weak (use with caution)" msgstr "Svag (använd med försiktighet)" -#: ../properties/nm-vpnc.c:276 +#: ../properties/nm-vpnc.c:423 msgid "None (completely insecure)" msgstr "Ingen (totalt osäker)" -#: ../properties/nm-vpnc.c:314 -msgid "NAT-T (default)" -msgstr "NAT-T (standard)" - -#: ../properties/nm-vpnc.c:321 -msgid "Cisco UDP" -msgstr "Cisco UDP" +#: ../properties/nm-vpnc.c:471 +msgid "Cisco UDP (default)" +msgstr "Cisco UDP (standard)" + +#: ../properties/nm-vpnc.c:478 +msgid "NAT-T" +msgstr "NAT-T" -#: ../properties/nm-vpnc.c:328 +#: ../properties/nm-vpnc.c:485 msgid "Disabled" msgstr "Inaktiverad" -#: ../properties/nm-vpnc.c:724 +#: ../properties/nm-vpnc.c:1104 msgid "TCP tunneling not supported" msgstr "TCP-tunnling stöds inte" -#: ../properties/nm-vpnc.c:726 +#: ../properties/nm-vpnc.c:1106 #, c-format msgid "" "The VPN settings file '%s' specifies that VPN traffic should be tunneled through TCP which is currently not supported in the vpnc software.\n" @@ -170,6 +170,16 @@ msgid "_User password:" msgstr "Användarlös_enord:" +#~ msgid "_Username:" +#~ msgstr "_Användarnamn:" +#~ msgid "_Domain:" +#~ msgstr "_Domän:" +#~ msgid "Connect _anonymously" +#~ msgstr "Anslut anon_ymt" +#~ msgid "Connect as _user:" +#~ msgstr "Anslut som _användare:" +#~ msgid "NAT-T (default)" +#~ msgstr "NAT-T (standard)" #~ msgid "G_roup Name:" #~ msgstr "G_ruppnamn:" #~ msgid "The following vpnc VPN connection will be created:" @@ -249,8 +259,6 @@ #~ msgstr "" #~ "Observera att filen som du importerar inte är en konfigurationsfil för " #~ "Cisco VPN eller VPNC. Fråga din adminstratör om filen." -#~ msgid "Required" -#~ msgstr "Krävs" #~ msgid "Use NAT _keepalive packets" #~ msgstr "Använd NAT-_keepalivepaket" #~ msgid "Use _domain for authentication" diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/po/zh_CN.po /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/zh_CN.po --- network-manager-vpnc-0.7/po/zh_CN.po 2008-05-27 21:50:05.000000000 +0100 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/po/zh_CN.po 2009-04-09 00:48:29.000000000 +0100 @@ -1,64 +1,54 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Funda Wang , 2006. +# Wei Mingzhi , 2009. # msgid "" msgstr "" "Project-Id-Version: NetworkManager-vpnc HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-16 04:58+0200\n" -"PO-Revision-Date: 2006-07-16 18:13+0800\n" -"Last-Translator: Funda Wang \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=NetworkManager&component=VPN: vpnc\n" +"POT-Creation-Date: 2009-02-17 01:49+0000\n" +"PO-Revision-Date: 2009-02-18 15:07+0800\n" +"Last-Translator: Wei Mingzhi \n" "Language-Team: zh_CN \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../auth-dialog/gnome-two-password-dialog.c:147 +#: ../auth-dialog/gnome-two-password-dialog.c:103 msgid "_Secondary Password:" -msgstr "次要密码(_S)：" +msgstr "次要密码(_S):" -#: ../auth-dialog/gnome-two-password-dialog.c:267 -msgid "_Username:" -msgstr "用户名(_U)：" - -#: ../auth-dialog/gnome-two-password-dialog.c:269 -msgid "_Domain:" -msgstr "域(_D)：" - -#: ../auth-dialog/gnome-two-password-dialog.c:271 +#: ../auth-dialog/gnome-two-password-dialog.c:159 msgid "_Password:" -msgstr "密码(_P)：" +msgstr "密码(_P):" -#: ../auth-dialog/gnome-two-password-dialog.c:354 -msgid "Connect _anonymously" -msgstr "匿名连接(_A)" +#: ../auth-dialog/gnome-two-password-dialog.c:240 +msgid "Sh_ow passwords" +msgstr "显示密码(_O)" -#: ../auth-dialog/gnome-two-password-dialog.c:359 -msgid "Connect as _user:" -msgstr "以用户连接(_U)：" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 +#: ../auth-dialog/gnome-two-password-dialog.c:300 msgid "_Remember passwords for this session" msgstr "本次会话记住密码(_R)" -#: ../auth-dialog/gnome-two-password-dialog.c:467 +#: ../auth-dialog/gnome-two-password-dialog.c:301 msgid "_Save passwords in keyring" msgstr "在密钥环中保存密码(_S)" -#: ../auth-dialog/main.c:161 +#: ../auth-dialog/main.c:170 #, c-format msgid "You need to authenticate to access the Virtual Private Network '%s'." msgstr "您需要进行身份验证才能访问“%s”。" -#: ../auth-dialog/main.c:162 +#: ../auth-dialog/main.c:171 msgid "Authenticate VPN" -msgstr "" +msgstr "认证 VPN" -#: ../auth-dialog/main.c:169 +#: ../auth-dialog/main.c:175 msgid "_Group Password:" -msgstr "组密码(_G)：" +msgstr "组密码(_G):" #: ../nm-vpnc.desktop.in.h:1 msgid "Add, Remove, and Edit VPN Connections" @@ -68,53 +58,59 @@ msgid "VPN Connection Manager (vpnc)" msgstr "VPN 连接管理器(vpnc)" -#: ../properties/nm-vpnc.c:83 -msgid "Compatible Cisco VPN client (vpnc)" -msgstr "" +#: ../properties/nm-vpnc.c:53 +msgid "Cisco Compatible VPN (vpnc)" +msgstr "Cisco 兼容 VPN (vpnc)" -#: ../properties/nm-vpnc.c:447 -msgid "The following vpnc VPN connection will be created:" +#: ../properties/nm-vpnc.c:54 +msgid "" +"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based " +"VPN gateways." msgstr "" +"与多种 Cisco, Juniper, Netscreen 以及 Sonicwall 的基于 IPSec 的 VPN 网关兼" +"容。" -#: ../properties/nm-vpnc.c:449 -#, c-format -msgid "Name: %s" -msgstr "名称：%s" +#: ../properties/nm-vpnc.c:339 +msgid "Saved" +msgstr "已保存" -#: ../properties/nm-vpnc.c:452 -#, c-format -msgid "Gateway: %s" -msgstr "网关：%s" +#: ../properties/nm-vpnc.c:346 +msgid "Always Ask" +msgstr "总是提示" -#: ../properties/nm-vpnc.c:454 -#, c-format -msgid "Group Name: %s" -msgstr "组名称：%s" +#: ../properties/nm-vpnc.c:353 +msgid "Not Required" +msgstr "不需要" -#: ../properties/nm-vpnc.c:458 -#, c-format -msgid "Username: %s" -msgstr "用户名：%s" +#: ../properties/nm-vpnc.c:412 +msgid "Secure (default)" +msgstr "安全的 (默认)" -#: ../properties/nm-vpnc.c:463 -#, c-format -msgid "Domain: %s" -msgstr "域：%s" +#: ../properties/nm-vpnc.c:415 +msgid "Weak (use with caution)" +msgstr "弱安全性 (谨慎使用)" -#: ../properties/nm-vpnc.c:468 -#, c-format -msgid "Routes: %s" -msgstr "路由：%s" +#: ../properties/nm-vpnc.c:423 +msgid "None (completely insecure)" +msgstr "无 (完全不安全)" -#: ../properties/nm-vpnc.c:472 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "连接细节可使用“编辑”按钮更改。" +#: ../properties/nm-vpnc.c:471 +msgid "Cisco UDP (default)" +msgstr "Cisco UDP (默认)" -#: ../properties/nm-vpnc.c:548 +#: ../properties/nm-vpnc.c:478 +msgid "NAT-T" +msgstr "NAT-T" + +#: ../properties/nm-vpnc.c:485 +msgid "Disabled" +msgstr "禁用" + +#: ../properties/nm-vpnc.c:1116 msgid "TCP tunneling not supported" -msgstr "" +msgstr "不支持 TCP 隧道" -#: ../properties/nm-vpnc.c:550 +#: ../properties/nm-vpnc.c:1118 #, c-format msgid "" "The VPN settings file '%s' specifies that VPN traffic should be tunneled " @@ -123,117 +119,115 @@ "The connection can still be created, with TCP tunneling disabled, however it " "may not work as expected." msgstr "" - -#: ../properties/nm-vpnc.c:574 -msgid "Cannot import settings" -msgstr "" - -#: ../properties/nm-vpnc.c:576 -#, c-format -msgid "The VPN settings file '%s' does not contain valid data." -msgstr "" - -#: ../properties/nm-vpnc.c:593 -msgid "Select file to import" -msgstr "选择要导入的文件" - -#. printf ("in impl_export\n"); -#: ../properties/nm-vpnc.c:753 -msgid "Save as..." -msgstr "另存为..." - -#: ../properties/nm-vpnc.c:783 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "已经存在名为“%s”的文件。" - -#: ../properties/nm-vpnc.c:786 -msgid "Do you want to replace it with the one you are saving?" -msgstr "" - -#: ../properties/nm-vpnc.c:800 -msgid "Failed to export configuration" -msgstr "" - -#: ../properties/nm-vpnc.c:802 -#, c-format -msgid "Failed to save file %s" -msgstr "保存文件 %s 失败" +"VPN 设置文件 '%s' 指定 VPN 流量经由 TCP 隧道，当前 vpnc 软件不支持此特性。\n" +"\n" +"连接仍然可以建立，但 TCP 隧道将被禁用。连接可能无法正确工作。" #: ../properties/nm-vpnc-dialog.glade.h:1 -msgid "Connection Name" -msgstr "连接名称" +msgid " " +msgstr " " #: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "Required Information" -msgstr "所需信息" +msgid "General" +msgstr "一般" #: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "如：172.16.0.0/16 10.11.12.0/24" +msgid "Optional" +msgstr "可选" #: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "G_roup Name:" -msgstr "组名称(_R)：" +msgid "Disable Dead Peer Detection" +msgstr "禁用死端检测" #: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "O_ptional Information" -msgstr "可选信息(_P)" +msgid "Domain:" +msgstr "域:" #: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "Override _user name" -msgstr "覆盖用户名(_U)" +msgid "Encryption method:" +msgstr "加密方法:" #: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "" -"Please enter the information provided by your system administrator below. Do " -"not enter your password here as you will be prompted when connecting." -msgstr "" +msgid "G_roup name:" +msgstr "组名称(_R):" #: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "Use _domain for authentication" -msgstr "" +msgid "Gro_up password:" +msgstr "组密码(_U):" #: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "_Gateway:" -msgstr "网关(_G)：" +msgid "NAT traversal:" +msgstr "NAT 遍历:" #: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "_Import Saved Configuration..." -msgstr "导入已存的配置(_I)..." +msgid "Show passwords" +msgstr "显示密码" #: ../properties/nm-vpnc-dialog.glade.h:11 -msgid "" -"_Name used to identify the connection to the private network, e.g. \"Campus " -"VPN\" or \"Corporate Network\"" -msgstr "" +msgid "User name:" +msgstr "用户名:" #: ../properties/nm-vpnc-dialog.glade.h:12 -msgid "_Only use VPN connection for these addresses" -msgstr "仅对这些地址使用 VPN 连接(_O)" +msgid "_Gateway:" +msgstr "网关(_G):" -#: ../src/nm-vpnc-service.c:117 -msgid "" -"The VPN login failed because the user name and password were not accepted." -msgstr "" +#: ../properties/nm-vpnc-dialog.glade.h:13 +msgid "_User password:" +msgstr "用户密码(_U):" -#: ../src/nm-vpnc-service.c:119 -msgid "The VPN login failed because the VPN program could not be started." -msgstr "" +#~ msgid "Connect _anonymously" +#~ msgstr "匿名连接(_A)" -#: ../src/nm-vpnc-service.c:121 -msgid "" -"The VPN login failed because the VPN program could not connect to the VPN " -"server." -msgstr "" +#~ msgid "Connect as _user:" +#~ msgstr "以用户连接(_U)：" -#: ../src/nm-vpnc-service.c:123 -msgid "" -"The VPN login failed because the VPN configuration options were invalid." -msgstr "" +#~ msgid "Name: %s" +#~ msgstr "名称：%s" -#: ../src/nm-vpnc-service.c:125 -msgid "" -"The VPN login failed because the VPN program received an invalid " -"configuration from the VPN server." -msgstr "" +#~ msgid "Gateway: %s" +#~ msgstr "网关：%s" + +#~ msgid "Group Name: %s" +#~ msgstr "组名称：%s" + +#~ msgid "Username: %s" +#~ msgstr "用户名：%s" + +#~ msgid "Domain: %s" +#~ msgstr "域：%s" + +#~ msgid "Routes: %s" +#~ msgstr "路由：%s" + +#~ msgid "The connection details can be changed using the \"Edit\" button." +#~ msgstr "连接细节可使用“编辑”按钮更改。" + +#~ msgid "Select file to import" +#~ msgstr "选择要导入的文件" + +#~ msgid "Save as..." +#~ msgstr "另存为..." + +#~ msgid "A file named \"%s\" already exists." +#~ msgstr "已经存在名为“%s”的文件。" + +#~ msgid "Failed to save file %s" +#~ msgstr "保存文件 %s 失败" + +#~ msgid "Required Information" +#~ msgstr "所需信息" + +#~ msgid "example: 172.16.0.0/16 10.11.12.0/24" +#~ msgstr "如：172.16.0.0/16 10.11.12.0/24" + +#~ msgid "O_ptional Information" +#~ msgstr "可选信息(_P)" + +#~ msgid "Override _user name" +#~ msgstr "覆盖用户名(_U)" + +#~ msgid "_Import Saved Configuration..." +#~ msgstr "导入已存的配置(_I)..." + +#~ msgid "_Only use VPN connection for these addresses" +#~ msgstr "仅对这些地址使用 VPN 连接(_O)" diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/properties/Makefile.am /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/properties/Makefile.am --- network-manager-vpnc-0.7/properties/Makefile.am 2008-09-08 13:37:25.000000000 +0100 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/properties/Makefile.am 2009-04-09 00:48:29.000000000 +0100 @@ -1,3 +1,5 @@ +SUBDIRS=. tests + INCLUDES = -I${top_srcdir} plugindir = $(libdir)/NetworkManager @@ -31,6 +33,7 @@ $(GTK_LIBS) \ $(GCONF_LIBS) \ $(NM_UTILS_LIBS) \ + $(GNOMEKEYRING_LIBS) \ $(top_builddir)/common-gnome/libnm-vpnc-common-gnome.la libnm_vpnc_properties_la_LDFLAGS = \ diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/properties/nm-vpnc.c /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/properties/nm-vpnc.c --- network-manager-vpnc-0.7/properties/nm-vpnc.c 2008-11-28 17:31:08.000000000 +0000 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/properties/nm-vpnc.c 2009-04-09 00:48:29.000000000 +0100 @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /*************************************************************************** - * CVSID: $Id: nm-vpnc.c 4284 2008-11-14 17:04:29Z dcbw $ + * CVSID: $Id: nm-vpnc.c 4366 2008-12-06 00:19:59Z dcbw $ * * nm-vpnc.c : GNOME UI dialogs for configuring vpnc VPN connections * @@ -308,7 +308,8 @@ init_one_pw_combo (VpncPluginUiWidget *self, NMSettingVPN *s_vpn, const char *combo_name, - const char *key) + const char *key, + const char *entry_name) { VpncPluginUiWidgetPrivate *priv = VPNC_PLUGIN_UI_WIDGET_GET_PRIVATE (self); int active = -1; @@ -316,6 +317,19 @@ GtkListStore *store; GtkTreeIter iter; const char *value = NULL; + guint32 default_idx = 1; + + /* If there's already a password and the password type can't be found in + * the VPN settings, default to saving it. Otherwise, always ask for it. + */ + widget = glade_xml_get_widget (priv->xml, entry_name); + if (widget) { + const char *tmp; + + tmp = gtk_entry_get_text (GTK_ENTRY (widget)); + if (tmp && strlen (tmp)) + default_idx = 0; + } store = gtk_list_store_new (1, G_TYPE_STRING); if (s_vpn) @@ -346,7 +360,7 @@ g_assert (widget); gtk_combo_box_set_model (GTK_COMBO_BOX (widget), GTK_TREE_MODEL (store)); g_object_unref (store); - gtk_combo_box_set_active (GTK_COMBO_BOX (widget), active < 0 ? 0 : active); + gtk_combo_box_set_active (GTK_COMBO_BOX (widget), active < 0 ? default_idx : active); pw_type_changed_helper (self, widget); g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (pw_type_combo_changed_cb), self); @@ -418,8 +432,15 @@ gtk_combo_box_set_active (GTK_COMBO_BOX (widget), active < 0 ? 0 : active); g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self); - init_one_pw_combo (self, s_vpn, "user_pass_type_combo", NM_VPNC_KEY_XAUTH_PASSWORD_TYPE); - init_one_pw_combo (self, s_vpn, "group_pass_type_combo", NM_VPNC_KEY_SECRET_TYPE); + /* Fill the VPN passwords *before* initializing the PW type combos, since + * knowing if there are passwords when initializing the combos is helpful. + */ + fill_vpn_passwords (self, connection); + + init_one_pw_combo (self, s_vpn, "user_pass_type_combo", + NM_VPNC_KEY_XAUTH_PASSWORD_TYPE, "user_password_entry"); + init_one_pw_combo (self, s_vpn, "group_pass_type_combo", + NM_VPNC_KEY_SECRET_TYPE, "group_password_entry"); widget = glade_xml_get_widget (priv->xml, "user_entry"); g_return_val_if_fail (widget != NULL, FALSE); @@ -493,8 +514,6 @@ } g_signal_connect (G_OBJECT (widget), "toggled", G_CALLBACK (stuff_changed_cb), self); - fill_vpn_passwords (self, connection); - widget = glade_xml_get_widget (priv->xml, "show_passwords_checkbutton"); g_return_val_if_fail (widget != NULL, FALSE); g_signal_connect (G_OBJECT (widget), "toggled", @@ -955,7 +974,9 @@ NMSettingVPN *s_vpn; GHashTable *pcf; const char *buf; - gboolean have_value; + gboolean bool_value; + NMSettingIP4Config *s_ip4; + gint val; pcf = pcf_file_load (path); if (!pcf) { @@ -972,8 +993,11 @@ g_object_set (s_vpn, NM_SETTING_VPN_SERVICE_TYPE, NM_DBUS_SERVICE_VPNC, NULL); nm_connection_add_setting (connection, NM_SETTING (s_vpn)); + s_ip4 = NM_SETTING_IP4_CONFIG (nm_setting_ip4_config_new ()); + nm_connection_add_setting (connection, NM_SETTING (s_ip4)); + /* Connection name */ - if ((buf = pcf_file_lookup_value (pcf, "main", "Description"))) + if (pcf_file_lookup_string (pcf, "main", "Description", &buf)) g_object_set (s_con, NM_SETTING_CONNECTION_ID, buf, NULL); else { g_set_error (error, 0, 0, "does not look like a %s VPN connection (parse failed)", @@ -983,7 +1007,7 @@ } /* Gateway */ - if ((buf = pcf_file_lookup_value (pcf, "main", "Host"))) + if (pcf_file_lookup_string (pcf, "main", "Host", &buf)) nm_setting_vpn_add_data_item (s_vpn, NM_VPNC_KEY_GATEWAY, buf); else { g_set_error (error, 0, 0, "does not look like a %s VPN connection (no Host)", @@ -993,7 +1017,7 @@ } /* Group name */ - if ((buf = pcf_file_lookup_value (pcf, "main", "GroupName"))) + if (pcf_file_lookup_string (pcf, "main", "GroupName", &buf)) nm_setting_vpn_add_data_item (s_vpn, NM_VPNC_KEY_ID, buf); else { g_set_error (error, 0, 0, "does not look like a %s VPN connection (no GroupName)", @@ -1004,25 +1028,25 @@ /* Optional settings */ - buf = pcf_file_lookup_value (pcf, "main", "UserName"); - have_value = buf == NULL ? FALSE : strlen (buf) > 0; - if (have_value) + if (pcf_file_lookup_string (pcf, "main", "UserName", &buf)) nm_setting_vpn_add_data_item (s_vpn, NM_VPNC_KEY_XAUTH_USER, buf); - buf = pcf_file_lookup_value (pcf, "main", "UserPassword"); - have_value = buf == NULL ? FALSE : strlen (buf) > 0; - if (have_value) + if (pcf_file_lookup_string (pcf, "main", "UserPassword", &buf)) nm_setting_vpn_add_secret (s_vpn, NM_VPNC_KEY_XAUTH_PASSWORD, buf); - buf = pcf_file_lookup_value (pcf, "main", "GroupPwd"); - have_value = buf == NULL ? FALSE : strlen (buf) > 0; - if (have_value) + if (pcf_file_lookup_bool (pcf, "main", "SaveUserPassword", &bool_value)) { + if (bool_value) { + nm_setting_vpn_add_data_item (s_vpn, + NM_VPNC_KEY_XAUTH_PASSWORD_TYPE, + NM_VPNC_PW_TYPE_SAVE); + } + } + + if (pcf_file_lookup_string (pcf, "main", "GroupPwd", &buf)) nm_setting_vpn_add_secret (s_vpn, NM_VPNC_KEY_SECRET, buf); else { /* Handle encrypted passwords */ - buf = pcf_file_lookup_value (pcf, "main", "enc_GroupPwd"); - have_value = buf == NULL ? FALSE : strlen (buf) > 0; - if (have_value) { + if (pcf_file_lookup_string (pcf, "main", "enc_GroupPwd", &buf)) { char *decrypted; decrypted = decrypt_cisco_key (buf); @@ -1034,57 +1058,64 @@ } } - buf = pcf_file_lookup_value (pcf, "main", "NTDomain"); - have_value = buf == NULL ? FALSE : strlen (buf) > 0; - if (have_value) + if (pcf_file_lookup_string (pcf, "main", "NTDomain", &buf)) nm_setting_vpn_add_data_item (s_vpn, NM_VPNC_KEY_DOMAIN, buf); - buf = pcf_file_lookup_value (pcf, "main", "SingleDES"); - have_value = (buf == NULL ? FALSE : strcmp (buf, "0") != 0); - if (have_value) - nm_setting_vpn_add_data_item (s_vpn, NM_VPNC_KEY_SINGLE_DES, "yes"); + if (pcf_file_lookup_bool (pcf, "main", "SingleDES", &bool_value)) { + if (bool_value) + nm_setting_vpn_add_data_item (s_vpn, NM_VPNC_KEY_SINGLE_DES, "yes"); + } /* Default is enabled, only disabled if explicit EnableNat=0 exists */ - buf = pcf_file_lookup_value (pcf, "main", "EnableNat"); - have_value = (buf ? strncmp (buf, "0", 1) == 0 : FALSE); - if (have_value) - nm_setting_vpn_add_data_item (s_vpn, NM_VPNC_KEY_NAT_TRAVERSAL_MODE, NM_VPNC_NATT_MODE_NATT); + if (pcf_file_lookup_bool (pcf, "main", "EnableNat", &bool_value)) { + if (!bool_value) { + nm_setting_vpn_add_data_item (s_vpn, + NM_VPNC_KEY_NAT_TRAVERSAL_MODE, + NM_VPNC_NATT_MODE_NONE); + } + } - if ((buf = pcf_file_lookup_value (pcf, "main", "PeerTimeout"))) { - long int val; + /* Default to Cisco UDP */ + if (!nm_setting_vpn_get_data_item (s_vpn, NM_VPNC_KEY_NAT_TRAVERSAL_MODE)) { + nm_setting_vpn_add_data_item (s_vpn, + NM_VPNC_KEY_NAT_TRAVERSAL_MODE, + NM_VPNC_NATT_MODE_CISCO); + } - errno = 0; - val = strtol (buf, NULL, 10); - if ((errno == 0) && ((val == 0) || ((val >= 10) && (val <= 86400)))) { + if (pcf_file_lookup_int (pcf, "main", "PeerTimeout", &val)) { + if ((val == 0) || ((val >= 10) && (val <= 86400))) { char *tmp = g_strdup_printf ("%d", (gint) val); nm_setting_vpn_add_data_item (s_vpn, NM_VPNC_KEY_DPD_IDLE_TIMEOUT, tmp); g_free (tmp); } } - buf = pcf_file_lookup_value (pcf, "main", "X-NM-Routes"); - have_value = buf == NULL ? FALSE : strlen (buf) > 0; - if (have_value) { - NMSettingIP4Config *s_ip4; + if (pcf_file_lookup_bool (pcf, "main", "EnableLocalLAN", &bool_value)) { + if (bool_value) + g_object_set (s_ip4, NM_SETTING_IP4_CONFIG_NEVER_DEFAULT, TRUE, NULL); + } - s_ip4 = NM_SETTING_IP4_CONFIG (nm_setting_ip4_config_new ()); - nm_connection_add_setting (connection, NM_SETTING (s_ip4)); - add_routes (s_ip4, buf); + if (pcf_file_lookup_string (pcf, "main", "DHGroup", &buf)) { + if (!strcmp (buf, "1") || !strcmp (buf, "2") || !strcmp (buf, "5")) + nm_setting_vpn_add_data_item (s_vpn, NM_VPNC_KEY_DHGROUP, buf); } - if ((buf = pcf_file_lookup_value (pcf, "main", "TunnelingMode"))) { + if (pcf_file_lookup_string (pcf, "main", "X-NM-Routes", &buf)) + add_routes (s_ip4, buf); + + if (pcf_file_lookup_int (pcf, "main", "TunnelingMode", &val)) { /* If applicable, put up warning that TCP tunneling will be disabled */ - if (strncmp (buf, "1", 1) == 0) { + if (val == 1) { GtkWidget *dialog; char *basename; basename = g_path_get_basename (path); dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE, - _("TCP tunneling not supported")); + GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE, + _("TCP tunneling not supported")); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), - _("The VPN settings file '%s' specifies that VPN traffic should be tunneled through TCP which is currently not supported in the vpnc software.\n\nThe connection can still be created, with TCP tunneling disabled, however it may not work as expected."), basename); + _("The VPN settings file '%s' specifies that VPN traffic should be tunneled through TCP which is currently not supported in the vpnc software.\n\nThe connection can still be created, with TCP tunneling disabled, however it may not work as expected."), basename); g_free (basename); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); @@ -1114,8 +1145,11 @@ const char *username = NULL; const char *domain = NULL; const char *peertimeout = NULL; + const char *dhgroup = NULL; GString *routes = NULL; gboolean success = FALSE; + guint32 routes_count = 0; + gboolean save_password = FALSE; s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION)); s_ip4 = (NMSettingIP4Config *) nm_connection_get_setting (connection, NM_TYPE_SETTING_IP4_CONFIG); @@ -1150,7 +1184,7 @@ value = nm_setting_vpn_get_data_item (s_vpn, NM_VPNC_KEY_DOMAIN); if (value && strlen (value)) - domain = value; + domain = value; value = nm_setting_vpn_get_data_item (s_vpn, NM_VPNC_KEY_SINGLE_DES); if (value && !strcmp (value, "yes")) @@ -1164,7 +1198,17 @@ if (value && strlen (value)) peertimeout = value; - routes = g_string_new (""); + value = nm_setting_vpn_get_data_item (s_vpn, NM_VPNC_KEY_DHGROUP); + if (value && strlen (value)) + dhgroup = value; + + value = nm_setting_vpn_get_data_item (s_vpn, NM_VPNC_KEY_XAUTH_PASSWORD_TYPE); + if (value && strlen (value)) { + if (!strcmp (value, NM_VPNC_PW_TYPE_SAVE)) + save_password = TRUE; + } + + routes = g_string_new ("X-NM-Routes="); if (s_ip4 && nm_setting_ip4_config_get_num_routes (s_ip4)) { int i; @@ -1173,14 +1217,20 @@ char str_addr[INET_ADDRSTRLEN + 1]; struct in_addr num_addr; - if (routes->len) + if (routes_count) g_string_append_c (routes, ' '); num_addr.s_addr = nm_ip4_route_get_dest (route); if (inet_ntop (AF_INET, &num_addr, &str_addr[0], INET_ADDRSTRLEN + 1)) g_string_append_printf (routes, "%s/%d", str_addr, nm_ip4_route_get_prefix (route)); + + routes_count++; } } + if (!routes_count) { + g_string_free (routes, TRUE); + routes = NULL; + } fprintf (f, "[main]\n" @@ -1194,7 +1244,7 @@ "ISPConnect=\n" "ISPCommand=\n" "Username=%s\n" - "SaveUserPassword=0\n" + "SaveUserPassword=%s\n" "EnableBackup=0\n" "BackupServer=\n" "EnableNat=%s\n" @@ -1203,7 +1253,7 @@ "CertPath=\n" "CertSubjectName=\n" "CertSerialHash=\n" - "DHGroup=2\n" + "DHGroup=%s\n" "ForceKeepAlives=0\n" "enc_GroupPwd=\n" "UserPassword=\n" @@ -1220,16 +1270,18 @@ "EnableSplitDNS=1\n" "SingleDES=%s\n" "SPPhonebook=\n" - "%s", - /* Description */ nm_setting_connection_get_id (s_con), - /* Host */ gateway, - /* GroupName */ groupname, - /* Username */ username != NULL ? username : "", - /* EnableNat */ enablenat ? "1" : "0", - /* NTDomain */ domain != NULL ? domain : "", - /* PeerTimeout */ peertimeout != NULL ? peertimeout : "0", - /* SingleDES */ singledes ? "1" : "0", - /* X-NM-Routes */ routes->str ? routes->str : ""); + "%s\n", + /* Description */ nm_setting_connection_get_id (s_con), + /* Host */ gateway, + /* GroupName */ groupname, + /* Username */ username != NULL ? username : "", + /* Save Password */ save_password ? "1" : "0", + /* EnableNat */ enablenat ? "1" : "0", + /* DHGroup */ dhgroup != NULL ? dhgroup : "2", + /* NTDomain */ domain != NULL ? domain : "", + /* PeerTimeout */ peertimeout != NULL ? peertimeout : "0", + /* SingleDES */ singledes ? "1" : "0", + /* X-NM-Routes */ (routes && routes->str) ? routes->str : ""); success = TRUE; diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/properties/pcf-file.c /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/properties/pcf-file.c --- network-manager-vpnc-0.7/properties/pcf-file.c 2008-05-27 21:50:05.000000000 +0100 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/properties/pcf-file.c 2009-04-09 00:48:29.000000000 +0100 @@ -1,7 +1,29 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* NetworkManager -- Network link 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 2005 - 2008 Red Hat, Inc. + * (C) Copyright 2007 - 2008 Novell, Inc. + */ + #include #include #include #include +#include #include "pcf-file.h" @@ -71,6 +93,7 @@ g_hash_table_insert (pcf, g_utf8_strdown (s+1, -1), group); } else { PcfEntry *entry; + char *key; /* Normal assignment */ if (!(e = strchr (s, '='))) { @@ -90,13 +113,15 @@ entry->value = g_strdup (e); if (*s == '!') { - entry->key = g_utf8_strdown (s+1, -1); + key = g_utf8_strdown (s+1, -1); entry->read_only = TRUE; } else { - entry->key = g_utf8_strdown (s, -1); + key = g_utf8_strdown (s, -1); entry->read_only = FALSE; } + entry->key = g_strdup (g_strstrip (key)); + g_free (key); g_hash_table_insert (group, entry->key, entry); } } @@ -118,8 +143,8 @@ PcfEntry * pcf_file_lookup (GHashTable *pcf_file, - const char *group, - const char *key) + const char *group, + const char *key) { gpointer section; PcfEntry *entry = NULL; @@ -143,16 +168,94 @@ return entry; } -const char * -pcf_file_lookup_value (GHashTable *pcf_file, - const char *group, - const char *key) +gboolean +pcf_file_lookup_string (GHashTable *pcf_file, + const char *group, + const char *key, + const char **value) { PcfEntry *entry; + g_return_val_if_fail (pcf_file != NULL, FALSE); + g_return_val_if_fail (group != NULL, FALSE); + g_return_val_if_fail (key != NULL, FALSE); + g_return_val_if_fail (value != NULL, FALSE); + + *value = NULL; entry = pcf_file_lookup (pcf_file, group, key); - if (entry) - return entry->value; + if (!entry || !entry->value || !strlen (entry->value)) + return FALSE; + + *value = entry->value; + return TRUE; +} + +gboolean +pcf_file_lookup_bool (GHashTable *pcf_file, + const char *group, + const char *key, + gboolean *value) +{ + const char *buf = NULL; + gboolean success = FALSE; + + g_return_val_if_fail (pcf_file != NULL, FALSE); + g_return_val_if_fail (group != NULL, FALSE); + g_return_val_if_fail (key != NULL, FALSE); + g_return_val_if_fail (value != NULL, FALSE); + + *value = FALSE; + if (!pcf_file_lookup_string (pcf_file, group, key, &buf)) + return FALSE; + + if (strlen (buf) == 1) { + if (strcmp (buf, "1") == 0) { + *value = TRUE; + success = TRUE; + } else if (strcmp (buf, "0") == 0) { + *value = FALSE; + success = TRUE; + } + } else { + if ( !strncasecmp (buf, "yes", 3) + || !strncasecmp (buf, "true", 4)) { + *value = TRUE; + success = TRUE; + } else if ( !strncasecmp (buf, "no", 2) + || !strncasecmp (buf, "false", 5)) { + *value = FALSE; + success = TRUE; + } + } - return NULL; + return success; } + +gboolean +pcf_file_lookup_int (GHashTable *pcf_file, + const char *group, + const char *key, + gint *value) +{ + const char *buf = NULL; + long int tmp; + + g_return_val_if_fail (pcf_file != NULL, FALSE); + g_return_val_if_fail (group != NULL, FALSE); + g_return_val_if_fail (key != NULL, FALSE); + g_return_val_if_fail (value != NULL, FALSE); + + *value = 0; + if (!pcf_file_lookup_string (pcf_file, group, key, &buf)) + return FALSE; + + errno = 0; + tmp = strtol (buf, NULL, 10); + if ((errno == 0) && (tmp > G_MININT) && (tmp < G_MAXINT)) { + *value = (gint) tmp; + return TRUE; + } + + return FALSE; +} + diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/properties/pcf-file.h /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/properties/pcf-file.h --- network-manager-vpnc-0.7/properties/pcf-file.h 2008-05-27 21:50:05.000000000 +0100 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/properties/pcf-file.h 2009-04-09 00:48:29.000000000 +0100 @@ -1,3 +1,24 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* NetworkManager -- Network link 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 2005 - 2008 Red Hat, Inc. + * (C) Copyright 2007 - 2008 Novell, Inc. + */ + #ifndef PCF_FILE_H #define PCF_FILE_H @@ -13,11 +34,23 @@ GHashTable *pcf_file_load (const char *fname); PcfEntry *pcf_file_lookup (GHashTable *pcf_file, - const char *group, - const char *key); + const char *group, + const char *key); -const char *pcf_file_lookup_value (GHashTable *pcf_file, - const char *group, - const char *key); +gboolean pcf_file_lookup_string (GHashTable *pcf_file, + const char *group, + const char *key, + const char **value); + +gboolean pcf_file_lookup_bool (GHashTable *pcf_file, + const char *group, + const char *key, + gboolean *value); + +gboolean pcf_file_lookup_int (GHashTable *pcf_file, + const char *group, + const char *key, + gint *value); #endif /* PCF_FILE_H */ + diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/properties/tests/Makefile.am /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/properties/tests/Makefile.am --- network-manager-vpnc-0.7/properties/tests/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/properties/tests/Makefile.am 2009-04-09 00:48:29.000000000 +0100 @@ -0,0 +1,35 @@ +SUBDIRS=pcf + +INCLUDES = -I${top_srcdir} + +noinst_PROGRAMS = test-import-export + +test_import_export_SOURCES = \ + test-import-export.c + +test_import_export_CPPFLAGS = \ + $(GLIB_CFLAGS) \ + $(GLADE_CFLAGS) \ + $(GTK_CFLAGS) \ + $(GCONF_CFLAGS) \ + $(GNOMEKEYRING_CFLAGS) \ + $(NM_UTILS_CFLAGS) \ + $(DBUS_CFLAGS) + +test_import_export_LDADD = \ + $(GTHREAD_LIBS) \ + $(GLADE_LIBS) \ + $(GTK_LIBS) \ + $(GCONF_LIBS) \ + $(GNOMEKEYRING_LIBS) \ + $(DBUS_LIBS) \ + $(NM_UTILS_LIBS) \ + $(top_builddir)/properties/libnm-vpnc-properties.la + +if WITH_TESTS + +check-local: test-import-export + $(abs_builddir)/test-import-export $(abs_srcdir)/pcf + +endif + diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/properties/tests/pcf/always-ask.pcf /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/properties/tests/pcf/always-ask.pcf --- network-manager-vpnc-0.7/properties/tests/pcf/always-ask.pcf 1970-01-01 01:00:00.000000000 +0100 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/properties/tests/pcf/always-ask.pcf 2009-04-09 00:48:29.000000000 +0100 @@ -0,0 +1,38 @@ +[main] +Description=Always Ask For Password +!Host=10.20.30.40 +!AuthType=1 +!GroupName=blahblah +!GroupPwd=my-group-password +!enc_GroupPwd= +EnableISPConnect=0 +ISPConnectType=0 +ISPConnect= +ISPCommand= +Username=bsmith +SaveUserPassword=0 +UserPassword=my-user-password +enc_UserPassword= +!NTDomain=COMPANY +!EnableBackup=0 +!BackupServer= +!EnableMSLogon=1 +!MSLogonType=0 +!EnableNat=1 +!TunnelingMode=0 +!TcpTunnelingPort=10000 +CertStore=0 +CertName= +CertPath= +CertSubjectName= +CertSerialHash=00000000000000000000000000000000 +SendCertChain=0 +VerifyCertDN= +DHGroup=2 +ForceKeepAlives=1 +PeerTimeout=90 +!EnableLocalLAN=1 +!EnableSplitDNS=1 +ISPPhonebook= +X-NM-Routes=10.0.0.0/8 172.16.0.0/16 + diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/properties/tests/pcf/basic.pcf /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/properties/tests/pcf/basic.pcf --- network-manager-vpnc-0.7/properties/tests/pcf/basic.pcf 1970-01-01 01:00:00.000000000 +0100 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/properties/tests/pcf/basic.pcf 2009-04-09 00:48:29.000000000 +0100 @@ -0,0 +1,38 @@ +[main] +Description=Basic VPN +!Host=10.20.30.40 +!AuthType=1 +!GroupName=blahblah +!GroupPwd=my-group-password +!enc_GroupPwd= +EnableISPConnect=0 +ISPConnectType=0 +ISPConnect= +ISPCommand= +Username=bsmith +SaveUserPassword=1 +UserPassword=my-user-password +enc_UserPassword= +!NTDomain=COMPANY +!EnableBackup=0 +!BackupServer= +!EnableMSLogon=1 +!MSLogonType=0 +!EnableNat=1 +!TunnelingMode=0 +!TcpTunnelingPort=10000 +CertStore=0 +CertName= +CertPath= +CertSubjectName= +CertSerialHash=00000000000000000000000000000000 +SendCertChain=0 +VerifyCertDN= +DHGroup=2 +ForceKeepAlives=1 +PeerTimeout=90 +!EnableLocalLAN=1 +!EnableSplitDNS=1 +ISPPhonebook= +X-NM-Routes=10.0.0.0/8 172.16.0.0/16 + diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/properties/tests/pcf/everything-via-vpn.pcf /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/properties/tests/pcf/everything-via-vpn.pcf --- network-manager-vpnc-0.7/properties/tests/pcf/everything-via-vpn.pcf 1970-01-01 01:00:00.000000000 +0100 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/properties/tests/pcf/everything-via-vpn.pcf 2009-04-09 00:48:29.000000000 +0100 @@ -0,0 +1,37 @@ +[main] +Description=All your traffic are belong to VPN +!Host=10.20.30.40 +!AuthType=1 +!GroupName=blahblah +!GroupPwd=my-group-password +!enc_GroupPwd= +EnableISPConnect=0 +ISPConnectType=0 +ISPConnect= +ISPCommand= +Username=bsmith +SaveUserPassword=1 +UserPassword=my-user-password +enc_UserPassword= +!NTDomain=COMPANY +!EnableBackup=0 +!BackupServer= +!EnableMSLogon=1 +!MSLogonType=0 +!EnableNat=1 +!TunnelingMode=0 +!TcpTunnelingPort=10000 +CertStore=0 +CertName= +CertPath= +CertSubjectName= +CertSerialHash=00000000000000000000000000000000 +SendCertChain=0 +VerifyCertDN= +DHGroup=2 +ForceKeepAlives=1 +PeerTimeout=90 +!EnableLocalLAN=0 +!EnableSplitDNS=0 +ISPPhonebook= + diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/properties/tests/pcf/Makefile.am /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/properties/tests/pcf/Makefile.am --- network-manager-vpnc-0.7/properties/tests/pcf/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/properties/tests/pcf/Makefile.am 2009-04-09 00:48:29.000000000 +0100 @@ -0,0 +1,6 @@ +EXTRA_DIST = \ + basic.pcf \ + everything-via-vpn.pcf \ + no-natt.pcf \ + always-ask.pcf + diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/properties/tests/pcf/no-natt.pcf /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/properties/tests/pcf/no-natt.pcf --- network-manager-vpnc-0.7/properties/tests/pcf/no-natt.pcf 1970-01-01 01:00:00.000000000 +0100 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/properties/tests/pcf/no-natt.pcf 2009-04-09 00:48:29.000000000 +0100 @@ -0,0 +1,38 @@ +[main] +Description=No NAT Traversal +!Host=10.20.30.40 +!AuthType=1 +!GroupName=blahblah +!GroupPwd=my-group-password +!enc_GroupPwd= +EnableISPConnect=0 +ISPConnectType=0 +ISPConnect= +ISPCommand= +Username=bsmith +SaveUserPassword=1 +UserPassword=my-user-password +enc_UserPassword= +!NTDomain=COMPANY +!EnableBackup=0 +!BackupServer= +!EnableMSLogon=1 +!MSLogonType=0 +!EnableNat=0 +!TunnelingMode=0 +!TcpTunnelingPort=10000 +CertStore=0 +CertName= +CertPath= +CertSubjectName= +CertSerialHash=00000000000000000000000000000000 +SendCertChain=0 +VerifyCertDN= +DHGroup=2 +ForceKeepAlives=1 +PeerTimeout=90 +!EnableLocalLAN=1 +!EnableSplitDNS=1 +ISPPhonebook= +X-NM-Routes=10.0.0.0/8 172.16.0.0/16 + diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/properties/tests/test-import-export.c /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/properties/tests/test-import-export.c --- network-manager-vpnc-0.7/properties/tests/test-import-export.c 1970-01-01 01:00:00.000000000 +0100 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/properties/tests/test-import-export.c 2009-04-09 00:48:29.000000000 +0100 @@ -0,0 +1,469 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* + * Copyright (C) 2009 Dan Williams, + * + * 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. + * + */ + +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#define NM_VPN_API_SUBJECT_TO_CHANGE +#include + +#include "nm-test-helpers.h" +#include "properties/nm-vpnc.h" +#include "src/nm-vpnc-service.h" + +typedef struct { + const char *name; + const char *value; +} Item; + +static void +item_count_func (const char *key, const char *value, gpointer user_data) +{ + (* (guint32 *) user_data)++; +} + +static void +test_items (const char *detail, NMSettingVPN *s_vpn, Item *test_items, gboolean secrets) +{ + Item *iter; + guint32 expected_count = 0, actual_count = 0; + const char *value; + + for (iter = test_items; iter->name; iter++) { + if (secrets) + value = nm_setting_vpn_get_secret (s_vpn, iter->name); + else + value = nm_setting_vpn_get_data_item (s_vpn, iter->name); + + if (!iter->value) { + ASSERT (value == NULL, detail, "unexpected item '%s'", iter->name); + } else { + ASSERT (value != NULL, detail, "unexpected missing value for item %s", iter->name); + ASSERT (strcmp (value, iter->value) == 0, detail, "unexpected value for item %s", iter->name); + expected_count++; + } + } + + if (secrets) + nm_setting_vpn_foreach_secret (s_vpn, item_count_func, &actual_count); + else + nm_setting_vpn_foreach_data_item (s_vpn, item_count_func, &actual_count); + + ASSERT (actual_count == expected_count, + detail, "unexpected number of items (got %d, expected %d", actual_count, expected_count); +} + + +static Item basic_items[] = { + { NM_VPNC_KEY_GATEWAY, "10.20.30.40" }, + { NM_VPNC_KEY_ID, "blahblah" }, + { NM_VPNC_KEY_SECRET_TYPE, NULL }, + { NM_VPNC_KEY_XAUTH_USER, "bsmith" }, + { NM_VPNC_KEY_XAUTH_PASSWORD_TYPE, NM_VPNC_PW_TYPE_SAVE }, + { NM_VPNC_KEY_DOMAIN, "COMPANY" }, + { NM_VPNC_KEY_DHGROUP, "2" }, + { NM_VPNC_KEY_PERFECT_FORWARD, NULL }, + { NM_VPNC_KEY_APP_VERSION, NULL }, + { NM_VPNC_KEY_SINGLE_DES, NULL }, + { NM_VPNC_KEY_NO_ENCRYPTION, NULL }, + { NM_VPNC_KEY_NAT_TRAVERSAL_MODE, NM_VPNC_NATT_MODE_CISCO }, + { NM_VPNC_KEY_DPD_IDLE_TIMEOUT, "90" }, + { NM_VPNC_KEY_CISCO_UDP_ENCAPS_PORT, NULL }, + { NULL, NULL } +}; + +static Item basic_secrets[] = { + { NM_VPNC_KEY_SECRET, "my-group-password" }, + { NM_VPNC_KEY_XAUTH_PASSWORD, "my-user-password" }, + { NULL, NULL } +}; + +static NMConnection * +get_basic_connection (const char *detail, + NMVpnPluginUiInterface *plugin, + const char *dir, + const char *filename) +{ + NMConnection *connection; + GError *error = NULL; + char *pcf; + + pcf = g_build_path ("/", dir, filename, NULL); + ASSERT (pcf != NULL, + "basic", "failed to create pcf path"); + + connection = nm_vpn_plugin_ui_interface_import (plugin, pcf, &error); + if (error) + FAIL ("basic", "error importing %s: %s", pcf, error->message); + ASSERT (connection != NULL, + "basic", "error importing %s: (unknown)", pcf); + + g_free (pcf); + return connection; +} + +static void +test_basic_import (NMVpnPluginUiInterface *plugin, const char *dir) +{ + NMConnection *connection; + NMSettingConnection *s_con; + NMSettingIP4Config *s_ip4; + NMSettingVPN *s_vpn; + NMIP4Route *route; + struct in_addr tmp; + const char *expected_id = "Basic VPN"; + const char *expected_route1_dest = "10.0.0.0"; + const char *expected_route1_gw = "0.0.0.0"; + const char *expected_route2_dest = "172.16.0.0"; + const char *expected_route2_gw = "0.0.0.0"; + const char *value; + + connection = get_basic_connection ("basic-import", plugin, dir, "basic.pcf"); + ASSERT (connection != NULL, "basic-import", "failed to import connection"); + + /* Connection setting */ + s_con = (NMSettingConnection *) nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION); + ASSERT (s_con != NULL, + "basic-import", "missing 'connection' setting"); + + ASSERT (strcmp (nm_setting_connection_get_id (s_con), expected_id) == 0, + "basic-import", "unexpected connection ID"); + + ASSERT (nm_setting_connection_get_uuid (s_con) == NULL, + "basic-import", "unexpected valid UUID"); + + /* IP4 setting */ + s_ip4 = (NMSettingIP4Config *) nm_connection_get_setting (connection, NM_TYPE_SETTING_IP4_CONFIG); + ASSERT (s_con != NULL, + "basic-import", "missing 'ip4-config' setting"); + + ASSERT (nm_setting_ip4_config_get_num_addresses (s_ip4) == 0, + "basic-import", "unexpected addresses"); + + ASSERT (nm_setting_ip4_config_get_never_default (s_ip4) == TRUE, + "basic-import", "never-default unexpectedly FALSE"); + + ASSERT (nm_setting_ip4_config_get_method (s_ip4) == NULL, + "basic-import", "unexpected IPv4 method"); + + ASSERT (nm_setting_ip4_config_get_dhcp_client_id (s_ip4) == NULL, + "basic-import", "unexpected valid DHCP client ID"); + + ASSERT (nm_setting_ip4_config_get_dhcp_hostname (s_ip4) == NULL, + "basic-import", "unexpected valid DHCP hostname"); + + ASSERT (nm_setting_ip4_config_get_num_dns_searches (s_ip4) == 0, + "basic-import", "unexpected DNS searches"); + + ASSERT (nm_setting_ip4_config_get_num_dns (s_ip4) == 0, + "basic-import", "unexpected DNS servers"); + + ASSERT (nm_setting_ip4_config_get_num_routes (s_ip4) == 2, + "basic-import", "unexpected number of routes"); + + /* Route #1 */ + route = nm_setting_ip4_config_get_route (s_ip4, 0); + ASSERT (inet_pton (AF_INET, expected_route1_dest, &tmp) > 0, + "basic-import", "couldn't convert expected route destination #1"); + ASSERT (nm_ip4_route_get_dest (route) == tmp.s_addr, + "basic-import", "unexpected route #1 destination"); + + ASSERT (inet_pton (AF_INET, expected_route1_gw, &tmp) > 0, + "basic-import", "couldn't convert expected route next hop #1"); + ASSERT (nm_ip4_route_get_next_hop (route) == tmp.s_addr, + "basic-import", "unexpected route #1 next hop"); + + ASSERT (nm_ip4_route_get_prefix (route) == 8, + "basic-import", "unexpected route #1 prefix"); + ASSERT (nm_ip4_route_get_metric (route) == 0, + "basic-import", "unexpected route #1 metric"); + + /* Route #2 */ + route = nm_setting_ip4_config_get_route (s_ip4, 1); + ASSERT (inet_pton (AF_INET, expected_route2_dest, &tmp) > 0, + "basic-import", "couldn't convert expected route destination #2"); + ASSERT (nm_ip4_route_get_dest (route) == tmp.s_addr, + "basic-import", "unexpected route #2 destination"); + + ASSERT (inet_pton (AF_INET, expected_route2_gw, &tmp) > 0, + "basic-import", "couldn't convert expected route next hop #2"); + ASSERT (nm_ip4_route_get_next_hop (route) == tmp.s_addr, + "basic-import", "unexpected route #2 next hop"); + + ASSERT (nm_ip4_route_get_prefix (route) == 16, + "basic-import", "unexpected route #2 prefix"); + ASSERT (nm_ip4_route_get_metric (route) == 0, + "basic-import", "unexpected route #2 metric"); + + /* VPN setting */ + s_vpn = (NMSettingVPN *) nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN); + ASSERT (s_vpn != NULL, + "basic-import", "missing 'vpn' setting"); + + /* Data items */ + test_items ("basic-import-data", s_vpn, &basic_items[0], FALSE); + + /* Secrets */ + test_items ("basic-import-secrets", s_vpn, &basic_secrets[0], TRUE); + + g_object_unref (connection); +} + +static void +save_one_key (const char *key, const char *value, gpointer user_data) +{ + GSList **list = user_data; + + *list = g_slist_append (*list, g_strdup (key)); +} + +static void +remove_secrets (NMConnection *connection) +{ + NMSettingVPN *s_vpn; + GSList *keys = NULL, *iter; + + s_vpn = (NMSettingVPN *) nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN); + if (!s_vpn) + return; + + nm_setting_vpn_foreach_secret (s_vpn, save_one_key, &keys); + for (iter = keys; iter; iter = g_slist_next (iter)) + nm_setting_vpn_remove_secret (s_vpn, (const char *) iter->data); + + g_slist_foreach (keys, (GFunc) g_free, NULL); + g_slist_free (keys); +} + +#define EXPORTED_NAME "basic-export-test.pcf" +static void +test_basic_export (NMVpnPluginUiInterface *plugin, const char *dir) +{ + NMConnection *connection; + NMConnection *reimported; + char *path; + gboolean success; + GError *error = NULL; + int ret; + + connection = get_basic_connection ("basic-export", plugin, dir, "basic.pcf"); + ASSERT (connection != NULL, "basic-export", "failed to import connection"); + + path = g_build_path ("/", dir, EXPORTED_NAME, NULL); + success = nm_vpn_plugin_ui_interface_export (plugin, path, connection, &error); + if (!success) { + if (!error) + FAIL ("basic-export", "export failed with missing error"); + else + FAIL ("basic-export", "export failed: %s", error->message); + } + + /* Now re-import it and compare the connections to ensure they are the same */ + reimported = get_basic_connection ("basic-export", plugin, dir, EXPORTED_NAME); + ret = unlink (path); + ASSERT (connection != NULL, "basic-export", "failed to re-import connection"); + + /* Clear secrets first, since they don't get exported, and thus would + * make the connection comparison below fail. + */ + remove_secrets (connection); + + ASSERT (nm_connection_compare (connection, reimported, NM_SETTING_COMPARE_FLAG_EXACT) == TRUE, + "basic-export", "original and reimported connection differ"); + + g_object_unref (reimported); + g_object_unref (connection); + g_free (path); +} + + +static void +test_everything_via_vpn (NMVpnPluginUiInterface *plugin, const char *dir) +{ + NMConnection *connection; + NMSettingConnection *s_con; + NMSettingIP4Config *s_ip4; + GError *error = NULL; + char *pcf; + const char *expected_id = "All your traffic are belong to VPN"; + const char *value; + + pcf = g_build_path ("/", dir, "everything-via-vpn.pcf", NULL); + ASSERT (pcf != NULL, + "everything-via-vpn", "failed to create pcf path"); + + connection = nm_vpn_plugin_ui_interface_import (plugin, pcf, &error); + if (error) + FAIL ("everything-via-vpn", "error importing %s: %s", pcf, error->message); + ASSERT (connection != NULL, + "everything-via-vpn", "error importing %s: (unknown)", pcf); + + /* Connection setting */ + s_con = (NMSettingConnection *) nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION); + ASSERT (s_con != NULL, + "everything-via-vpn", "missing 'connection' setting"); + + ASSERT (strcmp (nm_setting_connection_get_id (s_con), expected_id) == 0, + "everything-via-vpn", "unexpected connection ID"); + + /* IP4 setting */ + s_ip4 = (NMSettingIP4Config *) nm_connection_get_setting (connection, NM_TYPE_SETTING_IP4_CONFIG); + ASSERT (s_con != NULL, + "everything-via-vpn", "missing 'ip4-config' setting"); + + ASSERT (nm_setting_ip4_config_get_never_default (s_ip4) == FALSE, + "everything-via-vpn", "never-default unexpectedly FALSE"); + + ASSERT (nm_setting_ip4_config_get_num_routes (s_ip4) == 0, + "everything-via-vpn", "unexpected number of routes"); + + g_free (pcf); +} + +static void +test_no_natt (NMVpnPluginUiInterface *plugin, const char *dir) +{ + NMConnection *connection; + NMSettingConnection *s_con; + NMSettingVPN *s_vpn; + GError *error = NULL; + char *pcf; + const char *expected_id = "No NAT Traversal"; + const char *value; + + pcf = g_build_path ("/", dir, "no-natt.pcf", NULL); + ASSERT (pcf != NULL, + "no-natt", "failed to create pcf path"); + + connection = nm_vpn_plugin_ui_interface_import (plugin, pcf, &error); + if (error) + FAIL ("no-natt", "error importing %s: %s", pcf, error->message); + ASSERT (connection != NULL, + "no-natt", "error importing %s: (unknown)", pcf); + + /* Connection setting */ + s_con = (NMSettingConnection *) nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION); + ASSERT (s_con != NULL, + "no-natt", "missing 'connection' setting"); + + ASSERT (strcmp (nm_setting_connection_get_id (s_con), expected_id) == 0, + "no-natt", "unexpected connection ID"); + + /* VPN setting */ + s_vpn = (NMSettingVPN *) nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN); + ASSERT (s_vpn != NULL, + "no-natt", "missing 'vpn' setting"); + + value = nm_setting_vpn_get_data_item (s_vpn, NM_VPNC_KEY_NAT_TRAVERSAL_MODE); + ASSERT (value != NULL, + "no-natt", "unexpected missing value for item %s", NM_VPNC_KEY_NAT_TRAVERSAL_MODE); + ASSERT (strcmp (value, NM_VPNC_NATT_MODE_NONE) == 0, + "no-natt", "unexpected value for item %s", NM_VPNC_KEY_NAT_TRAVERSAL_MODE); + + g_free (pcf); +} + +static void +test_always_ask (NMVpnPluginUiInterface *plugin, const char *dir) +{ + NMConnection *connection; + NMSettingConnection *s_con; + NMSettingVPN *s_vpn; + GError *error = NULL; + char *pcf; + const char *expected_id = "Always Ask For Password"; + const char *value; + + pcf = g_build_path ("/", dir, "always-ask.pcf", NULL); + ASSERT (pcf != NULL, + "always-ask", "failed to create pcf path"); + + connection = nm_vpn_plugin_ui_interface_import (plugin, pcf, &error); + if (error) + FAIL ("always-ask", "error importing %s: %s", pcf, error->message); + ASSERT (connection != NULL, + "always-ask", "error importing %s: (unknown)", pcf); + + /* Connection setting */ + s_con = (NMSettingConnection *) nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION); + ASSERT (s_con != NULL, + "always-ask", "missing 'connection' setting"); + + ASSERT (strcmp (nm_setting_connection_get_id (s_con), expected_id) == 0, + "always-ask", "unexpected connection ID"); + + /* VPN setting */ + s_vpn = (NMSettingVPN *) nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN); + ASSERT (s_vpn != NULL, + "always-ask", "missing 'vpn' setting"); + + value = nm_setting_vpn_get_data_item (s_vpn, NM_VPNC_KEY_XAUTH_PASSWORD_TYPE); + ASSERT (value == NULL, + "always-ask", "unexpected value for item %s", NM_VPNC_KEY_XAUTH_PASSWORD_TYPE); + + g_free (pcf); +} + +int main (int argc, char **argv) +{ + GError *error = NULL; + DBusGConnection *bus; + char *basename; + NMVpnPluginUiInterface *plugin = NULL; + + if (argc != 2) + FAIL ("args", "usage: %s ", argv[0]); + + g_type_init (); + bus = dbus_g_bus_get (DBUS_BUS_SESSION, NULL); + + if (!nm_utils_init (&error)) + FAIL ("nm-utils-init", "failed to initialize libnm-util: %s", error->message); + + plugin = nm_vpn_plugin_ui_factory (&error); + if (error) + FAIL ("plugin-init", "failed to initialize UI plugin: %s", error->message); + ASSERT (plugin != NULL, + "plugin-init", "failed to initialize UI plugin"); + + /* The tests */ + test_basic_import (plugin, argv[1]); + test_everything_via_vpn (plugin, argv[1]); + test_no_natt (plugin, argv[1]); + test_always_ask (plugin, argv[1]); + + test_basic_export (plugin, argv[1]); + + g_object_unref (plugin); + + basename = g_path_get_basename (argv[0]); + fprintf (stdout, "%s: SUCCESS\n", basename); + g_free (basename); + return 0; +} + diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/src/nm-vpnc-service.c /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/src/nm-vpnc-service.c --- network-manager-vpnc-0.7/src/nm-vpnc-service.c 2008-11-28 17:31:08.000000000 +0000 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/src/nm-vpnc-service.c 2009-04-09 00:48:29.000000000 +0100 @@ -1,4 +1,23 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* NetworkManager -- Network link 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 2005 - 2008 Red Hat, Inc. + * (C) Copyright 2007 - 2008 Novell, Inc. + */ #include #include diff -Nru /tmp/i2oSDaEfe2/network-manager-vpnc-0.7/src/nm-vpnc-service.h /tmp/921vfAVc2S/network-manager-vpnc-0.7.1~rc4.20090316+bzr21/src/nm-vpnc-service.h --- network-manager-vpnc-0.7/src/nm-vpnc-service.h 2008-11-28 17:31:08.000000000 +0000 +++ network-manager-vpnc-0.7.1~rc4.20090316+bzr21/src/nm-vpnc-service.h 2009-04-09 00:48:29.000000000 +0100 @@ -1,9 +1,28 @@ -/* -*- Mode: C; tab-width: 5; indent-tabs-mode: t; c-basic-offset: 5 -*- */ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* NetworkManager -- Network link 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 2005 - 2008 Red Hat, Inc. + * (C) Copyright 2007 - 2008 Novell, Inc. + */ #ifndef NM_VPNC_PLUGIN_H #define NM_VPNC_PLUGIN_H -#include +#include #include #include