From 7d5fd0d319f497ccb29bec1cf657dabf3345586c Mon Sep 17 00:00:00 2001
From: Christian Dywan <christian@twotoasts.de>
Date: Mon, 17 Sep 2012 01:00:49 +0200
Subject: [PATCH] Fix tooltip on preferred language entry

---
 midori/midori-preferences.c | 7 +++++--
 midori/midori-websettings.c | 6 +++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c
index 8b1acacc..cbdf69bb 100644
--- a/midori/midori-preferences.c
+++ b/midori/midori-preferences.c
@@ -353,7 +353,8 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
     button = katze_property_proxy (settings, "enforce-font-family", NULL);
     INDENTED_ADD (button);
     #endif
-    label = katze_property_label (settings, "preferred-encoding");
+    label = gtk_label_new (_("Preferred Encoding"));
+    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
     INDENTED_ADD (label);
     button = katze_property_proxy (settings, "preferred-encoding", "custom-default-encoding");
     SPANNED_ADD (button);
@@ -421,9 +422,11 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
     #endif
 
     FRAME_NEW (NULL);
-    button = katze_property_label (settings, "preferred-languages");
+    button = gtk_label_new (_("Preferred languages"));
+    gtk_misc_set_alignment (GTK_MISC (button), 0.0, 0.5);
     INDENTED_ADD (button);
     entry = katze_property_proxy (settings, "preferred-languages", "languages");
+    gtk_widget_set_tooltip_text (entry, _("A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""));
     SPANNED_ADD (entry);
     label = gtk_label_new (_("Save downloaded files to:"));
     gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c
index 331de5b0..e0549b61 100644
--- a/midori/midori-websettings.c
+++ b/midori/midori-websettings.c
@@ -295,7 +295,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
                                      PROP_PREFERRED_ENCODING,
                                      g_param_spec_enum (
                                      "preferred-encoding",
-                                     _("Preferred Encoding"),
+                                     "Preferred Encoding",
                                      "The preferred character encoding",
                                      MIDORI_TYPE_PREFERRED_ENCODING,
                                      MIDORI_ENCODING_WESTERN,
@@ -419,8 +419,8 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
                                      PROP_PREFERRED_LANGUAGES,
                                      g_param_spec_string (
                                      "preferred-languages",
-                                     _("Preferred languages"),
-        _("A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""),
+                                     "Preferred languages",
+                                     "A comma separated list of languages",
                                      NULL,
                                      flags));