[pan2] String review
- From: Petr KovÃÅ <pmkovar src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pan2] String review
- Date: Sun, 8 Apr 2012 03:32:13 +0000 (UTC)
commit 6a00690c395b8dfbbd6d64abf170a6d95cf774e1
Author: Petr Kovar <pkovar redhat com>
Date: Sun Apr 8 05:31:29 2012 +0200
String review
pan/data-impl/data-impl.cc | 2 +-
pan/data-impl/server.cc | 4 ++--
pan/data/cert-store.cc | 2 +-
pan/gui/body-pane.cc | 10 +++++-----
pan/gui/e-cte-dialog.c | 8 ++++----
pan/gui/gui.cc | 6 +++---
pan/gui/pan.cc | 2 +-
pan/gui/post-ui.cc | 18 +++++++++---------
pan/gui/prefs-ui.cc | 30 +++++++++++++++---------------
pan/gui/profiles-dialog.cc | 16 ++++++++--------
pan/gui/server-ui.cc | 10 +++++-----
pan/gui/task-pane.cc | 2 +-
pan/tasks/task-post.cc | 2 +-
pan/tasks/task-upload.cc | 16 ++++++++--------
pan/usenet-utils/ssl-utils.h | 8 ++++----
15 files changed, 68 insertions(+), 68 deletions(-)
---
diff --git a/pan/data-impl/data-impl.cc b/pan/data-impl/data-impl.cc
index f38d6a1..6f4d6ac 100644
--- a/pan/data-impl/data-impl.cc
+++ b/pan/data-impl/data-impl.cc
@@ -137,7 +137,7 @@ DataImpl :: password_encrypt (const PasswordData& pw)
gnome_keyring_store_password_sync (
GNOME_KEYRING_NETWORK_PASSWORD,
GNOME_KEYRING_DEFAULT,
- _("Pan newsreader server passwords"),
+ _("Pan Newsreader's server passwords"),
pw.pw.str,
"user", pw.user.str,
"server", pw.server.c_str(),
diff --git a/pan/data-impl/server.cc b/pan/data-impl/server.cc
index 7c59923..deb0b45 100644
--- a/pan/data-impl/server.cc
+++ b/pan/data-impl/server.cc
@@ -231,11 +231,11 @@ DataImpl :: get_server_auth (const Quark & server,
switch (res)
{
case GNOME_KEYRING_RESULT_NO_MATCH:
- Log::add_info_va(_("There seems to be no Password set for Server %s."), s->host.c_str());
+ Log::add_info_va(_("There seems to be no password set for server %s."), s->host.c_str());
break;
case GNOME_KEYRING_RESULT_NO_KEYRING_DAEMON:
- Log::add_urgent_va (_("The Gnome keyring denied access to the Passwords."), s->host.c_str());
+ Log::add_urgent_va (_("GNOME Keyring denied access to the passwords."), s->host.c_str());
break;
case GNOME_KEYRING_RESULT_OK:
diff --git a/pan/data/cert-store.cc b/pan/data/cert-store.cc
index 61f38b1..70d070c 100644
--- a/pan/data/cert-store.cc
+++ b/pan/data/cert-store.cc
@@ -267,7 +267,7 @@ namespace pan
int r(0);
r = get_all_certs_from_disk ();
- if (r != 0) Log::add_info_va(_("Succesfully added %d SSL PEM certificate(s) to Certificate Store."), r);
+ if (r != 0) Log::add_info_va(_("Successfully added %d SSL PEM certificate(s) to Certificate Store."), r);
}
diff --git a/pan/gui/body-pane.cc b/pan/gui/body-pane.cc
index a3474da..8095e52 100644
--- a/pan/gui/body-pane.cc
+++ b/pan/gui/body-pane.cc
@@ -1262,9 +1262,9 @@ BodyPane :: on_verbose_tooltip_cb(GtkWidget *widget,
std::pair<std::string,std::string> name_and_email = get_email_address(info.signers[0].name);
g_snprintf(buf, sizeof(buf),
_("<u>This is a <b>PGP-Signed</b> message.</u>\n\n"
- "<b>Signer</b> : %s ('%s')\n"
- "<b>Valid until</b> : %s\n"
- "<b>Created on</b> : %s"),
+ "<b>Signer:</b> %s ('%s')\n"
+ "<b>Valid until:</b> %s\n"
+ "<b>Created on:</b> %s"),
name_and_email.first.c_str(), name_and_email.second.c_str(),
(info.signers[0].never_expires ? _("always") : ed.get_date_string(info.signers[0].expires)),
ed.get_date_string(info.signers[0].created)
@@ -1677,10 +1677,10 @@ BodyPane :: BodyPane (Data& data, ArticleCache& cache, Prefs& prefs, GroupPrefs
// menu for popup menu for attachments
_menu = gtk_menu_new ();
- l = gtk_menu_item_new_with_label(_("Save attachment as ...."));
+ l = gtk_menu_item_new_with_label(_("Save Attachment As..."));
g_signal_connect (l, "activate", G_CALLBACK(menu_clicked_as_cb), this);
gtk_menu_shell_append (GTK_MENU_SHELL(_menu), l);
- l = gtk_menu_item_new_with_label(_("Save all attachments"));
+ l = gtk_menu_item_new_with_label(_("Save All Attachments"));
_selection = MENU_SAVE_ALL;
g_signal_connect (l, "activate", G_CALLBACK(menu_clicked_all_cb), this);
gtk_menu_shell_append (GTK_MENU_SHELL(_menu),l);
diff --git a/pan/gui/e-cte-dialog.c b/pan/gui/e-cte-dialog.c
index efa36e6..81d826a 100644
--- a/pan/gui/e-cte-dialog.c
+++ b/pan/gui/e-cte-dialog.c
@@ -75,13 +75,13 @@ e_cte_dialog (const char *title, const char *prompt, GMimeContentEncoding now, G
store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
gtk_list_store_append (store, &iter);
- gtk_list_store_set (store, &iter, 0, _("Default encoding"), 1, GMIME_CONTENT_ENCODING_DEFAULT, -1);
+ gtk_list_store_set (store, &iter, 0, _("Default Encoding"), 1, GMIME_CONTENT_ENCODING_DEFAULT, -1);
gtk_list_store_append (store, &iter);
- gtk_list_store_set (store, &iter, 0, _("7Bit Encoding"), 1, GMIME_CONTENT_ENCODING_7BIT, -1);
+ gtk_list_store_set (store, &iter, 0, _("7-Bit Encoding"), 1, GMIME_CONTENT_ENCODING_7BIT, -1);
gtk_list_store_append (store, &iter);
- gtk_list_store_set (store, &iter, 0, _("8Bit Encoding"), 1, GMIME_CONTENT_ENCODING_8BIT, -1);
+ gtk_list_store_set (store, &iter, 0, _("8-Bit Encoding"), 1, GMIME_CONTENT_ENCODING_8BIT, -1);
gtk_list_store_append (store, &iter);
- gtk_list_store_set (store, &iter, 0, _("BASE64 Encoding"), 1, GMIME_CONTENT_ENCODING_BASE64, -1);
+ gtk_list_store_set (store, &iter, 0, _("Base64 Encoding"), 1, GMIME_CONTENT_ENCODING_BASE64, -1);
gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter, 0, _("Quoted-Printable Encoding"), 1, GMIME_CONTENT_ENCODING_QUOTEDPRINTABLE, -1);
diff --git a/pan/gui/gui.cc b/pan/gui/gui.cc
index 18a3f87..9f335c3 100644
--- a/pan/gui/gui.cc
+++ b/pan/gui/gui.cc
@@ -1384,7 +1384,7 @@ bool GUI::deletion_confirmation_dialog()
GTK_MESSAGE_WARNING,
GTK_BUTTONS_NONE, NULL);
HIG :: message_dialog_set_text (GTK_MESSAGE_DIALOG(d),
- _("You marked some articles for deletion"),
+ _("You have marked some articles for deletion."),
_("Are you sure you want to delete them?"));
gtk_dialog_add_buttons (GTK_DIALOG(d),
GTK_STOCK_CANCEL, GTK_RESPONSE_NO,
@@ -1413,7 +1413,7 @@ bool GUI :: confirm_accept_new_cert_dialog(GtkWindow * parent, gnutls_x509_crt_t
gtk_dialog_add_button (GTK_DIALOG(d), _("Always trust"), -66);
HIG :: message_dialog_set_text (GTK_MESSAGE_DIALOG(d), buf,
- _("Do you want to accept it permanently (deletable afterwards) ?"));
+ _("Do you want to accept it permanently? (You can change this later.)"));
gtk_dialog_add_buttons (GTK_DIALOG(d),
GTK_STOCK_CANCEL, GTK_RESPONSE_NO,
GTK_STOCK_APPLY, GTK_RESPONSE_YES,
@@ -1914,7 +1914,7 @@ void GUI :: do_read_selected_group ()
conv = iconv_open (to, from);
if (conv == (iconv_t)-1)
{
- Log::add_err(_("Error loading iconv library. Some Charsets in the GUI will not be able to be encoded."));
+ Log::add_err(_("Error loading iconv library. Encoding certain character sets will not work in GUI."));
} else
iconv_inited = true;
}
diff --git a/pan/gui/pan.cc b/pan/gui/pan.cc
index afa668c..9802872 100644
--- a/pan/gui/pan.cc
+++ b/pan/gui/pan.cc
@@ -380,7 +380,7 @@ namespace
update_status_icon(ICON_STATUS_ERROR);
if (n()) return;
notif_shown = true;
- notify_of(ICON_STATUS_ERROR, message.str, _("An Error has occurred!"));
+ notify_of(ICON_STATUS_ERROR, message.str, _("An error has occurred!"));
}
virtual void on_queue_size_changed (Queue&, unsigned long, unsigned long) {}
diff --git a/pan/gui/post-ui.cc b/pan/gui/post-ui.cc
index 3dcc13e..bccc3a7 100644
--- a/pan/gui/post-ui.cc
+++ b/pan/gui/post-ui.cc
@@ -183,7 +183,7 @@ PostUI:: update_filequeue_label (GtkTreeSelection *selection)
TaskUpload * task (dynamic_cast<TaskUpload*>(*it));
if (task) kb += task->_bytes/1024;
}
- g_snprintf(str,sizeof(str), _("Upload Queue : %ld Tasks, %ld KB (~ %.2f MB) total ."), tasks.size(), kb, kb/1024.0f);
+ g_snprintf(str,sizeof(str), _("Upload queue: %ld tasks, %ld KB (~ %.2f MB) total."), tasks.size(), kb, kb/1024.0f);
gtk_label_set_text (GTK_LABEL(_filequeue_label), str);
}
@@ -487,10 +487,10 @@ namespace
{
{ "wrap", GTK_STOCK_JUSTIFY_FILL, N_("_Wrap Text"), 0, N_("Wrap Text"), G_CALLBACK(do_wrap), true },
{ "always-run-editor", 0, N_("Always Run Editor"), 0, 0, G_CALLBACK(do_edit2), false },
- { "remember-charset", 0, N_("Remember Character Encoding for this Group"), 0, 0, G_CALLBACK(on_remember_charset_toggled), true },
+ { "remember-charset", 0, N_("Remember Character Encoding for This Group"), 0, 0, G_CALLBACK(on_remember_charset_toggled), true },
{ "master-reply", 0, N_("Thread Attached Replies"), 0, 0, G_CALLBACK(on_mr_toggled), true },
- { "gpg-encrypt", 0, N_("PGP-Encrypt the Message"), 0, 0, G_CALLBACK(on_enc_toggled), false },
- { "gpg-sign", 0, N_("PGP-Sign the Message"), 0, 0, G_CALLBACK(on_sign_toggled), false },
+ { "gpg-encrypt", 0, N_("PGP-Encrypt the Article"), 0, 0, G_CALLBACK(on_enc_toggled), false },
+ { "gpg-sign", 0, N_("PGP-Sign the Article"), 0, 0, G_CALLBACK(on_sign_toggled), false },
{ "spellcheck", 0, N_("Check _Spelling"), 0, 0, G_CALLBACK(on_spellcheck_toggled), true }
};
@@ -758,7 +758,7 @@ PostUI :: check_message (const Quark& server, GMimeMessage * msg, bool binpost)
s.c_str());
gtk_dialog_add_button (GTK_DIALOG(d), _("Go Back"), GTK_RESPONSE_CANCEL);
if (goodness.is_warn())
- gtk_dialog_add_button (GTK_DIALOG(d), _("Post Anyway"), GTK_RESPONSE_APPLY);
+ gtk_dialog_add_button (GTK_DIALOG(d), _("Continue Anyway"), GTK_RESPONSE_APPLY);
const int response = gtk_dialog_run (GTK_DIALOG(d));
gtk_widget_destroy (d);
return response == GTK_RESPONSE_APPLY;
@@ -1099,7 +1099,7 @@ PostUI :: maybe_post_message (GMimeMessage * message)
else
{
if (user_has_gpg)
- Log::add_err_va(_("Error signing/encrypting your message. Perhaps you misspelled your email-address (%s) ?"),p.gpg_sig_uid.c_str());
+ Log::add_err_va(_("Error signing/encrypting your message. Perhaps you misspelled your email address (%s)?"),p.gpg_sig_uid.c_str());
}
} else {
@@ -2497,7 +2497,7 @@ PostUI :: create_filequeue_tab ()
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_insert_column_with_data_func(t, 2, (_("Filename")), renderer, render_filename, 0, 0);
renderer = gtk_cell_renderer_text_new ();
- gtk_tree_view_insert_column_with_attributes (t, 3, (_("Size (kB)")),renderer,"text", 3,NULL);
+ gtk_tree_view_insert_column_with_attributes (t, 3, (_("Size (KB)")),renderer,"text", 3,NULL);
// connect signals for popup menu
g_signal_connect (w, "popup-menu", G_CALLBACK(on_popup_menu), this);
@@ -2609,7 +2609,7 @@ PostUI :: create_parts_tab ()
g_snprintf (buf, sizeof(buf), "%s", _upload_ptr->_subject.c_str());
l = gtk_label_new (buf);
gtk_misc_set_alignment (GTK_MISC(l), 0.5f, 0.5f);
- gtk_widget_set_tooltip_text (l, _("The current Subject Line"));
+ gtk_widget_set_tooltip_text (l, _("The current subject line"));
gtk_table_attach (GTK_TABLE(t), l, 1, 2, row, row+1, fe, fill, 0, 0);
++row;
@@ -2721,7 +2721,7 @@ gtk_widget_set_tooltip_text (w, _("The email account where mail replies to your
gtk_table_attach (GTK_TABLE(t), w, 0, 2, row, row+1, GTK_FILL, GTK_FILL, 0, 0);
++row;
- w = _message_id_check = gtk_check_button_new_with_mnemonic (_("Add \"Message-_Id\" header"));
+ w = _message_id_check = gtk_check_button_new_with_mnemonic (_("Add \"Message-_ID\" header"));
b = _prefs.get_flag(MESSAGE_ID_PREFS_KEY,false);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(w), b);
g_signal_connect (w, "toggled", G_CALLBACK(message_id_toggled_cb), this);
diff --git a/pan/gui/prefs-ui.cc b/pan/gui/prefs-ui.cc
index 2aabd3a..5ef6326 100644
--- a/pan/gui/prefs-ui.cc
+++ b/pan/gui/prefs-ui.cc
@@ -163,7 +163,7 @@ PrefsDialog :: populate_popup (GtkEntry *e, GtkMenu *m)
gtk_menu_shell_prepend (GTK_MENU_SHELL(m), mi);
GtkWidget * img = gtk_image_new_from_stock (GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU);
- mi = gtk_image_menu_item_new_with_mnemonic (_("Edit Hotkey"));
+ mi = gtk_image_menu_item_new_with_mnemonic (_("Edit Shortcut"));
g_signal_connect (mi, "activate", G_CALLBACK(edit_shortkey_cb),
g_object_get_data(G_OBJECT(e), "data"));
@@ -225,7 +225,7 @@ namespace pan
if (!gtk_accelerator_valid(acc_key.accel_key, acc_key.accel_mods))
{
gtk_entry_set_icon_from_stock(e, GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_DIALOG_WARNING);
- gtk_entry_set_icon_tooltip_text (e, GTK_ENTRY_ICON_PRIMARY, _("Error: Shortkey is invalid!"));
+ gtk_entry_set_icon_tooltip_text (e, GTK_ENTRY_ICON_PRIMARY, _("Error: Shortcut key is invalid!"));
return;
}
@@ -241,7 +241,7 @@ namespace pan
if (found)
{
gtk_entry_set_icon_from_stock(e, GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_DIALOG_WARNING);
- gtk_entry_set_icon_tooltip_text (e, GTK_ENTRY_ICON_PRIMARY, _("Error: Shortkey already exists!"));
+ gtk_entry_set_icon_tooltip_text (e, GTK_ENTRY_ICON_PRIMARY, _("Error: Shortcut key already exists!"));
}
else
{
@@ -630,7 +630,7 @@ namespace pan
const std::string mode (prefs.get_string (mode_key, mode_fallback));
GtkListStore * store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
const char* strings[7][2] = { { N_("Disabled"),"never" },
- { N_("Only new (Score == 0)"),"new" },
+ { N_("Only new (score == 0)"),"new" },
{ N_("9999 or more"), "watched" },
{ N_("5000 to 9998"), "high" },
{ N_("1 to 4999"), "medium" },
@@ -699,7 +699,7 @@ void
PrefsDialog :: update_default_charset_label(const StringView& value)
{
char buf[256];
- g_snprintf(buf, sizeof(buf),_("Select default <u>global</u> charset. Current setting : <b>%s</b> ."),
+ g_snprintf(buf, sizeof(buf),_("Select default <u>global</u> character set. Current setting: <b>%s</b>."),
value.str);
gtk_label_set_markup(GTK_LABEL(charset_label), buf);
gtk_widget_show_all(charset_label);
@@ -735,7 +735,7 @@ namespace
PrefsDialog* pd (static_cast<PrefsDialog*>(user_data));
std::string def = pd->prefs().get_string("default-charset", "UTF-8");
char * tmp = e_charset_dialog (_("Character Encoding"),
- _("Global Charset Settings"),
+ _("Global Character Set Settings"),
def.c_str(), GTK_WINDOW(pd->root()));
if (!tmp) return;
@@ -948,7 +948,7 @@ PrefsDialog :: PrefsDialog (Prefs& prefs, GtkWindow* parent):
HIG :: workarea_add_wide_control (t, &row, w);
w = new_check_button (_("Expand threads upon selection"), "expand-selected-articles", false, prefs);
HIG :: workarea_add_wide_control (t, &row, w);
- w = new_check_button (_("Always show article deletion confirmation dialog"), "show-deletion-confirm-dialog", true, prefs);
+ w = new_check_button (_("Always ask before deleting an article"), "show-deletion-confirm-dialog", true, prefs);
HIG :: workarea_add_wide_control (t, &row, w);
w = new_check_button (_("Smooth scrolling"), "smooth-scrolling", true, prefs);
HIG :: workarea_add_wide_control (t, &row, w);
@@ -959,12 +959,12 @@ PrefsDialog :: PrefsDialog (Prefs& prefs, GtkWindow* parent):
w = new_check_button (_("Clear article cache on shutdown"), "clear-article-cache-on-shutdown", false, prefs);
HIG :: workarea_add_wide_control (t, &row, w);
w = new_spin_button ("cache-size-megs", 10, 1024*16, prefs);
- l = gtk_label_new(_("Size of article cache (in MiB) :"));
+ l = gtk_label_new(_("Size of article cache (in MiB):"));
gtk_misc_set_alignment (GTK_MISC(l), 0.0, 0.5);
gtk_label_set_mnemonic_widget(GTK_LABEL(l), w);
HIG::workarea_add_row (t, &row, l, w);
w = new_entry ("cache-file-extension", "msg", prefs);
- l = gtk_label_new(_("File extension for Cached Articles: "));
+ l = gtk_label_new(_("File extension for cached articles: "));
gtk_misc_set_alignment (GTK_MISC(l), 0.0, 0.5);
HIG :: workarea_add_row (t, &row, l, w);
@@ -1076,16 +1076,16 @@ PrefsDialog :: PrefsDialog (Prefs& prefs, GtkWindow* parent):
row = 0;
t = HIG :: workarea_create ();
- gtk_widget_set_tooltip_text (t, _("This menu lets you configure Pan to take certain actions on your behalf automatically, based on a post's score."));
+ gtk_widget_set_tooltip_text (t, _("This menu lets you configure Pan to take certain actions on your behalf automatically, based on an article's score."));
w = score_handler_new (prefs, "rules-delete-value", "never", b);
- HIG :: workarea_add_row (t, &row, _("_Delete posts scoring at: "), w);
+ HIG :: workarea_add_row (t, &row, _("_Delete articles scoring at: "), w);
w = score_handler_new (prefs, "rules-mark-read-value", "never", b);
- HIG :: workarea_add_row (t, &row, _("Mark posts _read scoring at: "), w);
+ HIG :: workarea_add_row (t, &row, _("Mark articles as _read scoring at: "), w);
w = score_handler_new (prefs, "rules-autocache-value", "never", b);
- HIG :: workarea_add_row (t, &row, _("_Cache posts scoring at: "), w);
+ HIG :: workarea_add_row (t, &row, _("_Cache articles scoring at: "), w);
w = score_handler_new (prefs, "rules-auto-dl-value", "never", b);
- HIG :: workarea_add_row (t, &row, _("Download _attachments of posts scoring at: "), w);
+ HIG :: workarea_add_row (t, &row, _("Download _attachments of articles scoring at: "), w);
HIG :: workarea_finish (t, &row);
gtk_notebook_append_page (GTK_NOTEBOOK(notebook), t, new_label_with_icon(_("_Actions"), _("Actions"), icon_prefs_actions, prefs));
@@ -1216,7 +1216,7 @@ PrefsDialog :: PrefsDialog (Prefs& prefs, GtkWindow* parent):
gtk_widget_show_all (scroll);
- gtk_notebook_append_page (GTK_NOTEBOOK(notebook), scroll, new_label_with_icon(_("_Hotkeys"), _("Hotkeys"), icon_prefs_hotkeys, prefs));
+ gtk_notebook_append_page (GTK_NOTEBOOK(notebook), scroll, new_label_with_icon(_("_Shortcuts"), _("Shortcuts"), icon_prefs_hotkeys, prefs));
gtk_widget_show_all (notebook);
gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area( GTK_DIALOG(dialog))), notebook, true, true, 0);
diff --git a/pan/gui/profiles-dialog.cc b/pan/gui/profiles-dialog.cc
index 2fda5a9..3ceb9ea 100644
--- a/pan/gui/profiles-dialog.cc
+++ b/pan/gui/profiles-dialog.cc
@@ -80,7 +80,7 @@ namespace
if (row == ROW_GPGSIG)
{
gtk_widget_set_tooltip_text(d->_signature_file_combo_box,
- _("Please choose your Email Address according to your PGP key's user id."));
+ _("Please choose your email address according to your PGP key's user id."));
gtk_widget_hide (d->_signature_file);
}
@@ -155,9 +155,9 @@ ProfileDialog :: ProfileDialog (const Data & data,
w = _address_entry = gtk_entry_new ();
set_entry (w, profile.address);
#ifdef HAVE_GMIME_CRYPTO
- gtk_widget_set_tooltip_text(w, _("Your Email Address.\n"
- "Note that this has to match your PGP Signature's Address\n"
- "if you want to PGP-Sign or Encrypt your messages correctly."));
+ gtk_widget_set_tooltip_text(w, _("Your email address.\n"
+ "Note that this has to match your PGP signature's address\n"
+ "if you want your messages to be PGP-signed or encrypted correctly."));
#endif
HIG :: workarea_add_row (t, &row, _("_Email Address:"), w);
w = _server_combo = make_servers_combo (data, profile.posting_server);
@@ -193,7 +193,7 @@ ProfileDialog :: ProfileDialog (const Data & data,
w = gtk_combo_box_new_with_model (GTK_TREE_MODEL(store));
hbox = gtk_hbox_new(FALSE, 3);
- l = gtk_label_new(_("Signature Type : "));
+ l = gtk_label_new(_("Signature Type: "));
gtk_misc_set_alignment (GTK_MISC(l), 0.0f, 0.5f);
gtk_box_pack_start(GTK_BOX(hbox), l, false, false, 0);
gtk_box_pack_start(GTK_BOX(hbox), w, true, true, 0);
@@ -223,7 +223,7 @@ ProfileDialog :: ProfileDialog (const Data & data,
HIG :: workarea_add_section_title (t, &row, _("X-Face (Avatar)"));
w = _xface_entry = gtk_entry_new ();
set_entry (w, profile.xface);
- gtk_widget_set_tooltip_markup (w, _("You can add an avatar icon to your articles with a unique X-Face code. \n"
+ gtk_widget_set_tooltip_markup (w, _("You can add an avatar icon to your articles with a unique X-Face code.\n"
"Add the code without the trailing <b>\"X-Face:\"</b> \n if it was generated "
"by a helper program (for example http://www.dairiki.org/xface/xface.php)."));
HIG :: workarea_add_row (t, &row, _("_X-Face:"), w, NULL);
@@ -233,7 +233,7 @@ ProfileDialog :: ProfileDialog (const Data & data,
w = _msgid_fqdn_entry = gtk_entry_new ();
set_entry (w, profile.fqdn);
- gtk_widget_set_tooltip_text (w, _("When posting to Usenet, your article's Message-ID contains a domain name. \n"
+ gtk_widget_set_tooltip_text (w, _("When posting to Usenet, your article's Message-ID contains a domain name.\n"
"You can set a custom domain name here, or leave it blank to let Pan use the "
"domain name from your email address."));
HIG :: workarea_add_row (t, &row, _("Message-ID _Domain Name:"), w, NULL);
@@ -265,7 +265,7 @@ ProfileDialog :: ProfileDialog (const Data & data,
if (!s.empty())
gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW(w)), s.c_str(), s.size());
GtkWidget * eventbox = gtk_event_box_new ();
- gtk_widget_set_tooltip_text (eventbox, _("Extra headers to be included in your posts, such as\nReply-To: \"Your Name\""
+ gtk_widget_set_tooltip_text (eventbox, _("Extra headers to be included in your articles, such as\nReply-To: \"Your Name\""
"<yourname somewhere com>\nOrganization: Your Organization\n"));
GtkWidget * scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW(scrolled_window),
diff --git a/pan/gui/server-ui.cc b/pan/gui/server-ui.cc
index 3c515c7..83cf3e3 100644
--- a/pan/gui/server-ui.cc
+++ b/pan/gui/server-ui.cc
@@ -261,7 +261,7 @@ pan :: import_sec_from_disk_dialog_new (Data& data, Queue& queue, GtkWindow * wi
std::string prev_path = g_get_home_dir ();
std::string res;
- GtkWidget * w = gtk_file_chooser_dialog_new (_("Import SSL certificate (PEM format) from File"),
+ GtkWidget * w = gtk_file_chooser_dialog_new (_("Import SSL Certificate (PEM Format) From File"),
window,
GTK_FILE_CHOOSER_ACTION_OPEN,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
@@ -398,7 +398,7 @@ pan :: server_edit_dialog_new (Data& data, Queue& queue, GtkWindow * window, con
struct { int o; const char * str; } ssl_items[] = {
- { 0, N_("Use Plaintext (Unsecured) Connections") },
+ { 0, N_("Use Unsecure (Plaintext) Connections") },
{ 1, N_("Use Secure SSL Connections") }
};
@@ -415,14 +415,14 @@ pan :: server_edit_dialog_new (Data& data, Queue& queue, GtkWindow * window, con
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (w), renderer, true);
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (w), renderer, "text", 0, NULL);
gtk_combo_box_set_active (GTK_COMBO_BOX(w), 0);
- l = gtk_label_new (_("TLS (SSL) Options:"));
+ l = gtk_label_new (_("TLS (SSL) Settings:"));
e = gtk_event_box_new ();
gtk_container_add (GTK_CONTAINER(e), l);
gtk_misc_set_alignment (GTK_MISC(l), 0.0f, 0.5f);
gtk_widget_set_tooltip_text( e,
- _("You can set the option for using/disabling secure SSL/TLS connections here. "
+ _("You can enable/disable secure SSL/TLS connections here. "
"If you enable SSL/TLS, your data is encrypted and secure. "
- "It is encouraged to use this option for privacy reasons."));
+ "It is encouraged to enable SSL/TLS for privacy reasons."));
HIG::workarea_add_row (t, &row, e, w);
d->always_trust_checkbox = w = gtk_check_button_new_with_label (_("Always trust this server's certificate"));
diff --git a/pan/gui/task-pane.cc b/pan/gui/task-pane.cc
index 6e3d46e..454f56c 100644
--- a/pan/gui/task-pane.cc
+++ b/pan/gui/task-pane.cc
@@ -260,7 +260,7 @@ TaskPane :: prompt_user_for_new_dest (GtkWindow * parent, const Quark& current_p
if (!file :: file_exists (prev_path.c_str()))
prev_path = g_get_home_dir ();
- GtkWidget * w = gtk_file_chooser_dialog_new (_("Choose new destination for selected Tasks"),
+ GtkWidget * w = gtk_file_chooser_dialog_new (_("Choose New Destination for Selected Tasks"),
GTK_WINDOW(parent),
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
diff --git a/pan/tasks/task-post.cc b/pan/tasks/task-post.cc
index 70ebec0..eb8576b 100644
--- a/pan/tasks/task-post.cc
+++ b/pan/tasks/task-post.cc
@@ -78,7 +78,7 @@ TaskPost :: on_nntp_done (NNTP * nntp,
_state.set_need_nntp (_server);
}
else {
- Log :: add_info_va (_("Posting of \"%s\" succesful: %s"),
+ Log :: add_info_va (_("Posting of \"%s\" successful: %s"),
res, response.str);
_state.set_completed ();
set_error (response);
diff --git a/pan/tasks/task-upload.cc b/pan/tasks/task-upload.cc
index a8502fc..7bfde74 100644
--- a/pan/tasks/task-upload.cc
+++ b/pan/tasks/task-upload.cc
@@ -248,7 +248,7 @@ TaskUpload :: use_nntp (NNTP * nntp)
if (_queue_pos != -1)
set_status_va (_("Uploading %s - Part %d of %d"), _basename.c_str(), needed->partno, _total_parts);
else
- set_status_va (_("Uploading Message body with Subject \"%s\""), _subject.c_str());
+ set_status_va (_("Uploading message body with subject \"%s\""), _subject.c_str());
std::string data;
if (_queue_pos != -1) _cache.get_data(data,needed->message_id.c_str());
@@ -305,7 +305,7 @@ TaskUpload :: on_nntp_done (NNTP * nntp,
switch (atoi(response.str))
{
case NO_POSTING:
- Log :: add_err_va (_("Posting of File %s (Part %d of %d) failed: No Posts allowed by server."),
+ Log :: add_err_va (_("Posting of file %s (part %d of %d) failed: No posts allowed by server."),
_basename.c_str(), it->second.partno, _total_parts);
this->stop();
break;
@@ -313,7 +313,7 @@ TaskUpload :: on_nntp_done (NNTP * nntp,
if (health != OK) // if we got a dupe, the health is OK, so skip that
{
tmp.severity = Log :: PAN_SEVERITY_ERROR;
- g_snprintf(buf,sizeof(buf), _("Posting of File %s (Part %d of %d) failed: %s"),
+ g_snprintf(buf,sizeof(buf), _("Posting of file %s (part %d of %d) failed: %s"),
_basename.c_str(), it->second.partno, _total_parts, response.str);
tmp.message = buf;
_logfile.push_front(tmp);
@@ -323,14 +323,14 @@ TaskUpload :: on_nntp_done (NNTP * nntp,
tmp.severity = Log :: PAN_SEVERITY_INFO;
if (post_ok && !_needed.empty())
{
- g_snprintf(buf,sizeof(buf), _("Posting of file %s (Part %d of %d) succesful: %s"),
+ g_snprintf(buf,sizeof(buf), _("Posting of file %s (part %d of %d) successful: %s"),
_basename.c_str(), it->second.partno, _total_parts, response.str);
tmp.message = buf;
_logfile.push_front(tmp);
}
else if (post_ok && _needed.empty())
{
- g_snprintf(buf,sizeof(buf), _("Posting of file %s (Part %d of %d) succesful: %s"),
+ g_snprintf(buf,sizeof(buf), _("Posting of file %s (part %d of %d) successful: %s"),
_basename.c_str(), it->second.partno, _total_parts, response.str);
tmp.message = buf;
_logfile.push_front(tmp);
@@ -340,11 +340,11 @@ TaskUpload :: on_nntp_done (NNTP * nntp,
foreach_const (std::deque<Log::Entry>, _logfile, it)
if (it->severity == Log :: PAN_SEVERITY_ERROR) error = true;
if (!error)
- g_snprintf(buf,sizeof(buf), _("Posting of file %s succesful: %s"),
+ g_snprintf(buf,sizeof(buf), _("Posting of file %s successful: %s"),
_basename.c_str(), response.str);
else
{
- g_snprintf(buf,sizeof(buf), _("Posting of file %s not completely successful: Check the log (right-click on list item) !"),
+ g_snprintf(buf,sizeof(buf), _("Posting of file %s not completely successful: Check the log (right-click list item)."),
_basename.c_str(), response.str);
tmp.severity = Log :: PAN_SEVERITY_ERROR;
}
@@ -361,7 +361,7 @@ TaskUpload :: on_nntp_done (NNTP * nntp,
_needed.erase (it);
Log::add_entry_list (tmp, _logfile);
_logfile.clear();
- Log :: add_err_va (_("Posting of file %s not successful: Check the log (right-click on list item) !"),
+ Log :: add_err_va (_("Posting of file %s not successful: Check the log (right-click list item)."),
_basename.c_str(), response.str);
break;
}
diff --git a/pan/usenet-utils/ssl-utils.h b/pan/usenet-utils/ssl-utils.h
index d815568..d369a95 100644
--- a/pan/usenet-utils/ssl-utils.h
+++ b/pan/usenet-utils/ssl-utils.h
@@ -213,14 +213,14 @@ namespace pan
char email1[2048], email2[2048];
char tmp1[2048], tmp2[2048];
- g_snprintf(tmp1,sizeof(tmp1), _("The current server <b>'%s'</b> sent this security certificate :\n\n"), server.c_str());
- g_snprintf(tmp2,sizeof(tmp2), _("Certificate information for server <b>'%s'</b> :\n\n"), server.c_str());
+ g_snprintf(tmp1,sizeof(tmp1), _("The current server <b>'%s'</b> sent this security certificate:\n\n"), server.c_str());
+ g_snprintf(tmp2,sizeof(tmp2), _("Certificate information for server <b>'%s'</b>:\n\n"), server.c_str());
g_snprintf(buf,size, _("%s"
"<b>Issuer information:</b>\n"
"%s\n"
- "<b>Valid until : </b>%s\n\n"
- "<b>Not valid before : </b>%s\n\n"),
+ "<b>Valid until:</b> %s\n\n"
+ "<b>Not valid before:</b> %s\n\n"),
on_connect ? tmp1 : tmp2,
cp.build_complete(p_issuer).c_str(),
until,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
