2007-08-23 mcrha Fix for bug #329746

svn path=/trunk/; revision=34078

7 files changed, 19 insertions, 17 deletions

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)