[evolution] Bug #616250 - Restore and Backup options aren't fully descriptive

[Milan Crha <mcrha src gnome org>]

commit 5bde5537b6d098b16f96e46f48fdf45a3ce92207
Author: Milan Crha <mcrha redhat com>
Date:   Mon Oct 4 16:18:01 2010 +0200

    Bug #616250 - Restore and Backup options aren't fully descriptive

 plugins/backup-restore/backup-restore.c            |   18 +++++++++---------
 plugins/backup-restore/backup.c                    |   14 +++++++-------
 .../org-gnome-backup-restore.eplug.xml             |    4 ++--
 .../org-gnome-backup-restore.error.xml             |   12 ++++++------
 4 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c
index 283079d..2174606 100644
--- a/plugins/backup-restore/backup-restore.c
+++ b/plugins/backup-restore/backup-restore.c
@@ -157,7 +157,7 @@ action_settings_backup_cb (GtkAction *action,
 
 	file = e_shell_run_save_dialog (
 		e_shell_window_get_shell (shell_window),
-		_("Select name of the Evolution backup file"),
+		_("Select name of the Evolution back up file"),
 		"evolution-backup.tar.gz", "*.tar.gz", (GtkCallback)
 		set_local_only, NULL);
 
@@ -188,7 +188,7 @@ action_settings_backup_cb (GtkAction *action,
 
 		mask = dialog_prompt_user (
 			GTK_WINDOW (shell_window),
-			_("_Restart Evolution after backup"),
+			_("_Restart Evolution after back up"),
 			"org.gnome.backup-restore:backup-confirm", NULL);
 		if (mask & BR_OK) {
 			path = g_file_get_path (file);
@@ -214,7 +214,7 @@ action_settings_restore_cb (GtkAction *action,
 
 	file = e_shell_run_open_dialog (
 		e_shell_window_get_shell (shell_window),
-		_("Select name of the Evolution backup file to restore"),
+		_("Select name of the Evolution back up file to restore"),
 		(GtkCallback) set_local_only, NULL);
 
 	if (file == NULL)
@@ -295,14 +295,14 @@ backup_restore_page (EPlugin *ep, EConfigHookItemFactoryData *hook_data)
 	gtk_container_set_border_width (GTK_CONTAINER (page), 12);
 
 	hbox = gtk_hbox_new (FALSE, 6);
-	label = gtk_label_new (_("You can restore Evolution from your backup. It can restore all the Mails, Calendars, Tasks, Memos, Contacts. It also restores all your personal settings, mail filters etc."));
+	label = gtk_label_new (_("You can restore Evolution from your back up. It can restore all the Mails, Calendars, Tasks, Memos, Contacts. It also restores all your personal settings, mail filters etc."));
 	gtk_label_set_line_wrap ((GtkLabel *)label, TRUE);
 	gtk_label_set_single_line_mode ((GtkLabel *)label, FALSE);
 	gtk_box_pack_start ((GtkBox *)hbox, label, FALSE, FALSE, 6);
 	gtk_box_pack_start ((GtkBox *)page, hbox, FALSE, FALSE, 0);
 
 	hbox = gtk_hbox_new (FALSE, 6);
-	cbox = gtk_check_button_new_with_mnemonic (_("_Restore Evolution from the backup file"));
+	cbox = gtk_check_button_new_with_mnemonic (_("_Restore Evolution from the back up file"));
 	g_signal_connect (cbox, "toggled", G_CALLBACK (check_toggled), assistant);
 	gtk_box_pack_start ((GtkBox *)hbox, cbox, FALSE, FALSE, 6);
 	gtk_box_pack_start ((GtkBox *)page, hbox, FALSE, FALSE, 0);
@@ -320,7 +320,7 @@ backup_restore_page (EPlugin *ep, EConfigHookItemFactoryData *hook_data)
 	gtk_widget_set_sensitive (hbox, FALSE);
 
 	gtk_assistant_append_page (assistant, page);
-	gtk_assistant_set_page_title (assistant, page, _("Restore from backup"));
+	gtk_assistant_set_page_title (assistant, page, _("Restore from back up"));
 	gtk_widget_show_all (page);
 
 	g_object_set_data ((GObject *)assistant, "restore", GINT_TO_POINTER (FALSE));
@@ -358,14 +358,14 @@ static GtkActionEntry entries[] = {
 
 	{ "settings-backup",
 	  NULL,
-	  N_("_Backup Evolution Settings..."),
+	  N_("_Back up Evolution Data..."),
 	  NULL,
-	  N_("Backup Evolution data and settings to an archive file"),
+	  N_("Back up Evolution data and settings to an archive file"),
 	  G_CALLBACK (action_settings_backup_cb) },
 
 	{ "settings-restore",
 	  NULL,
-	  N_("R_estore Evolution Settings..."),
+	  N_("R_estore Evolution Data..."),
 	  NULL,
 	  N_("Restore Evolution data and settings from an archive file"),
 	  G_CALLBACK (action_settings_restore_cb) }
diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c
index 03ff5a4..2ce3d08 100644
--- a/plugins/backup-restore/backup.c
+++ b/plugins/backup-restore/backup.c
@@ -77,11 +77,11 @@ static gboolean complete = FALSE;
 
 static GOptionEntry options[] = {
 	{ "backup", '\0', 0, G_OPTION_ARG_NONE, &backup_op,
-	  N_("Backup Evolution directory"), NULL },
+	  N_("Back up Evolution directory"), NULL },
 	{ "restore", '\0', 0, G_OPTION_ARG_NONE, &restore_op,
 	  N_("Restore Evolution directory"), NULL },
 	{ "check", '\0', 0, G_OPTION_ARG_NONE, &check_op,
-	  N_("Check Evolution Backup"), NULL },
+	  N_("Check Evolution Back up"), NULL },
 	{ "restart", '\0', 0, G_OPTION_ARG_NONE, &restart_arg,
 	  N_("Restart Evolution"), NULL },
 	{ "gui", '\0', 0, G_OPTION_ARG_NONE, &gui_arg,
@@ -315,7 +315,7 @@ backup (const gchar *filename)
 
 	run_cmd ("rm $HOME/" EVOLUTION_DIR_FILE);
 
-	txt = _("Backup complete");
+	txt = _("Back up complete");
 
 	if (restart_arg) {
 
@@ -407,7 +407,7 @@ restore (const gchar *filename)
 	run_cmd ("mv $HOME/.camel_certs $HOME/.camel_certs_old");
 
 	CANCEL (complete);
-	txt = _("Extracting files from backup");
+	txt = _("Extracting files from back up");
 
 	if (is_new_format) {
 		GString *dir_fn;
@@ -479,7 +479,7 @@ restore (const gchar *filename)
 	}
 
 	CANCEL (complete);
-	txt = _("Removing temporary backup files");
+	txt = _("Removing temporary back up files");
 	run_cmd ("rm -rf $DATADIR_old");
 	run_cmd ("rm -rf $CONFIGDIR_old");
 	run_cmd ("rm -rf $HOME/.camel_certs_old");
@@ -616,7 +616,7 @@ dlg_response (GtkWidget *dlg, gint response, gpointer data)
 		/* backup was canceled, delete the backup file as it is not needed now */
 		gchar *cmd, *filename;
 
-		g_message ("Backup canceled, removing partial backup file.");
+		g_message ("Back up canceled, removing partial back up file.");
 
 		filename = g_shell_quote (bk_file);
 		cmd = g_strconcat ("rm ", filename, NULL);
@@ -703,7 +703,7 @@ main (gint argc, gchar **argv)
 		gtk_window_set_default_icon_name ("evolution");
 
 		/* Backup / Restore only can have GUI. We should restrict the rest */
-		progress_dialog = gtk_dialog_new_with_buttons (backup_op ? _("Evolution Backup"): _("Evolution Restore"),
+		progress_dialog = gtk_dialog_new_with_buttons (backup_op ? _("Evolution Back up"): _("Evolution Restore"),
 							  NULL,
 							  GTK_DIALOG_MODAL,
 							  GTK_STOCK_CANCEL,
diff --git a/plugins/backup-restore/org-gnome-backup-restore.eplug.xml b/plugins/backup-restore/org-gnome-backup-restore.eplug.xml
index c78b376..653ad62 100644
--- a/plugins/backup-restore/org-gnome-backup-restore.eplug.xml
+++ b/plugins/backup-restore/org-gnome-backup-restore.eplug.xml
@@ -5,9 +5,9 @@
     id="org.gnome.plugin.backup.restore"
     type="shlib"
     location="@PLUGINDIR@/liborg-gnome-backup-restore SOEXT@"
-    _name="Backup and Restore">
+    _name="Back up and Restore">
     <author name="JP Rosevear" email="jpr novell com"/>
-    <_description>Backup and restore your Evolution data and settings.</_description>
+    <_description>Back up and restore your Evolution data and settings.</_description>
 
     <hook class="org.gnome.evolution.ui:1.0">
       <ui-manager id="org.gnome.evolution.shell">
diff --git a/plugins/backup-restore/org-gnome-backup-restore.error.xml b/plugins/backup-restore/org-gnome-backup-restore.error.xml
index e8786b6..398715e 100644
--- a/plugins/backup-restore/org-gnome-backup-restore.error.xml
+++ b/plugins/backup-restore/org-gnome-backup-restore.error.xml
@@ -2,18 +2,18 @@
 <error-list domain="org.gnome.backup-restore">
 
  <error id="invalid-backup" type="warning">
-  <_primary>Invalid Evolution backup file</_primary>
-  <_secondary>Please select a valid backup file to restore.</_secondary>
+  <_primary>Invalid Evolution back up file</_primary>
+  <_secondary>Please select a valid back up file to restore.</_secondary>
  </error>
    <error id="backup-confirm" type="warning" default="GTK_RESPONSE_CANCEL">
     <_primary>Are you sure you want to close Evolution?</_primary>
-    <_secondary xml:space="preserve">To backup your data and settings, you must first close Evolution. Please make sure that you save any unsaved data before proceeding.</_secondary>
-    <button _label="Close and Backup Evolution" response="GTK_RESPONSE_YES"/>
+    <_secondary xml:space="preserve">To back up your data and settings, you must first close Evolution. Please make sure that you save any unsaved data before proceeding.</_secondary>
+    <button _label="Close and Back up Evolution" response="GTK_RESPONSE_YES"/>
     <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
   </error>
    <error id="restore-confirm" type="warning" default="GTK_RESPONSE_CANCEL">
-    <_primary>Are you sure you want to restore Evolution from the selected backup file?</_primary>
-    <_secondary xml:space="preserve">To restore your data and settings, you must first close Evolution. Please make sure that you save any unsaved data before proceeding. This will delete all your current Evolution data and settings and restore them from your backup.</_secondary>
+    <_primary>Are you sure you want to restore Evolution from the selected back up file?</_primary>
+    <_secondary xml:space="preserve">To restore your data and settings, you must first close Evolution. Please make sure that you save any unsaved data before proceeding. This will delete all your current Evolution data and settings and restore them from your back up.</_secondary>
     <button _label="Close and Restore Evolution" response="GTK_RESPONSE_YES"/>
     <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
   </error>