Matthew Barnes <mbarnes@redhat.com> ** Fixes bug #249844 (Use C_() macro instead of Q_() macro, Use fully qualified names for New submenu entries).

svn path=/trunk/; revision=35897

10 files changed, 48 insertions, 13 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index ad97f391c0..ebe9a1db47 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,12 @@
+2008-08-04  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #249844
+
+	* gui/component/addressbook-component.c
+	(impl__get_userCreatableItems): 
+	Use C_() macro instead of Q_() macro. 
+	Use fully qualified names for "New" submenu entries. 
+
 2008-08-02  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #546057
diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c
index b55cb9bd16..cc109fb0a3 100644
--- a/addressbook/gui/component/addressbook-component.c
+++ b/addressbook/gui/component/addressbook-component.c
@@ -226,7 +226,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	list->_buffer[0].id = "contact";
 	list->_buffer[0].description = _("New Contact");
-	list->_buffer[0].menuDescription = _("_Contact");
+	list->_buffer[0].menuDescription = C_("New", "_Contact");
 	list->_buffer[0].tooltip = _("Create a new contact");
 	list->_buffer[0].menuShortcut = 'c';
 	list->_buffer[0].iconName = "contact-new";
@@ -234,7 +234,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	list->_buffer[1].id = "contact_list";
 	list->_buffer[1].description = _("New Contact List");
-	list->_buffer[1].menuDescription = _("Contact _List");
+	list->_buffer[1].menuDescription = C_("New", "Contact _List");
 	list->_buffer[1].tooltip = _("Create a new contact list");
 	list->_buffer[1].menuShortcut = 'l';
 	list->_buffer[1].iconName = "stock_contact-list";
@@ -242,7 +242,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	list->_buffer[2].id = "address_book";
 	list->_buffer[2].description = _("New Address Book");
-	list->_buffer[2].menuDescription = _("Address _Book");
+	list->_buffer[2].menuDescription = C_("New", "Address _Book");
 	list->_buffer[2].tooltip = _("Create a new address book");
 	list->_buffer[2].menuShortcut = '\0';
 	list->_buffer[2].iconName = "address-book-new";
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 8f3ff530b6..560d962ad9 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,12 @@
+2008-08-04  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #249844
+
+	* gui/memos-component.c (impl__get_userCreatableItems):
+	* gui/tasks-component.c (impl__get_userCreatableItems):
+	Use C_() macro instead of Q_() macro. 
+	Use fully qualified names for "New" submenu entries. 
+
 2008-08-02  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #546057
diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c
index 0d95f2c2d8..c6be74977b 100644
--- a/calendar/gui/memos-component.c
+++ b/calendar/gui/memos-component.c
@@ -1258,7 +1258,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	list->_buffer[0].id = CREATE_MEMO_ID;
 	list->_buffer[0].description = _("New memo");
-	list->_buffer[0].menuDescription = _("Mem_o");
+	list->_buffer[0].menuDescription = C_("New", "Mem_o");
 	list->_buffer[0].tooltip = _("Create a new memo");
 	list->_buffer[0].menuShortcut = 'o';
 	list->_buffer[0].iconName = "stock_insert-note";
@@ -1266,7 +1266,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	list->_buffer[1].id = CREATE_SHARED_MEMO_ID;
 	list->_buffer[1].description = _("New shared memo");
-	list->_buffer[1].menuDescription = _("_Shared memo");
+	list->_buffer[1].menuDescription = C_("New", "_Shared memo");
 	list->_buffer[1].tooltip = _("Create a shared new memo");
 	list->_buffer[1].menuShortcut = 'h';
 	list->_buffer[1].iconName = "stock_insert-note";
@@ -1274,7 +1274,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	list->_buffer[2].id = CREATE_MEMO_LIST_ID;
 	list->_buffer[2].description = _("New memo list");
-	list->_buffer[2].menuDescription = _("Memo li_st");
+	list->_buffer[2].menuDescription = C_("New", "Memo li_st");
 	list->_buffer[2].tooltip = _("Create a new memo list");
 	list->_buffer[2].menuShortcut = '\0';
 	list->_buffer[2].iconName = "stock_notes";
diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c
index 3188b97d62..4aea88b88f 100644
--- a/calendar/gui/tasks-component.c
+++ b/calendar/gui/tasks-component.c
@@ -1323,7 +1323,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	list->_buffer[0].id = CREATE_TASK_ID;
 	list->_buffer[0].description = _("New task");
-	list->_buffer[0].menuDescription = _("_Task");
+	list->_buffer[0].menuDescription = C_("New", "_Task");
 	list->_buffer[0].tooltip = _("Create a new task");
 	list->_buffer[0].menuShortcut = 't';
 	list->_buffer[0].iconName = "stock_task";
@@ -1331,7 +1331,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	list->_buffer[1].id = CREATE_TASK_ASSIGNED_ID;
 	list->_buffer[1].description = _("New assigned task");
-	list->_buffer[1].menuDescription = _("Assigne_d Task");
+	list->_buffer[1].menuDescription = C_("New", "Assigne_d Task");
 	list->_buffer[1].tooltip = _("Create a new assigned task");
 	list->_buffer[1].menuShortcut = '\0';
 	list->_buffer[1].iconName = "stock_task";
@@ -1339,7 +1339,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	list->_buffer[2].id = CREATE_TASK_LIST_ID;
 	list->_buffer[2].description = _("New task list");
-	list->_buffer[2].menuDescription = _("Tas_k list");
+	list->_buffer[2].menuDescription = C_("New", "Tas_k list");
 	list->_buffer[2].tooltip = _("Create a new task list");
 	list->_buffer[2].menuShortcut = '\0';
 	list->_buffer[2].iconName = "stock_todo";
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 87086beb98..3dbb9a64cb 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,12 @@
+2008-08-04  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #249844
+
+	* em-folder-tree.c (render_display_name):
+	* mail-component.c (impl__get_userCreatableItems):
+	Use C_() macro instead of Q_() macro. 
+	Use fully qualified names for "New" submenu entries. 
+
 2008-08-04  Paul Bolle  <pebolle@tiscali.nl>
 
 	** Fixes bug #537088
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 6140ee5bbd..e7cbd0c75b 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -377,7 +377,7 @@ render_display_name (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
 		 * Do not translate the "folder-display|" part. Remove it
 		 * from your translation.
 		 */
-		display = g_strdup_printf (Q_("folder-display|%s (%u)"), name, unread);
+		display = g_strdup_printf (C_("folder-display", "%s (%u)"), name, unread);
 		g_free (name);
 	} else
 		display = name;
diff --git a/mail/mail-component.c b/mail/mail-component.c
index c4b0e317ad..afdcfdb1e0 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -912,7 +912,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant, CORBA_Environment
 
 	list->_buffer[0].id = "message";
 	list->_buffer[0].description = _("New Mail Message");
-	list->_buffer[0].menuDescription = _("_Mail Message");
+	list->_buffer[0].menuDescription = C_("New", "_Mail Message");
 	list->_buffer[0].tooltip = _("Compose a new mail message");
 	list->_buffer[0].menuShortcut = 'm';
 	list->_buffer[0].iconName = "mail-message-new";
@@ -920,7 +920,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant, CORBA_Environment
 
 	list->_buffer[1].id = "folder";
 	list->_buffer[1].description = _("New Mail Folder");
-	list->_buffer[1].menuDescription = _("Mail _Folder");
+	list->_buffer[1].menuDescription = C_("New", "Mail _Folder");
 	list->_buffer[1].tooltip = _("Create a new mail folder");
 	list->_buffer[1].menuShortcut = '\0';
 	list->_buffer[1].iconName = "folder-new";
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 47d6b785e9..6f12b5bd4b 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-04  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #249844
+
+	* test/evolution-test-component.c (impl__get_userCreatableItems):
+	Use C_() macro instead of Q_() macro. 
+	Use fully qualified names for "New" submenu entries. 
+
 2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes bug #544862
diff --git a/shell/test/evolution-test-component.c b/shell/test/evolution-test-component.c
index 3f2b39278c..1ce8006ea5 100644
--- a/shell/test/evolution-test-component.c
+++ b/shell/test/evolution-test-component.c
@@ -105,7 +105,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	list->_buffer[0].id = CREATE_TEST_ID;
 	list->_buffer[0].description = _("New Test");
-	list->_buffer[0].menuDescription = _("_Test");
+	list->_buffer[0].menuDescription = C_("New", "_Test");
 	list->_buffer[0].tooltip = _("Create a new test item");
 	list->_buffer[0].menuShortcut = 'i';
 	list->_buffer[0].iconName = "";