Backup-restore-plugin: string issues resolved. Bug #458508.

committing on behalf of Anand V M   <avmuttagi@gmail.com>


svn path=/trunk/; revision=33980

4 files changed, 28 insertions, 20 deletions

diff --git a/plugins/backup-restore/ChangeLog b/plugins/backup-restore/ChangeLog
index 5701b5826b..94cbeb44e6 100644
--- a/plugins/backup-restore/ChangeLog
+++ b/plugins/backup-restore/ChangeLog
@@ -1,3 +1,11 @@
+2007-08-07  Johnny Jacob  <jjohnny@novell.com>
+	
+	* Committed on behalf of Anand V M   <avmuttagi@gmail.com>
+	
+	** Fix for bug #458508
+
+	* backup-restore-plugin: string issues resolved.
+
 2007-08-23  Srinivasa Ragavan  <sragavan@novell.com>
 
 	* backup-restore.c: (org_gnome_backup_restore_restore): Popup the
diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c
index 08a081290d..d2d4f3aae4 100644
--- a/plugins/backup-restore/backup-restore.c
+++ b/plugins/backup-restore/backup-restore.c
@@ -93,9 +93,9 @@ org_gnome_backup_restore_backup (EPlugin *ep, ESMenuTargetShell *target)
 	GtkWidget *vbox;
 	int response;
 
-	dlg = e_file_get_save_filesel(target->target.widget, _("Select name of the Evolution archive"), NULL, GTK_FILE_CHOOSER_ACTION_SAVE);
+	dlg = e_file_get_save_filesel(target->target.widget, _("Select name of the Evolution backup file"), NULL, GTK_FILE_CHOOSER_ACTION_SAVE);
 								  
-/* 	dlg = gtk_file_chooser_dialog_new (_("Select name of the Evolution archive"), GTK_WINDOW (target->target.widget),  */
+/* 	dlg = gtk_file_chooser_dialog_new (_("Select name of the Evolution backup file"), GTK_WINDOW (target->target.widget),  */
 /* 					   GTK_FILE_CHOOSER_ACTION_SAVE,  */
 /* 					   GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,  */
 /* 					   GTK_STOCK_SAVE, GTK_RESPONSE_OK, NULL); */
@@ -136,9 +136,9 @@ org_gnome_backup_restore_restore (EPlugin *ep, ESMenuTargetShell *target)
 	GtkWidget *vbox;
 	int response;
 
-	dlg = e_file_get_save_filesel(target->target.widget, _("Select name of the Evolution archive to restore"), NULL, GTK_FILE_CHOOSER_ACTION_OPEN);
+	dlg = e_file_get_save_filesel(target->target.widget, _("Select name of the Evolution backup file to restore"), NULL, GTK_FILE_CHOOSER_ACTION_OPEN);
 								  
-/* 	dlg = gtk_file_chooser_dialog_new (_("Select Evolution archive to restore"), GTK_WINDOW (target->target.widget),  */
+/* 	dlg = gtk_file_chooser_dialog_new (_("Select Evolution backup file to restore"), GTK_WINDOW (target->target.widget),  */
 /* 					   GTK_FILE_CHOOSER_ACTION_OPEN,  */
 /* 					   GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,  */
 /* 					   GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL); */
@@ -164,7 +164,7 @@ org_gnome_backup_restore_restore (EPlugin *ep, ESMenuTargetShell *target)
 			if (mask & BR_OK) 
 				restore (filename, mask & BR_START);
 		} else {
-			e_error_run (GTK_WINDOW (target->target.widget), "org.gnome.backup-restore:invalid-archive", NULL);
+			e_error_run (GTK_WINDOW (target->target.widget), "org.gnome.backup-restore:invalid-backup", NULL);
 		}
 		
 		g_free (filename);
@@ -201,7 +201,7 @@ restore_wizard (GnomeDruidPage *druidpage, GnomeDruid *druid, gpointer user_data
 
 	if (state) {
 		if (!file ||!sanity_check (file)) {
-			 e_error_run ((GtkWindow *)druid, "org.gnome.backup-restore:invalid-archive", NULL);
+			 e_error_run ((GtkWindow *)druid, "org.gnome.backup-restore:invalid-backup", NULL);
 		} else
 			restore (file, TRUE);
 		
@@ -235,13 +235,13 @@ backup_restore_page (EPlugin *ep, EConfigHookItemFactoryData *hook_data)
 	
 	page = gnome_druid_page_standard_new_with_vals (_("Restore from backup"), NULL, NULL);
 	hbox = gtk_hbox_new (FALSE, 6);
-	label = gtk_label_new (_("You can restore Evolution from your archive. It can restore all the Mails/Calendars/Tasks/Memos/Addressbook. \nIt also restores all your personal settings, mail filters etc."));
+	label = gtk_label_new (_("You can restore Evolution from your backup. It can restore all the Mails, Calendars, Tasks, Memos, Contacts. \nIt also restores all your personal settings, mail filters etc."));
 	gtk_box_pack_start ((GtkBox *)hbox, label, FALSE, FALSE, 6);
 	box = gtk_vbox_new (FALSE, 6);
 	gtk_box_pack_start ((GtkBox *)box, hbox, FALSE, FALSE, 0);
 	
 	hbox = gtk_hbox_new (FALSE, 6);
-	cbox = gtk_check_button_new_with_mnemonic (_("_Restore Evolution from the backup archive"));
+	cbox = gtk_check_button_new_with_mnemonic (_("_Restore Evolution from the backup file"));
 	g_signal_connect (cbox, "toggled", G_CALLBACK (check_toggled), hook_data->parent);
 	gtk_box_pack_start ((GtkBox *)hbox, cbox, FALSE, FALSE, 6);
 	gtk_box_pack_start ((GtkBox *)box, hbox, FALSE, FALSE, 0);
diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c
index d49bb9f744..90d389e239 100644
--- a/plugins/backup-restore/backup.c
+++ b/plugins/backup-restore/backup.c
@@ -41,11 +41,11 @@ static const GOptionEntry options[] = {
 	{ "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 archive"), NULL },
+	  N_("Check Evolution Backup"), NULL },
 	{ "restart", '\0', 0, G_OPTION_ARG_NONE, &restart_arg,
 	  N_("Restart Evolution"), NULL },
 	{ "gui", '\0', 0, G_OPTION_ARG_NONE, &gui_arg,
-	  N_("With GUI"), NULL },
+	  N_("With Graphical User Interface"), NULL },
 	{ G_OPTION_REMAINING, '\0', 0,
 	  G_OPTION_ARG_STRING_ARRAY, &opt_remaining },
 	{ NULL }
@@ -79,7 +79,7 @@ backup (const char *filename)
 	/* FIXME stay on this file system ,other options?" */
 	/* FIXME compression type?" */
 	/* FIXME date/time stamp?" */
-	/* FIXME archive location?" */
+	/* FIXME backup location?" */
 	command = g_strdup_printf ("cd ~ && tar zpcf %s .evolution .camel_certs", filename);
 	s (command);
 	g_free (command);
@@ -113,7 +113,7 @@ restore (const char *filename)
 	s ("mv ~/.camel_certs ~/.camel_certs_old");
 
 	CANCEL (complete);
-	txt = _("Extracting files from the archive");
+	txt = _("Extracting files from backup");
 	command = g_strdup_printf ("cd ~ && tar zxf %s", filename);
 	s (command);
 	g_free (command);
@@ -241,13 +241,13 @@ main (int argc, char **argv)
 
 	for (i = 0; i < g_strv_length (opt_remaining); i++) {
 		if (backup_op) {
-			oper = _("Backing up to %s");
-			d(g_message ("Backing up to %s", (char *) opt_remaining[i]));
+			oper = _("Backing up to the folder %s");
+			d(g_message ("Backing up to the folder %s", (char *) opt_remaining[i]));
 			bk_file = g_strdup ((char *) opt_remaining[i]);
 			file = bk_file;
 		} else if (restore_op) {
-			oper = _("Restoring from %s");
-			d(g_message ("Restoring from %s", (char *) opt_remaining[i]));
+			oper = _("Restoring from the folder %s");
+			d(g_message ("Restoring from the folder %s", (char *) opt_remaining[i]));
 			res_file = g_strdup ((char *) opt_remaining[i]);
 			file = res_file;
 		} else if (check_op) {
diff --git a/plugins/backup-restore/org-gnome-backup-restore.error.xml b/plugins/backup-restore/org-gnome-backup-restore.error.xml
index ae21cb912d..95f1d033ea 100644
--- a/plugins/backup-restore/org-gnome-backup-restore.error.xml
+++ b/plugins/backup-restore/org-gnome-backup-restore.error.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <error-list domain="org.gnome.backup-restore">
 
- <error id="invalid-archive" type="warning">
-  <_title>Invalid Evolution archive</_title>
-  <_secondary>Please select a valid archive file to restore.</_secondary>
+ <error id="invalid-backup" type="warning">
+  <_title>Invalid Evolution backup file</_title>
+  <_secondary>Please select a valid backup file to restore.</_secondary>
  </error>
    <error id="backup-confirm" type="warning" default="GTK_RESPONSE_NO">
     <_primary>Are you sure you want to close Evolution?</_primary>
@@ -12,7 +12,7 @@
     <button stock="gtk-yes" response="GTK_RESPONSE_YES"/>
   </error>
    <error id="restore-confirm" type="warning" default="GTK_RESPONSE_NO">
-    <_primary>Are you sure you want to restore Evolution from the selected archive?</_primary>
+    <_primary>Are you sure you want to restore Evolution from the selected backup file?</_primary>
     <_secondary xml:space="preserve">This will delete all your current Evolution data and settings and restore them from your backup. Evolution restore can start only when Evolution is not running. Please make sure that you close all your unsaved windows before you proceed. If you want Evolution to restart automatically restart after restore, please enable the toggle button.</_secondary>
     <button stock="gtk-no" response="GTK_RESPONSE_NO"/>
     <button stock="gtk-yes" response="GTK_RESPONSE_YES"/>