Commit 94f29464 authored by Adam Schreiber's avatar Adam Schreiber Committed by Adam Schreiber

Fix various string errors. Fixes bug #391666

2007-01-31  Adam Schreiber  <sadam@clemson.edu>

    * src/seahorse-sign.c:
    * src/seahorse-pgp-generate.glade:
    * src/seahorse-keyserver-sync.glade:
    * src/seahorse-keyserver-sync.c:
    * src/seahorse-sign.glade:
    * src/seahorse-key-manager.c:
    * plugins/nautilus/seahorse-tool.c:
    * agent/seahorse-agent-main.c:
    * libseahorse/seahorse-prefs.c:
    * libseahorse/seahorse-signer.glade:
    * libseahorse/seahorse-default-key-control.c:
    * libseahorse/seahorse-default-key-control.h:
    * libseahorse/seahorse-signer.c:
    * libseahorse/seahorse-ssh-operation.c:
    * libseahorse/seahorse-prefs.glade:
    * daemon/seahorse-daemon.c: Fix various string errors. 
    Fixes bug #391666

svn path=/trunk/; revision=1543
parent 374726e9
2007-01-31 Adam Schreiber <sadam@clemson.edu>
* src/seahorse-sign.c:
* src/seahorse-pgp-generate.glade:
* src/seahorse-keyserver-sync.glade:
* src/seahorse-keyserver-sync.c:
* src/seahorse-sign.glade:
* src/seahorse-key-manager.c:
* plugins/nautilus/seahorse-tool.c:
* agent/seahorse-agent-main.c:
* libseahorse/seahorse-prefs.c:
* libseahorse/seahorse-signer.glade:
* libseahorse/seahorse-default-key-control.c:
* libseahorse/seahorse-default-key-control.h:
* libseahorse/seahorse-signer.c:
* libseahorse/seahorse-ssh-operation.c:
* libseahorse/seahorse-prefs.glade:
* daemon/seahorse-daemon.c: Fix various string errors.
Fixes bug #391666
* help/C/seahorse.xml:
* plugins/applet/docs/C/seahorse-applet.xml: Fix build due to
gnome-doc-utils change. Patch from Joseph Sacco. Fixes bug #402921
......
......@@ -53,7 +53,7 @@ static const GOptionEntry options[] = {
N_("Print variables in for a C type shell"), NULL },
{ "variables", 'v', 0, G_OPTION_ARG_NONE, &seahorse_agent_displayvars,
N_("Display variables instead of editing conf files (gpg.conf, ssh agent socket)"), NULL },
N_("Display variables instead of editing conf files (gpg.conf, SSH agent socket)"), NULL },
{ "execute", 'x', 0, G_OPTION_ARG_NONE, &seahorse_agent_execvars,
N_("Execute other arguments on the command line"), NULL },
......@@ -62,7 +62,7 @@ static const GOptionEntry options[] = {
N_("Allow GPG agent request from any display"), NULL },
{ G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY, &agent_exec_args,
NULL, N_("command ...") },
NULL, N_("command...") },
{ NULL }
};
......
......@@ -51,7 +51,7 @@ static const gchar *daemon_icons[] = {
static const GOptionEntry options[] = {
{ "no-daemonize", 'd', 0, G_OPTION_ARG_NONE, &daemon_no_daemonize,
N_("Do not daemonize seahorse-daemon"), NULL },
N_("Do not run seahorse-daemon as a daemon"), NULL },
{ NULL }
};
......
......@@ -25,67 +25,112 @@
/* TODO: This file should be renamed to seahorse-combo-keys.c once we're using SVN */
enum {
COMBO_STRING,
COMBO_POINTER,
N_COLUMNS
};
/* -----------------------------------------------------------------------------
* HELPERS
*/
static void
key_added (SeahorseKeyset *skset, SeahorseKey *skey, GtkOptionMenu *combo)
key_added (SeahorseKeyset *skset, SeahorseKey *skey, GtkComboBox *combo)
{
GtkWidget *menu;
GtkWidget *item;
GtkListStore *model;
GtkTreeIter iter;
gchar *userid;
g_return_if_fail (skey != NULL);
g_return_if_fail (combo != NULL);
menu = gtk_option_menu_get_menu (combo);
model = GTK_LIST_STORE (gtk_combo_box_get_model (combo));
userid = seahorse_key_get_display_name (skey);
item = gtk_menu_item_new_with_label (userid);
g_free (userid);
g_object_set_data (G_OBJECT (item), "key", skey);
gtk_list_store_append (model, &iter);
gtk_list_store_set (model, &iter,
COMBO_STRING, userid,
COMBO_POINTER, skey,
-1);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
g_free (userid);
seahorse_keyset_set_closure (skset, skey, item);
seahorse_keyset_set_closure (skset, skey, GINT_TO_POINTER (TRUE));
}
static void
key_changed (SeahorseKeyset *skset, SeahorseKey *skey, SeahorseKeyChange change,
GtkWidget *item, GtkOptionMenu *combo)
GtkWidget *closure, GtkComboBox *combo)
{
GList *children;
GtkTreeModel *model;
GtkTreeIter iter;
gboolean valid;
gchar *userid;
gpointer pntr;
SeahorseKey *skeyfrommodel;
g_return_if_fail (skey != NULL);
g_return_if_fail (item != NULL);
children = gtk_container_get_children (GTK_CONTAINER (item));
model = gtk_combo_box_get_model (combo);
valid = gtk_tree_model_get_iter_first (model, &iter);
if (children && GTK_IS_LABEL (children->data)) {
while (valid) {
gtk_tree_model_get (model, &iter,
COMBO_POINTER, pntr,
-1);
skeyfrommodel = SEAHORSE_KEY (pntr);
if (skeyfrommodel == skey) {
userid = seahorse_key_get_display_name (skey);
gtk_label_set_text (GTK_LABEL (children->data), userid);
gtk_list_store_set (GTK_LIST_STORE (model), &iter,
COMBO_STRING, userid,
-1);
g_free (userid);
break;
}
g_list_free (children);
valid = gtk_tree_model_iter_next (model, &iter);
}
}
static void
key_removed (SeahorseKeyset *skset, SeahorseKey *skey, GtkWidget *item,
GtkOptionMenu *combo)
key_removed (SeahorseKeyset *skset, SeahorseKey *skey, GtkWidget *closure,
GtkComboBox *combo)
{
GtkTreeModel *model;
GtkTreeIter iter;
gpointer pntr;
gboolean valid;
SeahorseKey *skeyfrommodel;
g_return_if_fail (skey != NULL);
g_return_if_fail (item != NULL);
g_return_if_fail (combo != NULL);
gtk_widget_destroy (item);
model = gtk_combo_box_get_model (combo);
while (valid) {
gtk_tree_model_get (model, &iter,
COMBO_POINTER, pntr,
-1);
skeyfrommodel = SEAHORSE_KEY (pntr);
if (skeyfrommodel == skey) {
gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
break;
}
valid = gtk_tree_model_iter_next (model, &iter);
}
}
static void
combo_destroyed (GtkOptionMenu *combo, SeahorseKeyset *skset)
combo_destroyed (GtkComboBox *combo, SeahorseKeyset *skset)
{
g_signal_handlers_disconnect_by_func (skset, key_added, combo);
g_signal_handlers_disconnect_by_func (skset, key_changed, combo);
......@@ -97,19 +142,27 @@ combo_destroyed (GtkOptionMenu *combo, SeahorseKeyset *skset)
*/
void
seahorse_combo_keys_attach (GtkOptionMenu *combo, SeahorseKeyset *skset,
seahorse_combo_keys_attach (GtkComboBox *combo, SeahorseKeyset *skset,
const gchar *none_option)
{
GtkMenu *menu;
GtkWidget *item;
GtkTreeModel *model;
GtkTreeIter iter;
GtkCellRenderer *renderer;
SeahorseKey *skey;
GList *l, *keys;
/* Setup the None Option */
menu = GTK_MENU (gtk_option_menu_get_menu (combo));
if (!menu) {
menu = GTK_MENU (gtk_menu_new ());
gtk_option_menu_set_menu (combo, GTK_WIDGET (menu));
model = gtk_combo_box_get_model (combo);
if (!model) {
model = GTK_TREE_MODEL (gtk_list_store_new (N_COLUMNS, G_TYPE_STRING, G_TYPE_POINTER));
gtk_combo_box_set_model (combo, model);
gtk_cell_layout_clear (GTK_CELL_LAYOUT (combo));
renderer = gtk_cell_renderer_text_new ();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE);
gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo), renderer,
"text", COMBO_STRING);
}
/* Setup the key list */
......@@ -125,16 +178,16 @@ seahorse_combo_keys_attach (GtkOptionMenu *combo, SeahorseKeyset *skset,
g_signal_connect_after (skset, "removed", G_CALLBACK (key_removed), combo);
if (none_option) {
item = gtk_separator_menu_item_new ();
gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
item = gtk_menu_item_new_with_label (none_option);
gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
gtk_list_store_prepend (GTK_LIST_STORE (model), &iter);
gtk_list_store_set (GTK_LIST_STORE (model), &iter,
COMBO_STRING, none_option,
COMBO_POINTER, NULL,
-1);
}
gtk_option_menu_set_history (combo, 0);
gtk_tree_model_get_iter_first (model, &iter);
gtk_combo_box_set_active_iter (combo, &iter);
/* Cleanup */
g_object_ref (skset);
......@@ -143,74 +196,77 @@ seahorse_combo_keys_attach (GtkOptionMenu *combo, SeahorseKeyset *skset,
}
void
seahorse_combo_keys_set_active_id (GtkOptionMenu *combo, GQuark keyid)
seahorse_combo_keys_set_active_id (GtkComboBox *combo, GQuark keyid)
{
SeahorseKey *skey;
GtkContainer *menu;
GList *l, *children;
GtkTreeModel *model;
GtkTreeIter iter;
gboolean valid;
gpointer pointer;
guint i;
g_return_if_fail (GTK_IS_OPTION_MENU (combo));
g_return_if_fail (GTK_IS_COMBO_BOX (combo));
menu = GTK_CONTAINER (gtk_option_menu_get_menu (combo));
g_return_if_fail (menu != NULL);
model = gtk_combo_box_get_model (combo);
g_return_if_fail (model != NULL);
children = gtk_container_get_children (menu);
valid = gtk_tree_model_get_iter_first (model, &iter);
i = 0;
for (i = 0, l = children; l != NULL; i++, l = g_list_next (l)) {
skey = SEAHORSE_KEY (g_object_get_data (l->data, "key"));
while (valid) {
gtk_tree_model_get (model, &iter,
COMBO_POINTER, &pointer,
-1);
skey = SEAHORSE_KEY (pointer);
if (!keyid) {
if (!skey) {
gtk_option_menu_set_history (combo, i);
gtk_combo_box_set_active_iter (combo, &iter);
break;
}
} else if (skey != NULL) {
if (keyid == seahorse_key_get_keyid (skey)) {
gtk_option_menu_set_history (combo, i);
gtk_combo_box_set_active_iter (combo, &iter);
break;
}
}
}
g_list_free (children);
valid = gtk_tree_model_iter_next (model, &iter);
i++;
}
}
void
seahorse_combo_keys_set_active (GtkOptionMenu *combo, SeahorseKey *skey)
seahorse_combo_keys_set_active (GtkComboBox *combo, SeahorseKey *skey)
{
seahorse_combo_keys_set_active_id (combo,
skey == NULL ? 0 : seahorse_key_get_keyid (skey));
}
SeahorseKey*
seahorse_combo_keys_get_active (GtkOptionMenu *combo)
seahorse_combo_keys_get_active (GtkComboBox *combo)
{
SeahorseKey *skey = NULL;
GtkContainer *menu;
GList *l, *children;
guint i;
GtkTreeModel *model;
GtkTreeIter iter;
gpointer pointer;
g_return_val_if_fail (GTK_IS_OPTION_MENU (combo), NULL);
g_return_val_if_fail (GTK_IS_COMBO_BOX (combo), NULL);
menu = GTK_CONTAINER (gtk_option_menu_get_menu (combo));
g_return_val_if_fail (menu != NULL, NULL);
model = gtk_combo_box_get_model (combo);
g_return_val_if_fail (model != NULL, NULL);
children = gtk_container_get_children (menu);
gtk_combo_box_get_active_iter(combo, &iter);
for (i = 0, l = children; l != NULL; i++, l = g_list_next (l)) {
if (i == gtk_option_menu_get_history (combo)) {
skey = SEAHORSE_KEY (g_object_get_data (l->data, "key"));
break;
}
}
gtk_tree_model_get (model, &iter,
COMBO_POINTER, &pointer,
-1);
g_list_free (children);
return skey;
return SEAHORSE_KEY (pointer);
}
GQuark
seahorse_combo_keys_get_active_id (GtkOptionMenu *combo)
seahorse_combo_keys_get_active_id (GtkComboBox *combo)
{
SeahorseKey *skey = seahorse_combo_keys_get_active (combo);
return skey == NULL ? 0 : seahorse_key_get_keyid (skey);
......
......@@ -22,7 +22,7 @@
/**
* seahorse_combo_keys_*: Shows a list of keys in a dropdown for selection.
*
* - Attaches to a GtkOptionMenu
* - Attaches to a GtkComboBox
* - Gets its list of keys from a SeahorseKeyset.
*/
......@@ -34,18 +34,18 @@
#include <gtk/gtk.h>
#include "seahorse-keyset.h"
void seahorse_combo_keys_attach (GtkOptionMenu *combo,
void seahorse_combo_keys_attach (GtkComboBox *combo,
SeahorseKeyset *skset,
const gchar *none_option);
void seahorse_combo_keys_set_active_id (GtkOptionMenu *combo,
void seahorse_combo_keys_set_active_id (GtkComboBox *combo,
GQuark keyid);
void seahorse_combo_keys_set_active (GtkOptionMenu *combo,
void seahorse_combo_keys_set_active (GtkComboBox *combo,
SeahorseKey *skey);
SeahorseKey* seahorse_combo_keys_get_active (GtkOptionMenu *combo);
SeahorseKey* seahorse_combo_keys_get_active (GtkComboBox *combo);
GQuark seahorse_combo_keys_get_active_id (GtkOptionMenu *combo);
GQuark seahorse_combo_keys_get_active_id (GtkComboBox *combo);
#endif /* __SEAHORSE_COMBO_KEYS_H__ */
......@@ -456,7 +456,7 @@ setup_sharing (SeahorseWidget *swidget)
/* -------------------------------------------------------------------------- */
static void
default_key_changed (GtkOptionMenu *combo, gpointer *data)
default_key_changed (GtkComboBox *combo, gpointer *data)
{
GQuark keyid = seahorse_combo_keys_get_active_id (combo);
seahorse_gconf_set_string (SEAHORSE_DEFAULT_KEY, keyid == 0 ? "" : g_quark_to_string (keyid));
......@@ -464,7 +464,7 @@ default_key_changed (GtkOptionMenu *combo, gpointer *data)
static void
gconf_notification (GConfClient *gclient, guint id, GConfEntry *entry,
GtkOptionMenu *combo)
GtkComboBox *combo)
{
GQuark keyid = g_quark_from_string (gconf_value_get_string (gconf_entry_get_value (entry)));
seahorse_combo_keys_set_active_id (combo, keyid);
......@@ -505,15 +505,15 @@ seahorse_prefs_new ()
SKEY_LOC_LOCAL,
SKEY_FLAG_CAN_SIGN,
SKEY_FLAG_EXPIRED | SKEY_FLAG_REVOKED | SKEY_FLAG_DISABLED);
seahorse_combo_keys_attach (GTK_OPTION_MENU (widget), skset, _("None. Prompt for a key."));
seahorse_combo_keys_attach (GTK_COMBO_BOX (widget), skset, _("None. Prompt for a key."));
g_object_unref (skset);
seahorse_combo_keys_set_active_id (GTK_OPTION_MENU (widget),
seahorse_combo_keys_set_active_id (GTK_COMBO_BOX (widget),
g_quark_from_string (seahorse_gconf_get_string (SEAHORSE_DEFAULT_KEY)));
g_signal_connect (widget, "changed", G_CALLBACK (default_key_changed), NULL);
gconf_id = seahorse_gconf_notify (SEAHORSE_DEFAULT_KEY,
(GConfClientNotifyFunc)gconf_notification, GTK_OPTION_MENU (widget));
(GConfClientNotifyFunc)gconf_notification, GTK_COMBO_BOX (widget));
g_signal_connect (widget, "destroy", G_CALLBACK (remove_gconf_notification), GINT_TO_POINTER (gconf_id));
#ifdef WITH_AGENT
......
This diff is collapsed.
......@@ -76,12 +76,12 @@ seahorse_signer_get ()
combo = glade_xml_get_widget (swidget->xml, "signer-select");
g_return_val_if_fail (combo != NULL, NULL);
seahorse_combo_keys_attach (GTK_OPTION_MENU (combo), skset, NULL);
seahorse_combo_keys_attach (GTK_COMBO_BOX (combo), skset, NULL);
g_object_unref (skset);
/* Select the last key used */
id = seahorse_gconf_get_string (SEAHORSE_LASTSIGNER_KEY);
seahorse_combo_keys_set_active_id (GTK_OPTION_MENU (combo), g_quark_from_string (id));
seahorse_combo_keys_set_active_id (GTK_COMBO_BOX (combo), g_quark_from_string (id));
g_free (id);
widget = seahorse_widget_get_top (swidget);
......@@ -101,7 +101,7 @@ seahorse_signer_get ()
}
if (ok) {
skey = seahorse_combo_keys_get_active (GTK_OPTION_MENU (combo));
skey = seahorse_combo_keys_get_active (GTK_COMBO_BOX (combo));
g_return_val_if_fail (SEAHORSE_IS_PGP_KEY (skey), NULL);
/* Save this as the last key signed with */
......
<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
<!-- Generated with glade3
Version: 3.0.1
Date: Thu Dec 28 22:27:44 2006
User: sadam
Host: merseine
-->
<glade-interface>
<requires lib="gnome"/>
<widget class="GtkDialog" id="signer">
<property name="border_width">5</property>
<property name="title" translatable="yes">Choose Signing Key</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="title">Choose Signing Key</property>
<property name="resizable">False</property>
<property name="modal">True</property>
<property name="default_width">400</property>
<property name="resizable">False</property>
<property name="destroy_with_parent">False</property>
<property name="decorated">True</property>
<property name="skip_taskbar_hint">False</property>
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="focus_on_map">True</property>
<property name="urgency_hint">False</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">2</property>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
<widget class="GtkButton" id="cancel">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
<property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">-6</property>
</widget>
</child>
<child>
<widget class="GtkButton" id="ok">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="can_focus">True</property>
<property name="has_focus">True</property>
<property name="label">gtk-ok</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">-5</property>
</widget>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">GTK_PACK_END</property>
</packing>
</child>
<child>
<widget class="GtkVBox" id="vbox1">
<property name="border_width">5</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="border_width">5</property>
<property name="spacing">12</property>
<child>
<widget class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="xalign">0.000000</property>
<property name="label" translatable="yes">_Sign message with key:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkHBox" id="sign_key_place">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<widget class="GtkOptionMenu" id="signer-select">
<widget class="GtkComboBox" id="signer-select">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="history">-1</property>
</widget>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
<widget class="GtkButton" id="cancel">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
<property name="response_id">-6</property>
</widget>
</child>
<child>
<widget class="GtkButton" id="ok">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="label">gtk-ok</property>
<property name="use_stock">True</property>
<property name="response_id">-5</property>
</widget>
<packing>
<property name="position">1</property>
</packing>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">GTK_PACK_END</property>
</packing>
</child>
</widget>
</child>
</widget>
</glade-interface>
......@@ -132,7 +132,7 @@ watch_ssh_process (GPid pid, gint status, SeahorseSSHOperation *sop)
/* Was killed */
if (!WIFEXITED (status)) {
seahorse_operation_mark_done (SEAHORSE_OPERATION (sop), FALSE,
g_error_new (SEAHORSE_ERROR, 0, _("The ssh command was terminated unexpectedly.")));
g_error_new (SEAHORSE_ERROR, 0, _("The SSH command was terminated unexpectedly.")));
/* Command failed */
} else if (WEXITSTATUS (status) != 0) {
......@@ -694,14 +694,14 @@ seahorse_ssh_operation_sync (SeahorseSSHSource *ssrc, const gchar *command,
if (!WIFEXITED (status)) {
g_critical ("SSH command didn't exit properly: %s", command);
g_set_error (error, SEAHORSE_ERROR, 0, "%s", _("The ssh command was terminated unexpectedly."));
g_set_error (error, SEAHORSE_ERROR, 0, "%s", _("The SSH command was terminated unexpectedly."));
g_free (sout);
g_free (serr);
return NULL;
}
if (WEXITSTATUS (status) != 0) {
g_set_error (error, SEAHORSE_ERROR, 0, "%s", _("The ssh command failed."));
g_set_error (error, SEAHORSE_ERROR, 0, "%s", _("The SSH command failed."));
g_warning ("SSH command failed: %s (%d)", command, WEXITSTATUS (status));
if (serr && serr[0])
g_warning ("SSH error output: %s", serr);
......
......@@ -63,7 +63,7 @@ static const GOptionEntry options[] = {
{ "uri-list", 'T', 0, G_OPTION_ARG_NONE, &read_uris,
N_("Read list of URIs on standard in"), NULL },
{ G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY, &arg_uris,
NULL, N_("file ...") },
NULL, N_("file...") },
{ NULL }
};
......
......@@ -1232,7 +1232,7 @@ static const GtkActionEntry keyserver_entries[] = {
{ "remote-find", GTK_STOCK_FIND, N_("_Find Remote Keys..."), "",
N_("Search for keys on a key server"), G_CALLBACK (search_activate) },
{ "remote-sync", GTK_STOCK_REFRESH, N_("_Sync and Publish Keys..."), "",
N_("Publish and/or sync your keys with those online."), G_CALLBACK (sync_activate) },
N_("Publish and/or synchronize your keys with those online."), G_CALLBACK (sync_activate) },
};
void
......
......@@ -144,8 +144,8 @@ seahorse_keyserver_sync_show (GList *keys)
/* The details message */
n = g_list_length (keys);
t = g_strdup_printf (ngettext ("<b>%d key is selected for syncing</b>",
"<b>%d keys are selected for syncing</b>", n), n);
t = g_strdup_printf (ngettext ("<b>%d key is selected for synchronizing</b>",
"<b>%d keys are selected for synchronizing</b>", n), n);
w = glade_xml_get_widget (swidget->xml, "detail-message");
g_return_val_if_fail (swidget != NULL, win);
......@@ -195,7 +195,7 @@ seahorse_keyserver_sync (GList *keys)
mop = seahorse_multi_operation_new ();
/* And now syncing keys from the servers */
/* And now synchronizing keys from the servers */
ks = seahorse_gconf_get_string_list (KEYSERVER_KEY);
ks = seahorse_server_source_purge_keyservers (ks);
......
......@@ -297,7 +297,7 @@
<child>
<widget class="GtkLabel" id="detail-message">
<property name="visible">True</property>
<property name="label" translatable="yes">&lt;b&gt;X keys are selected for syncing&lt;/b&gt;</property>
<property name="label" translatable="yes">&lt;b&gt;X keys are selected for synchronizing&lt;/b&gt;</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
......