From 764a1b7b002565c7115be0f0087fcf8f867a475e Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Mon, 28 Jul 2008 07:32:54 +0000
Subject: ** Fix for bug #543756

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.


svn path=/trunk/; revision=35851
---
 plugins/groupwise-features/ChangeLog                         |  8 ++++++++
 .../groupwise-features/org-gnome-shared-folder.errors.xml    | 12 ++++++++++--
 plugins/groupwise-features/process-meeting.c                 |  8 ++++----
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog
index f0587b07df..5ac0853112 100644
--- a/plugins/groupwise-features/ChangeLog
+++ b/plugins/groupwise-features/ChangeLog
@@ -1,3 +1,11 @@
+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.
+
 2008-06-20  Sankar P  <psankar@novell.com>
 
 	* mail-retract.c (retract_mail_settings):
diff --git a/plugins/groupwise-features/org-gnome-shared-folder.errors.xml b/plugins/groupwise-features/org-gnome-shared-folder.errors.xml
index 85ce4ac156..5e7bfb28e5 100644
--- a/plugins/groupwise-features/org-gnome-shared-folder.errors.xml
+++ b/plugins/groupwise-features/org-gnome-shared-folder.errors.xml
@@ -15,9 +15,17 @@ You cannot share folder with specified user &quot;{0}&quot;
 </_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"/>
diff --git a/plugins/groupwise-features/process-meeting.c b/plugins/groupwise-features/process-meeting.c
index 5b8da30b7e..f4606439ce 100644
--- a/plugins/groupwise-features/process-meeting.c
+++ b/plugins/groupwise-features/process-meeting.c
@@ -221,14 +221,14 @@ process_meeting (ECalendarView *cal_view, icalparameter_partstat status)
 
 		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);
-- 
cgit