Fixed many issues mentioned in #112781.

17 files changed, 75 insertions, 22 deletions

diff --git a/src/bookmarks/ephy-bookmark-action.c b/src/bookmarks/ephy-bookmark-action.c
index cd08ba66c..cbb49007f 100644
--- a/src/bookmarks/ephy-bookmark-action.c
+++ b/src/bookmarks/ephy-bookmark-action.c
@@ -16,7 +16,11 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <libgnome/gnome-i18n.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <bonobo/bonobo-i18n.h>
 
 #include "ephy-bookmark-action.h"
 #include "ephy-bookmarks.h"
diff --git a/src/bookmarks/ephy-bookmark-properties.c b/src/bookmarks/ephy-bookmark-properties.c
index 5445a7bfe..f2b20f931 100644
--- a/src/bookmarks/ephy-bookmark-properties.c
+++ b/src/bookmarks/ephy-bookmark-properties.c
@@ -17,6 +17,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "ephy-bookmark-properties.h"
 #include "ephy-topics-selector.h"
 #include "ephy-debug.h"
@@ -33,7 +37,7 @@
 #include <gtk/gtklabel.h>
 #include <gtk/gtkmisc.h>
 #include <gtk/gtkscrolledwindow.h>
-#include <libgnome/gnome-i18n.h>
+#include <bonobo/bonobo-i18n.h>
 
 static void ephy_bookmark_properties_class_init (EphyBookmarkPropertiesClass *klass);
 static void ephy_bookmark_properties_init (EphyBookmarkProperties *editor);
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index 4745a18d8..ce4898f78 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -17,6 +17,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <gtk/gtktable.h>
 #include <gtk/gtklabel.h>
 #include <gtk/gtkstock.h>
@@ -25,7 +29,7 @@
 #include <gtk/gtkhbox.h>
 #include <gtk/gtkvbox.h>
 #include <gdk/gdkkeysyms.h>
-#include <libgnome/gnome-i18n.h>
+#include <bonobo/bonobo-i18n.h>
 #include <libgnome/gnome-program.h>
 #include <libgnomeui/gnome-stock-icons.h>
 #include <string.h>
diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c
index 5bd807610..791440049 100644
--- a/src/bookmarks/ephy-bookmarks.c
+++ b/src/bookmarks/ephy-bookmarks.c
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "ephy-bookmarks.h"
 #include "ephy-file-helpers.h"
 #include "ephy-shell.h"
@@ -29,7 +33,7 @@
 #include "ephy-bookmarks-export.h"
 
 #include <string.h>
-#include <libgnome/gnome-i18n.h>
+#include <bonobo/bonobo-i18n.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 
 #define EPHY_BOOKMARKS_XML_VERSION "0.1"
diff --git a/src/bookmarks/ephy-new-bookmark.c b/src/bookmarks/ephy-new-bookmark.c
index b6fd1dcdf..0ddcef6c0 100644
--- a/src/bookmarks/ephy-new-bookmark.c
+++ b/src/bookmarks/ephy-new-bookmark.c
@@ -17,6 +17,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <gtk/gtktable.h>
 #include <gtk/gtklabel.h>
 #include <gtk/gtkentry.h>
@@ -25,7 +29,7 @@
 #include <gtk/gtkstock.h>
 #include <gtk/gtkscrolledwindow.h>
 #include <gtk/gtkeditable.h>
-#include <libgnome/gnome-i18n.h>
+#include <bonobo/bonobo-i18n.h>
 
 #include "ephy-new-bookmark.h"
 #include "ephy-state.h"
diff --git a/src/bookmarks/ephy-topic-action.c b/src/bookmarks/ephy-topic-action.c
index ee06a1f6b..448e7ffb6 100644
--- a/src/bookmarks/ephy-topic-action.c
+++ b/src/bookmarks/ephy-topic-action.c
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "ephy-node-common.h"
 #include "ephy-topic-action.h"
 #include "ephy-bookmarks.h"
diff --git a/src/ephy-encoding-menu.c b/src/ephy-encoding-menu.c
index b97011bac..dac05a0af 100644
--- a/src/ephy-encoding-menu.c
+++ b/src/ephy-encoding-menu.c
@@ -27,7 +27,7 @@
 #include "ephy-shell.h"
 #include "ephy-debug.h"
 
-#include <libgnome/gnome-i18n.h>
+#include <bonobo/bonobo-i18n.h>
 
 /**
  * Private data
diff --git a/src/ephy-favorites-menu.c b/src/ephy-favorites-menu.c
index ae4cff59f..ef31b3c52 100644
--- a/src/ephy-favorites-menu.c
+++ b/src/ephy-favorites-menu.c
@@ -220,7 +220,8 @@ ephy_favorites_menu_rebuild (EphyFavoritesMenu *wrhm)
 
 	xml = g_string_new (NULL);
 	g_string_append (xml, "<Root><menu><submenu name=\"GoMenu\">"
-			      "<placeholder name=\"GoFavorites\">");
+			      "<placeholder name=\"GoFavorites\">"
+			      "<separator name=\"GoSep3\"/>");
 
 	p->action_group = egg_action_group_new ("FavoritesActions");
 	egg_menu_merge_insert_action_group (merge, p->action_group, 0);
diff --git a/src/ephy-go-action.c b/src/ephy-go-action.c
index 0a5f1f77d..ab291cfa4 100644
--- a/src/ephy-go-action.c
+++ b/src/ephy-go-action.c
@@ -17,10 +17,14 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "ephy-go-action.h"
 
 #include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
+#include <bonobo/bonobo-i18n.h>
 #include "eggtoolitem.h"
 #include "ephy-debug.h"
 
@@ -71,7 +75,7 @@ create_tool_item (EggAction *action)
 
 	item = GTK_WIDGET (egg_tool_item_new ());
 
-	button = gtk_button_new_with_label (N_("Go"));
+	button = gtk_button_new_with_label (_("Go"));
 	gtk_button_set_relief(GTK_BUTTON (button), GTK_RELIEF_NONE);
 	
 	g_signal_connect (G_OBJECT (button), "clicked",
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index 8183cda73..5921cde12 100644
--- a/src/ephy-history-window.c
+++ b/src/ephy-history-window.c
@@ -17,6 +17,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <gtk/gtktable.h>
 #include <gtk/gtklabel.h>
 #include <gtk/gtkstock.h>
@@ -24,7 +28,7 @@
 #include <gtk/gtkhbox.h>
 #include <gtk/gtkvbox.h>
 #include <gdk/gdkkeysyms.h>
-#include <libgnome/gnome-i18n.h>
+#include <bonobo/bonobo-i18n.h>
 #include <libgnomeui/gnome-stock-icons.h>
 #include <string.h>
 
diff --git a/src/ephy-notebook.c b/src/ephy-notebook.c
index b772af8f1..4d0989a61 100644
--- a/src/ephy-notebook.c
+++ b/src/ephy-notebook.c
@@ -16,6 +16,10 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "ephy-notebook.h"
 #include "eel-gconf-extensions.h"
 #include "ephy-prefs.h"
@@ -28,7 +32,7 @@
 
 #include <gtk/gtk.h>
 #include <glib-object.h>
-#include <libgnome/gnome-i18n.h>
+#include <bonobo/bonobo-i18n.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
 
 #define AFTER_ALL_TABS -1
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 6d98032e6..b0d16d614 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -40,7 +40,7 @@
 #include "ephy-stock-icons.h"
 
 #include <string.h>
-#include <libgnome/gnome-i18n.h>
+#include <bonobo/bonobo-i18n.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
 #include <libgnomeui/gnome-stock-icons.h>
 #include <gtk/gtk.h>
diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c
index a108cae88..41bb553e4 100755
--- a/src/pdm-dialog.c
+++ b/src/pdm-dialog.c
@@ -16,6 +16,10 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "pdm-dialog.h"
 #include "ephy-shell.h"
 #include "ephy-embed-shell.h"
@@ -25,6 +29,7 @@
 #include <gtk/gtktreeview.h>
 #include <gtk/gtkliststore.h>
 #include <gtk/gtkcellrenderertext.h>
+
 #include <bonobo/bonobo-i18n.h>
 
 typedef struct PdmActionInfo PdmActionInfo;
@@ -609,7 +614,7 @@ show_cookies_properties (PdmDialog *dialog,
 	gtk_table_set_col_spacings (GTK_TABLE(table), 10);
 	gtk_widget_show (table);
 
-	str = g_strconcat ("<b>", _("Value"), "</b>", NULL);
+	str = g_strconcat ("<b>", _("Value:"), "</b>", NULL);
 	label = gtk_label_new (str);
 	g_free (str);
 	gtk_label_set_use_markup (GTK_LABEL(label), TRUE);
@@ -623,7 +628,7 @@ show_cookies_properties (PdmDialog *dialog,
 	gtk_widget_show (label);
 	gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 0, 1);
 
-	str = g_strconcat ("<b>", _("Path"), "</b>", NULL);
+	str = g_strconcat ("<b>", _("Path:"), "</b>", NULL);
 	label = gtk_label_new (str);
 	g_free (str);
 	gtk_label_set_use_markup (GTK_LABEL(label), TRUE);
@@ -637,7 +642,7 @@ show_cookies_properties (PdmDialog *dialog,
 	gtk_widget_show (label);
 	gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 1, 2);
 
-	str = g_strconcat ("<b>", _("Secure"), "</b>", NULL);
+	str = g_strconcat ("<b>", _("Secure:"), "</b>", NULL);
 	label = gtk_label_new (str);
 	g_free (str);
 	gtk_label_set_use_markup (GTK_LABEL(label), TRUE);
@@ -651,7 +656,7 @@ show_cookies_properties (PdmDialog *dialog,
 	gtk_widget_show (label);
 	gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 2, 3);
 
-	str = g_strconcat ("<b>", _("Expire"), "</b>", NULL);
+	str = g_strconcat ("<b>", _("Expire:"), "</b>", NULL);
 	label = gtk_label_new (str);
 	g_free (str);
 	gtk_label_set_use_markup (GTK_LABEL(label), TRUE);
diff --git a/src/ppview-toolbar.c b/src/ppview-toolbar.c
index a97765930..a6e8b9a1f 100755
--- a/src/ppview-toolbar.c
+++ b/src/ppview-toolbar.c
@@ -16,6 +16,9 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "ppview-toolbar.h"
 #include "ephy-window.h"
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index e5dc28c19..8171093dd 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -29,7 +29,7 @@
 #include "eel-gconf-extensions.h"
 #include "language-editor.h"
 
-#include <libgnome/gnome-i18n.h>
+#include <bonobo/bonobo-i18n.h>
 #include <gtk/gtkframe.h>
 #include <gtk/gtkhbox.h>
 #include <gtk/gtkvbox.h>
@@ -650,7 +650,7 @@ create_default_charset_menu (PrefsDialog *dialog)
 		CharsetInfo *info = (CharsetInfo *) charsets->data;
 		GtkWidget *item;
 
-		item = gtk_menu_item_new_with_label (info->title);
+		item = gtk_menu_item_new_with_label (_(info->title));
 		gtk_menu_shell_append (GTK_MENU_SHELL(menu),
 				       item);
 		gtk_widget_show (item);
@@ -687,12 +687,12 @@ general_prefs_new_language_menu (PrefsDialog *dialog)
 	{
 		GtkWidget *item;
 
-		item = gtk_menu_item_new_with_label (languages[i].name);
+		item = gtk_menu_item_new_with_label (_(languages[i].name));
 		gtk_menu_shell_append (GTK_MENU_SHELL(menu),
 				       item);
 		gtk_widget_show (item);
 		g_object_set_data (G_OBJECT(item), "desc",
-				   languages[i].name);
+				   _(languages[i].name));
 	}
 
 	return menu;
@@ -901,7 +901,7 @@ fill_language_editor (LanguageEditor *le)
 		}
 
 		/* FIXME unsafe, bad prefs could cause it to access random memory */
-		language_editor_add (le, languages[i].name, i);
+		language_editor_add (le, _(languages[i].name), i);
 	}
 }
 
diff --git a/src/session.c b/src/session.c
index 344b2faf1..9b9bdcad7 100644
--- a/src/session.c
+++ b/src/session.c
@@ -16,6 +16,10 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "session.h"
 #include "ephy-shell.h"
 #include "ephy-tab.h"
@@ -25,7 +29,7 @@
 #include "ephy-file-helpers.h"
 #include "eel-gconf-extensions.h"
 
-#include <libgnome/gnome-i18n.h>
+#include <bonobo/bonobo-i18n.h>
 #include <string.h>
 #include <gtk/gtkdialog.h>
 #include <gtk/gtkimage.h>
diff --git a/src/toolbar.c b/src/toolbar.c
index 89c4e165d..728f81daf 100755
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -17,6 +17,10 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "toolbar.h"
 #include "egg-menu-merge.h"
 #include "ephy-file-helpers.h"