evolution r35851 - trunk/plugins/groupwise-features

[mcrha svn gnome org]

Author: mcrha
Date: Mon Jul 28 07:32:54 2008
New Revision: 35851
URL: http://svn.gnome.org/viewvc/evolution?rev=35851&view=rev

Log:
2008-07-28  Milan Crha  <mcrha redhat com>

	** Fix for bug #543756

	* org-gnome-shared-folder.errors.xml:
	* process-meeting.c: (process_meeting):
	Make question better translatable.



Modified:
   trunk/plugins/groupwise-features/ChangeLog
   trunk/plugins/groupwise-features/org-gnome-shared-folder.errors.xml
   trunk/plugins/groupwise-features/process-meeting.c

Modified: trunk/plugins/groupwise-features/org-gnome-shared-folder.errors.xml
==============================================================================
--- trunk/plugins/groupwise-features/org-gnome-shared-folder.errors.xml	(original)
+++ trunk/plugins/groupwise-features/org-gnome-shared-folder.errors.xml	Mon Jul 28 07:32:54 2008
@@ -15,9 +15,17 @@
 </_secondary>
 </error>
 
-<error id="recurrence" type="question" default="GTK_RESPONSE_YES">
+<error id="recurrence-accept" type="question" default="GTK_RESPONSE_YES">
 <_primary>This is a recurring meeting</_primary>
-<_secondary>What would you like to {0}?</_secondary>
+<_secondary>Would you like to accept it?</_secondary>
+ <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+ <button label="This instance" response="GTK_RESPONSE_NO"/>
+ <button label="All instances" response="GTK_RESPONSE_YES"/>
+</error>
+
+<error id="recurrence-decline" type="question" default="GTK_RESPONSE_YES">
+<_primary>This is a recurring meeting</_primary>
+<_secondary>Would you like to decline it?</_secondary>
  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
  <button label="This instance" response="GTK_RESPONSE_NO"/>
  <button label="All instances" response="GTK_RESPONSE_YES"/>

Modified: trunk/plugins/groupwise-features/process-meeting.c
==============================================================================
--- trunk/plugins/groupwise-features/process-meeting.c	(original)
+++ trunk/plugins/groupwise-features/process-meeting.c	Mon Jul 28 07:32:54 2008
@@ -221,14 +221,14 @@
 
 		if (recurring) {
 			gint response;
-			const char *arg;
+			const char *msg;
 
 			if (status == ICAL_PARTSTAT_ACCEPTED || status == ICAL_PARTSTAT_TENTATIVE)
-				arg = "accept";
+				msg = "org.gnome.evolution.mail_shared_folder:recurrence-accept";
 			else
-				arg = "decline";
+				msg = "org.gnome.evolution.mail_shared_folder:recurrence-decline";
 
-			response = e_error_run (NULL, "org.gnome.evolution.mail_shared_folder:recurrence", arg, NULL);
+			response = e_error_run (NULL, msg, NULL);
 			if (response == GTK_RESPONSE_YES) {
 				icalproperty *prop;
 				const char *uid = icalcomponent_get_uid (r_data->icalcomp);