diff --git a/po/de.po b/po/de.po
index 53435f4..97f0f80 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Surfer 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-02 01:09+0200\n"
+"POT-Creation-Date: 2010-04-05 03:40+0200\n"
 "PO-Revision-Date: 2010-04-01 19:40+0200\n"
 "Last-Translator: Pierre Pronchery <EMAIL@ADDRESS>\n"
 "Language-Team: German\n"
@@ -84,58 +84,154 @@ msgstr ""
 msgid "Usage: surfer [URL]\n"
 msgstr "Usage: surfer [URL]\n"
 
-#: ../src/surfer.c:231
+#: ../src/surfer.c:49
+msgid "_New window"
+msgstr ""
+
+#: ../src/surfer.c:51
+msgid "_Open..."
+msgstr ""
+
+#: ../src/surfer.c:53
+msgid "_Open URL..."
+msgstr ""
+
+#: ../src/surfer.c:55
+msgid "Save _as..."
+msgstr ""
+
+#: ../src/surfer.c:58
+msgid "_Print..."
+msgstr ""
+
+#: ../src/surfer.c:60
+msgid "_Close"
+msgstr ""
+
+#: ../src/surfer.c:67
+msgid "_Cut"
+msgstr ""
+
+#: ../src/surfer.c:68
+msgid "Cop_y"
+msgstr ""
+
+#: ../src/surfer.c:69
+msgid "_Paste"
+msgstr ""
+
+#: ../src/surfer.c:71
+msgid "Select _all"
+msgstr ""
+
+#: ../src/surfer.c:78
+msgid "Unselect all"
+msgstr ""
+
+#: ../src/surfer.c:80
+msgid "_Find"
+msgstr ""
+
+#: ../src/surfer.c:83
+msgid "_Preferences"
+msgstr ""
+
+#: ../src/surfer.c:90
+msgid "Zoom in"
+msgstr ""
+
+#: ../src/surfer.c:92
+msgid "Zoom out"
+msgstr ""
+
+#: ../src/surfer.c:94
+msgid "Normal size"
+msgstr ""
+
+#: ../src/surfer.c:97
+msgid "_Refresh"
+msgstr ""
+
+#: ../src/surfer.c:99
+msgid "_Force refresh"
+msgstr ""
+
+#: ../src/surfer.c:100
+msgid "_Stop"
+msgstr ""
+
+#: ../src/surfer.c:102
+msgid "Page so_urce"
+msgstr ""
+
+#: ../src/surfer.c:120
+msgid "_File"
+msgstr ""
+
+#: ../src/surfer.c:121
+msgid "_Edit"
+msgstr ""
+
+#: ../src/surfer.c:122
+msgid "_View"
+msgstr ""
+
+#: ../src/surfer.c:123
+msgid "_Help"
+msgstr ""
+
+#: ../src/surfer.c:232
 msgid " Location: "
 msgstr ""
 
-#: ../src/surfer.c:253
+#: ../src/surfer.c:254
 msgid "Could not initialize HTML renderer"
 msgstr ""
 
-#: ../src/surfer.c:454 ../src/surfer.c:457
+#: ../src/surfer.c:455 ../src/surfer.c:458
 msgid "Question"
 msgstr ""
 
-#: ../src/surfer.c:474 ../src/surfer.c:708
+#: ../src/surfer.c:475 ../src/surfer.c:709
 msgid "Save file as..."
 msgstr ""
 
-#: ../src/surfer.c:505 ../src/surfer.c:508
+#: ../src/surfer.c:506 ../src/surfer.c:509
 msgid "Error"
 msgstr "Fehler"
 
-#: ../src/surfer.c:507
+#: ../src/surfer.c:508
 msgid "Unknown error"
 msgstr ""
 
-#: ../src/surfer.c:528
+#: ../src/surfer.c:529
 msgid "Find text"
 msgstr "Suchen"
 
-#: ../src/surfer.c:535
+#: ../src/surfer.c:536
 msgid "Text:"
 msgstr ""
 
-#: ../src/surfer.c:544
+#: ../src/surfer.c:545
 msgid "Case-sensitive"
 msgstr ""
 
-#: ../src/surfer.c:547
+#: ../src/surfer.c:548
 msgid "Wrap"
 msgstr ""
 
-#: ../src/surfer.c:575
+#: ../src/surfer.c:576
 msgid "Text not found"
 msgstr ""
 
-#: ../src/surfer.c:649
+#: ../src/surfer.c:650
 msgid "Open file..."
 msgstr ""
 
-#: ../src/surfer.c:832
+#: ../src/surfer.c:833
 msgid "Web surfer - Source of "
 msgstr ""
 
-#: ../src/surfer.c:874 ../src/surfer.c:877
+#: ../src/surfer.c:875 ../src/surfer.c:878
 msgid "Warning"
 msgstr "Achtung"
diff --git a/po/es.po b/po/es.po
index 57bc8e2..d3bb9d5 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Surfer 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-02 01:09+0200\n"
+"POT-Creation-Date: 2010-04-05 03:40+0200\n"
 "PO-Revision-Date: 2010-04-01 19:40+0200\n"
 "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
 "Language-Team: Spanish\n"
@@ -84,58 +84,154 @@ msgstr ""
 msgid "Usage: surfer [URL]\n"
 msgstr "Usage: surfer [URL]\n"
 
-#: ../src/surfer.c:231
+#: ../src/surfer.c:49
+msgid "_New window"
+msgstr ""
+
+#: ../src/surfer.c:51
+msgid "_Open..."
+msgstr "_Abrir..."
+
+#: ../src/surfer.c:53
+msgid "_Open URL..."
+msgstr ""
+
+#: ../src/surfer.c:55
+msgid "Save _as..."
+msgstr "Guardar _como..."
+
+#: ../src/surfer.c:58
+msgid "_Print..."
+msgstr ""
+
+#: ../src/surfer.c:60
+msgid "_Close"
+msgstr ""
+
+#: ../src/surfer.c:67
+msgid "_Cut"
+msgstr ""
+
+#: ../src/surfer.c:68
+msgid "Cop_y"
+msgstr ""
+
+#: ../src/surfer.c:69
+msgid "_Paste"
+msgstr ""
+
+#: ../src/surfer.c:71
+msgid "Select _all"
+msgstr ""
+
+#: ../src/surfer.c:78
+msgid "Unselect all"
+msgstr ""
+
+#: ../src/surfer.c:80
+msgid "_Find"
+msgstr ""
+
+#: ../src/surfer.c:83
+msgid "_Preferences"
+msgstr ""
+
+#: ../src/surfer.c:90
+msgid "Zoom in"
+msgstr ""
+
+#: ../src/surfer.c:92
+msgid "Zoom out"
+msgstr ""
+
+#: ../src/surfer.c:94
+msgid "Normal size"
+msgstr ""
+
+#: ../src/surfer.c:97
+msgid "_Refresh"
+msgstr ""
+
+#: ../src/surfer.c:99
+msgid "_Force refresh"
+msgstr ""
+
+#: ../src/surfer.c:100
+msgid "_Stop"
+msgstr ""
+
+#: ../src/surfer.c:102
+msgid "Page so_urce"
+msgstr ""
+
+#: ../src/surfer.c:120
+msgid "_File"
+msgstr ""
+
+#: ../src/surfer.c:121
+msgid "_Edit"
+msgstr ""
+
+#: ../src/surfer.c:122
+msgid "_View"
+msgstr ""
+
+#: ../src/surfer.c:123
+msgid "_Help"
+msgstr ""
+
+#: ../src/surfer.c:232
 msgid " Location: "
 msgstr ""
 
-#: ../src/surfer.c:253
+#: ../src/surfer.c:254
 msgid "Could not initialize HTML renderer"
 msgstr ""
 
-#: ../src/surfer.c:454 ../src/surfer.c:457
+#: ../src/surfer.c:455 ../src/surfer.c:458
 msgid "Question"
 msgstr ""
 
-#: ../src/surfer.c:474 ../src/surfer.c:708
+#: ../src/surfer.c:475 ../src/surfer.c:709
 msgid "Save file as..."
 msgstr "Guardar como..."
 
-#: ../src/surfer.c:505 ../src/surfer.c:508
+#: ../src/surfer.c:506 ../src/surfer.c:509
 msgid "Error"
 msgstr ""
 
-#: ../src/surfer.c:507
+#: ../src/surfer.c:508
 msgid "Unknown error"
 msgstr ""
 
-#: ../src/surfer.c:528
+#: ../src/surfer.c:529
 msgid "Find text"
 msgstr "Buscar"
 
-#: ../src/surfer.c:535
+#: ../src/surfer.c:536
 msgid "Text:"
 msgstr ""
 
-#: ../src/surfer.c:544
+#: ../src/surfer.c:545
 msgid "Case-sensitive"
 msgstr ""
 
-#: ../src/surfer.c:547
+#: ../src/surfer.c:548
 msgid "Wrap"
 msgstr ""
 
-#: ../src/surfer.c:575
+#: ../src/surfer.c:576
 msgid "Text not found"
 msgstr ""
 
-#: ../src/surfer.c:649
+#: ../src/surfer.c:650
 msgid "Open file..."
 msgstr "Abrir..."
 
-#: ../src/surfer.c:832
+#: ../src/surfer.c:833
 msgid "Web surfer - Source of "
 msgstr ""
 
-#: ../src/surfer.c:874 ../src/surfer.c:877
+#: ../src/surfer.c:875 ../src/surfer.c:878
 msgid "Warning"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 0afe6b5..056c1a8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Surfer 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-02 01:09+0200\n"
+"POT-Creation-Date: 2010-04-05 03:40+0200\n"
 "PO-Revision-Date: 2010-04-01 19:40+0200\n"
 "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
 "Language-Team: French\n"
@@ -84,58 +84,154 @@ msgstr ""
 msgid "Usage: surfer [URL]\n"
 msgstr "Usage: surfer [URL]\n"
 
-#: ../src/surfer.c:231
+#: ../src/surfer.c:49
+msgid "_New window"
+msgstr ""
+
+#: ../src/surfer.c:51
+msgid "_Open..."
+msgstr "_Ouvrir..."
+
+#: ../src/surfer.c:53
+msgid "_Open URL..."
+msgstr "_Ouvrir une adresse..."
+
+#: ../src/surfer.c:55
+msgid "Save _as..."
+msgstr "Enregistrer _sous..."
+
+#: ../src/surfer.c:58
+msgid "_Print..."
+msgstr ""
+
+#: ../src/surfer.c:60
+msgid "_Close"
+msgstr "_Fermer"
+
+#: ../src/surfer.c:67
+msgid "_Cut"
+msgstr "Co_uper"
+
+#: ../src/surfer.c:68
+msgid "Cop_y"
+msgstr "_Copier"
+
+#: ../src/surfer.c:69
+msgid "_Paste"
+msgstr "C_oller"
+
+#: ../src/surfer.c:71
+msgid "Select _all"
+msgstr "_Tout sélectionner"
+
+#: ../src/surfer.c:78
+msgid "Unselect all"
+msgstr "Tout désélectionner"
+
+#: ../src/surfer.c:80
+msgid "_Find"
+msgstr ""
+
+#: ../src/surfer.c:83
+msgid "_Preferences"
+msgstr "_Préférences"
+
+#: ../src/surfer.c:90
+msgid "Zoom in"
+msgstr "Zoomer"
+
+#: ../src/surfer.c:92
+msgid "Zoom out"
+msgstr "Dézoomer"
+
+#: ../src/surfer.c:94
+msgid "Normal size"
+msgstr "Taille normale"
+
+#: ../src/surfer.c:97
+msgid "_Refresh"
+msgstr ""
+
+#: ../src/surfer.c:99
+msgid "_Force refresh"
+msgstr ""
+
+#: ../src/surfer.c:100
+msgid "_Stop"
+msgstr ""
+
+#: ../src/surfer.c:102
+msgid "Page so_urce"
+msgstr "So_urce de la page"
+
+#: ../src/surfer.c:120
+msgid "_File"
+msgstr "_Fichier"
+
+#: ../src/surfer.c:121
+msgid "_Edit"
+msgstr "É_dition"
+
+#: ../src/surfer.c:122
+msgid "_View"
+msgstr "_Vue"
+
+#: ../src/surfer.c:123
+msgid "_Help"
+msgstr "_Aide"
+
+#: ../src/surfer.c:232
 msgid " Location: "
 msgstr " Adresse: "
 
-#: ../src/surfer.c:253
+#: ../src/surfer.c:254
 msgid "Could not initialize HTML renderer"
 msgstr ""
 
-#: ../src/surfer.c:454 ../src/surfer.c:457
+#: ../src/surfer.c:455 ../src/surfer.c:458
 msgid "Question"
 msgstr "Question"
 
-#: ../src/surfer.c:474 ../src/surfer.c:708
+#: ../src/surfer.c:475 ../src/surfer.c:709
 msgid "Save file as..."
 msgstr "Enregistrer sous..."
 
-#: ../src/surfer.c:505 ../src/surfer.c:508
+#: ../src/surfer.c:506 ../src/surfer.c:509
 msgid "Error"
 msgstr "Erreur"
 
-#: ../src/surfer.c:507
+#: ../src/surfer.c:508
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: ../src/surfer.c:528
+#: ../src/surfer.c:529
 msgid "Find text"
 msgstr "Chercher du texte"
 
-#: ../src/surfer.c:535
+#: ../src/surfer.c:536
 msgid "Text:"
 msgstr "Texte: "
 
-#: ../src/surfer.c:544
+#: ../src/surfer.c:545
 msgid "Case-sensitive"
 msgstr ""
 
-#: ../src/surfer.c:547
+#: ../src/surfer.c:548
 msgid "Wrap"
 msgstr "Chercher en boucle"
 
-#: ../src/surfer.c:575
+#: ../src/surfer.c:576
 msgid "Text not found"
 msgstr "Texte non trouvé"
 
-#: ../src/surfer.c:649
+#: ../src/surfer.c:650
 msgid "Open file..."
 msgstr "Ouvrir un fichier..."
 
-#: ../src/surfer.c:832
+#: ../src/surfer.c:833
 msgid "Web surfer - Source of "
 msgstr "Web surfer - Source de "
 
-#: ../src/surfer.c:874 ../src/surfer.c:877
+#: ../src/surfer.c:875 ../src/surfer.c:878
 msgid "Warning"
 msgstr "Avertissement"
diff --git a/src/surfer.c b/src/surfer.c
index 3769c20..113b4eb 100644
--- a/src/surfer.c
+++ b/src/surfer.c
@@ -26,6 +26,7 @@
 #include "surfer.h"
 #include "common.h"
 #define _(string) gettext(string)
+#define N_(string) (string)
 
 
 /* Surfer */
@@ -45,60 +46,60 @@ static DesktopAccel _surfer_accel[] =
 #ifndef EMBEDDED
 static DesktopMenu _menu_file[] =
 {
-	{ "_New window",	G_CALLBACK(on_file_new_window), "window-new",
+	{ N_("_New window"),	G_CALLBACK(on_file_new_window), "window-new",
 		GDK_N },
-	{ "_Open...",		G_CALLBACK(on_file_open), GTK_STOCK_OPEN,
+	{ N_("_Open..."),	G_CALLBACK(on_file_open), GTK_STOCK_OPEN,
 		GDK_O },
-	{ "_Open URL...",	G_CALLBACK(on_file_open_url), NULL, GDK_L },
+	{ N_("_Open URL..."),	G_CALLBACK(on_file_open_url), NULL, GDK_L },
 	{ "", NULL, NULL, 0 },
-	{ "Save _as...",	G_CALLBACK(on_file_save_as), GTK_STOCK_SAVE_AS,
+	{ N_("Save _as..."),	G_CALLBACK(on_file_save_as), GTK_STOCK_SAVE_AS,
 		GDK_S },
 	{ "", NULL, NULL, 0 },
-	{ "_Print...",		G_CALLBACK(on_file_print), GTK_STOCK_PRINT, 0 },
+	{ N_("_Print..."),	G_CALLBACK(on_file_print), GTK_STOCK_PRINT, 0 },
 	{ "", NULL, NULL, 0 },
-	{ "_Close",		G_CALLBACK(on_file_close), GTK_STOCK_CLOSE,
+	{ N_("_Close"),		G_CALLBACK(on_file_close), GTK_STOCK_CLOSE,
 		GDK_W },
 	{ NULL,			NULL, NULL, 0 }
 };
 
 static DesktopMenu _menu_edit[] =
 {
-	{ "_Cut",		NULL, GTK_STOCK_CUT, GDK_X },
-	{ "Cop_y",		NULL, GTK_STOCK_COPY, GDK_C },
-	{ "_Paste",		NULL, GTK_STOCK_PASTE, GDK_V },
+	{ N_("_Cut"),		NULL, GTK_STOCK_CUT, GDK_X },
+	{ N_("Cop_y"),		NULL, GTK_STOCK_COPY, GDK_C },
+	{ N_("_Paste"),		NULL, GTK_STOCK_PASTE, GDK_V },
 	{ "",			NULL, NULL, 0 },
-	{ "Select _all",	G_CALLBACK(on_edit_select_all),
+	{ N_("Select _all"),	G_CALLBACK(on_edit_select_all),
 #if GTK_CHECK_VERSION(2, 10, 0)
 		GTK_STOCK_SELECT_ALL,
 #else
 		NULL,
 #endif
 		GDK_A },
-	{ "Unselect all",	G_CALLBACK(on_edit_unselect_all), NULL, 0 },
+	{ N_("Unselect all"),	G_CALLBACK(on_edit_unselect_all), NULL, 0 },
 	{ "",			NULL, NULL, 0 },
-	{ "_Find",		G_CALLBACK(on_edit_find), GTK_STOCK_FIND,
+	{ N_("_Find"),		G_CALLBACK(on_edit_find), GTK_STOCK_FIND,
 		GDK_F },
 	{ "",			NULL, NULL, 0 },
-	{ "_Preferences",	G_CALLBACK(on_edit_preferences),
+	{ N_("_Preferences"),	G_CALLBACK(on_edit_preferences),
 		GTK_STOCK_PREFERENCES, GDK_P },
 	{ NULL,			NULL, NULL, 0 }
 };
 
 static DesktopMenu _menu_view[] =
 {
-	{ "Zoom in",		G_CALLBACK(on_view_zoom_in), "zoom-in",
+	{ N_("Zoom in"),	G_CALLBACK(on_view_zoom_in), "zoom-in",
 		GDK_plus },
-	{ "Zoom out",		G_CALLBACK(on_view_zoom_out), "zoom-out",
+	{ N_("Zoom out"),	G_CALLBACK(on_view_zoom_out), "zoom-out",
 		GDK_minus },
-	{ "Normal size",	G_CALLBACK(on_view_normal_size), "zoom-1",
+	{ N_("Normal size"),	G_CALLBACK(on_view_normal_size), "zoom-1",
 		GDK_0 },
 	{ "",			NULL, NULL, 0 },
-	{ "_Refresh",		G_CALLBACK(on_view_refresh), GTK_STOCK_REFRESH,
+	{ N_("_Refresh"),	G_CALLBACK(on_view_refresh), GTK_STOCK_REFRESH,
 		GDK_R },
-	{ "_Force refresh",	G_CALLBACK(on_view_force_refresh), NULL, 0 },
-	{ "_Stop",		G_CALLBACK(on_view_stop), GTK_STOCK_STOP, 0 },
+	{ N_("_Force refresh"),	G_CALLBACK(on_view_force_refresh), NULL, 0 },
+	{ N_("_Stop"),		G_CALLBACK(on_view_stop), GTK_STOCK_STOP, 0 },
 	{ "",			NULL, NULL, 0 },
-	{ "Page so_urce",	G_CALLBACK(on_view_page_source),
+	{ N_("Page so_urce"),	G_CALLBACK(on_view_page_source),
 		"stock_view-html-source", GDK_U },
 	{ NULL,			NULL, NULL, 0 }
 };
@@ -116,10 +117,10 @@ static DesktopMenu _menu_help[] =
 
 static DesktopMenubar _surfer_menubar[] =
 {
-	{ "_File", _menu_file },
-	{ "_Edit", _menu_edit },
-	{ "_View", _menu_view },
-	{ "_Help", _menu_help },
+	{ N_("_File"), _menu_file },
+	{ N_("_Edit"), _menu_edit },
+	{ N_("_View"), _menu_view },
+	{ N_("_Help"), _menu_help },
 	{ NULL, NULL }
 };
 #endif /* !EMBEDDED */