[Commits] [SCM] claws branch, master, updated. 3.13.0-68-g129afc0

claws at claws-mail.org claws at claws-mail.org
Sat Nov 14 11:36:54 CET 2015


The branch, master has been updated
       via  129afc04beeeee64892771607241af3568733bdf (commit)
      from  f90abad06b715583e0ff3e7ec000e4414b17dcd9 (commit)

Summary of changes:
 src/addressbook.c                       |    2 +-
 src/compose.c                           |   22 ++++++++++++----------
 src/folderview.c                        |    2 +-
 src/imap_gtk.c                          |    7 ++++---
 src/mainwindow.c                        |    2 +-
 src/plugins/attachwarner/attachwarner.c |    4 ++--
 src/plugins/managesieve/sieve_editor.c  |    2 +-
 src/plugins/vcalendar/vcalendar.c       |    4 ++--
 src/prefs_actions.c                     |    6 +++---
 src/prefs_filtering.c                   |    6 +++---
 src/prefs_folder_item.c                 |    4 ++--
 src/prefs_matcher.c                     |    4 +++-
 src/prefs_template.c                    |    6 +++---
 13 files changed, 38 insertions(+), 33 deletions(-)


- Log -----------------------------------------------------------------
commit 129afc04beeeee64892771607241af3568733bdf
Author: Paul <paul at claws-mail.org>
Date:   Sat Nov 14 10:36:49 2015 +0000

    remove the internally used plus symbol from the translatable strings

diff --git a/src/addressbook.c b/src/addressbook.c
index 97b0bd3..9aa8d30 100644
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -2919,7 +2919,7 @@ static void addressbook_treenode_delete_cb(GtkAction *action, gpointer data)
 			    	     "If you delete the folder only, the addresses it contains will be moved into the parent folder." ),
 			 	 obj->name );
 			aval = alertpanel( _("Delete folder"), message,
-				GTK_STOCK_CANCEL, _("+Delete _folder only"), _("Delete folder and _addresses"));
+				GTK_STOCK_CANCEL, g_strconcat("+",_("Delete _folder only"), NULL), _("Delete folder and _addresses"));
 			g_free(message);
 			if( aval == G_ALERTALTERNATE ) {
 				delType = ADDRTREE_DEL_FOLDER_ONLY;
diff --git a/src/compose.c b/src/compose.c
index ed92268..b8ed86d 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -3608,7 +3608,7 @@ static ComposeInsertResult compose_insert_file(Compose *compose, const gchar *fi
 						"in the message body. Are you sure you want to do that?"),
 						to_human_readable(file_stat.st_size));
 			aval = alertpanel_full(_("Are you sure?"), msg, GTK_STOCK_CANCEL,
-					_("+_Insert"), NULL, TRUE, NULL, ALERT_QUESTION, G_ALERTDEFAULT);
+					g_strconcat("+", _("_Insert"), NULL), NULL, TRUE, NULL, ALERT_QUESTION, G_ALERTDEFAULT);
 			g_free(msg);
 
 			/* do we ask for confirmation next time? */
@@ -3734,7 +3734,7 @@ static gboolean compose_attach_append(Compose *compose, const gchar *file,
 	if (size == 0 && !compose->batch) {
 		gchar * msg = g_strdup_printf(_("File %s is empty."), filename);
 		AlertValue aval = alertpanel_full(_("Empty file"), msg, 
-				GTK_STOCK_CANCEL, _("+_Attach anyway"), NULL, FALSE,
+				GTK_STOCK_CANCEL,  g_strconcat("+", _("_Attach anyway"), NULL), NULL, FALSE,
 				NULL, ALERT_WARNING, G_ALERTDEFAULT);
 		g_free(msg);
 
@@ -5024,7 +5024,7 @@ static gboolean compose_check_for_set_recipients(Compose *compose)
 			}
 			aval = alertpanel(_("Send"),
 					  _("The only recipient is the default CC address. Send anyway?"),
-					  GTK_STOCK_CANCEL, _("+_Send"), NULL);
+					  GTK_STOCK_CANCEL, g_strconcat("+", _("_Send"), NULL), NULL);
 			if (aval != G_ALERTALTERNATE)
 				return FALSE;
 		}
@@ -5056,7 +5056,7 @@ static gboolean compose_check_for_set_recipients(Compose *compose)
 			}
 			aval = alertpanel(_("Send"),
 					  _("The only recipient is the default BCC address. Send anyway?"),
-					  GTK_STOCK_CANCEL, _("+_Send"), NULL);
+					  GTK_STOCK_CANCEL, g_strconcat("+", _("_Send"), NULL), NULL);
 			if (aval != G_ALERTALTERNATE)
 				return FALSE;
 		}
@@ -5089,9 +5089,9 @@ static gboolean compose_check_entries(Compose *compose, gboolean check_everythin
 			gchar *message;
 
 			if (compose->sending)
-				button_label = _("+_Send");
+				button_label = g_strconcat("+", _("_Send"), NULL);
 			else
-				button_label = _("+_Queue");
+				button_label = g_strconcat("+", _("_Queue"), NULL);
 			message = g_strdup_printf(_("Subject is empty. %s"),
 					compose->sending?_("Send it anyway?"):
 					_("Queue it anyway?"));
@@ -5612,7 +5612,8 @@ static gint compose_write_to_file(Compose *compose, FILE *fp, gint action, gbool
 			msg = g_strdup_printf(_("Can't convert the character encoding of the message \n"
 						"to the specified %s charset.\n"
 						"Send it as %s?"), out_codeset, src_codeset);
-			aval = alertpanel_full(_("Error"), msg, GTK_STOCK_CANCEL, _("+_Send"), NULL, FALSE,
+			aval = alertpanel_full(_("Error"), msg, GTK_STOCK_CANCEL,
+					       g_strconcat("+", _("_Send"), NULL), NULL, FALSE,
 					      NULL, ALERT_ERROR, G_ALERTDEFAULT);
 			g_free(msg);
 
@@ -5899,7 +5900,7 @@ static gboolean compose_warn_encryption(Compose *compose)
 		return TRUE;
 
 	val = alertpanel_full(_("Encryption warning"), warning,
-		  GTK_STOCK_CANCEL, _("+C_ontinue"), NULL,
+		  GTK_STOCK_CANCEL, g_strconcat("+", _("C_ontinue"), NULL), NULL,
 		  TRUE, NULL, ALERT_WARNING, G_ALERTALTERNATE);
 	if (val & G_ALERTDISABLE) {
 		val &= ~G_ALERTDISABLE;
@@ -10323,7 +10324,8 @@ static void compose_close_cb(GtkAction *action, gpointer data)
 		} else {
 			val = alertpanel(_("Save changes"),
 				 _("This message has been modified. Save the latest changes?"),
-				 _("_Don't save"), _("+_Save to Drafts"), GTK_STOCK_CANCEL);
+				 _("_Don't save"), g_strconcat("+", _("_Save to Drafts"), NULL),
+				GTK_STOCK_CANCEL);
 		}
 		g_mutex_unlock(compose->mutex);
 		switch (val) {
@@ -11257,7 +11259,7 @@ static void compose_insert_drag_received_cb (GtkWidget		*widget,
 				val = alertpanel_full(_("Insert or attach?"),
 					 _("Do you want to insert the contents of the file(s) "
 					   "into the message body, or attach it to the email?"),
-					  GTK_STOCK_CANCEL, _("+_Insert"), _("_Attach"),
+					  GTK_STOCK_CANCEL, g_strconcat("+", _("_Insert"), NULL), _("_Attach"),
 					  TRUE, NULL, ALERT_QUESTION, G_ALERTALTERNATE);
 				break;
 			case COMPOSE_DND_INSERT:
diff --git a/src/folderview.c b/src/folderview.c
index 9014165..a433d90 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -2378,7 +2378,7 @@ static void folderview_empty_trash_cb(GtkAction *action, gpointer data)
 	if (prefs_common.ask_on_clean) {
 		if (alertpanel(_("Empty trash"),
 			       _("Delete all messages in trash?"),
-			       GTK_STOCK_CANCEL, _("+_Empty trash"), NULL) != G_ALERTALTERNATE)
+			       GTK_STOCK_CANCEL, g_strconcat("+", _("_Empty trash"), NULL), NULL) != G_ALERTALTERNATE)
 			return;
 	}
 	
diff --git a/src/imap_gtk.c b/src/imap_gtk.c
index 0b0a2b9..7931d9b 100644
--- a/src/imap_gtk.c
+++ b/src/imap_gtk.c
@@ -512,8 +512,8 @@ static void subscribe_cb_full(FolderView *folderview, guint action)
 				G_CALLBACK(chk_update_val), &recurse);
 
 		avalue = alertpanel_full(_("Subscriptions"), message,
-		 			 GTK_STOCK_CANCEL, _("+_Search"), NULL, FALSE,
-					 rec_chk, ALERT_QUESTION, G_ALERTDEFAULT);
+		 			 GTK_STOCK_CANCEL, g_strconcat("+", _("_Search"), NULL),
+					 NULL, FALSE, rec_chk, ALERT_QUESTION, G_ALERTDEFAULT);
 		g_free(message);
 		if (avalue != G_ALERTALTERNATE) return;
 		
@@ -571,7 +571,8 @@ static void subscribe_cb_full(FolderView *folderview, guint action)
 			G_CALLBACK(chk_update_val), &recurse);
 
 	avalue = alertpanel_full(_("Subscriptions"), message,
-		 		 GTK_STOCK_CANCEL, action?_("+_Subscribe"):_("+_Unsubscribe"), NULL, FALSE,
+		 		 GTK_STOCK_CANCEL, action?g_strconcat("+", _("_Subscribe"), NULL):
+		 		 g_strconcat("+", _("_Unsubscribe"), NULL), NULL, FALSE,
 				 rec_chk, ALERT_QUESTION, G_ALERTDEFAULT);
 	g_free(message);
 	if (avalue != G_ALERTALTERNATE) return;
diff --git a/src/mainwindow.c b/src/mainwindow.c
index c51bbc6..4f5fcfc 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -4221,7 +4221,7 @@ static void mainwindow_check_synchronise(MainWindow *mainwin, gboolean ask)
 
 	if (offline_ask_sync && ask && alertpanel(_("Folder synchronisation"),
 			_("Do you want to synchronise your folders now?"),
-			GTK_STOCK_CANCEL, _("+_Synchronise"), NULL) != G_ALERTALTERNATE)
+			GTK_STOCK_CANCEL, g_strconcat("+", _("_Synchronise"), NULL), NULL) != G_ALERTALTERNATE)
 		return;
 	
 	if (offline_ask_sync)
diff --git a/src/plugins/attachwarner/attachwarner.c b/src/plugins/attachwarner/attachwarner.c
index 661b71a..af882f3 100644
--- a/src/plugins/attachwarner/attachwarner.c
+++ b/src/plugins/attachwarner/attachwarner.c
@@ -206,9 +206,9 @@ static gboolean attwarn_before_send_hook(gpointer source, gpointer data)
 		
 		debug_print("user has to decide\n");
 		if (compose->sending)
-			button_label = _("+_Send");
+			button_label = g_strconcat("+", _("_Send"), NULL);
 		else
-			button_label = _("+_Queue");
+			button_label = g_strconcat("+", _("_Queue"), NULL);
 
 		message = g_strdup_printf(
 				_("An attachment is mentioned in the mail you're sending, but no file was attached. Mention appears on line %d, which begins with text: <span weight=\"bold\">%.20s</span>...\n\n%s it anyway?"),
diff --git a/src/plugins/managesieve/sieve_editor.c b/src/plugins/managesieve/sieve_editor.c
index 8c41f68..2247981 100644
--- a/src/plugins/managesieve/sieve_editor.c
+++ b/src/plugins/managesieve/sieve_editor.c
@@ -430,7 +430,7 @@ static gboolean sieve_editor_confirm_close(SieveEditorPage *page)
 	if (page->modified) {
 		switch (alertpanel(_("Save changes"),
 				_("This script has been modified. Save the latest changes?"),
-				_("_Discard"), _("+_Save"), GTK_STOCK_CANCEL)) {
+				_("_Discard"), g_strconcat("+", _("_Save"), NULL), GTK_STOCK_CANCEL)) {
 			case G_ALERTDEFAULT:
 				return TRUE;
 			case G_ALERTALTERNATE:
diff --git a/src/plugins/vcalendar/vcalendar.c b/src/plugins/vcalendar/vcalendar.c
index ddbeb86..94153b4 100644
--- a/src/plugins/vcalendar/vcalendar.c
+++ b/src/plugins/vcalendar/vcalendar.c
@@ -1087,8 +1087,8 @@ static gboolean vcalviewer_action_cb(GtkButton *widget, gpointer data)
 		AlertValue val = alertpanel_full(_("No account found"), 
 					_("You have no account matching any attendee.\n"
 					    "Do you want to reply anyway?"),
-				   	GTK_STOCK_CANCEL, _("+Reply anyway"), NULL, FALSE,
-				   	NULL, ALERT_QUESTION, G_ALERTDEFAULT);
+				   	GTK_STOCK_CANCEL, g_strconcat("+", _("Reply anyway"), NULL),
+					NULL, FALSE, NULL, ALERT_QUESTION, G_ALERTDEFAULT);
 		if (val == G_ALERTALTERNATE) {		
 			account = account_get_default();
 			vcal_manager_update_answer(event, account->address, 
diff --git a/src/prefs_actions.c b/src/prefs_actions.c
index 0aaa351..d18df3a 100644
--- a/src/prefs_actions.c
+++ b/src/prefs_actions.c
@@ -897,12 +897,12 @@ static void prefs_actions_cancel(GtkWidget *w, gpointer data)
 
 	if (modified && alertpanel(_("Entry not saved"),
 				 _("The entry was not saved. Close anyway?"),
-				 GTK_STOCK_CLOSE, _("+_Continue editing"),
+				 GTK_STOCK_CLOSE, g_strconcat("+", _("_Continue editing"), NULL),
 				 NULL) != G_ALERTDEFAULT) {
 		return;
 	} else if (modified_list && alertpanel(_("Actions list not saved"),
 				 _("The actions list has been modified. Close anyway?"),
-				 GTK_STOCK_CLOSE, _("+_Continue editing"), 
+				 GTK_STOCK_CLOSE, g_strconcat("+", _("_Continue editing"), NULL),
 				 NULL) != G_ALERTDEFAULT) {
 		return;
 	}
@@ -928,7 +928,7 @@ static void prefs_actions_ok(GtkWidget *widget, gpointer data)
 
 	if (modified && alertpanel(_("Entry not saved"),
 				 _("The entry was not saved. Close anyway?"),
-				 GTK_STOCK_CLOSE, _("+_Continue editing"),
+				 GTK_STOCK_CLOSE, g_strconcat("+", _("_Continue editing"), NULL),
 				 NULL) != G_ALERTDEFAULT) {
 		return;
 	} 
diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c
index 662c375..3ffcfa4 100644
--- a/src/prefs_filtering.c
+++ b/src/prefs_filtering.c
@@ -1474,7 +1474,7 @@ static gboolean prefs_filtering_check_mod(gboolean check_changed_list)
 	if (check_changed_list) {
 		if (modified && alertpanel(_("Filtering rules not saved"),
 					 _("The list of filtering rules have been modified. Close anyway?"),
-					 GTK_STOCK_CLOSE, _("+_Continue editing"), 
+					 GTK_STOCK_CLOSE, g_strconcat("+", _("_Continue editing"), NULL),
 					 NULL) != G_ALERTDEFAULT) {
 			return TRUE;
 		}
@@ -1496,7 +1496,7 @@ static gboolean prefs_filtering_check_mod(gboolean check_changed_list)
 		if (!filtering_str) {
 			val = alertpanel(_("Entry not saved"),
 				 _("The entry was not saved. Close anyway?"),
-				 GTK_STOCK_CLOSE, _("+_Continue editing"), NULL);
+				 GTK_STOCK_CLOSE, g_strconcat("+", _("_Continue editing"),NULL), NULL);
 			if (G_ALERTDEFAULT != val) {
 				g_free(filtering_str);
 				g_free(str); /* fixed two leaks: huzzah! */
@@ -1518,7 +1518,7 @@ static gboolean prefs_filtering_check_mod(gboolean check_changed_list)
 		    strlen(action)) {
 			val = alertpanel(_("Entry not saved"),
 				 _("The entry was not saved. Close anyway?"),
-				 GTK_STOCK_CLOSE, _("+_Continue editing"), NULL);
+				 GTK_STOCK_CLOSE, g_strconcat("+", _("_Continue editing"), NULL), NULL);
 			if (G_ALERTDEFAULT != val) {
 				g_free(name);
 				g_free(condition);
diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index 0afce45..fbc1faa 100644
--- a/src/prefs_folder_item.c
+++ b/src/prefs_folder_item.c
@@ -1684,8 +1684,8 @@ static void clean_cache_cb(GtkWidget *widget, gpointer data)
 	if (alertpanel_full(_("Discard cache"), 
 			    _("Do you really want to discard the local cached "
 			      "data for this folder?"),
-		 		 GTK_STOCK_CANCEL, _("+Discard"), NULL, FALSE,
-				 NULL, ALERT_WARNING, G_ALERTDEFAULT)
+		 		 GTK_STOCK_CANCEL, g_strconcat("+", _("Discard"), NULL),
+				 NULL, FALSE, NULL, ALERT_WARNING, G_ALERTDEFAULT)
 		!= G_ALERTALTERNATE)
 		return;
 	
diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
index 2db83f2..272cad8 100644
--- a/src/prefs_matcher.c
+++ b/src/prefs_matcher.c
@@ -2137,7 +2137,9 @@ static void prefs_matcher_ok(void)
 				if (!matcher_str || strcmp(matcher_str, str) != 0) {
 	                        	val = alertpanel(_("Entry not saved"),
        		                        	 _("The entry was not saved.\nClose anyway?"),
-               		                	 GTK_STOCK_CLOSE, _("+_Continue editing"), NULL);
+               		                	 GTK_STOCK_CLOSE,
+						 g_strconcat("+", _("_Continue editing"), NULL),
+						 NULL);
 					if (G_ALERTDEFAULT != val) {
 						g_free(matcher_str);						 
 	        	                        g_free(str);
diff --git a/src/prefs_template.c b/src/prefs_template.c
index 90722f8..732c7cf 100644
--- a/src/prefs_template.c
+++ b/src/prefs_template.c
@@ -571,7 +571,7 @@ static void prefs_template_ok_cb(gpointer action, gpointer data)
 
 	if (modified && alertpanel(_("Entry not saved"),
 				 _("The entry was not saved. Close anyway?"),
-				 GTK_STOCK_CLOSE, _("+_Continue editing"), 
+				 GTK_STOCK_CLOSE, g_strconcat("+", _("_Continue editing"), NULL),
 				 NULL) != G_ALERTDEFAULT) {
 		return;
 	} 
@@ -596,12 +596,12 @@ static void prefs_template_cancel_cb(gpointer action, gpointer data)
 
 	if (modified && alertpanel(_("Entry not saved"),
 				 _("The entry was not saved. Close anyway?"),
-				 GTK_STOCK_CLOSE, _("+_Continue editing"),
+				 GTK_STOCK_CLOSE, g_strconcat("+", _("_Continue editing"), NULL),
 				 NULL) != G_ALERTDEFAULT) {
 		return;
 	} else if (modified_list && alertpanel(_("Templates list not saved"),
 				 _("The templates list has been modified. Close anyway?"),
-				 GTK_STOCK_CLOSE, _("+_Continue editing"), 
+				 GTK_STOCK_CLOSE, g_strconcat("+", _("_Continue editing"), NULL),
 				 NULL) != G_ALERTDEFAULT) {
 		return;
 	}

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list