[Commits] [SCM] claws branch, master, updated. 3.18.0-1-g176c702ac
wwp at claws-mail.org
wwp at claws-mail.org
Sun Jul 11 10:31:28 CEST 2021
The branch, master has been updated
via 176c702ac0d55c13a8ef5bfa4d03b454104a302f (commit)
from 6c97b75d366f7ecffbb26f41335b563d80e914a3 (commit)
Summary of changes:
src/addrduplicates.c | 2 +-
src/addressbook.c | 4 ++--
src/addrmerge.c | 2 +-
src/common/prefs.c | 4 ++--
src/grouplistdialog.c | 2 +-
src/plugins/pgpcore/pgp_viewer.c | 2 +-
src/plugins/spamassassin/spamassassin_gtk.c | 2 +-
src/prefs_msg_colors.c | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
- Log -----------------------------------------------------------------
commit 176c702ac0d55c13a8ef5bfa4d03b454104a302f
Author: wwp <subscript at free.fr>
Date: Sun Jul 11 10:30:50 2021 +0200
English fixes and enhancements related to translation issues.
diff --git a/src/addrduplicates.c b/src/addrduplicates.c
index 80b83c57d..06def3d6a 100644
--- a/src/addrduplicates.c
+++ b/src/addrduplicates.c
@@ -839,7 +839,7 @@ gboolean addrduplicates_delete_item_person(ItemPerson *item, AddressDataSource *
iface = ds->interface;
if( iface && iface->readOnly ) {
alertpanel( _("Delete address"),
- _("This address data is readonly and cannot be deleted."),
+ _("This address data is read-only and cannot be deleted."),
GTK_STOCK_CLOSE, NULL, NULL, ALERTFOCUS_FIRST );
return FALSE;
}
diff --git a/src/addressbook.c b/src/addressbook.c
index 523fc6445..e874efa5c 100644
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -1434,7 +1434,7 @@ static void addressbook_del_clicked(GtkButton *button, gpointer data)
iface = ds->interface;
if( iface->readOnly ) {
alertpanel( _("Delete address(es)"),
- _("This address data is readonly and cannot be deleted."),
+ _("This address data is read-only and cannot be deleted."),
GTK_STOCK_CLOSE, NULL, NULL, ALERTFOCUS_FIRST);
return;
}
@@ -2206,7 +2206,7 @@ static void addressbook_clip_paste_cb( GtkAction *action, gpointer data ) {
ds = addressbook_find_datasource( GTK_CMCTREE_NODE(addrbook.treeSelected) );
if( ds == NULL ) return;
if( addrindex_ds_get_readonly( ds ) ) {
- alertpanel_error( _("Cannot paste. Target address book is readonly.") );
+ alertpanel_error( _("Cannot paste. Target address book is read-only.") );
return;
}
diff --git a/src/addrmerge.c b/src/addrmerge.c
index 767dc66f1..8a7fe1384 100644
--- a/src/addrmerge.c
+++ b/src/addrmerge.c
@@ -395,7 +395,7 @@ void addrmerge_merge(
/* Test for read only */
if( ds->interface->readOnly ) {
alertpanel( _("Merge addresses"),
- _("This address data is readonly and cannot be deleted."),
+ _("This address data is read-only and cannot be deleted."),
GTK_STOCK_CLOSE, NULL, NULL, ALERTFOCUS_FIRST );
return;
}
diff --git a/src/common/prefs.c b/src/common/prefs.c
index 748950728..12df810a2 100644
--- a/src/common/prefs.c
+++ b/src/common/prefs.c
@@ -231,7 +231,7 @@ gint prefs_file_close_revert(PrefFile *pfile)
}
/*!
- *\brief Check if "path" is a file and readonly
+ *\brief Check if "path" is a file and read-only
*/
static gboolean prefs_is_readonly(const gchar * path)
{
@@ -242,7 +242,7 @@ static gboolean prefs_is_readonly(const gchar * path)
}
/*!
- *\brief Check if "rcfile" is in rcdir, a file and readonly
+ *\brief Check if "rcfile" is in rcdir, a file and read-only
*/
gboolean prefs_rc_is_readonly(const gchar * rcfile)
{
diff --git a/src/grouplistdialog.c b/src/grouplistdialog.c
index 2314c2f7c..0ec451f83 100644
--- a/src/grouplistdialog.c
+++ b/src/grouplistdialog.c
@@ -345,7 +345,7 @@ static GtkCMCTreeNode *grouplist_create_branch(NewsGroupInfo *ginfo,
else if (ginfo->type == 'm')
cols[2] = _("moderated");
else if (ginfo->type == 'n')
- cols[2] = _("readonly");
+ cols[2] = _("read-only");
else
cols[2] = _("unknown");
diff --git a/src/plugins/pgpcore/pgp_viewer.c b/src/plugins/pgpcore/pgp_viewer.c
index df94c95b4..b020b75a5 100644
--- a/src/plugins/pgpcore/pgp_viewer.c
+++ b/src/plugins/pgpcore/pgp_viewer.c
@@ -178,7 +178,7 @@ static void pgpview_show_mime_part(TextView *textview, MimeInfo *partinfo)
if (!prefs_common_get_prefs()->work_offline) {
val = alertpanel(_("Key import"),
_("This key is not in your keyring. Do you want "
- "Claws Mail to try and import it?"),
+ "Claws Mail to try to import it?"),
_("_No"), _("from keyserver"), _("from Web Key Directory"),
ALERTFOCUS_SECOND);
GTK_EVENTS_FLUSH();
diff --git a/src/plugins/spamassassin/spamassassin_gtk.c b/src/plugins/spamassassin/spamassassin_gtk.c
index ad7ad2ca1..3eb52f4d3 100644
--- a/src/plugins/spamassassin/spamassassin_gtk.c
+++ b/src/plugins/spamassassin/spamassassin_gtk.c
@@ -394,7 +394,7 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
gtk_widget_show(hbox_timeout);
gtk_box_pack_start (GTK_BOX (vbox2), hbox_timeout, TRUE, TRUE, 0);
- timeout_label = gtk_label_new(_("Timeout"));
+ timeout_label = gtk_label_new(_("Timeout (secs)"));
gtk_widget_show(timeout_label);
gtk_box_pack_start(GTK_BOX(hbox_timeout), timeout_label, FALSE, FALSE, 0);
diff --git a/src/prefs_msg_colors.c b/src/prefs_msg_colors.c
index 108b9baf2..5eda4dc6b 100644
--- a/src/prefs_msg_colors.c
+++ b/src/prefs_msg_colors.c
@@ -341,7 +341,7 @@ static void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
COLOR_BUTTON_PACK_START(hbox, COL_DIFF_HUNK,
/* TRANSLATORS: A hunk is a section of the patch indicating how the files differ */
- C_("Tooltip.", "Pick color for hunk lines"));
+ C_("Tooltip", "Pick color for hunk lines"));
COLOR_LABEL_PACK_START(hbox, COL_DIFF_HUNK,
/* TRANSLATORS: A hunk is a section of the patch indicating how the files differ */
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list