[Xfce4-commits] <xfce4-panel:devel> Improve strings in migrate dialog.

[Nick Schermer]

Updating branch refs/heads/devel
         to d54e9a1c841bc4c4cd3309a2518b8717228d656a (commit)
       from 720203c31d6cec1d304e0964abc162d5f3e6beee (commit)

commit d54e9a1c841bc4c4cd3309a2518b8717228d656a
Author: Nick Schermer <nick at xfce.org>
Date:   Mon Feb 15 23:36:51 2010 +0100

    Improve strings in migrate dialog.

 migrate/main.c |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/migrate/main.c b/migrate/main.c
index 5380484..3c42c5f 100644
--- a/migrate/main.c
+++ b/migrate/main.c
@@ -76,29 +76,31 @@ main (gint argc, gchar **argv)
   /* create question dialog */
   dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE,
                                    _("Welcome to the first start of the Xfce Panel"));
-  gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-                                   _("Click one of the options below for the "
-                                    "initial configuration of the Xfce Panel"));
+  gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s%s%s",
+      file != NULL ? _("Because the panel moved to a new system for storing the "
+                       "settings, it has to load a fresh inital configuration.") : "",
+      file != NULL ? " " : "",
+                     _("Choose below which setup you want for the first startup."));
   gtk_window_set_title (GTK_WINDOW (dialog), "Xfce Panel");
   gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_PREFERENCES);
   gtk_window_stick (GTK_WINDOW (dialog));
   gtk_window_set_keep_above (GTK_WINDOW (dialog), TRUE);
 
   button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("Migrate old config"), GTK_RESPONSE_OK);
-  gtk_widget_set_tooltip_text (button, _("The panel will migrate your existing 4.6 panel configuration"));
+  gtk_widget_set_tooltip_text (button, _("Migrate the old 4.6 configuration to Xfconf"));
   gtk_widget_set_sensitive (button, file != NULL);
   if (file != NULL)
     default_response = GTK_RESPONSE_OK;
 
   button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("Use default config"), GTK_RESPONSE_YES);
-  gtk_widget_set_tooltip_text (button, _("The default configuration will be loaded"));
+  gtk_widget_set_tooltip_text (button, _("Load the default configuration"));
   default_config_exists = g_file_test (DEFAULT_CONFIG, G_FILE_TEST_IS_REGULAR);
   gtk_widget_set_sensitive (button, default_config_exists);
   if (default_config_exists && file == NULL)
     default_response = GTK_RESPONSE_YES;
 
-  button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("Cancel"), GTK_RESPONSE_CANCEL);
-  gtk_widget_set_tooltip_text (button, _("Xfce Panel will start with one empty panel"));
+  button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("One empty panel"), GTK_RESPONSE_CANCEL);
+  gtk_widget_set_tooltip_text (button, _("Start with one empty panel"));
 
   gtk_dialog_set_default_response (GTK_DIALOG (dialog), default_response);