Patch from Andre Klapper <a9016009@gmx.de> ** Fix for bug #339156 (Added a gettext context to the string "Read")

svn path=/trunk/; revision=34910

7 files changed, 44 insertions, 26 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 4988b2d5d1..0be2a3cb3a 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,10 +1,15 @@
+2008-01-28  Andre Klapper  <a9016009@gmx.de>
+
+	* em-filter-i18n.h: Added translator comments.
+	* message-tag-followup.c: Added translator comments. 
+
 2008-01-25  Johnny Jacob  <jjohnny@novell.com>
- 
- 	** Fix for #467581.
- 
- 	* em-folder-browser.c : Don't cancel all threads for a vfolder
- 	based search (all/account search). Introduced cameloperation for
-  	this and cancel it on clear.
+
+	** Fix for #467581.
+
+	* em-folder-browser.c : Don't cancel all threads for a vfolder
+	based search (all/account search). Introduced cameloperation for
+	this and cancel it on clear.
 	
 2008-01-24  Milan Crha  <mcrha@redhat.com>
 
diff --git a/mail/em-filter-i18n.h b/mail/em-filter-i18n.h
index 7db8144860..bec0d2c120 100644
--- a/mail/em-filter-i18n.h
+++ b/mail/em-filter-i18n.h
@@ -49,6 +49,7 @@ char *s = N_("Message is not Junk");
 char *s = N_("Move to Folder");
 char *s = N_("Pipe to Program");
 char *s = N_("Play Sound");
+/* Translators: "Read" as in "has been read" (em-filter-i18n.h) */
 char *s = N_("Read");
 char *s = N_("Recipients");
 char *s = N_("Regex Match");
diff --git a/mail/message-tag-followup.c b/mail/message-tag-followup.c
index 668c7b9637..db5e23acf6 100644
--- a/mail/message-tag-followup.c
+++ b/mail/message-tag-followup.c
@@ -78,6 +78,7 @@ static char *available_flags[] = {
 	N_("For Your Information"),
 	N_("Forward"),
 	N_("No Response Necessary"),
+	/* Translators: "Read" as in "has been read" (message-tag-followup.c) */
 	N_("Read"),
 	N_("Reply"),
 	N_("Reply to All"),
diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog
index 77d14ff61f..075bd3661a 100644
--- a/plugins/groupwise-features/ChangeLog
+++ b/plugins/groupwise-features/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-28  Andre Klapper  <a9016009@gmx.de>
+
+	* proxy-add-dialog.glade: string "Read" needs gettext context, 
+	translator comments.  
+
 2008-01-24  Milan Crha  <mcrha@redhat.com>
 
 	** Part of bug #511488
@@ -23,9 +28,9 @@
 
 2007-11-12  indu  <indu_ait@yahoo.co.in>
 
-          ** Fix for bug #458515
-          *  status-track.c: (recipient->undelivered_date)
-             string corrected
+	** Fix for bug #458515
+	*  status-track.c: (recipient->undelivered_date): 
+	string corrected
 
 2007-10-26  Kjartan Maraas  <kmaraas@gnome.org>
 
@@ -45,10 +50,10 @@
 	Use standard icon names where applicable.
 
 2007-08-17  Johnny Jacob  <jjohnny@novell.com>
- 
- 	** Fix for bug #458715.
+
+	** Fix for bug #458715.
 	
-        * proxy.c : (proxy_page_changed_cb) : Do not include "<All User
+	* proxy.c : (proxy_page_changed_cb) : Do not include "<All User
 	Access>" in the list. And use g_malloc0.
 	
 2007-08-16  Milan Crha  <mcrha@redhat.com>
@@ -117,7 +122,7 @@
 
 2007-02-05  Sankar P  <psankar@novell.com>
 
-        * junk-settings.c:
+	* junk-settings.c:
 	Include missing header file
 
 2007-01-27  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
@@ -141,7 +146,7 @@
 2007-01-18  Raghavendran <raghavguru7@gmail.com>
 	
 	* org-gnome-groupwise-features.xml: 
-  	* mail-send-options.c :
+	* mail-send-options.c :
 	Added code for implementing Send options via
 	a data hook .
 2006-11-17  Harish Krishnaswamy  <kharish@novell.com>
diff --git a/plugins/groupwise-features/proxy-add-dialog.glade b/plugins/groupwise-features/proxy-add-dialog.glade
index 06c8c4823c..a8622f232b 100644
--- a/plugins/groupwise-features/proxy-add-dialog.glade
+++ b/plugins/groupwise-features/proxy-add-dialog.glade
@@ -433,7 +433,7 @@
 				<widget class="GtkCheckButton" id="mailRead">
 				  <property name="visible">True</property>
 				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">_Read</property>
+				  <property name="label" translatable="yes" context="yes" comments="To Translators: strip the part in front of the | and the | itself">permission to read|_Read</property>
 				  <property name="use_underline">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
 				  <property name="focus_on_click">True</property>
@@ -457,7 +457,8 @@
 				<widget class="GtkCheckButton" id="appRead">
 				  <property name="visible">True</property>
 				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">_Read</property>
+				  <property name="label" translatable="yes" context="yes" comments="To Translators: strip the part in front of the | and the | itself">permission to read|_Read</property>
+
 				  <property name="use_underline">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
 				  <property name="focus_on_click">True</property>
@@ -481,7 +482,7 @@
 				<widget class="GtkCheckButton" id="noteRead">
 				  <property name="visible">True</property>
 				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">_Read</property>
+				  <property name="label" translatable="yes" context="yes" comments="To Translators: strip the part in front of the | and the | itself">permission to read|_Read</property>
 				  <property name="use_underline">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
 				  <property name="focus_on_click">True</property>
@@ -505,7 +506,7 @@
 				<widget class="GtkCheckButton" id="taskRead">
 				  <property name="visible">True</property>
 				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">_Read</property>
+				  <property name="label" translatable="yes" context="yes" comments="To Translators: strip the part in front of the | and the | itself">permission to read|_Read</property>
 				  <property name="use_underline">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
 				  <property name="focus_on_click">True</property>
diff --git a/ui/ChangeLog b/ui/ChangeLog
index 5cb22f0872..ca90d40629 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-28  Andre Klapper  <a9016009@gmx.de>
+
+	* evolution-mail-message.xml: Added translator comments.
+
 2007-12-17  Srinivasa Ragavan  <sragavan@novell.com>
 
 	* evolution-mail-global.xml: Add Debug Log menu item for mailer.
@@ -14,9 +18,9 @@
 	Fix capitalization of "Switcher Appearance" menu (HIG 8.3.2).
 
 2007-12-09  Andre Klapper  <a9016009@gmx.de>
- 
- 	* evolution.xml:
- 	change "Evolution FAQ" menu item name to "Frequently Asked questions".
+
+	* evolution.xml:
+	change "Evolution FAQ" menu item name to "Frequently Asked questions".
 	if i think of it, our users should not need a geek dictionary.
 
 2007-12-07  Denis Washington <denisw@svn.gnome.org>
@@ -35,11 +39,11 @@
 	Add mnemonic to PrepareForOffline menu item
 
 2007-11-26  Andre Klapper  <a9016009@gmx.de>
- 
- 	** Fixes bug #497810
- 
- 	* evolution.xml:
- 	add "Evolution FAQ" help menu item 
+
+	** Fixes bug #497810
+
+	* evolution.xml:
+	add "Evolution FAQ" help menu item 
 
 2007-11-26 Nicholas Miell <nmiell@gmail.com>
 
diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml
index c0655386fe..ab1e86b245 100644
--- a/ui/evolution-mail-message.xml
+++ b/ui/evolution-mail-message.xml
@@ -347,6 +347,7 @@
 	  <separator f="" name="emaillist4"/>
 
           <submenu name="MessageMarkAs" _label="Mar_k as">
+	    <!-- Translators: "Read" as in "has been read" (evolution-mail-message.xml) -->
             <menuitem name="MessageMarkAsRead" verb="" _label="_Read"/>
             <menuitem name="MessageMarkAsUnRead" verb="" _label="_Unread"/>