2007-08-23 mcrha Fix for bug #329746

svn path=/trunk/; revision=34078

11 files changed, 68 insertions, 39 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index e9c1d98fc2..1825f72a4f 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,23 @@
 2007-08-23  Milan Crha  <mcrha@redhat.com>
 
+	** Fix for bug #329746
+
+	* gui/dialogs/comp-editor.c: (make_icon_from_comp):
+	Return proper icon for memo components.
+	* gui/dialogs/delete-comp.c: (delete_component_dialog),
+	(prompt_retract_dialog):
+	* gui/dialogs/changed-comp.c: (changed_component_dialog):
+	* gui/dialogs/comp-editor.c: (make_title_from_comp),
+	(make_title_from_string):
+	* gui/dialogs/cancel-comp.c: (cancel_component_dialog):
+	* gui/dialogs/delete-error.c: (delete_error_dialog):
+	* gui/dialogs/recur-comp.c: (recur_component_dialog):
+	* gui/itip-utils.c: (comp_subject), (comp_description):
+	* calendar.error.xml:
+	Renamed 'Journal' to 'Memo'.
+
+2007-08-23  Milan Crha  <mcrha@redhat.com>
+
 	** Fix for bug #428110
 
 	* gui/memos-component.c: (update_single_object):
diff --git a/calendar/calendar.error.xml b/calendar/calendar.error.xml
index 1fa63eb29c..95431369af 100644
--- a/calendar/calendar.error.xml
+++ b/calendar/calendar.error.xml
@@ -29,16 +29,16 @@
   <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
  </error>
 
- <error id="prompt-cancel-journal" type="question" default="GTK_RESPONSE_YES">
-  <_primary>Would you like to send a cancelation notice for this journal entry?</_primary>
-  <_secondary>If you do not send a cancelation notice, the other participants may not know the journal has been deleted.</_secondary>
+ <error id="prompt-cancel-memo" type="question" default="GTK_RESPONSE_YES">
+  <_primary>Would you like to send a cancelation notice for this memo?</_primary>
+  <_secondary>If you do not send a cancelation notice, the other participants may not know the memo has been deleted.</_secondary>
   <button _label="Do _not Send" response="GTK_RESPONSE_NO"/>
   <button _label="_Send Notice" response="GTK_RESPONSE_YES"/>
  </error>
 
- <error id="prompt-delete-journal" type="question" default="GTK_RESPONSE_NO">
-  <_primary>Are you sure you want to delete this journal entry?</_primary>
-  <_secondary>All information on this journal entry will be deleted and can not be restored.</_secondary>
+ <error id="prompt-delete-memo" type="question" default="GTK_RESPONSE_NO">
+  <_primary>Are you sure you want to delete this memo?</_primary>
+  <_secondary>All information on this memo will be deleted and can not be restored.</_secondary>
   <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
   <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
  </error>
@@ -64,9 +64,9 @@
   <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
  </error>
 
- <error id="prompt-delete-named-journal" type="question" default="GTK_RESPONSE_NO">
-  <_primary>Are you sure you want to delete the journal entry '{0}'?</_primary>
-  <_secondary>All information in this journal will be deleted and can not be restored.</_secondary>
+ <error id="prompt-delete-named-memo" type="question" default="GTK_RESPONSE_NO">
+  <_primary>Are you sure you want to delete the memo '{0}'?</_primary>
+  <_secondary>All information in this memo will be deleted and can not be restored.</_secondary>
   <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
   <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
  </error>
@@ -85,9 +85,9 @@
   <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
  </error>
 
- <error id="prompt-delete-journals" type="question" default="GTK_RESPONSE_NO">
-  <_primary>Are you sure you want to delete these {0} journal entries?</_primary>
-  <_secondary>All information in these journal entries will be deleted and can not be restored.</_secondary>
+ <error id="prompt-delete-memos" type="question" default="GTK_RESPONSE_NO">
+  <_primary>Are you sure you want to delete these {0} memos?</_primary>
+  <_secondary>All information in these memos will be deleted and can not be restored.</_secondary>
   <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
   <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
  </error>
diff --git a/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c
index 56547d52c1..26dda2423c 100644
--- a/calendar/gui/dialogs/cancel-comp.c
+++ b/calendar/gui/dialogs/cancel-comp.c
@@ -94,9 +94,9 @@ cancel_component_dialog (GtkWindow *parent, ECal *client, ECalComponent *comp, g
 
 	case E_CAL_COMPONENT_JOURNAL:
 		if (deleting)
-			id = "calendar:prompt-cancel-journal";
+			id = "calendar:prompt-cancel-memo";
 		else
-			id = "calendar:prompt-delete-journal";
+			id = "calendar:prompt-delete-memo";
 		break;
 
 	default:
diff --git a/calendar/gui/dialogs/changed-comp.c b/calendar/gui/dialogs/changed-comp.c
index 14d27b2424..308f6ba732 100644
--- a/calendar/gui/dialogs/changed-comp.c
+++ b/calendar/gui/dialogs/changed-comp.c
@@ -65,7 +65,7 @@ changed_component_dialog (GtkWindow *parent, ECalComponent *comp, gboolean delet
 			break;
 
 		case E_CAL_COMPONENT_JOURNAL:
-			str = _("This journal entry has been deleted.");
+			str = _("This memo has been deleted.");
 			break;
 
 		default:
@@ -89,7 +89,7 @@ changed_component_dialog (GtkWindow *parent, ECalComponent *comp, gboolean delet
 			break;
 
 		case E_CAL_COMPONENT_JOURNAL:
-			str = _("This journal entry has been changed.");
+			str = _("This memo has been changed.");
 			break;
 
 		default:
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 4a6c1468af..ef20917f21 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -2187,7 +2187,7 @@ make_title_from_comp (ECalComponent *comp, gboolean is_group_item)
 			type_string = _("Task - %s");
 		break;
 	case E_CAL_COMPONENT_JOURNAL:
-		type_string = _("Journal entry - %s");
+		type_string = _("Memo - %s");
 		break;
 	default:
 		g_message ("make_title_from_comp(): Cannot handle object of type %d", type);
@@ -2230,7 +2230,7 @@ make_title_from_string (ECalComponent *comp, const char *str, gboolean is_group_
 			type_string = _("Task - %s");
 		break;
 	case E_CAL_COMPONENT_JOURNAL:
-		type_string = _("Journal entry - %s");
+		type_string = _("Memo - %s");
 		break;
 	default:
 		g_message ("make_title_from_string(): Cannot handle object of type %d", type);
@@ -2260,6 +2260,8 @@ make_icon_from_comp (ECalComponent *comp)
 		return "stock_new-appointment";
 	case E_CAL_COMPONENT_TODO:
 		return "stock_task";
+	case E_CAL_COMPONENT_JOURNAL:
+		return "stock_insert-note";
 	default:
 		return "stock_calendar";
 	}
diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c
index 1624b8c30d..4e5cca3480 100644
--- a/calendar/gui/dialogs/delete-comp.c
+++ b/calendar/gui/dialogs/delete-comp.c
@@ -107,9 +107,9 @@ delete_component_dialog (ECalComponent *comp,
 
 		case E_CAL_COMPONENT_JOURNAL:
 			if (arg0)
-				id = "calendar:prompt-delete-named-journal";
+				id = "calendar:prompt-delete-named-memo";
 			else
-				id = "calendar:prompt-delete-journal";
+				id = "calendar:prompt-delete-memo";
 			break;
 
 		default:
@@ -136,9 +136,9 @@ delete_component_dialog (ECalComponent *comp,
 
 		case E_CAL_COMPONENT_JOURNAL:
 			if (n_comps == 1)
-				id = "calendar:prompt-delete-journal";
+				id = "calendar:prompt-delete-memo";
 			else
-				id = "calendar:prompt-delete-journals";
+				id = "calendar:prompt-delete-memos";
 			break;
 
 		default:
@@ -186,7 +186,7 @@ prompt_retract_dialog (ECalComponent *comp, char **retract_text, GtkWidget *pare
 			message = g_strdup_printf (_("Are you sure you want to delete this task?"));
 			break;
 		case E_CAL_COMPONENT_JOURNAL:
-			message = g_strdup_printf (_("Are you sure you want to delete this journal entry?"));
+			message = g_strdup_printf (_("Are you sure you want to delete this memo?"));
 			break;
 		default:
 			g_message ("Retract: Unsupported object type \n");
diff --git a/calendar/gui/dialogs/delete-error.c b/calendar/gui/dialogs/delete-error.c
index cec4b448ac..1edd5048b5 100644
--- a/calendar/gui/dialogs/delete-error.c
+++ b/calendar/gui/dialogs/delete-error.c
@@ -57,7 +57,7 @@ delete_error_dialog (GError *error, ECalComponentVType vtype)
 			str = _("The task could not be deleted due to a corba error");
 			break;
 		case E_CAL_COMPONENT_JOURNAL:
-			str = _("The journal entry could not be deleted due to a corba error");
+			str = _("The memo could not be deleted due to a corba error");
 			break;
 		default:
 			str = _("The item could not be deleted due to a corba error");
@@ -73,7 +73,7 @@ delete_error_dialog (GError *error, ECalComponentVType vtype)
 			str = _("The task could not be deleted because permission was denied");
 			break;
 		case E_CAL_COMPONENT_JOURNAL:
-			str = _("The journal entry could not be deleted because permission was denied");
+			str = _("The memo could not be deleted because permission was denied");
 			break;
 		default:
 			str = _("The item could not be deleted because permission was denied");
@@ -89,7 +89,7 @@ delete_error_dialog (GError *error, ECalComponentVType vtype)
 			str = _("The task could not be deleted due to an error");
 			break;
 		case E_CAL_COMPONENT_JOURNAL:
-			str = _("The journal entry could not be deleted due to an error");
+			str = _("The memo could not be deleted due to an error");
 			break;
 		default:
 			str = _("The item could not be deleted due to an error");
diff --git a/calendar/gui/dialogs/recur-comp.c b/calendar/gui/dialogs/recur-comp.c
index a7fe0be68a..769b3cfbb2 100644
--- a/calendar/gui/dialogs/recur-comp.c
+++ b/calendar/gui/dialogs/recur-comp.c
@@ -59,7 +59,7 @@ recur_component_dialog (ECal *client,
 		break;
 
 	case E_CAL_COMPONENT_JOURNAL:
-		str = g_strdup_printf (_("You are modifying a recurring journal entry. What would you like to modify?"));
+		str = g_strdup_printf (_("You are modifying a recurring memo. What would you like to modify?"));
 		break;
 
 	default:
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index e77a3a895b..fdf49fcee7 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -693,7 +693,7 @@ comp_subject (ECalComponentItipMethod method, ECalComponent *comp)
 		case E_CAL_COMPONENT_TODO:
 			description = _("Task information");
 		case E_CAL_COMPONENT_JOURNAL:
-			description = _("Journal information");
+			description = _("Memo information");
 		case E_CAL_COMPONENT_FREEBUSY:
 			description = _("Free/Busy information");
 		default:
@@ -816,7 +816,7 @@ comp_description (ECalComponent *comp)
         case E_CAL_COMPONENT_TODO:
                 return CORBA_string_dup (_("Task information"));
         case E_CAL_COMPONENT_JOURNAL:
-                return CORBA_string_dup (_("Journal information"));
+                return CORBA_string_dup (_("Memo information"));
         case E_CAL_COMPONENT_FREEBUSY:
                 e_cal_component_get_dtstart (comp, &dt);
                 if (dt.value)
diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog
index acff351299..a0f8eb3380 100644
--- a/plugins/itip-formatter/ChangeLog
+++ b/plugins/itip-formatter/ChangeLog
@@ -1,3 +1,12 @@
+2007-08-23  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #329746
+
+	* itip-formatter.c: (send_item), (format_itip_object):
+	Marked strings to localize and renamed 'Journal' to 'Memo'.
+	* itip-formatter.c: (find_cal_opened_cb):
+	Renamed 'Journal' to 'Memo'.
+
 2007-08-21  Suman Manjunath  <msuman@novell.com>
 
 	** Fix for bug #301835 (BNC)
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index ab5b8a6399..4d4eddccbd 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -683,7 +683,7 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
 				break;
 			case E_CAL_SOURCE_TYPE_JOURNAL:
 				itip_view_add_lower_info_item_printf (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_WARNING, 
-								      _("Unable to find this journal entry in any journal"));
+								      _("Unable to find this memo in any memo list"));
 				break;
 			default:
 				g_assert_not_reached ();
@@ -1247,13 +1247,13 @@ send_item (FormatItipPObject *pitip)
 
 		switch (pitip->type) {
 		case E_CAL_SOURCE_TYPE_EVENT:
-			itip_view_add_lower_info_item (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_INFO, "Meeting information sent");
+			itip_view_add_lower_info_item (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_INFO, _("Meeting information sent"));
 			break;
 		case E_CAL_SOURCE_TYPE_TODO:
-			itip_view_add_lower_info_item (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_INFO, "Task information sent");
+			itip_view_add_lower_info_item (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_INFO, _("Task information sent"));
 			break;
 		case E_CAL_SOURCE_TYPE_JOURNAL:
-			itip_view_add_lower_info_item (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_INFO, "Journal entry information sent");
+			itip_view_add_lower_info_item (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_INFO, _("Memo information sent"));
 			break;
 		default:
 			g_assert_not_reached ();
@@ -1262,13 +1262,13 @@ send_item (FormatItipPObject *pitip)
 	} else {
 		switch (pitip->type) {
 		case E_CAL_SOURCE_TYPE_EVENT:
-			itip_view_add_lower_info_item (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_ERROR, "Unable to send meeting information, the meeting does not exist");
+			itip_view_add_lower_info_item (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_ERROR, _("Unable to send meeting information, the meeting does not exist"));
 			break;
 		case E_CAL_SOURCE_TYPE_TODO:
-			itip_view_add_lower_info_item (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_ERROR, "Unable to send task information, the task does not exist");
+			itip_view_add_lower_info_item (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_ERROR, _("Unable to send task information, the task does not exist"));
 			break;
 		case E_CAL_SOURCE_TYPE_JOURNAL:
-			itip_view_add_lower_info_item (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_ERROR, "Unable to send journal entry information, the journal entry does not exist");
+			itip_view_add_lower_info_item (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_ERROR, _("Unable to send memo information, the memo does not exist"));
 			break;
 		default:
 			g_assert_not_reached ();
@@ -2044,13 +2044,13 @@ format_itip_object (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject
 		/* FIXME Tell the user we don't support recurring tasks */
 		switch (pitip->type) {
 		case E_CAL_SOURCE_TYPE_EVENT:
-			itip_view_add_upper_info_item (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_INFO, "This meeting recurs");
+			itip_view_add_upper_info_item (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_INFO, _("This meeting recurs"));
 			break;
 		case E_CAL_SOURCE_TYPE_TODO:
-			itip_view_add_upper_info_item (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_INFO, "This task recurs");
+			itip_view_add_upper_info_item (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_INFO, _("This task recurs"));
 			break;
 		case E_CAL_SOURCE_TYPE_JOURNAL:
-			itip_view_add_upper_info_item (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_INFO, "This journal recurs");
+			itip_view_add_upper_info_item (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_INFO, _("This memo recurs"));
 			break;
 		default:
 			g_assert_not_reached ();