diff --git a/po/POTFILES b/po/POTFILES
index 2cc1c1d..0dc85ac 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -4,6 +4,7 @@
 ../src/copy.c
 ../src/delete.c
 ../src/desktop.c
+../src/desktopicon.c
 ../src/main.c
 ../src/move.c
 ../src/open.c
diff --git a/po/de.po b/po/de.po
index e85cdd7..e81df17 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Browser 0.1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 02:34+0200\n"
+"POT-Creation-Date: 2010-04-05 16:47+0200\n"
 "PO-Revision-Date: 2010-03-29 23:28+0200\n"
 "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
 "Language-Team: English\n"
@@ -40,15 +40,16 @@ msgstr "_Eigenschaften"
 msgid "_Close"
 msgstr "_Schliessen"
 
-#: ../src/browser.c:117 ../src/browser.c:119
+#: ../src/browser.c:117 ../src/browser.c:119 ../src/view.c:118
+#: ../src/view.c:120
 msgid "_About"
 msgstr "_Info"
 
-#: ../src/browser.c:126
+#: ../src/browser.c:126 ../src/view.c:127 ../src/view.c:134
 msgid "_File"
 msgstr "_Datei"
 
-#: ../src/browser.c:127
+#: ../src/browser.c:127 ../src/desktopicon.c:593
 msgid "_Edit"
 msgstr ""
 
@@ -56,7 +57,7 @@ msgstr ""
 msgid "_View"
 msgstr ""
 
-#: ../src/browser.c:129
+#: ../src/browser.c:129 ../src/view.c:128 ../src/view.c:135
 msgid "_Help"
 msgstr ""
 
@@ -88,12 +89,15 @@ msgstr ""
 msgid " Location: "
 msgstr ""
 
-#: ../src/browser.c:528 ../src/browser.c:531 ../src/desktop.c:1046
-#: ../src/desktop.c:1049 ../src/properties.c:111
+#: ../src/browser.c:528 ../src/browser.c:531 ../src/copy.c:204
+#: ../src/delete.c:127 ../src/delete.c:130 ../src/desktop.c:1046
+#: ../src/desktop.c:1049 ../src/move.c:131 ../src/properties.c:111
+#: ../src/view.c:359 ../src/view.c:362
 msgid "Error"
 msgstr "Fehler"
 
-#: ../src/browser.c:683
+#: ../src/browser.c:683 ../src/desktopicon.c:714 ../src/view.c:141
+#: ../src/view.c:410
 msgid "Open with..."
 msgstr "Offnen mit..."
 
@@ -131,15 +135,16 @@ msgid "Refreshing folder..."
 msgstr "Aktualisierung..."
 
 #: ../src/callbacks.c:197 ../src/callbacks.c:202 ../src/callbacks.c:1329
-#: ../src/callbacks.c:1332
+#: ../src/callbacks.c:1332 ../src/desktopicon.c:674 ../src/desktopicon.c:677
+#: ../src/desktopicon.c:748 ../src/desktopicon.c:753
 msgid "Warning"
 msgstr "Achtung"
 
-#: ../src/callbacks.c:200
+#: ../src/callbacks.c:200 ../src/desktopicon.c:751
 msgid "Are you sure you want to delete "
 msgstr ""
 
-#: ../src/callbacks.c:201
+#: ../src/callbacks.c:201 ../src/desktopicon.c:752
 msgid " file(s)?"
 msgstr ""
 
@@ -163,27 +168,27 @@ msgstr "List _Ordner zuerst"
 msgid "Show _hidden files"
 msgstr ""
 
-#: ../src/callbacks.c:462 ../src/view.c:496
+#: ../src/callbacks.c:462 ../src/view.c:498
 msgid "About Browser"
 msgstr "Info zu Browser"
 
-#: ../src/callbacks.c:473 ../src/view.c:507
+#: ../src/callbacks.c:473 ../src/view.c:509
 msgid "C_redits"
 msgstr "_Mitwirkende"
 
-#: ../src/callbacks.c:477 ../src/view.c:511
+#: ../src/callbacks.c:477 ../src/view.c:513
 msgid "_License"
 msgstr "_Lizenz"
 
-#: ../src/callbacks.c:526 ../src/view.c:560
+#: ../src/callbacks.c:526 ../src/view.c:562
 msgid "Credits"
 msgstr "Mitwirkende"
 
-#: ../src/callbacks.c:549 ../src/view.c:583
+#: ../src/callbacks.c:549 ../src/view.c:585
 msgid "Written by"
 msgstr "Programm von"
 
-#: ../src/callbacks.c:578 ../src/view.c:612
+#: ../src/callbacks.c:578 ../src/view.c:614
 msgid "License"
 msgstr "Lizenz"
 
@@ -211,7 +216,7 @@ msgstr "Offnen in neue Fenster"
 msgid "_Unmount"
 msgstr ""
 
-#: ../src/callbacks.c:1227
+#: ../src/callbacks.c:1227 ../src/desktopicon.c:606
 msgid "Open _with..."
 msgstr "Offnen _mit..."
 
@@ -332,6 +337,10 @@ msgid ""
 "  -r\tEquivalent to -R\n"
 msgstr ""
 
+#: ../src/desktop.c:164
+msgid "Creating desktop"
+msgstr ""
+
 #: ../src/desktop.c:248
 msgid "Home"
 msgstr "Persönlicher Ordner"
@@ -359,6 +368,10 @@ msgid ""
 "  -F\tDisplay contents of the desktop folder [default]\n"
 msgstr ""
 
+#: ../src/desktopicon.c:676
+msgid "Are you sure you want to execute this file?"
+msgstr ""
+
 #: ../src/main.c:44
 msgid "Usage: browser [directory...]\n"
 msgstr "Usage: browser [Ordner...]\n"
@@ -462,30 +475,38 @@ msgstr ""
 msgid "Usage: properties file...\n"
 msgstr ""
 
-#: ../src/view.c:184
+#: ../src/view.c:143
+msgid "Edit"
+msgstr ""
+
+#: ../src/view.c:145
+msgid "Close"
+msgstr "Schliessen"
+
+#: ../src/view.c:186
 msgid "Unknown file type"
 msgstr ""
 
-#: ../src/view.c:190
+#: ../src/view.c:192
 msgid "View - "
 msgstr ""
 
-#: ../src/view.c:218
+#: ../src/view.c:220
 msgid "Unable to view file type"
 msgstr ""
 
-#: ../src/view.c:315
+#: ../src/view.c:317
 msgid "View file..."
 msgstr ""
 
-#: ../src/view.c:396 ../src/view.c:653
+#: ../src/view.c:398 ../src/view.c:655
 msgid "Could not edit file"
 msgstr ""
 
-#: ../src/view.c:466
+#: ../src/view.c:468
 msgid "View"
 msgstr ""
 
-#: ../src/view.c:667
+#: ../src/view.c:669
 msgid "Usage: view file...\n"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 8c29222..c8aebb2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Browser 0.1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 02:34+0200\n"
+"POT-Creation-Date: 2010-04-05 16:47+0200\n"
 "PO-Revision-Date: 2010-03-30 01:04+0200\n"
 "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
 "Language-Team: Spanish\n"
@@ -40,15 +40,16 @@ msgstr "_Propriedades"
 msgid "_Close"
 msgstr ""
 
-#: ../src/browser.c:117 ../src/browser.c:119
+#: ../src/browser.c:117 ../src/browser.c:119 ../src/view.c:118
+#: ../src/view.c:120
 msgid "_About"
 msgstr ""
 
-#: ../src/browser.c:126
+#: ../src/browser.c:126 ../src/view.c:127 ../src/view.c:134
 msgid "_File"
 msgstr ""
 
-#: ../src/browser.c:127
+#: ../src/browser.c:127 ../src/desktopicon.c:593
 msgid "_Edit"
 msgstr ""
 
@@ -56,7 +57,7 @@ msgstr ""
 msgid "_View"
 msgstr ""
 
-#: ../src/browser.c:129
+#: ../src/browser.c:129 ../src/view.c:128 ../src/view.c:135
 msgid "_Help"
 msgstr ""
 
@@ -88,12 +89,15 @@ msgstr ""
 msgid " Location: "
 msgstr ""
 
-#: ../src/browser.c:528 ../src/browser.c:531 ../src/desktop.c:1046
-#: ../src/desktop.c:1049 ../src/properties.c:111
+#: ../src/browser.c:528 ../src/browser.c:531 ../src/copy.c:204
+#: ../src/delete.c:127 ../src/delete.c:130 ../src/desktop.c:1046
+#: ../src/desktop.c:1049 ../src/move.c:131 ../src/properties.c:111
+#: ../src/view.c:359 ../src/view.c:362
 msgid "Error"
 msgstr ""
 
-#: ../src/browser.c:683
+#: ../src/browser.c:683 ../src/desktopicon.c:714 ../src/view.c:141
+#: ../src/view.c:410
 msgid "Open with..."
 msgstr ""
 
@@ -131,15 +135,16 @@ msgid "Refreshing folder..."
 msgstr ""
 
 #: ../src/callbacks.c:197 ../src/callbacks.c:202 ../src/callbacks.c:1329
-#: ../src/callbacks.c:1332
+#: ../src/callbacks.c:1332 ../src/desktopicon.c:674 ../src/desktopicon.c:677
+#: ../src/desktopicon.c:748 ../src/desktopicon.c:753
 msgid "Warning"
 msgstr ""
 
-#: ../src/callbacks.c:200
+#: ../src/callbacks.c:200 ../src/desktopicon.c:751
 msgid "Are you sure you want to delete "
 msgstr ""
 
-#: ../src/callbacks.c:201
+#: ../src/callbacks.c:201 ../src/desktopicon.c:752
 msgid " file(s)?"
 msgstr ""
 
@@ -163,27 +168,27 @@ msgstr ""
 msgid "Show _hidden files"
 msgstr ""
 
-#: ../src/callbacks.c:462 ../src/view.c:496
+#: ../src/callbacks.c:462 ../src/view.c:498
 msgid "About Browser"
 msgstr "Acerca de Browser"
 
-#: ../src/callbacks.c:473 ../src/view.c:507
+#: ../src/callbacks.c:473 ../src/view.c:509
 msgid "C_redits"
 msgstr "C_réditos"
 
-#: ../src/callbacks.c:477 ../src/view.c:511
+#: ../src/callbacks.c:477 ../src/view.c:513
 msgid "_License"
 msgstr "_Licencia"
 
-#: ../src/callbacks.c:526 ../src/view.c:560
+#: ../src/callbacks.c:526 ../src/view.c:562
 msgid "Credits"
 msgstr "Créditos"
 
-#: ../src/callbacks.c:549 ../src/view.c:583
+#: ../src/callbacks.c:549 ../src/view.c:585
 msgid "Written by"
 msgstr "Escrito por"
 
-#: ../src/callbacks.c:578 ../src/view.c:612
+#: ../src/callbacks.c:578 ../src/view.c:614
 msgid "License"
 msgstr "Licencia"
 
@@ -211,7 +216,7 @@ msgstr ""
 msgid "_Unmount"
 msgstr ""
 
-#: ../src/callbacks.c:1227
+#: ../src/callbacks.c:1227 ../src/desktopicon.c:606
 msgid "Open _with..."
 msgstr ""
 
@@ -332,6 +337,10 @@ msgid ""
 "  -r\tEquivalent to -R\n"
 msgstr ""
 
+#: ../src/desktop.c:164
+msgid "Creating desktop"
+msgstr ""
+
 #: ../src/desktop.c:248
 msgid "Home"
 msgstr "Inicio"
@@ -359,6 +368,10 @@ msgid ""
 "  -F\tDisplay contents of the desktop folder [default]\n"
 msgstr ""
 
+#: ../src/desktopicon.c:676
+msgid "Are you sure you want to execute this file?"
+msgstr ""
+
 #: ../src/main.c:44
 msgid "Usage: browser [directory...]\n"
 msgstr ""
@@ -462,30 +475,38 @@ msgstr ""
 msgid "Usage: properties file...\n"
 msgstr ""
 
-#: ../src/view.c:184
+#: ../src/view.c:143
+msgid "Edit"
+msgstr ""
+
+#: ../src/view.c:145
+msgid "Close"
+msgstr ""
+
+#: ../src/view.c:186
 msgid "Unknown file type"
 msgstr ""
 
-#: ../src/view.c:190
+#: ../src/view.c:192
 msgid "View - "
 msgstr ""
 
-#: ../src/view.c:218
+#: ../src/view.c:220
 msgid "Unable to view file type"
 msgstr ""
 
-#: ../src/view.c:315
+#: ../src/view.c:317
 msgid "View file..."
 msgstr ""
 
-#: ../src/view.c:396 ../src/view.c:653
+#: ../src/view.c:398 ../src/view.c:655
 msgid "Could not edit file"
 msgstr ""
 
-#: ../src/view.c:466
+#: ../src/view.c:468
 msgid "View"
 msgstr ""
 
-#: ../src/view.c:667
+#: ../src/view.c:669
 msgid "Usage: view file...\n"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 09c1a93..cd7bb95 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Browser 0.1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 02:34+0200\n"
+"POT-Creation-Date: 2010-04-05 16:47+0200\n"
 "PO-Revision-Date: 2010-03-29 23:28+0200\n"
 "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
 "Language-Team: French\n"
@@ -40,15 +40,16 @@ msgstr "_Propriétés"
 msgid "_Close"
 msgstr "_Fermer"
 
-#: ../src/browser.c:117 ../src/browser.c:119
+#: ../src/browser.c:117 ../src/browser.c:119 ../src/view.c:118
+#: ../src/view.c:120
 msgid "_About"
 msgstr "À _propos"
 
-#: ../src/browser.c:126
+#: ../src/browser.c:126 ../src/view.c:127 ../src/view.c:134
 msgid "_File"
 msgstr "_Fichier"
 
-#: ../src/browser.c:127
+#: ../src/browser.c:127 ../src/desktopicon.c:593
 msgid "_Edit"
 msgstr "É_dition"
 
@@ -56,7 +57,7 @@ msgstr "É_dition"
 msgid "_View"
 msgstr "_Vue"
 
-#: ../src/browser.c:129
+#: ../src/browser.c:129 ../src/view.c:128 ../src/view.c:135
 msgid "_Help"
 msgstr "_Aide"
 
@@ -88,12 +89,15 @@ msgstr "Vignettes"
 msgid " Location: "
 msgstr " Chemin: "
 
-#: ../src/browser.c:528 ../src/browser.c:531 ../src/desktop.c:1046
-#: ../src/desktop.c:1049 ../src/properties.c:111
+#: ../src/browser.c:528 ../src/browser.c:531 ../src/copy.c:204
+#: ../src/delete.c:127 ../src/delete.c:130 ../src/desktop.c:1046
+#: ../src/desktop.c:1049 ../src/move.c:131 ../src/properties.c:111
+#: ../src/view.c:359 ../src/view.c:362
 msgid "Error"
 msgstr "Erreur"
 
-#: ../src/browser.c:683
+#: ../src/browser.c:683 ../src/desktopicon.c:714 ../src/view.c:141
+#: ../src/view.c:410
 msgid "Open with..."
 msgstr "Ouvrir avec..."
 
@@ -131,15 +135,16 @@ msgid "Refreshing folder..."
 msgstr "Actualisation du dossier..."
 
 #: ../src/callbacks.c:197 ../src/callbacks.c:202 ../src/callbacks.c:1329
-#: ../src/callbacks.c:1332
+#: ../src/callbacks.c:1332 ../src/desktopicon.c:674 ../src/desktopicon.c:677
+#: ../src/desktopicon.c:748 ../src/desktopicon.c:753
 msgid "Warning"
 msgstr "Avertissement"
 
-#: ../src/callbacks.c:200
+#: ../src/callbacks.c:200 ../src/desktopicon.c:751
 msgid "Are you sure you want to delete "
 msgstr "Voulez-vous vraiment effacer "
 
-#: ../src/callbacks.c:201
+#: ../src/callbacks.c:201 ../src/desktopicon.c:752
 msgid " file(s)?"
 msgstr " fichier(s)?"
 
@@ -163,27 +168,27 @@ msgstr "Lister les _dossiers en premier"
 msgid "Show _hidden files"
 msgstr "Afficher les fichiers cac_hés"
 
-#: ../src/callbacks.c:462 ../src/view.c:496
+#: ../src/callbacks.c:462 ../src/view.c:498
 msgid "About Browser"
 msgstr "À propos de Browser"
 
-#: ../src/callbacks.c:473 ../src/view.c:507
+#: ../src/callbacks.c:473 ../src/view.c:509
 msgid "C_redits"
 msgstr "C_rédits"
 
-#: ../src/callbacks.c:477 ../src/view.c:511
+#: ../src/callbacks.c:477 ../src/view.c:513
 msgid "_License"
 msgstr "_Licence"
 
-#: ../src/callbacks.c:526 ../src/view.c:560
+#: ../src/callbacks.c:526 ../src/view.c:562
 msgid "Credits"
 msgstr "Crédits"
 
-#: ../src/callbacks.c:549 ../src/view.c:583
+#: ../src/callbacks.c:549 ../src/view.c:585
 msgid "Written by"
 msgstr "Écrit par"
 
-#: ../src/callbacks.c:578 ../src/view.c:612
+#: ../src/callbacks.c:578 ../src/view.c:614
 msgid "License"
 msgstr "Licence"
 
@@ -211,7 +216,7 @@ msgstr "Ouvrir dans une _nouvelle fenêtre"
 msgid "_Unmount"
 msgstr ""
 
-#: ../src/callbacks.c:1227
+#: ../src/callbacks.c:1227 ../src/desktopicon.c:606
 msgid "Open _with..."
 msgstr "Ouvrir _avec..."
 
@@ -332,6 +337,10 @@ msgid ""
 "  -r\tEquivalent to -R\n"
 msgstr ""
 
+#: ../src/desktop.c:164
+msgid "Creating desktop"
+msgstr ""
+
 #: ../src/desktop.c:248
 msgid "Home"
 msgstr "Dossier personnel"
@@ -359,6 +368,10 @@ msgid ""
 "  -F\tDisplay contents of the desktop folder [default]\n"
 msgstr ""
 
+#: ../src/desktopicon.c:676
+msgid "Are you sure you want to execute this file?"
+msgstr "Voulez-vous vraiment exécuter ce fichier? "
+
 #: ../src/main.c:44
 msgid "Usage: browser [directory...]\n"
 msgstr "Usage: browser [dossier...]\n"
@@ -462,30 +475,38 @@ msgstr "exécution"
 msgid "Usage: properties file...\n"
 msgstr "Usage: properties fichier...\n"
 
-#: ../src/view.c:184
+#: ../src/view.c:143
+msgid "Edit"
+msgstr "Édition"
+
+#: ../src/view.c:145
+msgid "Close"
+msgstr "Fermer"
+
+#: ../src/view.c:186
 msgid "Unknown file type"
 msgstr ""
 
-#: ../src/view.c:190
+#: ../src/view.c:192
 msgid "View - "
 msgstr ""
 
-#: ../src/view.c:218
+#: ../src/view.c:220
 msgid "Unable to view file type"
 msgstr ""
 
-#: ../src/view.c:315
+#: ../src/view.c:317
 msgid "View file..."
 msgstr "Ouvrir..."
 
-#: ../src/view.c:396 ../src/view.c:653
+#: ../src/view.c:398 ../src/view.c:655
 msgid "Could not edit file"
 msgstr ""
 
-#: ../src/view.c:466
+#: ../src/view.c:468
 msgid "View"
 msgstr ""
 
-#: ../src/view.c:667
+#: ../src/view.c:669
 msgid "Usage: view file...\n"
 msgstr "Usage: view fichier...\n"
diff --git a/src/desktop.c b/src/desktop.c
index 6564c21..70403e6 100644
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -161,7 +161,7 @@ Desktop * desktop_new(DesktopLayout layout)
 			&& (desktop->home = g_get_home_dir()) == NULL)
 		desktop->home = "/";
 	if(_new_create_desktop(desktop) != 0)
-		return _new_error(desktop, "Creating desktop");
+		return _new_error(desktop, _("Creating desktop"));
 	desktop_refresh(desktop);
 	/* manage root window events */
 	desktop->menu = NULL;
diff --git a/src/desktopicon.c b/src/desktopicon.c
index 291569a..4a26613 100644
--- a/src/desktopicon.c
+++ b/src/desktopicon.c
@@ -21,12 +21,14 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
+#include <libintl.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <System.h>
 #include "mime.h"
 #include "desktopicon.h"
 #include "../config.h"
+#define _(string) gettext(string)
 
 #ifdef PACKAGE
 # undef PACKAGE
@@ -588,7 +590,7 @@ static void _popup_file(GtkWidget * menu, DesktopIcon * desktopicon)
 #if GTK_CHECK_VERSION(2, 6, 0)
 			GTK_STOCK_EDIT,
 #else
-			"_Edit",
+			_("_Edit"),
 #endif
 			G_CALLBACK(_on_icon_edit), desktopicon, menu);
 	if(desktopicon->isexec == TRUE)
@@ -601,7 +603,7 @@ static void _popup_file(GtkWidget * menu, DesktopIcon * desktopicon)
 	}
 	if(desktopicon->path != NULL && desktopicon->path[0] == '/')
 	{
-		menuitem = gtk_menu_item_new_with_mnemonic("Open _with...");
+		menuitem = gtk_menu_item_new_with_mnemonic(_("Open _with..."));
 		g_signal_connect_swapped(G_OBJECT(menuitem), "activate",
 				G_CALLBACK(_on_icon_open_with), desktopicon);
 		gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
@@ -647,7 +649,7 @@ static void _on_icon_open(gpointer data)
 	if(pid != 0)
 		return;
 	execlp("browser", "browser", "--", desktopicon->path, NULL);
-	fprintf(stderr, "%s%s\n", "desktop: browser: ", strerror(errno));
+	fprintf(stderr, "%s%s\n", PACKAGE ": browser: ", strerror(errno));
 	exit(127);
 }
 
@@ -669,10 +671,10 @@ static void _on_icon_run(gpointer data)
 
 	dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
 			GTK_MESSAGE_WARNING, GTK_BUTTONS_YES_NO, "%s",
-			"Warning");
+			_("Warning"));
 	gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
-			"%s", "Are you sure you want to execute this file?");
-	gtk_window_set_title(GTK_WINDOW(dialog), "Warning");
+			"%s", _("Are you sure you want to execute this file?"));
+	gtk_window_set_title(GTK_WINDOW(dialog), _("Warning"));
 	res = gtk_dialog_run(GTK_DIALOG(dialog));
 	gtk_widget_destroy(dialog);
 	if(res != GTK_RESPONSE_YES)
@@ -709,7 +711,7 @@ static void _on_icon_open_with(gpointer data)
 	char * filename = NULL;
 	pid_t pid;
 
-	dialog = gtk_file_chooser_dialog_new("Open with...",
+	dialog = gtk_file_chooser_dialog_new(_("Open with..."),
 			GTK_WINDOW(desktopicon->window),
 			GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL,
 			GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN,
@@ -743,11 +745,12 @@ static void _on_icon_delete(gpointer data)
 	dialog = gtk_message_dialog_new(GTK_WINDOW(desktopicon->window),
 			GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
 			GTK_MESSAGE_WARNING, GTK_BUTTONS_YES_NO, "%s",
-			"Warning");
+			_("Warning"));
 	gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(
 				dialog), "%s%lu%s",
-			"Are you sure you want to delete ", cnt, " file(s)?");
-	gtk_window_set_title(GTK_WINDOW(dialog), "Warning");
+			_("Are you sure you want to delete "), cnt,
+			_(" file(s)?"));
+	gtk_window_set_title(GTK_WINDOW(dialog), _("Warning"));
 	res = gtk_dialog_run(GTK_DIALOG(dialog));
 	gtk_widget_destroy(dialog);
 	if(res == GTK_RESPONSE_YES)
diff --git a/src/view.c b/src/view.c
index 061e428..bad7bc1 100644
--- a/src/view.c
+++ b/src/view.c
@@ -30,6 +30,8 @@ static char const _license[] =
 #include <Desktop.h>
 #include "mime.h"
 #include "../config.h"
+#define _(string) gettext(string)
+#define N_(string) (string)
 
 #include "common.c"
 
@@ -113,34 +115,34 @@ static DesktopMenu _view_menu_file_edit[] =
 static DesktopMenu _view_menu_help[] =
 {
 # if GTK_CHECK_VERSION(2, 6, 0)
-	{ "_About", G_CALLBACK(_on_help_about), GTK_STOCK_ABOUT, 0 },
+	{ N_("_About"), G_CALLBACK(_on_help_about), GTK_STOCK_ABOUT, 0 },
 # else
-	{ "_About", G_CALLBACK(_on_help_about), NULL, 0 },
+	{ N_("_About"), G_CALLBACK(_on_help_about), NULL, 0 },
 # endif
 	{ NULL, NULL, NULL, 0 }
 };
 
 static DesktopMenubar _view_menubar[] =
 {
-	{ "_File", _view_menu_file },
-	{ "_Help", _view_menu_help },
+	{ N_("_File"), _view_menu_file },
+	{ N_("_Help"), _view_menu_help },
 	{ NULL, NULL }
 };
 
 static DesktopMenubar _view_menubar_edit[] =
 {
-	{ "_File", _view_menu_file_edit },
-	{ "_Help", _view_menu_help },
+	{ N_("_File"), _view_menu_file_edit },
+	{ N_("_Help"), _view_menu_help },
 	{ NULL, NULL }
 };
 #else
 static DesktopToolbar _view_toolbar[] =
 {
-	{ "Open with...", G_CALLBACK(_on_open_with), GTK_STOCK_OPEN, GDK_O,
+	{ N_("Open with..."), G_CALLBACK(_on_open_with), GTK_STOCK_OPEN, GDK_O,
 		NULL },
-	{ "Edit", G_CALLBACK(_on_edit), GTK_STOCK_EDIT, GDK_E, NULL },
+	{ N_("Edit"), G_CALLBACK(_on_edit), GTK_STOCK_EDIT, GDK_E, NULL },
 	{ "", NULL, NULL, 0, 0 },
-	{ "Close", G_CALLBACK(_on_close), GTK_STOCK_CLOSE, GDK_W, NULL },
+	{ N_("Close"), G_CALLBACK(_on_close), GTK_STOCK_CLOSE, GDK_W, NULL },
 	{ NULL, NULL, NULL, 0, 0 }
 };
 #endif /* EMBEDDED */