Improve the wording of a few English strings and use colons

diff --git a/extensions/shortcuts.c b/extensions/shortcuts.c
index 741e73aafe3ba4bc93958c3347080f0400ad2ef9..7f0980991f3cf4162e8571c7893eba2902dd2abd 100644 (file)
--- a/extensions/shortcuts.c
+++ b/extensions/shortcuts.c
@@ -163,7 +163,7 @@ shortcuts_get_preferences_dialog (MidoriExtension* extension)
     app = midori_extension_get_app (extension);
     browser = katze_object_get_object (app, "browser");
 
-    dialog_title = _("Configure Keyboard shortcuts");
+    dialog_title = _("Customize Keyboard shortcuts");
     dialog = gtk_dialog_new_with_buttons (dialog_title, GTK_WINDOW (browser),
         GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
         #if !HAVE_OSX
@@ -260,7 +260,7 @@ shortcuts_app_add_browser_cb (MidoriApp*       app,
     panel = katze_object_get_object (browser, "panel");
     menu = katze_object_get_object (panel, "menu");
     g_object_unref (panel);
-    menuitem = gtk_menu_item_new_with_mnemonic (_("Configure Sh_ortcuts..."));
+    menuitem = gtk_menu_item_new_with_mnemonic (_("Customize Sh_ortcuts..."));
     g_signal_connect (menuitem, "activate",
         G_CALLBACK (shortcuts_menu_configure_shortcuts_activate_cb), extension);
     gtk_widget_show (menuitem);

diff --git a/extensions/toolbar-editor.c b/extensions/toolbar-editor.c
index 5e6f96ebca2bf75d6304a459dddb1d70cc707033..bf73ebb34afa10bb1ea66017ff86e1dd61c63b23 100644 (file)
--- a/extensions/toolbar-editor.c
+++ b/extensions/toolbar-editor.c
@@ -581,7 +581,7 @@ static void tb_editor_app_add_browser_cb(MidoriApp *app, MidoriBrowser *browser,
        panel = katze_object_get_object(browser, "panel");
        menu = katze_object_get_object(panel, "menu");
        g_object_unref(panel);
-       menuitem = gtk_menu_item_new_with_mnemonic(_("Configure _Toolbar..."));
+       menuitem = gtk_menu_item_new_with_mnemonic(_("Customize _Toolbar..."));
        g_signal_connect(menuitem, "activate",
                G_CALLBACK(tb_editor_menu_configure_toolbar_activate_cb), browser);
        gtk_widget_show(menuitem);

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index f03a525f7f79f5d9a6936ee356c281260449dba6..a622a866049203b5658f032fa4ccbd0e37b4dd78 100644 (file)
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -1173,7 +1173,7 @@ midori_browser_download_notify_status_cb (WebKitDownload* download,
                 gchar* path = soup_uri_decode (uri);
                 gchar* filename = g_strrstr (path, "/") + 1;
                 gchar* msg = g_strdup_printf (
-                    _("The file <b>%s</b> has been downloaded."), filename);
+                    _("The file '<b>%s</b>' has been downloaded."), filename);
                 g_free (path);
 
                 g_signal_emit (browser, signals[SEND_NOTIFICATION], 0,

diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c
index db35ba5022db0c1165af8688ac61219f7d5905a6..d08aba9236294bf1c6698dfa78ff3b1151d8e8a3 100644 (file)
--- a/midori/midori-websettings.c
+++ b/midori/midori-websettings.c
@@ -192,9 +192,9 @@ midori_startup_get_type (void)
     if (!type)
     {
         static const GEnumValue values[] = {
-         { MIDORI_STARTUP_BLANK_PAGE, "MIDORI_STARTUP_BLANK_PAGE", N_("Blank page") },
-         { MIDORI_STARTUP_HOMEPAGE, "MIDORI_STARTUP_HOMEPAGE", N_("Homepage") },
-         { MIDORI_STARTUP_LAST_OPEN_PAGES, "MIDORI_STARTUP_LAST_OPEN_PAGES", N_("Last open pages") },
+         { MIDORI_STARTUP_BLANK_PAGE, "MIDORI_STARTUP_BLANK_PAGE", N_("Show Blank page") },
+         { MIDORI_STARTUP_HOMEPAGE, "MIDORI_STARTUP_HOMEPAGE", N_("Show Homepage") },
+         { MIDORI_STARTUP_LAST_OPEN_PAGES, "MIDORI_STARTUP_LAST_OPEN_PAGES", N_("Show last open tabs") },
          { 0, NULL, NULL }
         };
         type = g_enum_register_static ("MidoriStartup", values);
@@ -249,8 +249,8 @@ midori_toolbar_style_get_type (void)
          { MIDORI_TOOLBAR_DEFAULT, "MIDORI_TOOLBAR_DEFAULT", N_("Default") },
          { MIDORI_TOOLBAR_ICONS, "MIDORI_TOOLBAR_ICONS", N_("Icons") },
          { MIDORI_TOOLBAR_TEXT, "MIDORI_TOOLBAR_TEXT", N_("Text") },
-         { MIDORI_TOOLBAR_BOTH, "MIDORI_TOOLBAR_BOTH", N_("Both") },
-         { MIDORI_TOOLBAR_BOTH_HORIZ, "MIDORI_TOOLBAR_BOTH_HORIZ", N_("Both horizontal") },
+         { MIDORI_TOOLBAR_BOTH, "MIDORI_TOOLBAR_BOTH", N_("Icons and text") },
+         { MIDORI_TOOLBAR_BOTH_HORIZ, "MIDORI_TOOLBAR_BOTH_HORIZ", N_("Text beside icons") },
          { 0, NULL, NULL }
         };
         type = g_enum_register_static ("MidoriToolbarStyle", values);
@@ -473,7 +473,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
                                      PROP_TOOLBAR_STYLE,
                                      g_param_spec_enum (
                                      "toolbar-style",
-                                     _("Toolbar Style"),
+                                     _("Toolbar Style:"),
                                      _("The style of the toolbar"),
                                      MIDORI_TYPE_TOOLBAR_STYLE,
                                      MIDORI_TOOLBAR_DEFAULT,
@@ -550,8 +550,8 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
                                      PROP_LOAD_ON_STARTUP,
                                      g_param_spec_enum (
                                      "load-on-startup",
-                                     _("Load on Startup"),
-                                     _("What to load on startup"),
+                                     _("When Midori starts:"),
+                                     _("What to do when Midori starts"),
                                      MIDORI_TYPE_STARTUP,
                                      MIDORI_STARTUP_LAST_OPEN_PAGES,
                                      flags));
@@ -560,7 +560,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
                                      PROP_HOMEPAGE,
                                      g_param_spec_string (
                                      "homepage",
-                                     _("Homepage"),
+                                     _("Homepage:"),
                                      _("The homepage"),
                                      "http://www.google.com",
                                      flags));
@@ -602,7 +602,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
                                      PROP_DOWNLOAD_FOLDER,
                                      g_param_spec_string (
                                      "download-folder",
-                                     _("Download Folder"),
+                                     _("Save downloaded files to:"),
                                      _("The folder downloaded files are saved to"),
                                      midori_get_download_dir (),
     #if WEBKIT_CHECK_VERSION (1, 1, 3)
@@ -727,7 +727,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
                                      PROP_OPEN_NEW_PAGES_IN,
                                      g_param_spec_enum (
                                      "open-new-pages-in",
-                                     _("Open new pages in"),
+                                     _("Open new pages in:"),
                                      _("Where to open new pages"),
                                      MIDORI_TYPE_NEW_PAGE,
                                      MIDORI_NEW_PAGE_TAB,
@@ -737,7 +737,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
                                      PROP_OPEN_EXTERNAL_PAGES_IN,
                                      g_param_spec_enum (
                                      "open-external-pages-in",
-                                     _("Open external pages in"),
+                                     _("Open external pages in:"),
                                      _("Where to open externally opened pages"),
                                      MIDORI_TYPE_NEW_PAGE,
                                      MIDORI_NEW_PAGE_TAB,