English fixes and enhancements related to translation issues.

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."),
 		            _("_Close"), NULL, NULL, ALERTFOCUS_FIRST );
 		return FALSE;
 	}

src/addressbook.c

@@ -1433,7 +1433,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."),
 			_("_Close"), NULL, NULL, ALERTFOCUS_FIRST);
 		return;
 	}
@@ -2205,7 +2205,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;
 	}
 

src/addrmerge.c

@@ -396,7 +396,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."),
 			_("_Close"), NULL, NULL, ALERTFOCUS_FIRST );
 		return;
 	}

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)
 {

src/grouplistdialog.c

@@ -356,7 +356,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");
 

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();

src/plugins/spamassassin/spamassassin_gtk.c

@@ -386,7 +386,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);
 

src/prefs_msg_colors.c

@@ -339,7 +339,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 */