From da4bacb5a3de0dafe863ea82aea78d2e40731730 Mon Sep 17 00:00:00 2001
From: Christian Neumair <cneumair@src.gnome.org>
Date: Sat, 17 May 2003 12:43:34 +0000
Subject: Fixed many issues mentioned in #112781.

---
 ChangeLog                                | 66 ++++++++++++++++++++++++++++++++
 data/starthere/index.xml.in              |  5 ++-
 data/starthere/section.xsl               |  6 ++-
 data/starthere/smartbookmarks.xml.in     | 11 +++---
 data/ui/epiphany-ui.xml.in               |  4 +-
 embed/downloader-view.c                  | 10 +++--
 embed/ephy-embed-event.c                 |  1 -
 embed/ephy-embed-persist.c               |  2 -
 embed/ephy-embed-utils.c                 |  4 ++
 embed/ephy-history.c                     |  6 ++-
 embed/mozilla/mozilla-i18n.c             |  2 +-
 embed/mozilla/mozilla-notifiers.cpp      |  4 +-
 lib/eel-gconf-extensions.c               |  2 +-
 lib/ephy-file-helpers.c                  |  2 +-
 lib/ephy-gui.c                           |  6 ++-
 lib/ephy-node.c                          |  2 +-
 lib/ephy-start-here.c                    |  6 ++-
 lib/ephy-string.c                        |  8 +++-
 lib/widgets/ephy-autocompletion-window.c |  1 -
 lib/widgets/ephy-node-view.c             |  1 -
 lib/widgets/ephy-tree-model-node.c       |  1 -
 src/bookmarks/ephy-bookmark-action.c     |  6 ++-
 src/bookmarks/ephy-bookmark-properties.c |  6 ++-
 src/bookmarks/ephy-bookmarks-editor.c    |  6 ++-
 src/bookmarks/ephy-bookmarks.c           |  6 ++-
 src/bookmarks/ephy-new-bookmark.c        |  6 ++-
 src/bookmarks/ephy-topic-action.c        |  4 ++
 src/ephy-encoding-menu.c                 |  2 +-
 src/ephy-favorites-menu.c                |  3 +-
 src/ephy-go-action.c                     |  8 +++-
 src/ephy-history-window.c                |  6 ++-
 src/ephy-notebook.c                      |  6 ++-
 src/ephy-window.c                        |  2 +-
 src/pdm-dialog.c                         | 13 +++++--
 src/ppview-toolbar.c                     |  3 ++
 src/prefs-dialog.c                       | 10 ++---
 src/session.c                            |  6 ++-
 src/toolbar.c                            |  4 ++
 38 files changed, 195 insertions(+), 52 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 058ac5b55..ae81a637a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,69 @@
+2003-05-17  Christian Neumair  <chris@gnome-de.org>
+
+	(#112781)
+
+	* data/starthere/index.xml.in
+	* data/starthere/section.xsl
+	* data/starthere/smartbookmarks.xml.in:
+	
+	i18nized page title and links, fixed semantic inconsistency.
+
+	* data/ui/epiphany-ui.xml.in
+	* src/ephy-favorites-menu.c:
+
+	Only construct Go menu's third separator if there are menu items added
+	after it.
+
+	* embed/downloader-view.c:
+
+	Re-added mnemonics to pause/resume button.
+
+	* embed/mozilla/mozilla-i18n.c
+	* embed/mozilla/mozilla-notifiers.cpp
+	* embed/downloader-view.c
+	* embed/ephy-embed-event.c
+	* embed/ephy-embed-persist.c
+	* embed/ephy-embed-utils.c
+	* embed/ephy-history.c
+	* lib/widgets/ephy-autocompletion-window.c
+	* lib/widgets/ephy-node-view.c
+	* lib/widgets/ephy-tree-model-node.c
+	* lib/eel-gconf-extensions.c
+	* lib/ephy-file-helpers.c
+	* lib/ephy-gui.c
+	* lib/ephy-node.c
+	* lib/ephy-start-here.c
+	* lib/ephy-string.c
+	* src/bookmarks/ephy-bookmark-action.c
+	* src/bookmarks/ephy-bookmark-properties.c
+	* src/bookmarks/ephy-bookmarks-editor.c
+	* src/bookmarks/ephy-bookmarks.c
+	* src/bookmarks/ephy-new-bookmark.c
+	* src/bookmarks/ephy-topic-action.c
+	* src/ephy-encoding-menu.c
+	* src/ephy-history-window.c
+	* src/ephy-notebook.c
+	* src/ephy-window.c
+	* src/ppview-toolbar.c
+	* src/session.c
+	* src/toolbar.c:
+	
+	Various i18n include fixes, inter alia included config.h where
+	required.
+
+	* src/ephy-go-action.c:
+	
+	Ditto, plus fixed gettext call.
+
+	* src/pdm-dialog.c:
+
+	Ditto, plus some slight string fixes.
+
+	* src/prefs-dialog.c:
+	
+	Ditto, plus added some gettext calls to localize language and encoding
+	selection.
+
 2003-05-17 David Bordoley <bordoley@msu.edu>
 	   Marco Pesenti Gritti  <marco@it.gnome.org>
 
diff --git a/data/starthere/index.xml.in b/data/starthere/index.xml.in
index 9e25d2c61..f35909862 100644
--- a/data/starthere/index.xml.in
+++ b/data/starthere/index.xml.in
@@ -1,9 +1,10 @@
 <?xml version="1.0"?>
 <?xml-stylesheet type="text/xsl" href="section.xsl"?>
 <section name="Home">
+<_pagetitle>Home</_pagetitle>
 <bar>
-<item section="home:">Home</item>
-<item section="home:smartbookmarks">Smart Bookmarks</item>
+<item section="home:"><_translate>Home</_translate></item>
+<item section="home:smartbookmarks"><_translate>Smart Bookmarks</_translate></item>
 </bar>
 <_title>The web browser</_title>
 <_paragraph>
diff --git a/data/starthere/section.xsl b/data/starthere/section.xsl
index 21075a990..a734ce708 100644
--- a/data/starthere/section.xsl
+++ b/data/starthere/section.xsl
@@ -10,7 +10,7 @@
 <xsl:template match="section">
 <html>
   <head>
-  <title><xsl:value-of select="@name"/></title>
+  <xsl:apply-templates/>
   <style type="text/css">
     body {
 	    margin-left: 150;
@@ -57,6 +57,10 @@
 </html>
 </xsl:template>
 
+<xsl:template match="pagetitle">
+  <title><xsl:apply-templates/></title>
+</xsl:template>
+
 <xsl:template match="content">
 <div class="body">
   <xsl:apply-templates/>
diff --git a/data/starthere/smartbookmarks.xml.in b/data/starthere/smartbookmarks.xml.in
index 81d7910d0..34ba168c1 100644
--- a/data/starthere/smartbookmarks.xml.in
+++ b/data/starthere/smartbookmarks.xml.in
@@ -1,9 +1,10 @@
 <?xml version="1.0"?>
 <?xml-stylesheet type="text/xsl" href="section.xsl"?>
 <section name="Smart Bookmarks">
+<_pagetitle>Smart Bookmarks</_pagetitle>
 <bar>
-<item section="home:">Home</item>
-<item section="home:smartbookmarks">Smart Bookmarks</item>
+<item section="home:"><_translate>Home</_translate></item>
+<item section="home:smartbookmarks"><_translate>Smart Bookmarks</_translate></item>
 </bar>
 <content>
 <_title>Smart Bookmarks</_title>
@@ -13,18 +14,18 @@ the address entry.
 </_paragraph>
 <_paragraph>
 Right click the links and choose "Bookmark Link..." from the menu list.
-When you will type a word in the toolbar entry, a list of your smart
+When you will type a word in the address entry, a list of your smart
 bookmarks will be displayed. Just choose one of them to perform the search.
 The next time you type a word, just pressing the Enter key will be enough to
 perform the same action.
 </_paragraph>
 <smartbookmark normal="http://www.google.com/"
 smart="http://www.google.com/search?q=%s&amp;ie=UTF-8&amp;oe=UTF-8" title="Search the web - Google">
-Search the web - Google
+<_translate>Search the web - Google</_translate>
 </smartbookmark>
 <smartbookmark normal="http://images.google.com/"
 smart="http://images.google.com/images?q=%s&amp;ie=UTF-8&amp;oe=UTF-8" title="Search images - Google">
-Search images - Google
+<_translate>Search images - Google</_translate>
 </smartbookmark>
 </content>
 </section>
diff --git a/data/ui/epiphany-ui.xml.in b/data/ui/epiphany-ui.xml.in
index 3a2f92e62..e9d02582c 100644
--- a/data/ui/epiphany-ui.xml.in
+++ b/data/ui/epiphany-ui.xml.in
@@ -58,9 +58,7 @@
 	<menuitem name="GoBookmarksMenu" verb="GoBookmarks"/>
 	<separator name="GoSep2"/>
 	<menuitem name="GoLocationMenu" verb="GoLocation"/>
-	<placeholder name="GoFavorites">
-	<separator name="GoSep3"/>
-	</placeholder>
+	<placeholder name="GoFavorites"/>
 </submenu>
 
 <submenu name="TabsMenu" verb="Tabs">
diff --git a/embed/downloader-view.c b/embed/downloader-view.c
index 500d86d76..7d8d411b0 100644
--- a/embed/downloader-view.c
+++ b/embed/downloader-view.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 "downloader-view.h"
 #include "ephy-gui.h"
 #include "ephy-prefs.h"
@@ -27,7 +31,7 @@
 #include <gtk/gtktreeview.h>
 #include <gtk/gtkliststore.h>
 #include <gtk/gtktreeviewcolumn.h>
-#include <libgnome/gnome-i18n.h>
+#include <bonobo/bonobo-i18n.h>
 #include <libgnomeui/gnome-dialog-util.h>
 #include <libgnomeui/gnome-dialog.h>
 #include <gtk/gtkprogressbar.h>
@@ -356,11 +360,11 @@ downloader_view_update_controls (DownloaderViewPrivate *priv)
 
 	if (info->is_paused)
 	{
-		gtk_button_set_label (GTK_BUTTON (priv->pause_button), _("Resume"));
+		gtk_button_set_label (GTK_BUTTON (priv->pause_button), _("_Resume"));
 	}
 	else
 	{
-		gtk_button_set_label (GTK_BUTTON (priv->pause_button), _("Pause"));
+		gtk_button_set_label (GTK_BUTTON (priv->pause_button), _("_Pause"));
 	}
 	
 	g_free (info);
diff --git a/embed/ephy-embed-event.c b/embed/ephy-embed-event.c
index 440eabadc..4b3c61e4c 100644
--- a/embed/ephy-embed-event.c
+++ b/embed/ephy-embed-event.c
@@ -18,7 +18,6 @@
 
 #include "ephy-embed-event.h"
 
-#include <bonobo/bonobo-i18n.h>
 #include <glib/ghash.h>
 #include <gtk/gtktypeutils.h>
 
diff --git a/embed/ephy-embed-persist.c b/embed/ephy-embed-persist.c
index 08dfd025b..cd6e3e20e 100644
--- a/embed/ephy-embed-persist.c
+++ b/embed/ephy-embed-persist.c
@@ -23,8 +23,6 @@
 #include "mozilla-embed.h"
 #include "mozilla-embed-persist.h"
 
-#include <bonobo/bonobo-i18n.h>
-
 enum
 {
         COMPLETED,
diff --git a/embed/ephy-embed-utils.c b/embed/ephy-embed-utils.c
index 941069b51..76ddd699e 100644
--- a/embed/ephy-embed-utils.c
+++ b/embed/ephy-embed-utils.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 "eel-gconf-extensions.h"
 #include "ephy-embed-utils.h"
 #include "ephy-embed-shell.h"
diff --git a/embed/ephy-history.c b/embed/ephy-history.c
index 42bf00d25..f59e9169b 100644
--- a/embed/ephy-history.c
+++ b/embed/ephy-history.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-types.h"
 #include "ephy-history.h"
 #include "ephy-file-helpers.h"
@@ -25,7 +29,7 @@
 
 #include <time.h>
 #include <string.h>
-#include <libgnome/gnome-i18n.h>
+#include <bonobo/bonobo-i18n.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
 
 #define EPHY_HISTORY_XML_VERSION "0.1"
diff --git a/embed/mozilla/mozilla-i18n.c b/embed/mozilla/mozilla-i18n.c
index c974d9765..ce0a5b4ef 100644
--- a/embed/mozilla/mozilla-i18n.c
+++ b/embed/mozilla/mozilla-i18n.c
@@ -18,7 +18,7 @@
 
 #include "mozilla-i18n.h"
 
-#include <libgnome/gnome-i18n.h>
+#include <bonobo/bonobo-i18n.h>
 
 const char *lgroups[] = {
         N_("Arabic"),
diff --git a/embed/mozilla/mozilla-notifiers.cpp b/embed/mozilla/mozilla-notifiers.cpp
index fd480ebc0..d9cc51689 100644
--- a/embed/mozilla/mozilla-notifiers.cpp
+++ b/embed/mozilla/mozilla-notifiers.cpp
@@ -16,7 +16,9 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "ephy-embed-shell.h"
 #include "ephy-embed-single.h"
diff --git a/lib/eel-gconf-extensions.c b/lib/eel-gconf-extensions.c
index 2d29bdf36..564085704 100644
--- a/lib/eel-gconf-extensions.c
+++ b/lib/eel-gconf-extensions.c
@@ -29,7 +29,7 @@
 #include <gconf/gconf-client.h>
 #include <gconf/gconf.h>
 #include <gtk/gtkwidget.h>
-#include <libgnome/gnome-i18n.h>
+#include <bonobo/bonobo-i18n.h>
 #include <gtk/gtkmessagedialog.h>
 
 static GConfClient *global_gconf_client = NULL;
diff --git a/lib/ephy-file-helpers.c b/lib/ephy-file-helpers.c
index 1b66004f0..6ca68be28 100644
--- a/lib/ephy-file-helpers.c
+++ b/lib/ephy-file-helpers.c
@@ -27,7 +27,7 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <glib.h>
-#include <libgnome/gnome-i18n.h>
+#include <bonobo/bonobo-i18n.h>
 #include <libgnome/gnome-init.h>
 #include <libgnome/gnome-exec.h>
 
diff --git a/lib/ephy-gui.c b/lib/ephy-gui.c
index 431b1cea2..d41d2a554 100644
--- a/lib/ephy-gui.c
+++ b/lib/ephy-gui.c
@@ -16,12 +16,16 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "ephy-gui.h"
 #include "eel-gconf-extensions.h"
 
 #include <ctype.h>
 #include <string.h>
-#include <libgnome/gnome-i18n.h>
+#include <bonobo/bonobo-i18n.h>
 #include <libgnome/gnome-help.h>
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtkmessagedialog.h>
diff --git a/lib/ephy-node.c b/lib/ephy-node.c
index befbbf66e..9af43551c 100644
--- a/lib/ephy-node.c
+++ b/lib/ephy-node.c
@@ -19,7 +19,7 @@
  */
 
 #include <config.h>
-#include <libgnome/gnome-i18n.h>
+#include <bonobo/bonobo-i18n.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
diff --git a/lib/ephy-start-here.c b/lib/ephy-start-here.c
index 834d890da..d35701030 100644
--- a/lib/ephy-start-here.c
+++ b/lib/ephy-start-here.c
@@ -16,9 +16,13 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <gtk/gtk.h>
 #include <libxml/tree.h>
-#include <libgnome/gnome-i18n.h>
+#include <bonobo/bonobo-i18n.h>
 #include <string.h>
 
 #include "ephy-start-here.h"
diff --git a/lib/ephy-string.c b/lib/ephy-string.c
index cf0272f61..46a6b6d9f 100644
--- a/lib/ephy-string.c
+++ b/lib/ephy-string.c
@@ -16,12 +16,16 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "ephy-string.h"
 
+#include <errno.h>
 #include <string.h>
 #include <glib.h>
-#include <libgnome/libgnome.h>
-#include <libgnome/gnome-i18n.h>
+#include <bonobo/bonobo-i18n.h>
 #include <libgnomevfs/gnome-vfs-mime.h>
 #include <libxml/parser.h>
 
diff --git a/lib/widgets/ephy-autocompletion-window.c b/lib/widgets/ephy-autocompletion-window.c
index d3c73b493..1af4a7481 100644
--- a/lib/widgets/ephy-autocompletion-window.c
+++ b/lib/widgets/ephy-autocompletion-window.c
@@ -16,7 +16,6 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <libgnome/gnome-i18n.h>
 #include <gtk/gtkcellrenderertext.h>
 #include <gtk/gtktreeview.h>
 #include <gtk/gtkscrolledwindow.h>
diff --git a/lib/widgets/ephy-node-view.c b/lib/widgets/ephy-node-view.c
index 5b94a5069..b1c4e003b 100644
--- a/lib/widgets/ephy-node-view.c
+++ b/lib/widgets/ephy-node-view.c
@@ -23,7 +23,6 @@
 #include <gtk/gtkcellrendererpixbuf.h>
 #include <gtk/gtkwindow.h>
 #include <gdk/gdkkeysyms.h>
-#include <libgnome/gnome-i18n.h>
 
 #include "eggtreemodelfilter.h"
 #include "ephy-node-view.h"
diff --git a/lib/widgets/ephy-tree-model-node.c b/lib/widgets/ephy-tree-model-node.c
index 6ea3544e9..ebeb17fd3 100644
--- a/lib/widgets/ephy-tree-model-node.c
+++ b/lib/widgets/ephy-tree-model-node.c
@@ -21,7 +21,6 @@
 #include <config.h>
 #include <gtk/gtktreeview.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <libgnome/gnome-i18n.h>
 #include <time.h>
 #include <string.h>
 
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"
-- 
cgit v1.2.3