diff --git a/po/de.po b/po/de.po
index 092e94e..187ed86 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-12-21 13:35+0100\n"
+"POT-Creation-Date: 2010-12-21 13:40+0100\n"
 "PO-Revision-Date: 2010-03-29 23:28+0200\n"
 "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
 "Language-Team: English\n"
@@ -28,7 +28,7 @@ msgstr "Neu _Ordner"
 msgid "New _symbolic link..."
 msgstr ""
 
-#: ../src/browser.c:79 ../src/browser.c:712
+#: ../src/browser.c:79 ../src/browser.c:716
 msgid "Open file..."
 msgstr "Offnen..."
 
@@ -68,101 +68,169 @@ msgstr ""
 msgid "_Preferences"
 msgstr "_Einstellungen"
 
-#: ../src/browser.c:135 ../src/browser.c:137 ../src/view.c:121
+#: ../src/browser.c:117
+msgid "_Refresh"
+msgstr ""
+
+#: ../src/browser.c:120
+msgid "_Home"
+msgstr "_Persönlicher Ordner"
+
+#: ../src/browser.c:124
+msgid "_Details"
+msgstr ""
+
+#: ../src/browser.c:126
+msgid "_Icons"
+msgstr ""
+
+#: ../src/browser.c:127
+msgid "_List"
+msgstr ""
+
+#: ../src/browser.c:128
+msgid "_Thumbnails"
+msgstr ""
+
+#: ../src/browser.c:136 ../src/browser.c:138 ../src/view.c:121
 #: ../src/view.c:123
 msgid "_About"
 msgstr "_Info"
 
-#: ../src/browser.c:144 ../src/view.c:130 ../src/view.c:137
+#: ../src/browser.c:145 ../src/view.c:130 ../src/view.c:137
 msgid "_File"
 msgstr "_Datei"
 
-#: ../src/browser.c:145 ../src/desktopicon.c:680 ../src/view.c:109
+#: ../src/browser.c:146 ../src/desktopicon.c:680 ../src/view.c:109
 msgid "_Edit"
 msgstr ""
 
-#: ../src/browser.c:146
+#: ../src/browser.c:147
 msgid "_View"
 msgstr ""
 
-#: ../src/browser.c:147 ../src/view.c:131 ../src/view.c:138
+#: ../src/browser.c:148 ../src/view.c:131 ../src/view.c:138
 msgid "_Help"
 msgstr ""
 
-#: ../src/browser.c:267
+#: ../src/browser.c:156 ../src/desktop.c:785 ../src/desktop.c:804
+msgid "Back"
+msgstr ""
+
+#: ../src/browser.c:158
+msgid "Up"
+msgstr ""
+
+#: ../src/browser.c:159
+msgid "Forward"
+msgstr ""
+
+#: ../src/browser.c:161
+msgid "Refresh"
+msgstr ""
+
+#: ../src/browser.c:164 ../src/desktop.c:864
+msgid "Home"
+msgstr "Persönlicher Ordner"
+
+#: ../src/browser.c:166
+msgid "Cut"
+msgstr ""
+
+#: ../src/browser.c:167
+msgid "Copy"
+msgstr ""
+
+#: ../src/browser.c:168
+msgid "Paste"
+msgstr ""
+
+#: ../src/browser.c:170
+msgid "Properties"
+msgstr "Eigenschaften"
+
+#: ../src/browser.c:227
+msgid "Error while loading default icons"
+msgstr ""
+
+#: ../src/browser.c:244
+msgid "Error while loading configuration"
+msgstr ""
+
+#: ../src/browser.c:271
 msgid "File browser"
 msgstr ""
 
-#: ../src/browser.c:286
+#: ../src/browser.c:290
 msgid "View as..."
 msgstr ""
 
-#: ../src/browser.c:290 ../src/callbacks.c:268
+#: ../src/browser.c:294 ../src/callbacks.c:268
 msgid "Details"
 msgstr ""
 
-#: ../src/browser.c:297 ../src/callbacks.c:269
+#: ../src/browser.c:301 ../src/callbacks.c:269
 msgid "Icons"
 msgstr ""
 
-#: ../src/browser.c:301 ../src/callbacks.c:270
+#: ../src/browser.c:305 ../src/callbacks.c:270
 msgid "List"
 msgstr ""
 
-#: ../src/browser.c:305 ../src/callbacks.c:271
+#: ../src/browser.c:309 ../src/callbacks.c:271
 msgid "Thumbnails"
 msgstr ""
 
-#: ../src/browser.c:326
+#: ../src/browser.c:330
 msgid " Location: "
 msgstr ""
 
-#: ../src/browser.c:573 ../src/browser.c:578 ../src/copy.c:204
+#: ../src/browser.c:577 ../src/browser.c:582 ../src/copy.c:204
 #: ../src/delete.c:163 ../src/delete.c:168 ../src/desktop.c:1440
 #: ../src/desktop.c:1445 ../src/move.c:130 ../src/properties.c:117
 #: ../src/properties.c:121 ../src/view.c:364 ../src/view.c:367
 msgid "Error"
 msgstr "Fehler"
 
-#: ../src/browser.c:734 ../src/desktopicon.c:814 ../src/view.c:144
+#: ../src/browser.c:738 ../src/desktopicon.c:814 ../src/view.c:144
 #: ../src/view.c:415
 msgid "Open with..."
 msgstr "Offnen mit..."
 
-#: ../src/browser.c:826 ../src/browser.c:1160
+#: ../src/browser.c:830 ../src/browser.c:1164
 msgid "Refreshing folder: "
 msgstr ""
 
-#: ../src/browser.c:847
+#: ../src/browser.c:851
 #, c-format
 msgid "%s%u file%c (%u hidden)"
 msgstr ""
 
-#: ../src/browser.c:1462
+#: ../src/browser.c:1466
 msgid "Filename"
 msgstr ""
 
-#: ../src/browser.c:1464
+#: ../src/browser.c:1468
 msgid "Size"
 msgstr "Größe"
 
-#: ../src/browser.c:1466
+#: ../src/browser.c:1470
 msgid "Owner"
 msgstr ""
 
-#: ../src/browser.c:1468
+#: ../src/browser.c:1472
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../src/browser.c:1470
+#: ../src/browser.c:1474
 msgid "Date"
 msgstr "Datum"
 
-#: ../src/browser.c:1472
+#: ../src/browser.c:1476
 msgid "MIME type"
 msgstr ""
 
-#: ../src/browser.c:1752
+#: ../src/browser.c:1756
 msgid "Refreshing folder..."
 msgstr "Aktualisierung..."
 
@@ -393,14 +461,6 @@ msgstr ""
 msgid "Appearance"
 msgstr ""
 
-#: ../src/desktop.c:785 ../src/desktop.c:804
-msgid "Back"
-msgstr ""
-
-#: ../src/desktop.c:864
-msgid "Home"
-msgstr "Persönlicher Ordner"
-
 #: ../src/desktop.c:884
 msgid "Applications"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 2c04bbd..a82bca7 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-12-21 13:35+0100\n"
+"POT-Creation-Date: 2010-12-21 13:40+0100\n"
 "PO-Revision-Date: 2010-03-30 01:04+0200\n"
 "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
 "Language-Team: Spanish\n"
@@ -28,7 +28,7 @@ msgstr ""
 msgid "New _symbolic link..."
 msgstr ""
 
-#: ../src/browser.c:79 ../src/browser.c:712
+#: ../src/browser.c:79 ../src/browser.c:716
 msgid "Open file..."
 msgstr ""
 
@@ -68,101 +68,169 @@ msgstr ""
 msgid "_Preferences"
 msgstr "_Preferencias"
 
-#: ../src/browser.c:135 ../src/browser.c:137 ../src/view.c:121
+#: ../src/browser.c:117
+msgid "_Refresh"
+msgstr ""
+
+#: ../src/browser.c:120
+msgid "_Home"
+msgstr "_Inicio"
+
+#: ../src/browser.c:124
+msgid "_Details"
+msgstr ""
+
+#: ../src/browser.c:126
+msgid "_Icons"
+msgstr ""
+
+#: ../src/browser.c:127
+msgid "_List"
+msgstr ""
+
+#: ../src/browser.c:128
+msgid "_Thumbnails"
+msgstr ""
+
+#: ../src/browser.c:136 ../src/browser.c:138 ../src/view.c:121
 #: ../src/view.c:123
 msgid "_About"
 msgstr ""
 
-#: ../src/browser.c:144 ../src/view.c:130 ../src/view.c:137
+#: ../src/browser.c:145 ../src/view.c:130 ../src/view.c:137
 msgid "_File"
 msgstr ""
 
-#: ../src/browser.c:145 ../src/desktopicon.c:680 ../src/view.c:109
+#: ../src/browser.c:146 ../src/desktopicon.c:680 ../src/view.c:109
 msgid "_Edit"
 msgstr ""
 
-#: ../src/browser.c:146
+#: ../src/browser.c:147
 msgid "_View"
 msgstr ""
 
-#: ../src/browser.c:147 ../src/view.c:131 ../src/view.c:138
+#: ../src/browser.c:148 ../src/view.c:131 ../src/view.c:138
 msgid "_Help"
 msgstr ""
 
-#: ../src/browser.c:267
+#: ../src/browser.c:156 ../src/desktop.c:785 ../src/desktop.c:804
+msgid "Back"
+msgstr ""
+
+#: ../src/browser.c:158
+msgid "Up"
+msgstr ""
+
+#: ../src/browser.c:159
+msgid "Forward"
+msgstr ""
+
+#: ../src/browser.c:161
+msgid "Refresh"
+msgstr ""
+
+#: ../src/browser.c:164 ../src/desktop.c:864
+msgid "Home"
+msgstr "Inicio"
+
+#: ../src/browser.c:166
+msgid "Cut"
+msgstr ""
+
+#: ../src/browser.c:167
+msgid "Copy"
+msgstr ""
+
+#: ../src/browser.c:168
+msgid "Paste"
+msgstr ""
+
+#: ../src/browser.c:170
+msgid "Properties"
+msgstr "Propriedades"
+
+#: ../src/browser.c:227
+msgid "Error while loading default icons"
+msgstr ""
+
+#: ../src/browser.c:244
+msgid "Error while loading configuration"
+msgstr ""
+
+#: ../src/browser.c:271
 msgid "File browser"
 msgstr ""
 
-#: ../src/browser.c:286
+#: ../src/browser.c:290
 msgid "View as..."
 msgstr ""
 
-#: ../src/browser.c:290 ../src/callbacks.c:268
+#: ../src/browser.c:294 ../src/callbacks.c:268
 msgid "Details"
 msgstr ""
 
-#: ../src/browser.c:297 ../src/callbacks.c:269
+#: ../src/browser.c:301 ../src/callbacks.c:269
 msgid "Icons"
 msgstr ""
 
-#: ../src/browser.c:301 ../src/callbacks.c:270
+#: ../src/browser.c:305 ../src/callbacks.c:270
 msgid "List"
 msgstr ""
 
-#: ../src/browser.c:305 ../src/callbacks.c:271
+#: ../src/browser.c:309 ../src/callbacks.c:271
 msgid "Thumbnails"
 msgstr ""
 
-#: ../src/browser.c:326
+#: ../src/browser.c:330
 msgid " Location: "
 msgstr ""
 
-#: ../src/browser.c:573 ../src/browser.c:578 ../src/copy.c:204
+#: ../src/browser.c:577 ../src/browser.c:582 ../src/copy.c:204
 #: ../src/delete.c:163 ../src/delete.c:168 ../src/desktop.c:1440
 #: ../src/desktop.c:1445 ../src/move.c:130 ../src/properties.c:117
 #: ../src/properties.c:121 ../src/view.c:364 ../src/view.c:367
 msgid "Error"
 msgstr ""
 
-#: ../src/browser.c:734 ../src/desktopicon.c:814 ../src/view.c:144
+#: ../src/browser.c:738 ../src/desktopicon.c:814 ../src/view.c:144
 #: ../src/view.c:415
 msgid "Open with..."
 msgstr ""
 
-#: ../src/browser.c:826 ../src/browser.c:1160
+#: ../src/browser.c:830 ../src/browser.c:1164
 msgid "Refreshing folder: "
 msgstr ""
 
-#: ../src/browser.c:847
+#: ../src/browser.c:851
 #, c-format
 msgid "%s%u file%c (%u hidden)"
 msgstr ""
 
-#: ../src/browser.c:1462
+#: ../src/browser.c:1466
 msgid "Filename"
 msgstr ""
 
-#: ../src/browser.c:1464
+#: ../src/browser.c:1468
 msgid "Size"
 msgstr ""
 
-#: ../src/browser.c:1466
+#: ../src/browser.c:1470
 msgid "Owner"
 msgstr ""
 
-#: ../src/browser.c:1468
+#: ../src/browser.c:1472
 msgid "Group"
 msgstr ""
 
-#: ../src/browser.c:1470
+#: ../src/browser.c:1474
 msgid "Date"
 msgstr ""
 
-#: ../src/browser.c:1472
+#: ../src/browser.c:1476
 msgid "MIME type"
 msgstr ""
 
-#: ../src/browser.c:1752
+#: ../src/browser.c:1756
 msgid "Refreshing folder..."
 msgstr ""
 
@@ -393,14 +461,6 @@ msgstr ""
 msgid "Appearance"
 msgstr ""
 
-#: ../src/desktop.c:785 ../src/desktop.c:804
-msgid "Back"
-msgstr ""
-
-#: ../src/desktop.c:864
-msgid "Home"
-msgstr "Inicio"
-
 #: ../src/desktop.c:884
 msgid "Applications"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 39506e8..789f55f 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-12-21 13:35+0100\n"
+"POT-Creation-Date: 2010-12-21 13:40+0100\n"
 "PO-Revision-Date: 2010-03-29 23:28+0200\n"
 "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
 "Language-Team: French\n"
@@ -28,7 +28,7 @@ msgstr "Nouveau _dossier"
 msgid "New _symbolic link..."
 msgstr "Nouveau _lien symbolique..."
 
-#: ../src/browser.c:79 ../src/browser.c:712
+#: ../src/browser.c:79 ../src/browser.c:716
 msgid "Open file..."
 msgstr "Ouvrir..."
 
@@ -42,19 +42,19 @@ msgstr "_Fermer"
 
 #: ../src/browser.c:92
 msgid "_Cut"
-msgstr ""
+msgstr "Co_uper"
 
 #: ../src/browser.c:94
 msgid "Cop_y"
-msgstr ""
+msgstr "_Copier"
 
 #: ../src/browser.c:96
 msgid "_Paste"
-msgstr ""
+msgstr "C_oller"
 
 #: ../src/browser.c:99
 msgid "_Delete"
-msgstr ""
+msgstr "_Supprimer"
 
 #: ../src/browser.c:101
 msgid "Select _all"
@@ -68,101 +68,169 @@ msgstr ""
 msgid "_Preferences"
 msgstr "_Préférences"
 
-#: ../src/browser.c:135 ../src/browser.c:137 ../src/view.c:121
+#: ../src/browser.c:117
+msgid "_Refresh"
+msgstr ""
+
+#: ../src/browser.c:120
+msgid "_Home"
+msgstr "_Dossier personnel"
+
+#: ../src/browser.c:124
+msgid "_Details"
+msgstr "_Détails"
+
+#: ../src/browser.c:126
+msgid "_Icons"
+msgstr "_Icônes"
+
+#: ../src/browser.c:127
+msgid "_List"
+msgstr "_Liste"
+
+#: ../src/browser.c:128
+msgid "_Thumbnails"
+msgstr "_Vignettes"
+
+#: ../src/browser.c:136 ../src/browser.c:138 ../src/view.c:121
 #: ../src/view.c:123
 msgid "_About"
 msgstr "À _propos"
 
-#: ../src/browser.c:144 ../src/view.c:130 ../src/view.c:137
+#: ../src/browser.c:145 ../src/view.c:130 ../src/view.c:137
 msgid "_File"
 msgstr "_Fichier"
 
-#: ../src/browser.c:145 ../src/desktopicon.c:680 ../src/view.c:109
+#: ../src/browser.c:146 ../src/desktopicon.c:680 ../src/view.c:109
 msgid "_Edit"
 msgstr "É_dition"
 
-#: ../src/browser.c:146
+#: ../src/browser.c:147
 msgid "_View"
 msgstr "_Vue"
 
-#: ../src/browser.c:147 ../src/view.c:131 ../src/view.c:138
+#: ../src/browser.c:148 ../src/view.c:131 ../src/view.c:138
 msgid "_Help"
 msgstr "_Aide"
 
-#: ../src/browser.c:267
+#: ../src/browser.c:156 ../src/desktop.c:785 ../src/desktop.c:804
+msgid "Back"
+msgstr "Précédent"
+
+#: ../src/browser.c:158
+msgid "Up"
+msgstr "Remonter"
+
+#: ../src/browser.c:159
+msgid "Forward"
+msgstr "Suivant"
+
+#: ../src/browser.c:161
+msgid "Refresh"
+msgstr "Rafraîchir"
+
+#: ../src/browser.c:164 ../src/desktop.c:864
+msgid "Home"
+msgstr "Dossier personnel"
+
+#: ../src/browser.c:166
+msgid "Cut"
+msgstr "Couper"
+
+#: ../src/browser.c:167
+msgid "Copy"
+msgstr "Copier"
+
+#: ../src/browser.c:168
+msgid "Paste"
+msgstr "Coller"
+
+#: ../src/browser.c:170
+msgid "Properties"
+msgstr "Propriétés"
+
+#: ../src/browser.c:227
+msgid "Error while loading default icons"
+msgstr ""
+
+#: ../src/browser.c:244
+msgid "Error while loading configuration"
+msgstr ""
+
+#: ../src/browser.c:271
 msgid "File browser"
 msgstr "Gestionnaire de fichiers"
 
-#: ../src/browser.c:286
+#: ../src/browser.c:290
 msgid "View as..."
 msgstr "Vue..."
 
-#: ../src/browser.c:290 ../src/callbacks.c:268
+#: ../src/browser.c:294 ../src/callbacks.c:268
 msgid "Details"
 msgstr "Détails"
 
-#: ../src/browser.c:297 ../src/callbacks.c:269
+#: ../src/browser.c:301 ../src/callbacks.c:269
 msgid "Icons"
 msgstr "Icônes"
 
-#: ../src/browser.c:301 ../src/callbacks.c:270
+#: ../src/browser.c:305 ../src/callbacks.c:270
 msgid "List"
 msgstr "Liste"
 
-#: ../src/browser.c:305 ../src/callbacks.c:271
+#: ../src/browser.c:309 ../src/callbacks.c:271
 msgid "Thumbnails"
 msgstr "Vignettes"
 
-#: ../src/browser.c:326
+#: ../src/browser.c:330
 msgid " Location: "
 msgstr " Chemin: "
 
-#: ../src/browser.c:573 ../src/browser.c:578 ../src/copy.c:204
+#: ../src/browser.c:577 ../src/browser.c:582 ../src/copy.c:204
 #: ../src/delete.c:163 ../src/delete.c:168 ../src/desktop.c:1440
 #: ../src/desktop.c:1445 ../src/move.c:130 ../src/properties.c:117
 #: ../src/properties.c:121 ../src/view.c:364 ../src/view.c:367
 msgid "Error"
 msgstr "Erreur"
 
-#: ../src/browser.c:734 ../src/desktopicon.c:814 ../src/view.c:144
+#: ../src/browser.c:738 ../src/desktopicon.c:814 ../src/view.c:144
 #: ../src/view.c:415
 msgid "Open with..."
 msgstr "Ouvrir avec..."
 
-#: ../src/browser.c:826 ../src/browser.c:1160
+#: ../src/browser.c:830 ../src/browser.c:1164
 msgid "Refreshing folder: "
 msgstr "Actualisation du dossier : "
 
-#: ../src/browser.c:847
+#: ../src/browser.c:851
 #, c-format
 msgid "%s%u file%c (%u hidden)"
 msgstr "%s%u fichier%c (%u cachés)"
 
-#: ../src/browser.c:1462
+#: ../src/browser.c:1466
 msgid "Filename"
 msgstr "Nom de fichier"
 
-#: ../src/browser.c:1464
+#: ../src/browser.c:1468
 msgid "Size"
 msgstr "Taille"
 
-#: ../src/browser.c:1466
+#: ../src/browser.c:1470
 msgid "Owner"
 msgstr "Propriétaire"
 
-#: ../src/browser.c:1468
+#: ../src/browser.c:1472
 msgid "Group"
 msgstr "Groupe"
 
-#: ../src/browser.c:1470
+#: ../src/browser.c:1474
 msgid "Date"
 msgstr "Date"
 
-#: ../src/browser.c:1472
+#: ../src/browser.c:1476
 msgid "MIME type"
 msgstr "Type MIME"
 
-#: ../src/browser.c:1752
+#: ../src/browser.c:1756
 msgid "Refreshing folder..."
 msgstr "Actualisation du dossier..."
 
@@ -353,7 +421,7 @@ msgid ""
 "Recursively delete?"
 msgstr ""
 "%s est un dossier.\n"
-"Effacer ?"
+"Effacer récursivement ?"
 
 #: ../src/delete.c:335 ../src/delete.c:359
 msgid "Yes to all"
@@ -413,14 +481,6 @@ msgstr "Mosaïque"
 msgid "Appearance"
 msgstr "Apparence"
 
-#: ../src/desktop.c:785 ../src/desktop.c:804
-msgid "Back"
-msgstr "Retour"
-
-#: ../src/desktop.c:864
-msgid "Home"
-msgstr "Dossier personnel"
-
 #: ../src/desktop.c:884
 msgid "Applications"
 msgstr "Applications"
diff --git a/po/it.po b/po/it.po
index 587a593..7ebe767 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Browser 0.1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-21 13:35+0100\n"
+"POT-Creation-Date: 2010-12-21 13:40+0100\n"
 "PO-Revision-Date: 2010-04-07 23:18+0200\n"
 "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
 "Language-Team: Italian\n"
@@ -28,7 +28,7 @@ msgstr ""
 msgid "New _symbolic link..."
 msgstr ""
 
-#: ../src/browser.c:79 ../src/browser.c:712
+#: ../src/browser.c:79 ../src/browser.c:716
 msgid "Open file..."
 msgstr ""
 
@@ -68,101 +68,169 @@ msgstr ""
 msgid "_Preferences"
 msgstr ""
 
-#: ../src/browser.c:135 ../src/browser.c:137 ../src/view.c:121
+#: ../src/browser.c:117
+msgid "_Refresh"
+msgstr ""
+
+#: ../src/browser.c:120
+msgid "_Home"
+msgstr ""
+
+#: ../src/browser.c:124
+msgid "_Details"
+msgstr ""
+
+#: ../src/browser.c:126
+msgid "_Icons"
+msgstr ""
+
+#: ../src/browser.c:127
+msgid "_List"
+msgstr ""
+
+#: ../src/browser.c:128
+msgid "_Thumbnails"
+msgstr ""
+
+#: ../src/browser.c:136 ../src/browser.c:138 ../src/view.c:121
 #: ../src/view.c:123
 msgid "_About"
 msgstr ""
 
-#: ../src/browser.c:144 ../src/view.c:130 ../src/view.c:137
+#: ../src/browser.c:145 ../src/view.c:130 ../src/view.c:137
 msgid "_File"
 msgstr ""
 
-#: ../src/browser.c:145 ../src/desktopicon.c:680 ../src/view.c:109
+#: ../src/browser.c:146 ../src/desktopicon.c:680 ../src/view.c:109
 msgid "_Edit"
 msgstr ""
 
-#: ../src/browser.c:146
+#: ../src/browser.c:147
 msgid "_View"
 msgstr ""
 
-#: ../src/browser.c:147 ../src/view.c:131 ../src/view.c:138
+#: ../src/browser.c:148 ../src/view.c:131 ../src/view.c:138
 msgid "_Help"
 msgstr ""
 
-#: ../src/browser.c:267
+#: ../src/browser.c:156 ../src/desktop.c:785 ../src/desktop.c:804
+msgid "Back"
+msgstr ""
+
+#: ../src/browser.c:158
+msgid "Up"
+msgstr ""
+
+#: ../src/browser.c:159
+msgid "Forward"
+msgstr ""
+
+#: ../src/browser.c:161
+msgid "Refresh"
+msgstr ""
+
+#: ../src/browser.c:164 ../src/desktop.c:864
+msgid "Home"
+msgstr ""
+
+#: ../src/browser.c:166
+msgid "Cut"
+msgstr ""
+
+#: ../src/browser.c:167
+msgid "Copy"
+msgstr ""
+
+#: ../src/browser.c:168
+msgid "Paste"
+msgstr ""
+
+#: ../src/browser.c:170
+msgid "Properties"
+msgstr ""
+
+#: ../src/browser.c:227
+msgid "Error while loading default icons"
+msgstr ""
+
+#: ../src/browser.c:244
+msgid "Error while loading configuration"
+msgstr ""
+
+#: ../src/browser.c:271
 msgid "File browser"
 msgstr ""
 
-#: ../src/browser.c:286
+#: ../src/browser.c:290
 msgid "View as..."
 msgstr ""
 
-#: ../src/browser.c:290 ../src/callbacks.c:268
+#: ../src/browser.c:294 ../src/callbacks.c:268
 msgid "Details"
 msgstr ""
 
-#: ../src/browser.c:297 ../src/callbacks.c:269
+#: ../src/browser.c:301 ../src/callbacks.c:269
 msgid "Icons"
 msgstr ""
 
-#: ../src/browser.c:301 ../src/callbacks.c:270
+#: ../src/browser.c:305 ../src/callbacks.c:270
 msgid "List"
 msgstr ""
 
-#: ../src/browser.c:305 ../src/callbacks.c:271
+#: ../src/browser.c:309 ../src/callbacks.c:271
 msgid "Thumbnails"
 msgstr ""
 
-#: ../src/browser.c:326
+#: ../src/browser.c:330
 msgid " Location: "
 msgstr ""
 
-#: ../src/browser.c:573 ../src/browser.c:578 ../src/copy.c:204
+#: ../src/browser.c:577 ../src/browser.c:582 ../src/copy.c:204
 #: ../src/delete.c:163 ../src/delete.c:168 ../src/desktop.c:1440
 #: ../src/desktop.c:1445 ../src/move.c:130 ../src/properties.c:117
 #: ../src/properties.c:121 ../src/view.c:364 ../src/view.c:367
 msgid "Error"
 msgstr ""
 
-#: ../src/browser.c:734 ../src/desktopicon.c:814 ../src/view.c:144
+#: ../src/browser.c:738 ../src/desktopicon.c:814 ../src/view.c:144
 #: ../src/view.c:415
 msgid "Open with..."
 msgstr ""
 
-#: ../src/browser.c:826 ../src/browser.c:1160
+#: ../src/browser.c:830 ../src/browser.c:1164
 msgid "Refreshing folder: "
 msgstr ""
 
-#: ../src/browser.c:847
+#: ../src/browser.c:851
 #, c-format
 msgid "%s%u file%c (%u hidden)"
 msgstr ""
 
-#: ../src/browser.c:1462
+#: ../src/browser.c:1466
 msgid "Filename"
 msgstr ""
 
-#: ../src/browser.c:1464
+#: ../src/browser.c:1468
 msgid "Size"
 msgstr ""
 
-#: ../src/browser.c:1466
+#: ../src/browser.c:1470
 msgid "Owner"
 msgstr ""
 
-#: ../src/browser.c:1468
+#: ../src/browser.c:1472
 msgid "Group"
 msgstr ""
 
-#: ../src/browser.c:1470
+#: ../src/browser.c:1474
 msgid "Date"
 msgstr ""
 
-#: ../src/browser.c:1472
+#: ../src/browser.c:1476
 msgid "MIME type"
 msgstr ""
 
-#: ../src/browser.c:1752
+#: ../src/browser.c:1756
 msgid "Refreshing folder..."
 msgstr ""
 
@@ -393,14 +461,6 @@ msgstr ""
 msgid "Appearance"
 msgstr ""
 
-#: ../src/desktop.c:785 ../src/desktop.c:804
-msgid "Back"
-msgstr ""
-
-#: ../src/desktop.c:864
-msgid "Home"
-msgstr ""
-
 #: ../src/desktop.c:884
 msgid "Applications"
 msgstr ""
diff --git a/src/browser.c b/src/browser.c
index d42b238..ae00c01 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -114,17 +114,18 @@ static DesktopMenu _browser_menu_edit[] =
 
 static DesktopMenu _browser_menu_view[] =
 {
-	{ "_Refresh", G_CALLBACK(on_refresh), GTK_STOCK_REFRESH,
+	{ N_("_Refresh"), G_CALLBACK(on_refresh), GTK_STOCK_REFRESH,
 		GDK_CONTROL_MASK, GDK_R },
 	{ "", NULL, NULL, 0, 0 },
-	{ "_Home", G_CALLBACK(on_view_home), GTK_STOCK_HOME, GDK_MOD1_MASK,
+	{ N_("_Home"), G_CALLBACK(on_view_home), GTK_STOCK_HOME, GDK_MOD1_MASK,
 		GDK_Home },
 #if GTK_CHECK_VERSION(2, 6, 0)
 	{ "", NULL, NULL, 0, 0 },
-	{ "_Details", G_CALLBACK(on_view_details), "stock_view-details", 0, 0 },
-	{ "_Icons", G_CALLBACK(on_view_icons), NULL, 0, 0 },
-	{ "_List", G_CALLBACK(on_view_list), NULL, 0, 0 },
-	{ "_Thumbnails", G_CALLBACK(on_view_thumbnails), NULL, 0, 0 },
+	{ N_("_Details"), G_CALLBACK(on_view_details), "stock_view-details", 0,
+		0 },
+	{ N_("_Icons"), G_CALLBACK(on_view_icons), NULL, 0, 0 },
+	{ N_("_List"), G_CALLBACK(on_view_list), NULL, 0, 0 },
+	{ N_("_Thumbnails"), G_CALLBACK(on_view_thumbnails), NULL, 0, 0 },
 #endif
 	{ NULL, NULL, NULL, 0, 0 }
 };
@@ -152,21 +153,22 @@ static DesktopMenubar _browser_menubar[] =
 /* toolbar */
 static DesktopToolbar _browser_toolbar[] =
 {
-	{ "Back", G_CALLBACK(on_back), GTK_STOCK_GO_BACK, GDK_MOD1_MASK,
+	{ N_("Back"), G_CALLBACK(on_back), GTK_STOCK_GO_BACK, GDK_MOD1_MASK,
 		GDK_Left, NULL },
-	{ "Up", G_CALLBACK(on_updir), GTK_STOCK_GO_UP, 0, 0, NULL },
-	{ "Forward", G_CALLBACK(on_forward), GTK_STOCK_GO_FORWARD,
+	{ N_("Up"), G_CALLBACK(on_updir), GTK_STOCK_GO_UP, 0, 0, NULL },
+	{ N_("Forward"), G_CALLBACK(on_forward), GTK_STOCK_GO_FORWARD,
 		GDK_MOD1_MASK, GDK_Right, NULL },
-	{ "Refresh", G_CALLBACK(on_refresh), GTK_STOCK_REFRESH, 0, 0, NULL },
-	{ "", NULL, NULL, 0, 0, NULL },
-	{ "Home", G_CALLBACK(on_home), GTK_STOCK_HOME, 0, 0, NULL },
-	{ "", NULL, NULL, 0, 0, NULL },
-	{ "Cut", G_CALLBACK(on_cut), GTK_STOCK_CUT, 0, 0, NULL },
-	{ "Copy", G_CALLBACK(on_copy), GTK_STOCK_COPY, 0, 0, NULL },
-	{ "Paste", G_CALLBACK(on_paste), GTK_STOCK_PASTE, 0, 0, NULL },
-	{ "", NULL, NULL, 0, 0, NULL },
-	{ "Properties", G_CALLBACK(on_properties), GTK_STOCK_PROPERTIES, 0, 0,
+	{ N_("Refresh"), G_CALLBACK(on_refresh), GTK_STOCK_REFRESH, 0, 0,
 		NULL },
+	{ "", NULL, NULL, 0, 0, NULL },
+	{ N_("Home"), G_CALLBACK(on_home), GTK_STOCK_HOME, 0, 0, NULL },
+	{ "", NULL, NULL, 0, 0, NULL },
+	{ N_("Cut"), G_CALLBACK(on_cut), GTK_STOCK_CUT, 0, 0, NULL },
+	{ N_("Copy"), G_CALLBACK(on_copy), GTK_STOCK_COPY, 0, 0, NULL },
+	{ N_("Paste"), G_CALLBACK(on_paste), GTK_STOCK_PASTE, 0, 0, NULL },
+	{ "", NULL, NULL, 0, 0, NULL },
+	{ N_("Properties"), G_CALLBACK(on_properties), GTK_STOCK_PROPERTIES, 0,
+		0, NULL },
 	{ NULL, NULL, NULL, 0, 0, NULL }
 };
 
@@ -222,7 +224,8 @@ Browser * browser_new(char const * directory)
 	browser->window = NULL;
 	if(_new_pixbufs(browser) != 0)
 	{
-		browser_error(browser, "Error while loading default icons", -1);
+		browser_error(browser, _("Error while loading default icons"),
+				-1);
 		free(browser);
 		return NULL;
 	}
@@ -238,7 +241,8 @@ Browser * browser_new(char const * directory)
 	browser->prefs.show_hidden_files = FALSE;
 	if((browser->config = config_new()) == NULL
 			|| browser_config_load(browser) != 0)
-		browser_error(browser, "Error while loading configuration", 0);
+		browser_error(browser, _("Error while loading configuration"),
+				0);
 
 	/* mime */
 	browser->mime = mime_new(); /* FIXME share MIME instances */