[balsa] Clean some translatable strings
- From: Peter Bloomfield <peterb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa] Clean some translatable strings
- Date: Wed, 23 Nov 2016 01:07:57 +0000 (UTC)
commit 55746ccf7e59a9f001eb797cc38808b9bbb94af6
Author: Piotr Drąg <piotrdrag gmail com>
Date: Sun Nov 20 17:46:12 2016 +0100
Clean some translatable strings
Typo fixes, correct capitalization, double spaces, etc.
Signed-off-by: Peter Bloomfield <PeterBloomfield bellsouth net>
balsa-mailto-handler.desktop.in.in | 2 +-
balsa.desktop.in.in | 2 +-
libbalsa/address-view.c | 4 +-
libbalsa/filter-funcs.c | 2 +-
libbalsa/identity.c | 2 +-
libbalsa/libbalsa-gpgme.c | 2 +-
libbalsa/mailbox_maildir.c | 8 ++--
libbalsa/mailbox_mbox.c | 4 +-
libbalsa/mailbox_mh.c | 2 +-
libbalsa/message.c | 2 +-
libbalsa/misc.c | 48 ++++++++++++++++----------------
libbalsa/send.c | 2 +-
libinit_balsa/assistant_page_user.c | 2 +-
libinit_balsa/assistant_page_welcome.c | 2 +-
sounds/balsa.soundlist.in | 4 +-
src/ab-window.c | 4 +-
src/address-book-config.c | 4 +-
src/balsa-message.c | 6 ++--
src/balsa-mime-widget-message.c | 6 ++--
src/balsa-mime-widget-vcalendar.c | 4 +-
src/balsa-print-object-header.c | 6 ++--
src/filter-edit-callbacks.c | 2 +-
src/filter-edit-dialog.c | 2 +-
src/folder-conf.c | 10 +++---
src/mailbox-conf.c | 6 ++--
src/main-window.c | 4 +-
src/main.c | 4 +-
src/pref-manager.c | 22 +++++++-------
src/sendmsg-window.c | 16 +++++-----
src/store-address.c | 4 +-
src/toolbar-factory.c | 2 +-
31 files changed, 95 insertions(+), 95 deletions(-)
---
diff --git a/balsa-mailto-handler.desktop.in.in b/balsa-mailto-handler.desktop.in.in
index cff195b..c18c555 100644
--- a/balsa-mailto-handler.desktop.in.in
+++ b/balsa-mailto-handler.desktop.in.in
@@ -1,6 +1,6 @@
[Desktop Entry]
_Name=Balsa
-_Comment=E-Mail utility
+_Comment=Email utility
_GenericName=Mail Client
_X-GNOME-FullName=Balsa Mail Client
TryExec=balsa
diff --git a/balsa.desktop.in.in b/balsa.desktop.in.in
index da30e76..c6af298 100644
--- a/balsa.desktop.in.in
+++ b/balsa.desktop.in.in
@@ -1,6 +1,6 @@
[Desktop Entry]
_Name=Balsa
-_Comment=E-Mail utility
+_Comment=Email utility
_GenericName=Mail Client
_X-GNOME-FullName=Balsa Mail Client
TryExec=balsa
diff --git a/libbalsa/address-view.c b/libbalsa/address-view.c
index 01249d3..aa86553 100644
--- a/libbalsa/address-view.c
+++ b/libbalsa/address-view.c
@@ -158,8 +158,8 @@ enum LibBalsaAddressViewMatchType_ {
/* Must be consistent with LibBalsaAddressType enum: */
const gchar *const libbalsa_address_view_types[] = {
N_("To:"),
- N_("Cc:"),
- N_("Bcc:"),
+ N_("CC:"),
+ N_("BCC:"),
N_("Reply To:"),
};
diff --git a/libbalsa/filter-funcs.c b/libbalsa/filter-funcs.c
index 85d4ac9..77d8f31 100644
--- a/libbalsa/filter-funcs.c
+++ b/libbalsa/filter-funcs.c
@@ -381,7 +381,7 @@ append_header_names(LibBalsaCondition *cond, GString *res)
{ CONDITION_MATCH_TO, N_("To") },
{ CONDITION_MATCH_FROM, N_("From") },
{ CONDITION_MATCH_SUBJECT, N_("Subject") },
- { CONDITION_MATCH_CC, N_("Cc") },
+ { CONDITION_MATCH_CC, N_("CC") },
{ CONDITION_MATCH_BODY, N_("Body") }
};
diff --git a/libbalsa/identity.c b/libbalsa/identity.c
index 4b2a27c..c6c3be6 100644
--- a/libbalsa/identity.c
+++ b/libbalsa/identity.c
@@ -1002,7 +1002,7 @@ setup_ident_frame(GtkDialog * dialog, gboolean createp, gpointer tree)
/* create the "Messages" tab */
grid = append_ident_notebook_page(notebook, _("Messages"), NULL);
row = 0;
- ident_dialog_add_entry(grid, row++, dialog, _("_Bcc:"),
+ ident_dialog_add_entry(grid, row++, dialog, _("_BCC:"),
"identity-bcc");
ident_dialog_add_entry(grid, row++, dialog, _("Reply _string:"),
"identity-replystring");
diff --git a/libbalsa/libbalsa-gpgme.c b/libbalsa/libbalsa-gpgme.c
index cba4654..d9c6f49 100644
--- a/libbalsa/libbalsa-gpgme.c
+++ b/libbalsa/libbalsa-gpgme.c
@@ -870,7 +870,7 @@ get_key_from_name(gpgme_ctx_t ctx, const gchar * name, gboolean secret,
if (error)
g_set_error(error, GPGME_ERROR_QUARK,
GPG_ERR_KEY_SELECTION,
- _("%s: insufficient validity for uid %s"),
+ _("%s: insufficient validity for UID %s"),
"gmime-gpgme", name);
}
}
diff --git a/libbalsa/mailbox_maildir.c b/libbalsa/mailbox_maildir.c
index 4b8b84d..78e7f43 100644
--- a/libbalsa/mailbox_maildir.c
+++ b/libbalsa/mailbox_maildir.c
@@ -197,7 +197,7 @@ lbm_maildir_check_files(const gchar * path, gboolean create)
if (mkdir(path, S_IRWXU)) {
libbalsa_information(LIBBALSA_INFORMATION_WARNING,
- _("Could not create a MailDir directory at %s (%s)"),
+ _("Could not create a Maildir directory at %s (%s)"),
path, strerror(errno));
return -1;
}
@@ -205,7 +205,7 @@ lbm_maildir_check_files(const gchar * path, gboolean create)
snprintf(tmp, sizeof(tmp), "%s/cur", path);
if (mkdir(tmp, S_IRWXU)) {
libbalsa_information(LIBBALSA_INFORMATION_WARNING,
- _("Could not create a MailDir at %s (%s)"),
+ _("Could not create a Maildir at %s (%s)"),
path, strerror(errno));
rmdir(path);
return -1;
@@ -214,7 +214,7 @@ lbm_maildir_check_files(const gchar * path, gboolean create)
snprintf(tmp, sizeof(tmp), "%s/new", path);
if (mkdir(tmp, S_IRWXU)) {
libbalsa_information(LIBBALSA_INFORMATION_WARNING,
- _("Could not create a MailDir at %s (%s)"),
+ _("Could not create a Maildir at %s (%s)"),
path, strerror(errno));
snprintf(tmp, sizeof(tmp), "%s/cur", path);
rmdir(tmp);
@@ -225,7 +225,7 @@ lbm_maildir_check_files(const gchar * path, gboolean create)
snprintf(tmp, sizeof(tmp), "%s/tmp", path);
if (mkdir(tmp, S_IRWXU)) {
libbalsa_information(LIBBALSA_INFORMATION_WARNING,
- _("Could not create a MailDir at %s (%s)"),
+ _("Could not create a Maildir at %s (%s)"),
path, strerror(errno));
snprintf(tmp, sizeof(tmp), "%s/cur", path);
rmdir(tmp);
diff --git a/libbalsa/mailbox_mbox.c b/libbalsa/mailbox_mbox.c
index 37aefa9..a295a43 100644
--- a/libbalsa/mailbox_mbox.c
+++ b/libbalsa/mailbox_mbox.c
@@ -196,7 +196,7 @@ lbm_mbox_check_files(const gchar * path, gboolean create)
if (libbalsa_mailbox_type_from_path(path) !=
LIBBALSA_TYPE_MAILBOX_MBOX) {
libbalsa_information(LIBBALSA_INFORMATION_WARNING,
- _("Mailbox %s does not appear to be an Mbox mailbox."),
+ _("Mailbox %s does not appear to be an mbox mailbox."),
path);
return -1;
}
@@ -438,7 +438,7 @@ lbm_mbox_save(LibBalsaMailboxMbox * mbox)
|| (unlink(filename) != 0 && errno != ENOENT)
|| libbalsa_safe_rename(template, filename) != 0)
libbalsa_information(LIBBALSA_INFORMATION_WARNING,
- _("Failed to save cache file “%s”: %s. "
+ _("Failed to save cache file “%s”: %s. "
"New version saved as “%s”"),
filename, strerror(errno), template);
g_free(template);
diff --git a/libbalsa/mailbox_mh.c b/libbalsa/mailbox_mh.c
index 4f6fa63..9fe73e3 100644
--- a/libbalsa/mailbox_mh.c
+++ b/libbalsa/mailbox_mh.c
@@ -167,7 +167,7 @@ lbm_mh_check_files(const gchar * path, gboolean create)
if (libbalsa_mailbox_type_from_path(path) !=
LIBBALSA_TYPE_MAILBOX_MH) {
libbalsa_information(LIBBALSA_INFORMATION_WARNING,
- _("Mailbox %s does not appear to be a Mh mailbox."),
+ _("Mailbox %s does not appear to be an MH mailbox."),
path);
return -1;
}
diff --git a/libbalsa/message.c b/libbalsa/message.c
index d7e9136..85731e7 100644
--- a/libbalsa/message.c
+++ b/libbalsa/message.c
@@ -612,7 +612,7 @@ libbalsa_message_change_flags(LibBalsaMessage * message,
if (message->mailbox->readonly) {
libbalsa_information(LIBBALSA_INFORMATION_WARNING,
- _("Mailbox (%s) is readonly: "
+ _("Mailbox (%s) is read-only: "
"cannot change flags."),
message->mailbox->name);
return;
diff --git a/libbalsa/misc.c b/libbalsa/misc.c
index d892a28..920369d 100644
--- a/libbalsa/misc.c
+++ b/libbalsa/misc.c
@@ -593,53 +593,53 @@ libbalsa_utf8_strstr(const gchar *s1, const gchar *s2)
/* The LibBalsaCodeset enum is not used for anything currently, but this
* list must be the same length, and should probably be kept consistent: */
LibBalsaCodesetInfo libbalsa_codeset_info[LIBBALSA_NUM_CODESETS] = {
- {N_("west european"), /* WEST_EUROPE */
+ {N_("West European"), /* WEST_EUROPE */
"iso-8859-1", "windows-1252"} ,
- {N_("east european"), /* EAST_EUROPE */
+ {N_("East European"), /* EAST_EUROPE */
"iso-8859-2", "windows-1250"} ,
- {N_("south european"), /* SOUTH_EUROPE */
+ {N_("South European"), /* SOUTH_EUROPE */
"iso-8859-3"} ,
- {N_("north european"), /* NORTH_EUROPE */
+ {N_("North European"), /* NORTH_EUROPE */
"iso-8859-4"} ,
- {N_("cyrillic"), /* CYRILLIC */
+ {N_("Cyrillic"), /* CYRILLIC */
"iso-8859-5", "windows-1251"} ,
- {N_("arabic"), /* ARABIC */
+ {N_("Arabic"), /* ARABIC */
"iso-8859-6", "windows-1256"} ,
- {N_("greek"), /* GREEK */
+ {N_("Greek"), /* GREEK */
"iso-8859-7", "windows-1253"} ,
- {N_("hebrew"), /* HEBREW */
+ {N_("Hebrew"), /* HEBREW */
"iso-8859-8", "windows-1255"} ,
- {N_("turkish"), /* TURKISH */
+ {N_("Turkish"), /* TURKISH */
"iso-8859-9", "windows-1254"} ,
- {N_("nordic"), /* NORDIC */
+ {N_("Nordic"), /* NORDIC */
"iso-8859-10"} ,
- {N_("thai"), /* THAI */
+ {N_("Thai"), /* THAI */
"iso-8859-11"} ,
- {N_("baltic"), /* BALTIC */
+ {N_("Baltic"), /* BALTIC */
"iso-8859-13", "windows-1257"} ,
- {N_("celtic"), /* CELTIC */
+ {N_("Celtic"), /* CELTIC */
"iso-8859-14"} ,
- {N_("west europe (euro)"), /* WEST_EUROPE_EURO */
+ {N_("West European (euro)"), /* WEST_EUROPE_EURO */
"iso-8859-15"} ,
- {N_("russian"), /* RUSSIAN */
+ {N_("Russian"), /* RUSSIAN */
"koi-8r"} ,
- {N_("ukrainian"), /* UKRAINE */
+ {N_("Ukrainian"), /* UKRAINE */
"koi-8u"} ,
- {N_("japanese"), /* JAPAN */
+ {N_("Japanese"), /* JAPAN */
"iso-2022-jp"} ,
- {N_("korean"), /* KOREA */
+ {N_("Korean"), /* KOREA */
"euc-kr"} ,
- {N_("east european"), /* EAST_EUROPE_WIN */
+ {N_("East European"), /* EAST_EUROPE_WIN */
"windows-1250"} ,
- {N_("cyrillic"), /* CYRILLIC_WIN */
+ {N_("Cyrillic"), /* CYRILLIC_WIN */
"windows-1251"} ,
- {N_("greek"), /* GREEK_WIN */
+ {N_("Greek"), /* GREEK_WIN */
"windows-1253"} ,
- {N_("hebrew"), /* HEBREW_WIN */
+ {N_("Hebrew"), /* HEBREW_WIN */
"windows-1255"} ,
- {N_("arabic"), /* ARABIC_WIN */
+ {N_("Arabic"), /* ARABIC_WIN */
"windows-1256"} ,
- {N_("baltic"), /* BALTIC_WIN */
+ {N_("Baltic"), /* BALTIC_WIN */
"windows-1257"} ,
};
diff --git a/libbalsa/send.c b/libbalsa/send.c
index a90a23b..6a52cf2 100644
--- a/libbalsa/send.c
+++ b/libbalsa/send.c
@@ -1734,7 +1734,7 @@ libbalsa_message_create_mime_message(LibBalsaMessage* message, gboolean flow,
"application/octet-stream";
libbalsa_information(LIBBALSA_INFORMATION_WARNING,
- _("Cannot determine charset "
+ _("Cannot determine character set "
"for text file “%s”; "
"sending as mime type “%s”"),
libbalsa_vfs_get_uri_utf8(body->file_uri),
diff --git a/libinit_balsa/assistant_page_user.c b/libinit_balsa/assistant_page_user.c
index 875a538..0526f70 100644
--- a/libinit_balsa/assistant_page_user.c
+++ b/libinit_balsa/assistant_page_user.c
@@ -132,7 +132,7 @@ balsa_druid_page_user_init(BalsaDruidPageUser * user,
preset = libbalsa_guess_email_address();
balsa_init_add_grid_entry
- (grid, row++, _("Your _Email Address, for this email account:"),
+ (grid, row++, _("Your _email address for this email account:"),
preset, &(user->ed1), druid, page, &(user->email));
g_free(preset);
diff --git a/libinit_balsa/assistant_page_welcome.c b/libinit_balsa/assistant_page_welcome.c
index 6c194f3..fc750a0 100644
--- a/libinit_balsa/assistant_page_welcome.c
+++ b/libinit_balsa/assistant_page_welcome.c
@@ -32,7 +32,7 @@ balsa_druid_page_welcome(GtkAssistant * druid)
"email account, provided by an Internet Service Provider, "
"and you should have made that Internet connection on your "
"computer\n\n"
- "• or your Network Administrator at your place of "
+ "• or your network administrator at your place of "
"work/study/similar may have set up your computer to "
"connect to the network.");
diff --git a/sounds/balsa.soundlist.in b/sounds/balsa.soundlist.in
index 04a1789..8649f4e 100644
--- a/sounds/balsa.soundlist.in
+++ b/sounds/balsa.soundlist.in
@@ -1,9 +1,9 @@
[__section_info__]
-_description=Balsa E-mail reader
+_description=Balsa Email Reader
[startup]
file=balsa/startup.wav
-_description=Program startup
+_description=Program start-up
[newmail]
file=balsa/newmail.wav
diff --git a/src/ab-window.c b/src/ab-window.c
index ebb88b2..5beb702 100644
--- a/src/ab-window.c
+++ b/src/ab-window.c
@@ -189,7 +189,7 @@ balsa_ab_window_list(BalsaAbWindow * ab, GCallback row_activated_cb)
renderer = gtk_cell_renderer_text_new();
column =
- gtk_tree_view_column_new_with_attributes(_("E-Mail Address"),
+ gtk_tree_view_column_new_with_attributes(_("Email Address"),
renderer,
"text",
LIST_COLUMN_ADDRESS_STRING,
@@ -329,7 +329,7 @@ balsa_ab_window_init(BalsaAbWindow *ab)
gtk_container_add(GTK_CONTAINER(hbox), w);
gtk_widget_show(GTK_WIDGET(w));
- w = gtk_button_new_with_mnemonic(_("_Re-Import"));
+ w = gtk_button_new_with_mnemonic(_("_Re-import"));
g_signal_connect(G_OBJECT(w), "clicked",
G_CALLBACK(balsa_ab_window_reload),
ab);
diff --git a/src/address-book-config.c b/src/address-book-config.c
index ad71756..e45a603 100644
--- a/src/address-book-config.c
+++ b/src/address-book-config.c
@@ -668,7 +668,7 @@ bad_path(gchar * path, GtkWindow * window, gint type)
GTK_DIALOG_MODAL|
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO,
- _("No path found. "
+ _("No path found. "
"Do you want to give one?"));
#if HAVE_MACOSX_DESKTOP
libbalsa_macosx_menu_for_parent(ask, window);
@@ -927,7 +927,7 @@ balsa_address_book_add_menu(BalsaAddressBookCallback callback,
g_object_weak_ref(G_OBJECT(menu), (GWeakNotify) g_free, abc);
menuitem =
- gtk_menu_item_new_with_label(_("VCard Address Book (GnomeCard)"));
+ gtk_menu_item_new_with_label(_("vCard Address Book (GnomeCard)"));
g_signal_connect(G_OBJECT(menuitem), "activate",
G_CALLBACK(add_vcard_cb), abc);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
diff --git a/src/balsa-message.c b/src/balsa-message.c
index 567cc57..64a7ddd 100644
--- a/src/balsa-message.c
+++ b/src/balsa-message.c
@@ -1341,7 +1341,7 @@ mpart_content_name(const gchar *content_type)
else if (g_ascii_strcasecmp(content_type, "multipart/encrypted") == 0)
return g_strdup(_("encrypted parts"));
else if (g_ascii_strcasecmp(content_type, "message/rfc822") == 0)
- return g_strdup(_("rfc822 message"));
+ return g_strdup(_("RFC822 message"));
else
return g_strdup_printf(_("“%s” parts"),
strchr(content_type, '/') + 1);
@@ -1434,7 +1434,7 @@ display_part(BalsaMessage * bm, LibBalsaMessageBody * body,
libbalsa_utf8_sanitize(&from, balsa_app.convert_unknown_8bit, NULL);
libbalsa_utf8_sanitize(&subj, balsa_app.convert_unknown_8bit, NULL);
icon_title =
- g_strdup_printf(_("rfc822 message (from %s, subject “%s”)"),
+ g_strdup_printf(_("RFC822 message (from %s, subject “%s”)"),
from, subj);
g_free(from);
g_free(subj);
@@ -2583,7 +2583,7 @@ create_mdn_dialog(GtkWindow *parent, gchar * sender, gchar * mdn_to_address,
GTK_BUTTONS_YES_NO,
_("The sender of this mail, %s, "
"requested \n"
- "a Message Disposition Notification"
+ "a Message Disposition Notification "
"(MDN) to be returned to “%s”.\n"
"Do you want to send "
"this notification?"),
diff --git a/src/balsa-mime-widget-message.c b/src/balsa-mime-widget-message.c
index 003c9a5..d423815 100644
--- a/src/balsa-mime-widget-message.c
+++ b/src/balsa-mime-widget-message.c
@@ -746,14 +746,14 @@ bmw_message_set_headers_d(BalsaMessage * bm,
}
add_header_address_list(bm, grid, "to", _("To:"), headers->to_list,
show_all_headers);
- add_header_address_list(bm, grid, "cc", _("Cc:"), headers->cc_list,
+ add_header_address_list(bm, grid, "cc", _("CC:"), headers->cc_list,
show_all_headers);
- add_header_address_list(bm, grid, "bcc", _("Bcc:"), headers->bcc_list,
+ add_header_address_list(bm, grid, "bcc", _("BCC:"), headers->bcc_list,
show_all_headers);
#if BALSA_SHOW_FCC_AS_WELL_AS_X_BALSA_FCC
if (headers->fcc_url)
- add_header_gchar(grid, "fcc", _("Fcc:"), headers->fcc_url,
+ add_header_gchar(grid, "fcc", _("FCC:"), headers->fcc_url,
show_all_headers);
#endif
diff --git a/src/balsa-mime-widget-vcalendar.c b/src/balsa-mime-widget-vcalendar.c
index 8eb3e64..2c05f09 100644
--- a/src/balsa-mime-widget-vcalendar.c
+++ b/src/balsa-mime-widget-vcalendar.c
@@ -300,7 +300,7 @@ vevent_reply(GObject * button, GtkWidget * box)
/* create the message subject */
dummy = g_strdup_printf("%s: %s",
- event->summary ? event->summary : _("iTip Calendar Request"),
+ event->summary ? event->summary : _("iTIP Calendar Request"),
libbalsa_vcal_part_stat_to_str(pstat));
libbalsa_message_set_subject(message, dummy);
g_free(dummy);
@@ -338,7 +338,7 @@ vevent_reply(GObject * button, GtkWidget * box)
#endif
if (result != LIBBALSA_MESSAGE_CREATE_OK)
libbalsa_information(LIBBALSA_INFORMATION_ERROR,
- _("Sending the iTip calendar reply failed: %s"),
+ _("Sending the iTIP calendar reply failed: %s"),
error ? error->message : "?");
if (error)
g_error_free(error);
diff --git a/src/balsa-print-object-header.c b/src/balsa-print-object-header.c
index a399a2b..9c272e1 100644
--- a/src/balsa-print-object-header.c
+++ b/src/balsa-print-object-header.c
@@ -170,11 +170,11 @@ balsa_print_object_header_new_real(GList * list,
headers->from, &p_label_width, print_all_headers);
header_add_list(test_layout, header_buf, "to", _("To:"),
headers->to_list, &p_label_width, print_all_headers);
- header_add_list(test_layout, header_buf, "cc", _("Cc:"),
+ header_add_list(test_layout, header_buf, "cc", _("CC:"),
headers->cc_list, &p_label_width, print_all_headers);
- header_add_list(test_layout, header_buf, "bcc", _("Bcc:"),
+ header_add_list(test_layout, header_buf, "bcc", _("BCC:"),
headers->bcc_list, &p_label_width, print_all_headers);
- header_add_string(test_layout, header_buf, "fcc", _("Fcc:"),
+ header_add_string(test_layout, header_buf, "fcc", _("FCC:"),
headers->fcc_url, &p_label_width, print_all_headers);
header_add_list(test_layout, header_buf, "disposition-notification-to",
_("Disposition-Notification-To:"),
diff --git a/src/filter-edit-callbacks.c b/src/filter-edit-callbacks.c
index 0706acc..e5bdc5b 100644
--- a/src/filter-edit-callbacks.c
+++ b/src/filter-edit-callbacks.c
@@ -956,7 +956,7 @@ get_field_frame(void)
fe_matching_fields_to = add_check(grid, _("_To:"), 0,1);
fe_matching_fields_from = add_check(grid, _("_From:"), 1,1);
fe_matching_fields_subject = add_check(grid, _("_Subject"), 0,2);
- fe_matching_fields_cc = add_check(grid, _("_Cc:"), 1,2);
+ fe_matching_fields_cc = add_check(grid, _("_CC:"), 1,2);
fe_matching_fields_us_head =
gtk_check_button_new_with_mnemonic(_("_User header:"));
gtk_widget_set_hexpand(fe_matching_fields_us_head, TRUE);
diff --git a/src/filter-edit-dialog.c b/src/filter-edit-dialog.c
index 6d22c83..6b81746 100644
--- a/src/filter-edit-dialog.c
+++ b/src/filter-edit-dialog.c
@@ -415,7 +415,7 @@ build_action_page(GtkWindow * window)
g_signal_connect(G_OBJECT(dialog), "response",
G_CALLBACK(fe_sound_response), NULL);
- fe_popup_button = gtk_check_button_new_with_label(_("Popup text:"));
+ fe_popup_button = gtk_check_button_new_with_label(_("Pop-up text:"));
gtk_widget_set_hexpand(fe_popup_button, TRUE);
gtk_grid_attach(GTK_GRID(grid), fe_popup_button, 0, 1, 1, 1);
fe_popup_entry = gtk_entry_new();
diff --git a/src/folder-conf.c b/src/folder-conf.c
index 7408674..aee7dc8 100644
--- a/src/folder-conf.c
+++ b/src/folder-conf.c
@@ -409,7 +409,7 @@ folder_conf_imap_node(BalsaMailboxNode *mn)
libbalsa_create_grid_check(_("Subscribed _folders only"), grid, r++,
mn ? mn->subscribed : FALSE);
fcw->list_inbox =
- libbalsa_create_grid_check(_("Always show _INBOX"), grid, r++,
+ libbalsa_create_grid_check(_("Always show _Inbox"), grid, r++,
mn ? mn->list_inbox : TRUE);
label = libbalsa_create_grid_label(_("Pr_efix:"), grid, r);
@@ -638,10 +638,10 @@ subfolder_conf_clicked_ok(SubfolderDialogData * sdd)
(!sdd->old_parent || !*sdd->old_parent)) {
gchar *msg =
g_strdup_printf(_
- ("Renaming INBOX is special!\n"
+ ("Renaming Inbox is special!\n"
"You will create a subfolder %s in %s\n"
- "containing the messages from INBOX.\n"
- "INBOX and its subfolders will remain.\n"
+ "containing the messages from Inbox.\n"
+ "Inbox and its subfolders will remain.\n"
"What would you like to do?"),
folder, parent);
GtkWidget *ask =
@@ -649,7 +649,7 @@ folder, parent);
GTK_WINDOW(sdd->dialog),
GTK_DIALOG_MODAL |
libbalsa_dialog_flags(),
- _("Rename INBOX"),
+ _("Rename Inbox"),
GTK_RESPONSE_OK,
_("Cancel"),
GTK_RESPONSE_CANCEL,
diff --git a/src/mailbox-conf.c b/src/mailbox-conf.c
index c268ac2..152b110 100644
--- a/src/mailbox-conf.c
+++ b/src/mailbox-conf.c
@@ -387,12 +387,12 @@ mailbox_conf_delete(BalsaMailboxNode * mbnode)
GTK_BUTTONS_NONE,
_("This will remove the mailbox "
"“%s” from the list "
- "of mailboxes. "
+ "of mailboxes. "
"You may also delete the disk "
"file or files associated with "
"this mailbox.\n"
"If you do not remove the file "
- "on disk you may “Add Mailbox” "
+ "on disk you may “Add Mailbox” "
"to access the mailbox again.\n"
"What would you like to do?"),
mailbox->name);
@@ -408,7 +408,7 @@ mailbox_conf_delete(BalsaMailboxNode * mbnode)
GTK_BUTTONS_NONE,
_("This will remove the mailbox "
"“%s” and all its messages "
- "from your IMAP server. "
+ "from your IMAP server. "
"If %s has subfolders, it will "
"still appear as a node in the "
"folder tree.\n"
diff --git a/src/main-window.c b/src/main-window.c
index fc6ddbd..8dfdcb6 100644
--- a/src/main-window.c
+++ b/src/main-window.c
@@ -3984,7 +3984,7 @@ bw_find_real(BalsaWindow * window, BalsaIndex * bindex, gboolean again)
matching_to = bw_add_check_button(grid, _("_To:"), 1, 0);
matching_from = bw_add_check_button(grid, _("_From:"), 1, 1);
matching_subject = bw_add_check_button(grid, _("S_ubject"), 2, 0);
- matching_cc = bw_add_check_button(grid, _("_Cc:"), 2, 1);
+ matching_cc = bw_add_check_button(grid, _("_CC:"), 2, 1);
gtk_container_add(GTK_CONTAINER(frame), grid);
/* Frame with Apply and Clear buttons */
@@ -4380,7 +4380,7 @@ bw_notebook_switch_page_cb(GtkWidget * notebook,
if (mailbox->name) {
if (mailbox->readonly) {
title =
- g_strdup_printf(_("Balsa: %s (readonly)"), mailbox->name);
+ g_strdup_printf(_("Balsa: %s (read-only)"), mailbox->name);
} else {
title = g_strdup_printf(_("Balsa: %s"), mailbox->name);
}
diff --git a/src/main.c b/src/main.c
index adf90ac..747394c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -652,7 +652,7 @@ parse_options(int argc,
static GOptionEntry option_entries[] = {
{"checkmail", 'c', 0, G_OPTION_ARG_NONE,
&(cmd_check_mail_on_startup),
- N_("Get new mail on startup"), NULL},
+ N_("Get new mail on start-up"), NULL},
{"compose", 'm', 0, G_OPTION_ARG_STRING, &(opt_compose_email),
N_("Compose a new email to EMAIL@ADDRESS"), "EMAIL@ADDRESS"},
{"attach", 'a', 0, G_OPTION_ARG_FILENAME_ARRAY, &(opt_attach_list),
@@ -665,7 +665,7 @@ parse_options(int argc,
N_("Opens first unread mailbox"), NULL},
{"open-inbox", 'i', 0, G_OPTION_ARG_NONE,
&(cmd_open_inbox),
- N_("Opens default Inbox on startup"), NULL},
+ N_("Opens default Inbox on start-up"), NULL},
{"get-stats", 's', 0, G_OPTION_ARG_NONE,
&(cmd_get_stats),
N_("Prints number unread and unsent messages"), NULL},
diff --git a/src/pref-manager.c b/src/pref-manager.c
index 78ba688..d0833f3 100644
--- a/src/pref-manager.c
+++ b/src/pref-manager.c
@@ -561,7 +561,7 @@ open_preferences_manager(GtkWidget * widget, gpointer data)
#endif /* HAVE_GTKSPELL */
pm_append_page(notebook, create_startup_page(store),
- N_("Startup"), store, NULL);
+ N_("Start-up"), store, NULL);
pm_append_page(notebook, create_misc_page(store),
N_("Miscellaneous"), store, NULL);
@@ -1855,7 +1855,7 @@ checking_group(GtkWidget * page)
pm_page_add_to_size_group(page, pui->check_imap);
pui->check_imap_inbox =
- gtk_check_button_new_with_mnemonic(_("Check INBOX _only"));
+ gtk_check_button_new_with_mnemonic(_("Check Inbox _only"));
gtk_grid_attach(grid, pui->check_imap_inbox, 1, row, 2, 1);
++row;
@@ -1957,7 +1957,7 @@ alternative_group(GtkWidget * page)
group = pm_group_new(_("Display of multipart/alternative parts"));
pui->display_alt_plain =
- gtk_check_button_new_with_label(_("Prefer text/plain over html"));
+ gtk_check_button_new_with_label(_("Prefer text/plain over HTML"));
pm_group_add(group, pui->display_alt_plain, FALSE);
return group;
@@ -2031,7 +2031,7 @@ mdn_group(GtkWidget * page)
label = gtk_label_new(_("The message header looks clean "
"(the notify-to address is the return path, "
- "and I am in the “To:” or “Cc:” list)."));
+ "and I am in the “To:” or “CC:” list)."));
gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
gtk_label_set_max_width_chars(GTK_LABEL(label), BALSA_MAX_WIDTH_CHARS);
set_align(label, 0.0, 0.5);
@@ -2196,7 +2196,7 @@ main_window_group(GtkWidget * page)
grid = create_grid(page);
pm_group_add(group, (GtkWidget *) grid, FALSE);
pui->pgdownmod =
- gtk_check_button_new_with_label(_("PageUp/PageDown keys "
+ gtk_check_button_new_with_label(_("Page Up/Page Down keys "
"scroll text by"));
gtk_grid_attach(grid, pui->pgdownmod, 0, 0, 1, 1);
scroll_adj = gtk_adjustment_new(50.0, 10.0, 100.0, 5.0, 10.0, 0.0);
@@ -2724,12 +2724,12 @@ options_group(GtkWidget * page)
{
GtkWidget *group;
- group = pm_group_new(_("Startup options"));
+ group = pm_group_new(_("Start-up options"));
pui->open_inbox_upon_startup =
- pm_group_add_check(group, _("Open Inbox upon startup"));
+ pm_group_add_check(group, _("Open Inbox upon start-up"));
pui->check_mail_upon_startup =
- pm_group_add_check(group, _("Check mail upon startup"));
+ pm_group_add_check(group, _("Check mail upon start-up"));
pui->remember_open_mboxes =
pm_group_add_check(group, _("Remember open mailboxes "
"between sessions"));
@@ -2747,9 +2747,9 @@ folder_scanning_group(GtkWidget * page)
group = pm_group_new(_("Folder scanning"));
- label = gtk_label_new(_("Choose depth 1 for fast startup; "
- "this defers scanning some folders. "
- "To see more of the tree at startup, "
+ label = gtk_label_new(_("Choose depth 1 for fast start-up; "
+ "this defers scanning some folders. "
+ "To see more of the tree at start-up, "
"choose a greater depth."));
gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
gtk_label_set_max_width_chars(GTK_LABEL(label), BALSA_MAX_WIDTH_CHARS);
diff --git a/src/sendmsg-window.c b/src/sendmsg-window.c
index 3ea776f..e6ada93 100644
--- a/src/sendmsg-window.c
+++ b/src/sendmsg-window.c
@@ -715,7 +715,7 @@ sw_buffer_signals_unblock(BalsaSendmsg * bsmsg, GtkTextBuffer * buffer)
}
static const gchar *const address_types[] =
- { N_("To:"), N_("Cc:"), N_("Bcc:") };
+ { N_("To:"), N_("CC:"), N_("BCC:") };
static gboolean
edit_with_gnome_check(gpointer data) {
@@ -1406,7 +1406,7 @@ change_attach_mode(GtkWidget * menu_item, BalsaAttachInfo *info)
GTK_BUTTONS_YES_NO,
_("Saying yes will not send the file "
"“%s” itself, but just a MIME "
- "message/external-body reference. "
+ "message/external-body reference. "
"Note that the recipient must "
"have proper permissions to see the "
"“real” file.\n\n"
@@ -1538,7 +1538,7 @@ sw_get_user_codeset(BalsaSendmsg * bsmsg, gboolean * change_type,
GtkWidget *combo_box = NULL;
gint codeset = -1;
GtkWidget *dialog =
- gtk_dialog_new_with_buttons(_("Choose charset"),
+ gtk_dialog_new_with_buttons(_("Choose character set"),
GTK_WINDOW(bsmsg->window),
GTK_DIALOG_DESTROY_WITH_PARENT |
libbalsa_dialog_flags(),
@@ -1547,7 +1547,7 @@ sw_get_user_codeset(BalsaSendmsg * bsmsg, gboolean * change_type,
NULL);
gchar *msg = g_strdup_printf
(_("File\n%s\nis not encoded in US-ASCII or UTF-8.\n"
- "Please choose the charset used to encode the file."),
+ "Please choose the character set used to encode the file."),
fname);
GtkWidget *info = gtk_label_new(msg);
GtkWidget *charset_button = libbalsa_charset_button_new();
@@ -2604,7 +2604,7 @@ create_info_pane(BalsaSendmsg * bsmsg)
bsmsg->fcc[1] =
balsa_mblist_mru_option_menu(GTK_WINDOW(bsmsg->window),
&balsa_app.fcc_mru);
- create_email_or_string_entry(bsmsg, grid, _("F_cc:"), ++row,
+ create_email_or_string_entry(bsmsg, grid, _("F_CC:"), ++row,
bsmsg->fcc);
gtk_widget_show_all(grid);
@@ -3523,7 +3523,7 @@ quote_body(BalsaSendmsg * bsmsg, LibBalsaMessageHeaders *headers,
gchar *cc_list =
internet_address_list_to_string(headers->cc_list,
FALSE);
- g_string_append_printf(body, "%s %s\n", _("Cc:"), cc_list);
+ g_string_append_printf(body, "%s %s\n", _("CC:"), cc_list);
g_free(cc_list);
}
@@ -4554,7 +4554,7 @@ sendmsg_window_set_field(BalsaSendmsg * bsmsg, const gchar * key,
GTK_MESSAGE_INFO,
GTK_BUTTONS_OK,
_("The link that you selected created\n"
- "a “Blind copy” (Bcc) address.\n"
+ "a “Blind copy” (BCC) address.\n"
"Please check that the address\n"
"is appropriate."));
#if HAVE_MACOSX_DESKTOP
@@ -5238,7 +5238,7 @@ send_message_handler(BalsaSendmsg * bsmsg, gboolean queue_only)
#ifdef HAVE_GPGME
balsa_information_parented(GTK_WINDOW(bsmsg->window),
LIBBALSA_INFORMATION_DEBUG,
- _("sending message with gpg mode %d"),
+ _("sending message with GPG mode %d"),
message->gpg_mode);
#endif
diff --git a/src/store-address.c b/src/store-address.c
index 68012ed..5efd9ae 100644
--- a/src/store-address.c
+++ b/src/store-address.c
@@ -335,8 +335,8 @@ store_address_note_frame(StoreAddressInfo *info)
if (message->headers) {
store_address_add_list(info, _("From: "), message->headers->from);
store_address_add_list(info, _("To: "), message->headers->to_list);
- store_address_add_list(info, _("Cc: "), message->headers->cc_list);
- store_address_add_list(info, _("Bcc: "), message->headers->bcc_list);
+ store_address_add_list(info, _("CC: "), message->headers->cc_list);
+ store_address_add_list(info, _("BCC: "), message->headers->bcc_list);
}
}
diff --git a/src/toolbar-factory.c b/src/toolbar-factory.c
index a49a10d..9c1f70a 100644
--- a/src/toolbar-factory.c
+++ b/src/toolbar-factory.c
@@ -167,7 +167,7 @@ button_data toolbar_buttons[]={
{BALSA_PIXMAP_MARK_ALL, N_("Mark all"), FALSE},
{BALSA_PIXMAP_SHOW_HEADERS, N_("All\nheaders"), FALSE},
{"gtk-cancel", N_("Reset\nFilter"), FALSE},
- {BALSA_PIXMAP_SHOW_PREVIEW, N_("Msg Preview"), FALSE},
+ {BALSA_PIXMAP_SHOW_PREVIEW, N_("Message Preview"), FALSE},
#ifdef HAVE_GPGME
{BALSA_PIXMAP_GPG_SIGN, N_("Sign"), FALSE},
{BALSA_PIXMAP_GPG_ENCRYPT, N_("Encrypt"), FALSE},
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
