diff --git a/ChangeLog b/ChangeLog
index d93be19ced31302e78208ea460a4a8891b74fa18..ce4acf904bd4f9998d27acb6a3dfa6395a1e9860 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2006-02-01	Benedikt Meurer <benny@xfce.org>
+
+	* thunar/thunar-standard-view.c: Open a dialog when renaming a file.
+	  Bug #1413.
+	* thunar/thunar-standard-view.c(thunar_standard_view_action_delete):
+	  Use "Cancel" and "Delete" buttons in the delete confirmation dialog,
+	  as suggested by Jasper.
+	* thunar/thunar-progress-dialog.c(thunar_progress_dialog_error),
+	  thunar/thunar-permissions-chooser.c
+	  (thunar_permissions_chooser_job_error): Use "Close" button for the
+	  error dialogs.
+	* po/Thunar.pot, po/*.po: Merge new strings.
+	* po/de.po: Some work on the german translations.
+	* docs/reference/thunar-vfs/tmpl/: Update thunar-vfs API docs.
+
 2006-02-01	Benedikt Meurer <benny@xfce.org>
 
 	* thunar/thunar-properties-dialog.c: Don't recreate plugin pages if
diff --git a/docs/reference/thunar-vfs/tmpl/thunar-vfs-info.sgml b/docs/reference/thunar-vfs/tmpl/thunar-vfs-info.sgml
index 5b8bf1ca7402edc26311ea580089808bf81da6a5..eef4a2f20cf4f727d34db8ef5a716c979d8121bd 100644
--- a/docs/reference/thunar-vfs/tmpl/thunar-vfs-info.sgml
+++ b/docs/reference/thunar-vfs/tmpl/thunar-vfs-info.sgml
@@ -31,7 +31,6 @@ ThunarVfsInfo
 @atime: the time of last access.
 @mtime: the time of last modification.
 @ctime: the time of last status change.
-@inode: the file's inode.
 @device: the file's device.
 @mime_info: the file's mime type.
 @path: the file's path.
diff --git a/docs/reference/thunar-vfs/tmpl/thunar-vfs-types.sgml b/docs/reference/thunar-vfs/tmpl/thunar-vfs-types.sgml
index 39342004abdc6b2f71672ee79b54d117a73868cf..12d51f3fe8f43721ae03b6c527f00e6fd59ce8cd 100644
--- a/docs/reference/thunar-vfs/tmpl/thunar-vfs-types.sgml
+++ b/docs/reference/thunar-vfs/tmpl/thunar-vfs-types.sgml
@@ -67,12 +67,6 @@ Basic Types
 </para>
 
 
-<!-- ##### TYPEDEF ThunarVfsFileInode ##### -->
-<para>
-
-</para>
-
-
 <!-- ##### TYPEDEF ThunarVfsFileSize ##### -->
 <para>
 
diff --git a/po/Thunar.pot b/po/Thunar.pot
index 9cb411dcdd3e650268a7c8be6c1e605fecf3e6e0..1a73e6f18e8efef7c2bb9ffa32d7a9447d9c8d73 100644
--- a/po/Thunar.pot
+++ b/po/Thunar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-01 01:05+0900\n"
+"POT-Creation-Date: 2006-02-01 22:26+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -84,29 +84,29 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:303
+#: ../thunar-vfs/thunar-vfs-info.c:302
 msgid "No Exec field specified"
 msgstr ""
 
 #. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:322
+#: ../thunar-vfs/thunar-vfs-info.c:321
 msgid "No URL field specified"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-info.c:327 ../thunar-vfs/thunar-vfs-info.c:447
+#: ../thunar-vfs/thunar-vfs-info.c:326 ../thunar-vfs/thunar-vfs-info.c:446
 msgid "Invalid desktop file"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-info.c:335
+#: ../thunar-vfs/thunar-vfs-info.c:334
 msgid "Unable to parse file"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-info.c:425
+#: ../thunar-vfs/thunar-vfs-info.c:424
 msgid "Invalid file name"
 msgstr ""
 
 #. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:682
+#: ../thunar-vfs/thunar-vfs-info.c:680
 #, c-format
 msgid "Failed to stat file `%s': %s"
 msgstr ""
@@ -456,7 +456,7 @@ msgstr ""
 msgid "There is nothing on the clipboard to paste"
 msgstr ""
 
-#: ../thunar/thunar-create-dialog.c:177
+#: ../thunar/thunar-create-dialog.c:177 ../thunar/thunar-standard-view.c:2014
 msgid "Enter the new name:"
 msgstr ""
 
@@ -520,11 +520,11 @@ msgstr ""
 msgid "Unable to execute file `%s'"
 msgstr ""
 
-#: ../thunar/thunar-file.c:756
+#: ../thunar/thunar-file.c:722
 msgid "The root folder has no parent"
 msgstr ""
 
-#: ../thunar/thunar-file.c:1050
+#: ../thunar/thunar-file.c:1016
 msgid "File System"
 msgstr ""
 
@@ -1047,8 +1047,7 @@ msgid "%s (%u Bytes)"
 msgstr ""
 
 #. display an error message
-#: ../thunar/thunar-properties-dialog.c:791
-#: ../thunar/thunar-standard-view.c:2562
+#: ../thunar/thunar-properties-dialog.c:788
 #, c-format
 msgid "Failed to rename `%s'"
 msgstr ""
@@ -1084,151 +1083,151 @@ msgstr ""
 msgid "Failed to add new shortcut"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:276
+#: ../thunar/thunar-standard-view.c:273
 msgid "File Context Menu"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:277
+#: ../thunar/thunar-standard-view.c:274
 msgid "Folder Context Menu"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:275
 msgid "Create _Folder..."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:275
 msgid "Create an empty folder within the current folder"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:276
 msgid "_Properties..."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:276
 msgid "View the properties of the selected file"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:277
 msgid "_Copy Files"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:277
 msgid "Copy the selected files"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:278
 msgid "Cu_t Files"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:278
 msgid "Cut the selected files"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:282
+#: ../thunar/thunar-standard-view.c:279
 msgid "_Paste Files"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:280
 msgid "_Delete Files"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:280
 msgid "Delete the selected files"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:281
 msgid "Paste Files into Folder"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:281
 msgid "Paste files into the selected folder"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:282
 msgid "Select _all Files"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:282
 msgid "Select all files in this window"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select _by Pattern..."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select all files that match a certain pattern"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:287 ../thunar/thunar-standard-view.c:2844
+#: ../thunar/thunar-standard-view.c:284 ../thunar/thunar-standard-view.c:2911
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:287
+#: ../thunar/thunar-standard-view.c:284
 msgid "Duplicate each selected file"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:288 ../thunar/thunar-standard-view.c:2850
+#: ../thunar/thunar-standard-view.c:285 ../thunar/thunar-standard-view.c:2917
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:288
+#: ../thunar/thunar-standard-view.c:285
 msgid "Create a symbolic link for each selected file"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:289
-msgid "_Rename"
+#: ../thunar/thunar-standard-view.c:286
+msgid "_Rename..."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:289
+#: ../thunar/thunar-standard-view.c:286
 msgid "Rename the selected file"
 msgstr ""
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:504
+#: ../thunar/thunar-standard-view.c:499
 msgid "Create _Document"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:960
+#: ../thunar/thunar-standard-view.c:956
 msgid "Loading folder contents..."
 msgstr ""
 
 #. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1472
+#: ../thunar/thunar-standard-view.c:1468
 msgid "New Empty File"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1472
+#: ../thunar/thunar-standard-view.c:1468
 msgid "New Empty File..."
 msgstr ""
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1523
+#: ../thunar/thunar-standard-view.c:1519
 msgid "New Folder"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1523
+#: ../thunar/thunar-standard-view.c:1519
 msgid "New Folder..."
 msgstr ""
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1572
+#: ../thunar/thunar-standard-view.c:1568
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1735
+#: ../thunar/thunar-standard-view.c:1731
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
 "permanently delete \"%s\"?"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1741
+#: ../thunar/thunar-standard-view.c:1737
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1251,24 +1250,36 @@ msgstr ""
 msgid "Pattern:"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:2517
+#. create a new dialog window
+#: ../thunar/thunar-standard-view.c:1985
+#, c-format
+msgid "Rename \"%s\""
+msgstr ""
+
+#. display an error message
+#: ../thunar/thunar-standard-view.c:2056
+#, c-format
+msgid "Failed to rename \"%s\""
+msgstr ""
+
+#: ../thunar/thunar-standard-view.c:2651
 #, c-format
 msgid "Failed to open directory `%s'"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:2817
+#: ../thunar/thunar-standard-view.c:2884
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:2823
+#: ../thunar/thunar-standard-view.c:2890
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:2832
+#: ../thunar/thunar-standard-view.c:2899
 msgid "_Delete File"
 msgid_plural "_Delete Files"
 msgstr[0] ""
diff --git a/po/ca.po b/po/ca.po
index 8ed4ec49751dfc352238dc9bfe8ad31147f4a632..e7c9a7b6529ac439945660dc198ad39069973d17 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-01 01:05+0900\n"
+"POT-Creation-Date: 2006-02-01 22:26+0100\n"
 "PO-Revision-Date: 2006-01-29 15:14+0900\n"
 "Last-Translator: Pau Rul·lan Ferragut <paurullan@bulma.net>\n"
 "Language-Team: Catalan\n"
@@ -94,30 +94,30 @@ msgstr ""
 "El voleu ometre?"
 
 #. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:303
+#: ../thunar-vfs/thunar-vfs-info.c:302
 msgid "No Exec field specified"
 msgstr "No s'ha especificat camp Exec"
 
 #. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:322
+#: ../thunar-vfs/thunar-vfs-info.c:321
 #, fuzzy
 msgid "No URL field specified"
 msgstr "No s'ha especificat camp Exec"
 
-#: ../thunar-vfs/thunar-vfs-info.c:327 ../thunar-vfs/thunar-vfs-info.c:447
+#: ../thunar-vfs/thunar-vfs-info.c:326 ../thunar-vfs/thunar-vfs-info.c:446
 msgid "Invalid desktop file"
 msgstr "El nom de l'escriptori no és vàlid"
 
-#: ../thunar-vfs/thunar-vfs-info.c:335
+#: ../thunar-vfs/thunar-vfs-info.c:334
 msgid "Unable to parse file"
 msgstr "No s'ha pogut analitzar el fitxer"
 
-#: ../thunar-vfs/thunar-vfs-info.c:425
+#: ../thunar-vfs/thunar-vfs-info.c:424
 msgid "Invalid file name"
 msgstr "El nom del fitxer no és vàlid"
 
 #. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:682
+#: ../thunar-vfs/thunar-vfs-info.c:680
 #, c-format
 msgid "Failed to stat file `%s': %s"
 msgstr "No s'ha pogut saber l'estat del fitxer `%s': %s"
@@ -476,7 +476,7 @@ msgstr "Altres aplicacions:"
 msgid "There is nothing on the clipboard to paste"
 msgstr "El portaretalls no té res per enganxar"
 
-#: ../thunar/thunar-create-dialog.c:177
+#: ../thunar/thunar-create-dialog.c:177 ../thunar/thunar-standard-view.c:2014
 msgid "Enter the new name:"
 msgstr "Introduïu el nom nou:"
 
@@ -540,11 +540,11 @@ msgstr "_Enllaça aquí"
 msgid "Unable to execute file `%s'"
 msgstr "No s'ha pogut executar el fitxer `%s'"
 
-#: ../thunar/thunar-file.c:756
+#: ../thunar/thunar-file.c:722
 msgid "The root folder has no parent"
 msgstr "La carpeta arrel no té pare"
 
-#: ../thunar/thunar-file.c:1050
+#: ../thunar/thunar-file.c:1016
 msgid "File System"
 msgstr "Sistema de fitxers"
 
@@ -1129,8 +1129,7 @@ msgid "%s (%u Bytes)"
 msgstr "Octets"
 
 #. display an error message
-#: ../thunar/thunar-properties-dialog.c:791
-#: ../thunar/thunar-standard-view.c:2562
+#: ../thunar/thunar-properties-dialog.c:788
 #, fuzzy, c-format
 msgid "Failed to rename `%s'"
 msgstr "Ha fallat"
@@ -1169,179 +1168,180 @@ msgstr "no a"
 msgid "Failed to add new shortcut"
 msgstr "Ha fallat afegeix nou drecera"
 
-#: ../thunar/thunar-standard-view.c:276
+#: ../thunar/thunar-standard-view.c:273
 #, fuzzy
 msgid "File Context Menu"
 msgstr "Fitxer Context Menú"
 
-#: ../thunar/thunar-standard-view.c:277
+#: ../thunar/thunar-standard-view.c:274
 #, fuzzy
 msgid "Folder Context Menu"
 msgstr "Carpeta Context Menú"
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:275
 #, fuzzy
 msgid "Create _Folder..."
 msgstr "Crea Carpeta."
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:275
 #, fuzzy
 msgid "Create an empty folder within the current folder"
 msgstr "Crea"
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:276
 #, fuzzy
 msgid "_Properties..."
 msgstr "_Propietats..."
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:276
 #, fuzzy
 msgid "View the properties of the selected file"
 msgstr "Visualització propietats de seleccionat fitxer"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:277
 #, fuzzy
 msgid "_Copy Files"
 msgstr "Copia Fitxers"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:277
 #, fuzzy
 msgid "Copy the selected files"
 msgstr "Copia seleccionat"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:278
 #, fuzzy
 msgid "Cu_t Files"
 msgstr "Fitxers"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:278
 #, fuzzy
 msgid "Cut the selected files"
 msgstr "Retalla seleccionat"
 
-#: ../thunar/thunar-standard-view.c:282
+#: ../thunar/thunar-standard-view.c:279
 #, fuzzy
 msgid "_Paste Files"
 msgstr "Enganxa Fitxers"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:280
 #, fuzzy
 msgid "_Delete Files"
 msgstr "Suprimeix Fitxers"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:280
 #, fuzzy
 msgid "Delete the selected files"
 msgstr "Suprimeix seleccionat"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:281
 #, fuzzy
 msgid "Paste Files into Folder"
 msgstr "Enganxa Fitxers Carpeta"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:281
 #, fuzzy
 msgid "Paste files into the selected folder"
 msgstr "Enganxa seleccionat"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:282
 #, fuzzy
 msgid "Select _all Files"
 msgstr "Selecciona tot Fitxers"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:282
 #, fuzzy
 msgid "Select all files in this window"
 msgstr "Selecciona tot in finestra"
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:283
 #, fuzzy
 msgid "Select _by Pattern..."
 msgstr "Selecciona Patró."
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:283
 #, fuzzy
 msgid "Select all files that match a certain pattern"
 msgstr "Selecciona tot a"
 
-#: ../thunar/thunar-standard-view.c:287 ../thunar/thunar-standard-view.c:2844
+#: ../thunar/thunar-standard-view.c:284 ../thunar/thunar-standard-view.c:2911
 #, fuzzy
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] "Fitxer"
 msgstr[1] "Fitxer"
 
-#: ../thunar/thunar-standard-view.c:287
+#: ../thunar/thunar-standard-view.c:284
 #, fuzzy
 msgid "Duplicate each selected file"
 msgstr "Duplicat seleccionat fitxer"
 
-#: ../thunar/thunar-standard-view.c:288 ../thunar/thunar-standard-view.c:2850
+#: ../thunar/thunar-standard-view.c:285 ../thunar/thunar-standard-view.c:2917
 #, fuzzy
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "Crea un _enllaç"
 msgstr[1] "Crea un _enllaç"
 
-#: ../thunar/thunar-standard-view.c:288
+#: ../thunar/thunar-standard-view.c:285
 #, fuzzy
 msgid "Create a symbolic link for each selected file"
 msgstr "Crea a enllaç per seleccionat fitxer"
 
-#: ../thunar/thunar-standard-view.c:289
-msgid "_Rename"
+#: ../thunar/thunar-standard-view.c:286
+#, fuzzy
+msgid "_Rename..."
 msgstr "_Reanomena"
 
-#: ../thunar/thunar-standard-view.c:289
+#: ../thunar/thunar-standard-view.c:286
 #, fuzzy
 msgid "Rename the selected file"
 msgstr "Canvia el nom seleccionat fitxer"
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:504
+#: ../thunar/thunar-standard-view.c:499
 #, fuzzy
 msgid "Create _Document"
 msgstr "Crea Acció"
 
-#: ../thunar/thunar-standard-view.c:960
+#: ../thunar/thunar-standard-view.c:956
 msgid "Loading folder contents..."
 msgstr "S'estan carregant els continguts de la carpeta..."
 
 #. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1472
+#: ../thunar/thunar-standard-view.c:1468
 msgid "New Empty File"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1472
+#: ../thunar/thunar-standard-view.c:1468
 #, fuzzy
 msgid "New Empty File..."
 msgstr "Nou Carpeta."
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1523
+#: ../thunar/thunar-standard-view.c:1519
 #, fuzzy
 msgid "New Folder"
 msgstr "Nova carpeta"
 
-#: ../thunar/thunar-standard-view.c:1523
+#: ../thunar/thunar-standard-view.c:1519
 #, fuzzy
 msgid "New Folder..."
 msgstr "Nou Carpeta."
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1572
+#: ../thunar/thunar-standard-view.c:1568
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1735
+#: ../thunar/thunar-standard-view.c:1731
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to\n"
 "permanently delete \"%s\"?"
 msgstr "suprimeix?"
 
-#: ../thunar/thunar-standard-view.c:1741
+#: ../thunar/thunar-standard-view.c:1737
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1366,26 +1366,38 @@ msgstr "Selecciona Patró"
 msgid "Pattern:"
 msgstr "Patró:"
 
-#: ../thunar/thunar-standard-view.c:2517
+#. create a new dialog window
+#: ../thunar/thunar-standard-view.c:1985
+#, fuzzy, c-format
+msgid "Rename \"%s\""
+msgstr "_Reanomena"
+
+#. display an error message
+#: ../thunar/thunar-standard-view.c:2056
+#, fuzzy, c-format
+msgid "Failed to rename \"%s\""
+msgstr "Ha fallat"
+
+#: ../thunar/thunar-standard-view.c:2651
 #, fuzzy, c-format
 msgid "Failed to open directory `%s'"
 msgstr "Ha fallat obre"
 
-#: ../thunar/thunar-standard-view.c:2817
+#: ../thunar/thunar-standard-view.c:2884
 #, fuzzy
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] "Copia Fitxer"
 msgstr[1] "Copia Fitxer"
 
-#: ../thunar/thunar-standard-view.c:2823
+#: ../thunar/thunar-standard-view.c:2890
 #, fuzzy
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] "Fitxer"
 msgstr[1] "Fitxer"
 
-#: ../thunar/thunar-standard-view.c:2832
+#: ../thunar/thunar-standard-view.c:2899
 #, fuzzy
 msgid "_Delete File"
 msgid_plural "_Delete Files"
diff --git a/po/de.po b/po/de.po
index 9a4a52153d8aeb234421c4ae81ad793f6481178b..5dc284cbc8d075980ca53da843418a10a9b71d62 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-01 01:05+0900\n"
-"PO-Revision-Date: 2006-01-23 23:26+0100\n"
+"POT-Creation-Date: 2006-02-01 22:26+0100\n"
+"PO-Revision-Date: 2006-02-01 20:10+0100\n"
 "Last-Translator: Benedikt Meurer <benny@xfce.org>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -82,29 +82,29 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:303
+#: ../thunar-vfs/thunar-vfs-info.c:302
 msgid "No Exec field specified"
 msgstr ""
 
 #. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:322
+#: ../thunar-vfs/thunar-vfs-info.c:321
 msgid "No URL field specified"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-info.c:327 ../thunar-vfs/thunar-vfs-info.c:447
+#: ../thunar-vfs/thunar-vfs-info.c:326 ../thunar-vfs/thunar-vfs-info.c:446
 msgid "Invalid desktop file"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-info.c:335
+#: ../thunar-vfs/thunar-vfs-info.c:334
 msgid "Unable to parse file"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-info.c:425
+#: ../thunar-vfs/thunar-vfs-info.c:424
 msgid "Invalid file name"
-msgstr ""
+msgstr "Ungültiger Dateiname"
 
 #. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:682
+#: ../thunar-vfs/thunar-vfs-info.c:680
 #, c-format
 msgid "Failed to stat file `%s': %s"
 msgstr ""
@@ -343,9 +343,8 @@ msgid "Deleting files..."
 msgstr "Lösche Dateien..."
 
 #: ../thunar/thunar-application.c:622
-#, fuzzy
 msgid "Creating files..."
-msgstr "Lösche Dateien..."
+msgstr "Erstelle Dateien..."
 
 #: ../thunar/thunar-application.c:662
 msgid "Creating directories..."
@@ -386,9 +385,8 @@ msgstr ""
 
 #. create the "Custom command" button
 #: ../thunar/thunar-chooser-dialog.c:284
-#, fuzzy
 msgid "_Browse"
-msgstr "_Schließen"
+msgstr "_Durchsuchen"
 
 #. display an error to the user
 #: ../thunar/thunar-chooser-dialog.c:457
@@ -457,7 +455,7 @@ msgstr "Andere Anwendungen:"
 msgid "There is nothing on the clipboard to paste"
 msgstr ""
 
-#: ../thunar/thunar-create-dialog.c:177
+#: ../thunar/thunar-create-dialog.c:177 ../thunar/thunar-standard-view.c:2014
 msgid "Enter the new name:"
 msgstr "Neuen Namen eingeben:"
 
@@ -521,11 +519,11 @@ msgstr "Hierher verknü_pfen"
 msgid "Unable to execute file `%s'"
 msgstr ""
 
-#: ../thunar/thunar-file.c:756
+#: ../thunar/thunar-file.c:722
 msgid "The root folder has no parent"
 msgstr ""
 
-#: ../thunar/thunar-file.c:1050
+#: ../thunar/thunar-file.c:1016
 #, fuzzy
 msgid "File System"
 msgstr "Dateisystem"
@@ -1053,8 +1051,7 @@ msgid "%s (%u Bytes)"
 msgstr "%s (%u Byte)"
 
 #. display an error message
-#: ../thunar/thunar-properties-dialog.c:791
-#: ../thunar/thunar-standard-view.c:2562
+#: ../thunar/thunar-properties-dialog.c:788
 #, c-format
 msgid "Failed to rename `%s'"
 msgstr "Konnte `%s' nicht umbenennen"
@@ -1091,153 +1088,154 @@ msgstr ""
 msgid "Failed to add new shortcut"
 msgstr "Andere Anwendung..."
 
-#: ../thunar/thunar-standard-view.c:276
+#: ../thunar/thunar-standard-view.c:273
 msgid "File Context Menu"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:277
+#: ../thunar/thunar-standard-view.c:274
 msgid "Folder Context Menu"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:275
 msgid "Create _Folder..."
 msgstr "_Verzeichnis erstellen..."
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:275
 msgid "Create an empty folder within the current folder"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:276
 msgid "_Properties..."
 msgstr "_Eigenschaften..."
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:276
 msgid "View the properties of the selected file"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:277
 msgid "_Copy Files"
 msgstr "Dateien _kopieren"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:277
 msgid "Copy the selected files"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:278
 msgid "Cu_t Files"
 msgstr "Dateien _ausschneiden"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:278
 msgid "Cut the selected files"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:282
+#: ../thunar/thunar-standard-view.c:279
 msgid "_Paste Files"
 msgstr "Dateien e_infügen"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:280
 msgid "_Delete Files"
 msgstr "Dateien _löschen"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:280
 msgid "Delete the selected files"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:281
 msgid "Paste Files into Folder"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:281
 msgid "Paste files into the selected folder"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:282
 msgid "Select _all Files"
 msgstr "Alles au_swählen"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:282
 msgid "Select all files in this window"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select _by Pattern..."
 msgstr "_Muster auswählen..."
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select all files that match a certain pattern"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:287 ../thunar/thunar-standard-view.c:2844
+#: ../thunar/thunar-standard-view.c:284 ../thunar/thunar-standard-view.c:2911
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:287
+#: ../thunar/thunar-standard-view.c:284
 msgid "Duplicate each selected file"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:288 ../thunar/thunar-standard-view.c:2850
+#: ../thunar/thunar-standard-view.c:285 ../thunar/thunar-standard-view.c:2917
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:288
+#: ../thunar/thunar-standard-view.c:285
 msgid "Create a symbolic link for each selected file"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:289
-msgid "_Rename"
+#: ../thunar/thunar-standard-view.c:286
+#, fuzzy
+msgid "_Rename..."
 msgstr "_Umbennen"
 
-#: ../thunar/thunar-standard-view.c:289
+#: ../thunar/thunar-standard-view.c:286
 msgid "Rename the selected file"
 msgstr ""
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:504
+#: ../thunar/thunar-standard-view.c:499
 #, fuzzy
 msgid "Create _Document"
 msgstr "Neue Aktion erstellen"
 
-#: ../thunar/thunar-standard-view.c:960
+#: ../thunar/thunar-standard-view.c:956
 msgid "Loading folder contents..."
 msgstr ""
 
 #. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1472
+#: ../thunar/thunar-standard-view.c:1468
 msgid "New Empty File"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1472
+#: ../thunar/thunar-standard-view.c:1468
 #, fuzzy
 msgid "New Empty File..."
 msgstr "Neues Verzeichnis..."
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1523
+#: ../thunar/thunar-standard-view.c:1519
 msgid "New Folder"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1523
+#: ../thunar/thunar-standard-view.c:1519
 msgid "New Folder..."
 msgstr "Neues Verzeichnis..."
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1572
+#: ../thunar/thunar-standard-view.c:1568
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1735
+#: ../thunar/thunar-standard-view.c:1731
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
 "permanently delete \"%s\"?"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1741
+#: ../thunar/thunar-standard-view.c:1737
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1260,26 +1258,38 @@ msgstr "Muster auswählen"
 msgid "Pattern:"
 msgstr "Muster:"
 
-#: ../thunar/thunar-standard-view.c:2517
+#. create a new dialog window
+#: ../thunar/thunar-standard-view.c:1985
+#, fuzzy, c-format
+msgid "Rename \"%s\""
+msgstr "_Umbennen"
+
+#. display an error message
+#: ../thunar/thunar-standard-view.c:2056
+#, fuzzy, c-format
+msgid "Failed to rename \"%s\""
+msgstr "Konnte `%s' nicht umbenennen"
+
+#: ../thunar/thunar-standard-view.c:2651
 #, c-format
 msgid "Failed to open directory `%s'"
 msgstr "Konnte Verzeichnis `%s' nicht öffnen"
 
-#: ../thunar/thunar-standard-view.c:2817
+#: ../thunar/thunar-standard-view.c:2884
 #, fuzzy
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] "_Datei"
 msgstr[1] "_Datei"
 
-#: ../thunar/thunar-standard-view.c:2823
+#: ../thunar/thunar-standard-view.c:2890
 #, fuzzy
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] "_Datei"
 msgstr[1] "_Datei"
 
-#: ../thunar/thunar-standard-view.c:2832
+#: ../thunar/thunar-standard-view.c:2899
 msgid "_Delete File"
 msgid_plural "_Delete Files"
 msgstr[0] ""
@@ -1288,13 +1298,12 @@ msgstr[1] ""
 #. tell the user that no templates were found
 #: ../thunar/thunar-templates-action.c:375
 msgid "No Templates installed"
-msgstr ""
+msgstr "Keine Vorlagen installiert"
 
 #. add the "Empty File" item
 #: ../thunar/thunar-templates-action.c:387
-#, fuzzy
 msgid "_Empty File"
-msgstr "_Datei"
+msgstr "_Leere Datei"
 
 #: ../thunar/thunar-window.c:214
 msgid "_File"
@@ -1342,7 +1351,7 @@ msgstr "_Anzeige"
 
 #: ../thunar/thunar-window.c:221
 msgid "_Reload"
-msgstr ""
+msgstr "_Neu laden"
 
 #: ../thunar/thunar-window.c:221
 #, fuzzy
@@ -1403,7 +1412,7 @@ msgstr ""
 
 #: ../thunar/thunar-window.c:230
 msgid "T_emplates"
-msgstr ""
+msgstr "_Vorlagen"
 
 #: ../thunar/thunar-window.c:230
 msgid "Go to the templates folder"
@@ -1439,7 +1448,7 @@ msgstr "Verborgene Dateien im momentan geöffneten Fenster anzeigen/verbergen"
 
 #: ../thunar/thunar-window.c:239
 msgid "St_atusbar"
-msgstr ""
+msgstr "St_atusleiste"
 
 #: ../thunar/thunar-window.c:239
 msgid "Change the visibility of this window's statusbar"
@@ -1484,7 +1493,7 @@ msgstr ""
 #.
 #: ../thunar/thunar-window.c:510
 msgid "View as _Icons"
-msgstr ""
+msgstr "_Symbolansicht"
 
 #: ../thunar/thunar-window.c:510
 msgid "Display folder content in an icon view"
@@ -1492,7 +1501,7 @@ msgstr ""
 
 #: ../thunar/thunar-window.c:517
 msgid "View as _Detailed List"
-msgstr ""
+msgstr "_Detailansicht"
 
 #: ../thunar/thunar-window.c:517
 msgid "Display folder content in a detailed list view"
@@ -1511,7 +1520,7 @@ msgstr ""
 #. display the "About Templates" dialog
 #: ../thunar/thunar-window.c:1351
 msgid "About Templates"
-msgstr ""
+msgstr "Ãœber Vorlagen"
 
 #: ../thunar/thunar-window.c:1372
 msgid "All files in this folder will appear in the \"Create Document\" menu."
@@ -1529,12 +1538,11 @@ msgstr ""
 
 #: ../thunar/thunar-window.c:1391
 msgid "Do _not display this message again"
-msgstr ""
+msgstr "Diese Meldung in Zukunft _nicht mehr anzeigen"
 
 #: ../thunar/thunar-window.c:1404
-#, fuzzy
 msgid "Failed to open templates folder"
-msgstr "Detailierte Verzeichnisansicht"
+msgstr "Das Verzeichnis mit den Vorlagen konnte nicht geöffnet werden"
 
 #: ../thunar/thunar-window.c:1495
 msgid ""
@@ -1572,7 +1580,7 @@ msgstr ""
 
 #: ../thunar-uca/thunar-uca-chooser.c:125
 msgid "Custom Actions"
-msgstr ""
+msgstr "Benutzerdefinierte Aktionen"
 
 #: ../thunar-uca/thunar-uca-chooser.c:142
 msgid ""
@@ -1622,7 +1630,7 @@ msgstr "Allgemein"
 
 #: ../thunar-uca/thunar-uca-editor.c:145
 msgid "_Name:"
-msgstr "Name:"
+msgstr "_Name:"
 
 #: ../thunar-uca/thunar-uca-editor.c:150
 msgid "The name of the action that will be displayed in the context menu."
diff --git a/po/el.po b/po/el.po
index 08d54dad23543c0ad70d64ecbd52b1ee9c9e40df..4a65b54fd6c54937cb9279ffee77f7122e9fad7a 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-01 01:05+0900\n"
+"POT-Creation-Date: 2006-02-01 22:26+0100\n"
 "PO-Revision-Date: 2005-12-04 23:18+0900\n"
 "Last-Translator: Stavros Giannouris <stavrosg2002@freemail.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -94,30 +94,30 @@ msgstr ""
 "Θέλετε να το προσπεράσετε;"
 
 #. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:303
+#: ../thunar-vfs/thunar-vfs-info.c:302
 msgid "No Exec field specified"
 msgstr "Δεν έχει οριστεί το πεδίο Exec"
 
 #. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:322
+#: ../thunar-vfs/thunar-vfs-info.c:321
 #, fuzzy
 msgid "No URL field specified"
 msgstr "Δεν έχει οριστεί το πεδίο Exec"
 
-#: ../thunar-vfs/thunar-vfs-info.c:327 ../thunar-vfs/thunar-vfs-info.c:447
+#: ../thunar-vfs/thunar-vfs-info.c:326 ../thunar-vfs/thunar-vfs-info.c:446
 msgid "Invalid desktop file"
 msgstr "Μη έγκυρο αρχείο συντόμευσης"
 
-#: ../thunar-vfs/thunar-vfs-info.c:335
+#: ../thunar-vfs/thunar-vfs-info.c:334
 msgid "Unable to parse file"
 msgstr "Δεν ήταν δυνατή η ανάγνωση του αρχείου"
 
-#: ../thunar-vfs/thunar-vfs-info.c:425
+#: ../thunar-vfs/thunar-vfs-info.c:424
 msgid "Invalid file name"
 msgstr "Μη έγκυρο όνομα αρχείου"
 
 #. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:682
+#: ../thunar-vfs/thunar-vfs-info.c:680
 #, c-format
 msgid "Failed to stat file `%s': %s"
 msgstr ""
@@ -477,7 +477,7 @@ msgstr "Άλλες Εφαρμογές:"
 msgid "There is nothing on the clipboard to paste"
 msgstr "Δεν υπάρχει τίποτα στο πρόχειρο για να επικολληθεί."
 
-#: ../thunar/thunar-create-dialog.c:177
+#: ../thunar/thunar-create-dialog.c:177 ../thunar/thunar-standard-view.c:2014
 msgid "Enter the new name:"
 msgstr "Εισάγετε νέο όνομα:"
 
@@ -543,11 +543,11 @@ msgstr "Δ_ημιουργία δεσμού εδώ"
 msgid "Unable to execute file `%s'"
 msgstr "Δεν ήταν δυνατή η εκτέλεση του αρχείου `%s'"
 
-#: ../thunar/thunar-file.c:756
+#: ../thunar/thunar-file.c:722
 msgid "The root folder has no parent"
 msgstr "Ο ριζικός φάκελος δεν έχει γονεϊκό φάκελο"
 
-#: ../thunar/thunar-file.c:1050
+#: ../thunar/thunar-file.c:1016
 #, fuzzy
 msgid "File System"
 msgstr "Σύστημα αρχείων"
@@ -1082,8 +1082,7 @@ msgid "%s (%u Bytes)"
 msgstr "%s (%u Bytes)"
 
 #. display an error message
-#: ../thunar/thunar-properties-dialog.c:791
-#: ../thunar/thunar-standard-view.c:2562
+#: ../thunar/thunar-properties-dialog.c:788
 #, c-format
 msgid "Failed to rename `%s'"
 msgstr "Η μετονομασία του `%s' απέτυχε"
@@ -1119,147 +1118,148 @@ msgstr "Η διαδρομή '%s' δεν αντιστοιχεί σε κατάλο
 msgid "Failed to add new shortcut"
 msgstr "Η προσθήκη νέας συντόμευσης απέτυχε"
 
-#: ../thunar/thunar-standard-view.c:276
+#: ../thunar/thunar-standard-view.c:273
 msgid "File Context Menu"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:277
+#: ../thunar/thunar-standard-view.c:274
 msgid "Folder Context Menu"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:275
 msgid "Create _Folder..."
 msgstr "Δημιουργία _Φακέλου..."
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:275
 msgid "Create an empty folder within the current folder"
 msgstr "Δημιουργία ενός άδειου φακέλου μέσα στον τρέχον φάκελο"
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:276
 #, fuzzy
 msgid "_Properties..."
 msgstr "_Ιδιότητες"
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:276
 msgid "View the properties of the selected file"
 msgstr "Προβολή των ιδιοτήτων του επιλεγμένου αρχείου"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:277
 msgid "_Copy Files"
 msgstr "_Αντιγραφή Αρχείων"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:277
 msgid "Copy the selected files"
 msgstr "Αντιγραφή των επιλεγμένων αρχείων"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:278
 msgid "Cu_t Files"
 msgstr "Α_ποκοπή Αρχείων"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:278
 msgid "Cut the selected files"
 msgstr "Αποκοπή των επιλεγμένων αρχείων"
 
-#: ../thunar/thunar-standard-view.c:282
+#: ../thunar/thunar-standard-view.c:279
 msgid "_Paste Files"
 msgstr "_Επικόλληση Αρχείων"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:280
 msgid "_Delete Files"
 msgstr "_Διαγραφή Αρχείων"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:280
 msgid "Delete the selected files"
 msgstr "Διαγραφή των επιλεγμένων αρχείων"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:281
 msgid "Paste Files into Folder"
 msgstr "Επικόλληση Αρχείων σε Φάκελο"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:281
 msgid "Paste files into the selected folder"
 msgstr "Επικόλληση αρχείων στον επιλεγμένο φάκελο"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:282
 msgid "Select _all Files"
 msgstr "Επιλογή ό_λων των Αρχείων"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:282
 msgid "Select all files in this window"
 msgstr "Επιλογή όλων των αρχείων σε αυτό το παράθυρο"
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select _by Pattern..."
 msgstr "Επιλογή _βάσει μοτίβου..."
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select all files that match a certain pattern"
 msgstr "Επιλογή όλων των αρχείων που ταιριάζουν σε ένα μοτίβο"
 
-#: ../thunar/thunar-standard-view.c:287 ../thunar/thunar-standard-view.c:2844
+#: ../thunar/thunar-standard-view.c:284 ../thunar/thunar-standard-view.c:2911
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:287
+#: ../thunar/thunar-standard-view.c:284
 msgid "Duplicate each selected file"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:288 ../thunar/thunar-standard-view.c:2850
+#: ../thunar/thunar-standard-view.c:285 ../thunar/thunar-standard-view.c:2917
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "Δημιουργία _Δεσμού"
 msgstr[1] "Δημιουργία _Δεσμών"
 
-#: ../thunar/thunar-standard-view.c:288
+#: ../thunar/thunar-standard-view.c:285
 msgid "Create a symbolic link for each selected file"
 msgstr "Δημιουργεί ένα συμβολικό δεσμό για κάθε επιλεγμένο αρχείο"
 
-#: ../thunar/thunar-standard-view.c:289
-msgid "_Rename"
+#: ../thunar/thunar-standard-view.c:286
+#, fuzzy
+msgid "_Rename..."
 msgstr "_Μετονομασία"
 
-#: ../thunar/thunar-standard-view.c:289
+#: ../thunar/thunar-standard-view.c:286
 msgid "Rename the selected file"
 msgstr "Μετονομασία του επιλεγμένου αρχείου"
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:504
+#: ../thunar/thunar-standard-view.c:499
 #, fuzzy
 msgid "Create _Document"
 msgstr "Δημιουργία Ενέργειας"
 
-#: ../thunar/thunar-standard-view.c:960
+#: ../thunar/thunar-standard-view.c:956
 msgid "Loading folder contents..."
 msgstr "Φόρτωμα περιεχομένων φακέλου..."
 
 #. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1472
+#: ../thunar/thunar-standard-view.c:1468
 msgid "New Empty File"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1472
+#: ../thunar/thunar-standard-view.c:1468
 #, fuzzy
 msgid "New Empty File..."
 msgstr "Νέος Φάκελος..."
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1523
+#: ../thunar/thunar-standard-view.c:1519
 msgid "New Folder"
 msgstr "Νέος Φάκελος"
 
-#: ../thunar/thunar-standard-view.c:1523
+#: ../thunar/thunar-standard-view.c:1519
 msgid "New Folder..."
 msgstr "Νέος Φάκελος..."
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1572
+#: ../thunar/thunar-standard-view.c:1568
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1735
+#: ../thunar/thunar-standard-view.c:1731
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
@@ -1268,7 +1268,7 @@ msgstr ""
 "Είστε σίγουρος/η ότι θέλετε να διαγράψετε\n"
 "οριστικά το \"%s\";"
 
-#: ../thunar/thunar-standard-view.c:1741
+#: ../thunar/thunar-standard-view.c:1737
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1295,24 +1295,36 @@ msgstr "Επιλογή βάσει Μοτίβου"
 msgid "Pattern:"
 msgstr "Μοτίβο:"
 
-#: ../thunar/thunar-standard-view.c:2517
+#. create a new dialog window
+#: ../thunar/thunar-standard-view.c:1985
+#, fuzzy, c-format
+msgid "Rename \"%s\""
+msgstr "_Μετονομασία"
+
+#. display an error message
+#: ../thunar/thunar-standard-view.c:2056
+#, fuzzy, c-format
+msgid "Failed to rename \"%s\""
+msgstr "Η μετονομασία του `%s' απέτυχε"
+
+#: ../thunar/thunar-standard-view.c:2651
 #, c-format
 msgid "Failed to open directory `%s'"
 msgstr "Το άνοιγμα του καταλόγου `%s' απέτυχε"
 
-#: ../thunar/thunar-standard-view.c:2817
+#: ../thunar/thunar-standard-view.c:2884
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] "_Αντιγραφή Αρχείου"
 msgstr[1] "_Αντιγραφή Αρχείων"
 
-#: ../thunar/thunar-standard-view.c:2823
+#: ../thunar/thunar-standard-view.c:2890
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] "Αποκοπή _Αρχείου"
 msgstr[1] "Αποκοπή _Αρχείων"
 
-#: ../thunar/thunar-standard-view.c:2832
+#: ../thunar/thunar-standard-view.c:2899
 msgid "_Delete File"
 msgid_plural "_Delete Files"
 msgstr[0] "_Διαγραφή Αρχείου"
diff --git a/po/es.po b/po/es.po
index 4424ab45eb52ad3d5af4a9e281f7ba304c365093..a92d388ad0d526824f341e748976480e8e25d8e1 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-01 01:05+0900\n"
+"POT-Creation-Date: 2006-02-01 22:26+0100\n"
 "PO-Revision-Date: 2005-10-14 23:57+0900\n"
 "Last-Translator: Pablo Hernández-M. Saiz <homeless3d@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -92,30 +92,30 @@ msgstr ""
 "¿Quiere dejarlo como está?"
 
 #. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:303
+#: ../thunar-vfs/thunar-vfs-info.c:302
 msgid "No Exec field specified"
 msgstr "Campo de ejecución no especificado"
 
 #. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:322
+#: ../thunar-vfs/thunar-vfs-info.c:321
 #, fuzzy
 msgid "No URL field specified"
 msgstr "Campo de ejecución no especificado"
 
-#: ../thunar-vfs/thunar-vfs-info.c:327 ../thunar-vfs/thunar-vfs-info.c:447
+#: ../thunar-vfs/thunar-vfs-info.c:326 ../thunar-vfs/thunar-vfs-info.c:446
 msgid "Invalid desktop file"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-info.c:335
+#: ../thunar-vfs/thunar-vfs-info.c:334
 msgid "Unable to parse file"
 msgstr "Imposible interpretar archivo"
 
-#: ../thunar-vfs/thunar-vfs-info.c:425
+#: ../thunar-vfs/thunar-vfs-info.c:424
 msgid "Invalid file name"
 msgstr "Nombre de archivo inválido"
 
 #. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:682
+#: ../thunar-vfs/thunar-vfs-info.c:680
 #, fuzzy, c-format
 msgid "Failed to stat file `%s': %s"
 msgstr "Imposible renombrar %s."
@@ -483,7 +483,7 @@ msgstr "Otra aplicación..."
 msgid "There is nothing on the clipboard to paste"
 msgstr "No hay nada en el portapapeles que pueda ser pegado"
 
-#: ../thunar/thunar-create-dialog.c:177
+#: ../thunar/thunar-create-dialog.c:177 ../thunar/thunar-standard-view.c:2014
 msgid "Enter the new name:"
 msgstr ""
 
@@ -548,11 +548,11 @@ msgstr ""
 msgid "Unable to execute file `%s'"
 msgstr "No se puede ejecutar el archivo \"%s\"."
 
-#: ../thunar/thunar-file.c:756
+#: ../thunar/thunar-file.c:722
 msgid "The root folder has no parent"
 msgstr ""
 
-#: ../thunar/thunar-file.c:1050
+#: ../thunar/thunar-file.c:1016
 #, fuzzy
 msgid "File System"
 msgstr "Raíz"
@@ -1089,8 +1089,7 @@ msgid "%s (%u Bytes)"
 msgstr "%s (%u Bytes)"
 
 #. display an error message
-#: ../thunar/thunar-properties-dialog.c:791
-#: ../thunar/thunar-standard-view.c:2562
+#: ../thunar/thunar-properties-dialog.c:788
 #, fuzzy, c-format
 msgid "Failed to rename `%s'"
 msgstr "Imposible renombrar %s."
@@ -1129,168 +1128,169 @@ msgstr ""
 msgid "Failed to add new shortcut"
 msgstr "No se puede añadir el marcador"
 
-#: ../thunar/thunar-standard-view.c:276
+#: ../thunar/thunar-standard-view.c:273
 msgid "File Context Menu"
 msgstr "Menú contextual de archivo"
 
-#: ../thunar/thunar-standard-view.c:277
+#: ../thunar/thunar-standard-view.c:274
 msgid "Folder Context Menu"
 msgstr "Menú contextual de carpeta"
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:275
 msgid "Create _Folder..."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:275
 msgid "Create an empty folder within the current folder"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:276
 #, fuzzy
 msgid "_Properties..."
 msgstr "_Propiedades"
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:276
 #, fuzzy
 msgid "View the properties of the selected file"
 msgstr "Ver las propiedades del elemento seleccionado"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:277
 #, fuzzy
 msgid "_Copy Files"
 msgstr "_Copiar archivos"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:277
 #, fuzzy
 msgid "Copy the selected files"
 msgstr "Abrir el elemento seleccionado"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:278
 #, fuzzy
 msgid "Cu_t Files"
 msgstr "Cor_tar archivos"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:278
 #, fuzzy
 msgid "Cut the selected files"
 msgstr "Abrir el elemento seleccionado"
 
-#: ../thunar/thunar-standard-view.c:282
+#: ../thunar/thunar-standard-view.c:279
 #, fuzzy
 msgid "_Paste Files"
 msgstr "_Pegar archivos"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:280
 #, fuzzy
 msgid "_Delete Files"
 msgstr "Archivos seleccionados"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:280
 #, fuzzy
 msgid "Delete the selected files"
 msgstr "Abrir el elemento seleccionado"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:281
 #, fuzzy
 msgid "Paste Files into Folder"
 msgstr "Pegar archivos en la carpeta"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:281
 msgid "Paste files into the selected folder"
 msgstr "Pegar archivos en la carpeta seleccionada"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:282
 #, fuzzy
 msgid "Select _all Files"
 msgstr "Seleccionar _todos los archivos"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:282
 msgid "Select all files in this window"
 msgstr "Seleccionar todos los archivos en esta ventana"
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:283
 #, fuzzy
 msgid "Select _by Pattern..."
 msgstr "Patrón de selección"
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select all files that match a certain pattern"
 msgstr "Selecciona todos los archivos que coinciden con un patrón"
 
-#: ../thunar/thunar-standard-view.c:287 ../thunar/thunar-standard-view.c:2844
+#: ../thunar/thunar-standard-view.c:284 ../thunar/thunar-standard-view.c:2911
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:287
+#: ../thunar/thunar-standard-view.c:284
 #, fuzzy
 msgid "Duplicate each selected file"
 msgstr "Abrir el elemento seleccionado"
 
-#: ../thunar/thunar-standard-view.c:288 ../thunar/thunar-standard-view.c:2850
+#: ../thunar/thunar-standard-view.c:285 ../thunar/thunar-standard-view.c:2917
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:288
+#: ../thunar/thunar-standard-view.c:285
 msgid "Create a symbolic link for each selected file"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:289
-msgid "_Rename"
+#: ../thunar/thunar-standard-view.c:286
+#, fuzzy
+msgid "_Rename..."
 msgstr "_Renombrar..."
 
-#: ../thunar/thunar-standard-view.c:289
+#: ../thunar/thunar-standard-view.c:286
 #, fuzzy
 msgid "Rename the selected file"
 msgstr "Renombra el elemento seleccionado"
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:504
+#: ../thunar/thunar-standard-view.c:499
 msgid "Create _Document"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:960
+#: ../thunar/thunar-standard-view.c:956
 msgid "Loading folder contents..."
 msgstr "Cargando el contenido de la carpeta..."
 
 #. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1472
+#: ../thunar/thunar-standard-view.c:1468
 msgid "New Empty File"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1472
+#: ../thunar/thunar-standard-view.c:1468
 #, fuzzy
 msgid "New Empty File..."
 msgstr "Carpeta"
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1523
+#: ../thunar/thunar-standard-view.c:1519
 #, fuzzy
 msgid "New Folder"
 msgstr "Carpeta"
 
-#: ../thunar/thunar-standard-view.c:1523
+#: ../thunar/thunar-standard-view.c:1519
 #, fuzzy
 msgid "New Folder..."
 msgstr "Carpeta"
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1572
+#: ../thunar/thunar-standard-view.c:1568
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1735
+#: ../thunar/thunar-standard-view.c:1731
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to\n"
 "permanently delete \"%s\"?"
 msgstr "¿Esta seguro de que desea borrar todos los elementos de la papelera?"
 
-#: ../thunar/thunar-standard-view.c:1741
+#: ../thunar/thunar-standard-view.c:1737
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1316,26 +1316,38 @@ msgstr "Patrón de selección"
 msgid "Pattern:"
 msgstr "Patrón:"
 
-#: ../thunar/thunar-standard-view.c:2517
+#. create a new dialog window
+#: ../thunar/thunar-standard-view.c:1985
+#, fuzzy, c-format
+msgid "Rename \"%s\""
+msgstr "_Renombrar..."
+
+#. display an error message
+#: ../thunar/thunar-standard-view.c:2056
+#, fuzzy, c-format
+msgid "Failed to rename \"%s\""
+msgstr "Imposible renombrar %s."
+
+#: ../thunar/thunar-standard-view.c:2651
 #, fuzzy, c-format
 msgid "Failed to open directory `%s'"
 msgstr "Imposible abrir el directorio %s."
 
-#: ../thunar/thunar-standard-view.c:2817
+#: ../thunar/thunar-standard-view.c:2884
 #, fuzzy
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] "_Copiar archivo"
 msgstr[1] "_Copiar archivos"
 
-#: ../thunar/thunar-standard-view.c:2823
+#: ../thunar/thunar-standard-view.c:2890
 #, fuzzy
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] "Cor_tar archivo"
 msgstr[1] "Cor_tar archivos"
 
-#: ../thunar/thunar-standard-view.c:2832
+#: ../thunar/thunar-standard-view.c:2899
 #, fuzzy
 msgid "_Delete File"
 msgid_plural "_Delete Files"
diff --git a/po/fr.po b/po/fr.po
index fd3eacd52ec44bba20b1a83f827ec520a8e9f890..1aa2a0e8023095f502831921cc3236c59f4c604b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-01 01:05+0900\n"
+"POT-Creation-Date: 2006-02-01 22:26+0100\n"
 "PO-Revision-Date: 2006-01-01 15:02+0100\n"
 "Last-Translator: Stephane Roy <sroy@j2n.net>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -92,30 +92,30 @@ msgstr ""
 "Voulez-vous l'ignorer ?"
 
 #. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:303
+#: ../thunar-vfs/thunar-vfs-info.c:302
 msgid "No Exec field specified"
 msgstr "Aucun champ Exec spécifié"
 
 #. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:322
+#: ../thunar-vfs/thunar-vfs-info.c:321
 #, fuzzy
 msgid "No URL field specified"
 msgstr "Aucun champ Exec spécifié"
 
-#: ../thunar-vfs/thunar-vfs-info.c:327 ../thunar-vfs/thunar-vfs-info.c:447
+#: ../thunar-vfs/thunar-vfs-info.c:326 ../thunar-vfs/thunar-vfs-info.c:446
 msgid "Invalid desktop file"
 msgstr "Fichier de bureau invalide"
 
-#: ../thunar-vfs/thunar-vfs-info.c:335
+#: ../thunar-vfs/thunar-vfs-info.c:334
 msgid "Unable to parse file"
 msgstr "Impossible d'analyser le fichier"
 
-#: ../thunar-vfs/thunar-vfs-info.c:425
+#: ../thunar-vfs/thunar-vfs-info.c:424
 msgid "Invalid file name"
 msgstr "Nom de fichier invalide"
 
 #. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:682
+#: ../thunar-vfs/thunar-vfs-info.c:680
 #, c-format
 msgid "Failed to stat file `%s': %s"
 msgstr "Échec pour récupérer le statut du fichier `%s' : %s"
@@ -475,7 +475,7 @@ msgstr "Autres applications :"
 msgid "There is nothing on the clipboard to paste"
 msgstr "Il n'y a rien à coller dans le presse-papier"
 
-#: ../thunar/thunar-create-dialog.c:177
+#: ../thunar/thunar-create-dialog.c:177 ../thunar/thunar-standard-view.c:2014
 msgid "Enter the new name:"
 msgstr "Entrer le nouveau nom :"
 
@@ -539,11 +539,11 @@ msgstr "_Lier ici"
 msgid "Unable to execute file `%s'"
 msgstr "Impossible d'exécuter le fichier `%s'"
 
-#: ../thunar/thunar-file.c:756
+#: ../thunar/thunar-file.c:722
 msgid "The root folder has no parent"
 msgstr "Le dossier racine n'a pas de père"
 
-#: ../thunar/thunar-file.c:1050
+#: ../thunar/thunar-file.c:1016
 #, fuzzy
 msgid "File System"
 msgstr "Système de fichier"
@@ -1084,8 +1084,7 @@ msgid "%s (%u Bytes)"
 msgstr "%s (%u octets)"
 
 #. display an error message
-#: ../thunar/thunar-properties-dialog.c:791
-#: ../thunar/thunar-standard-view.c:2562
+#: ../thunar/thunar-properties-dialog.c:788
 #, c-format
 msgid "Failed to rename `%s'"
 msgstr "Échec au changement de nom de `%s'"
@@ -1121,147 +1120,148 @@ msgstr "Le chemin '%s' ne fait pas référence à un répertoire"
 msgid "Failed to add new shortcut"
 msgstr "Échec à l'ajout d'un nouveau raccourci"
 
-#: ../thunar/thunar-standard-view.c:276
+#: ../thunar/thunar-standard-view.c:273
 msgid "File Context Menu"
 msgstr "Menu contextuel de fichier"
 
-#: ../thunar/thunar-standard-view.c:277
+#: ../thunar/thunar-standard-view.c:274
 msgid "Folder Context Menu"
 msgstr "Menu contextuel de dossier"
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:275
 msgid "Create _Folder..."
 msgstr "Création d'un _dossier..."
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:275
 msgid "Create an empty folder within the current folder"
 msgstr "Crée un dossier vide dans le dossier courant"
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:276
 #, fuzzy
 msgid "_Properties..."
 msgstr "_Propriétés"
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:276
 msgid "View the properties of the selected file"
 msgstr "Affiche les propriétés du fichier sélectionné"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:277
 msgid "_Copy Files"
 msgstr "_Copier les fichiers"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:277
 msgid "Copy the selected files"
 msgstr "Copie les fichiers sélectionnés"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:278
 msgid "Cu_t Files"
 msgstr "Cou_per les fichiers"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:278
 msgid "Cut the selected files"
 msgstr "Coupe les fichiers sélectionnés"
 
-#: ../thunar/thunar-standard-view.c:282
+#: ../thunar/thunar-standard-view.c:279
 msgid "_Paste Files"
 msgstr "Co_ller les fichiers"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:280
 msgid "_Delete Files"
 msgstr "_Supprimer les fichiers"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:280
 msgid "Delete the selected files"
 msgstr "Supprime les fichiers sélectionnés"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:281
 msgid "Paste Files into Folder"
 msgstr "Colle les fichiers dans le dossier"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:281
 msgid "Paste files into the selected folder"
 msgstr "Colle les fichiers dans le dossier sélectionné"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:282
 msgid "Select _all Files"
 msgstr "Sélectionner _tout les fichiers"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:282
 msgid "Select all files in this window"
 msgstr "Sélectionner tous les fichiers dans cette fenêtre"
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select _by Pattern..."
 msgstr "Sélectionner par _motif..."
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select all files that match a certain pattern"
 msgstr "Sélectionner tous les fichiers qui correspondent à un certain motif"
 
-#: ../thunar/thunar-standard-view.c:287 ../thunar/thunar-standard-view.c:2844
+#: ../thunar/thunar-standard-view.c:284 ../thunar/thunar-standard-view.c:2911
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] "Du_pliquer le fichier"
 msgstr[1] "Du_pliquer les fichiers"
 
-#: ../thunar/thunar-standard-view.c:287
+#: ../thunar/thunar-standard-view.c:284
 msgid "Duplicate each selected file"
 msgstr "Duplique chaque fichier sélectionné"
 
-#: ../thunar/thunar-standard-view.c:288 ../thunar/thunar-standard-view.c:2850
+#: ../thunar/thunar-standard-view.c:285 ../thunar/thunar-standard-view.c:2917
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "C_réer un lien"
 msgstr[1] "C_réer des liens"
 
-#: ../thunar/thunar-standard-view.c:288
+#: ../thunar/thunar-standard-view.c:285
 msgid "Create a symbolic link for each selected file"
 msgstr "Créer un lien symbolique pour chaque fichier sélectionné"
 
-#: ../thunar/thunar-standard-view.c:289
-msgid "_Rename"
+#: ../thunar/thunar-standard-view.c:286
+#, fuzzy
+msgid "_Rename..."
 msgstr "_Renommer"
 
-#: ../thunar/thunar-standard-view.c:289
+#: ../thunar/thunar-standard-view.c:286
 msgid "Rename the selected file"
 msgstr "Renommer le fichier sélectionné"
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:504
+#: ../thunar/thunar-standard-view.c:499
 #, fuzzy
 msgid "Create _Document"
 msgstr "Créer une action"
 
-#: ../thunar/thunar-standard-view.c:960
+#: ../thunar/thunar-standard-view.c:956
 msgid "Loading folder contents..."
 msgstr "Chargement du contenu du dossier..."
 
 #. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1472
+#: ../thunar/thunar-standard-view.c:1468
 msgid "New Empty File"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1472
+#: ../thunar/thunar-standard-view.c:1468
 #, fuzzy
 msgid "New Empty File..."
 msgstr "Nouveau dossier..."
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1523
+#: ../thunar/thunar-standard-view.c:1519
 msgid "New Folder"
 msgstr "Nouveau dossier"
 
-#: ../thunar/thunar-standard-view.c:1523
+#: ../thunar/thunar-standard-view.c:1519
 msgid "New Folder..."
 msgstr "Nouveau dossier..."
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1572
+#: ../thunar/thunar-standard-view.c:1568
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1735
+#: ../thunar/thunar-standard-view.c:1731
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
@@ -1270,7 +1270,7 @@ msgstr ""
 "Êtes-vous certain que vous voulez\n"
 "effacer \"%s\" définitivement ?"
 
-#: ../thunar/thunar-standard-view.c:1741
+#: ../thunar/thunar-standard-view.c:1737
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1297,24 +1297,36 @@ msgstr "Sélectionner par motif"
 msgid "Pattern:"
 msgstr "Motif :"
 
-#: ../thunar/thunar-standard-view.c:2517
+#. create a new dialog window
+#: ../thunar/thunar-standard-view.c:1985
+#, fuzzy, c-format
+msgid "Rename \"%s\""
+msgstr "_Renommer"
+
+#. display an error message
+#: ../thunar/thunar-standard-view.c:2056
+#, fuzzy, c-format
+msgid "Failed to rename \"%s\""
+msgstr "Échec au changement de nom de `%s'"
+
+#: ../thunar/thunar-standard-view.c:2651
 #, c-format
 msgid "Failed to open directory `%s'"
 msgstr "Échec à l'ouverture du répertoire `%s'"
 
-#: ../thunar/thunar-standard-view.c:2817
+#: ../thunar/thunar-standard-view.c:2884
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] "_Copier le fichier"
 msgstr[1] "_Copier les fichiers"
 
-#: ../thunar/thunar-standard-view.c:2823
+#: ../thunar/thunar-standard-view.c:2890
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] "Co_uper le fichier"
 msgstr[1] "Co_uper les fichiers"
 
-#: ../thunar/thunar-standard-view.c:2832
+#: ../thunar/thunar-standard-view.c:2899
 msgid "_Delete File"
 msgid_plural "_Delete Files"
 msgstr[0] "_Supprimer le fichier"
diff --git a/po/hu.po b/po/hu.po
index d878f0546d568c85155474cdc70fedc8cdcc8cc0..4aeff71d5c39caf280549148ce59a0c68cacd3ea 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-01 01:05+0900\n"
+"POT-Creation-Date: 2006-02-01 22:26+0100\n"
 "PO-Revision-Date: 2005-10-06 22:02+0900\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -91,30 +91,30 @@ msgstr ""
 "Átugrod?"
 
 #. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:303
+#: ../thunar-vfs/thunar-vfs-info.c:302
 msgid "No Exec field specified"
 msgstr ""
 
 #. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:322
+#: ../thunar-vfs/thunar-vfs-info.c:321
 msgid "No URL field specified"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-info.c:327 ../thunar-vfs/thunar-vfs-info.c:447
+#: ../thunar-vfs/thunar-vfs-info.c:326 ../thunar-vfs/thunar-vfs-info.c:446
 msgid "Invalid desktop file"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-info.c:335
+#: ../thunar-vfs/thunar-vfs-info.c:334
 #, fuzzy
 msgid "Unable to parse file"
 msgstr "Nem nyitható meg e fájl: %s"
 
-#: ../thunar-vfs/thunar-vfs-info.c:425
+#: ../thunar-vfs/thunar-vfs-info.c:424
 msgid "Invalid file name"
 msgstr ""
 
 #. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:682
+#: ../thunar-vfs/thunar-vfs-info.c:680
 #, fuzzy, c-format
 msgid "Failed to stat file `%s': %s"
 msgstr "Nem törölhető: %s"
@@ -482,7 +482,7 @@ msgstr "_Hely megnyitása..."
 msgid "There is nothing on the clipboard to paste"
 msgstr "Nincs beillesztenivaló a vágólapon"
 
-#: ../thunar/thunar-create-dialog.c:177
+#: ../thunar/thunar-create-dialog.c:177 ../thunar/thunar-standard-view.c:2014
 msgid "Enter the new name:"
 msgstr ""
 
@@ -547,11 +547,11 @@ msgstr ""
 msgid "Unable to execute file `%s'"
 msgstr "Nem lehet másolni a fájlt: %s"
 
-#: ../thunar/thunar-file.c:756
+#: ../thunar/thunar-file.c:722
 msgid "The root folder has no parent"
 msgstr ""
 
-#: ../thunar/thunar-file.c:1050
+#: ../thunar/thunar-file.c:1016
 #, fuzzy
 msgid "File System"
 msgstr "Fájlrendszer"
@@ -1089,8 +1089,7 @@ msgid "%s (%u Bytes)"
 msgstr "%s (%u bájt)"
 
 #. display an error message
-#: ../thunar/thunar-properties-dialog.c:791
-#: ../thunar/thunar-standard-view.c:2562
+#: ../thunar/thunar-properties-dialog.c:788
 #, fuzzy, c-format
 msgid "Failed to rename `%s'"
 msgstr "Nem törölhető: %s"
@@ -1127,170 +1126,170 @@ msgstr ""
 msgid "Failed to add new shortcut"
 msgstr "Nem törölhető: %s"
 
-#: ../thunar/thunar-standard-view.c:276
+#: ../thunar/thunar-standard-view.c:273
 #, fuzzy
 msgid "File Context Menu"
 msgstr "Helyi menü"
 
-#: ../thunar/thunar-standard-view.c:277
+#: ../thunar/thunar-standard-view.c:274
 #, fuzzy
 msgid "Folder Context Menu"
 msgstr "Helyi menü"
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:275
 msgid "Create _Folder..."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:275
 msgid "Create an empty folder within the current folder"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:276
 #, fuzzy
 msgid "_Properties..."
 msgstr "Tulajdonságok"
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:276
 #, fuzzy
 msgid "View the properties of the selected file"
 msgstr "A kijelölt elem tulajdonságai"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:277
 #, fuzzy
 msgid "_Copy Files"
 msgstr "Fájlok másolása"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:277
 #, fuzzy
 msgid "Copy the selected files"
 msgstr "A kijelölt elem tulajdonságai"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:278
 #, fuzzy
 msgid "Cu_t Files"
 msgstr "Fájlok kivágása"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:278
 #, fuzzy
 msgid "Cut the selected files"
 msgstr "A kijelölt elem tulajdonságai"
 
-#: ../thunar/thunar-standard-view.c:282
+#: ../thunar/thunar-standard-view.c:279
 #, fuzzy
 msgid "_Paste Files"
 msgstr "Fájlok beillesztése"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:280
 #, fuzzy
 msgid "_Delete Files"
 msgstr "Minden fájl kiválasztása"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:280
 #, fuzzy
 msgid "Delete the selected files"
 msgstr "A kijelölt elem tulajdonságai"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:281
 #, fuzzy
 msgid "Paste Files into Folder"
 msgstr "Fájlok mappába illesztése"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:281
 msgid "Paste files into the selected folder"
 msgstr "Fájlok beillesztése a kijelölt mappába"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:282
 #, fuzzy
 msgid "Select _all Files"
 msgstr "Minden fájl kiválasztása"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:282
 msgid "Select all files in this window"
 msgstr "Minden fájlt kiválaszt ebből az ablakból"
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:283
 #, fuzzy
 msgid "Select _by Pattern..."
 msgstr "Kijelölés mintával"
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select all files that match a certain pattern"
 msgstr "Egy adott mintára illő valamennyi fájl kiválasztása"
 
-#: ../thunar/thunar-standard-view.c:287 ../thunar/thunar-standard-view.c:2844
+#: ../thunar/thunar-standard-view.c:284 ../thunar/thunar-standard-view.c:2911
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:287
+#: ../thunar/thunar-standard-view.c:284
 #, fuzzy
 msgid "Duplicate each selected file"
 msgstr "A kijelölt elem tulajdonságai"
 
-#: ../thunar/thunar-standard-view.c:288 ../thunar/thunar-standard-view.c:2850
+#: ../thunar/thunar-standard-view.c:285 ../thunar/thunar-standard-view.c:2917
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:288
+#: ../thunar/thunar-standard-view.c:285
 msgid "Create a symbolic link for each selected file"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:289
-msgid "_Rename"
+#: ../thunar/thunar-standard-view.c:286
+msgid "_Rename..."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:289
+#: ../thunar/thunar-standard-view.c:286
 #, fuzzy
 msgid "Rename the selected file"
 msgstr "A kijelölt elem tulajdonságai"
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:504
+#: ../thunar/thunar-standard-view.c:499
 msgid "Create _Document"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:960
+#: ../thunar/thunar-standard-view.c:956
 msgid "Loading folder contents..."
 msgstr "Mappa beolvasása..."
 
 #. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1472
+#: ../thunar/thunar-standard-view.c:1468
 msgid "New Empty File"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1472
+#: ../thunar/thunar-standard-view.c:1468
 #, fuzzy
 msgid "New Empty File..."
 msgstr "Mappa"
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1523
+#: ../thunar/thunar-standard-view.c:1519
 #, fuzzy
 msgid "New Folder"
 msgstr "Mappa"
 
-#: ../thunar/thunar-standard-view.c:1523
+#: ../thunar/thunar-standard-view.c:1519
 #, fuzzy
 msgid "New Folder..."
 msgstr "Mappa"
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1572
+#: ../thunar/thunar-standard-view.c:1568
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1735
+#: ../thunar/thunar-standard-view.c:1731
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
 "permanently delete \"%s\"?"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1741
+#: ../thunar/thunar-standard-view.c:1737
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1314,26 +1313,38 @@ msgstr "Kijelölés mintával"
 msgid "Pattern:"
 msgstr "Minta:"
 
-#: ../thunar/thunar-standard-view.c:2517
+#. create a new dialog window
+#: ../thunar/thunar-standard-view.c:1985
+#, c-format
+msgid "Rename \"%s\""
+msgstr ""
+
+#. display an error message
+#: ../thunar/thunar-standard-view.c:2056
+#, fuzzy, c-format
+msgid "Failed to rename \"%s\""
+msgstr "Nem törölhető: %s"
+
+#: ../thunar/thunar-standard-view.c:2651
 #, fuzzy, c-format
 msgid "Failed to open directory `%s'"
 msgstr "Nem megnyitható könyvtár: %s"
 
-#: ../thunar/thunar-standard-view.c:2817
+#: ../thunar/thunar-standard-view.c:2884
 #, fuzzy
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] "Fájl másolás"
 msgstr[1] "Fájl másolás"
 
-#: ../thunar/thunar-standard-view.c:2823
+#: ../thunar/thunar-standard-view.c:2890
 #, fuzzy
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] "Fájl kivágás"
 msgstr[1] "Fájl kivágás"
 
-#: ../thunar/thunar-standard-view.c:2832
+#: ../thunar/thunar-standard-view.c:2899
 #, fuzzy
 msgid "_Delete File"
 msgid_plural "_Delete Files"
diff --git a/po/it.po b/po/it.po
index d21622cad95900a7b67d3883bdaa4f638665cb0b..6f33838990346a2420a7afc9a40d709f74f0d2ac 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-01 01:05+0900\n"
+"POT-Creation-Date: 2006-02-01 22:26+0100\n"
 "PO-Revision-Date: 2006-01-21 10:58+0100\n"
 "Last-Translator: Roberto Pariset <r.pariset@gmail.com>\n"
 "Language-Team: GUFI <traduzioni@gufi.org>\n"
@@ -95,30 +95,30 @@ msgstr ""
 "Si desidera saltarlo?"
 
 #. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:303
+#: ../thunar-vfs/thunar-vfs-info.c:302
 msgid "No Exec field specified"
 msgstr "Campo Exec non specificato"
 
 #. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:322
+#: ../thunar-vfs/thunar-vfs-info.c:321
 #, fuzzy
 msgid "No URL field specified"
 msgstr "Campo Exec non specificato"
 
-#: ../thunar-vfs/thunar-vfs-info.c:327 ../thunar-vfs/thunar-vfs-info.c:447
+#: ../thunar-vfs/thunar-vfs-info.c:326 ../thunar-vfs/thunar-vfs-info.c:446
 msgid "Invalid desktop file"
 msgstr "Desktop file non valido"
 
-#: ../thunar-vfs/thunar-vfs-info.c:335
+#: ../thunar-vfs/thunar-vfs-info.c:334
 msgid "Unable to parse file"
 msgstr "Impossibile fare il parsing del file"
 
-#: ../thunar-vfs/thunar-vfs-info.c:425
+#: ../thunar-vfs/thunar-vfs-info.c:424
 msgid "Invalid file name"
 msgstr "Nome del file non valido"
 
 #. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:682
+#: ../thunar-vfs/thunar-vfs-info.c:680
 #, c-format
 msgid "Failed to stat file `%s': %s"
 msgstr "Stat del file `%s' fallito: %s"
@@ -478,7 +478,7 @@ msgstr "Altre applicazioni:"
 msgid "There is nothing on the clipboard to paste"
 msgstr "Nella clipboard non c'è niente da incollare"
 
-#: ../thunar/thunar-create-dialog.c:177
+#: ../thunar/thunar-create-dialog.c:177 ../thunar/thunar-standard-view.c:2014
 msgid "Enter the new name:"
 msgstr "Inserire il nuovo nome:"
 
@@ -544,11 +544,11 @@ msgstr "Collega qui"
 msgid "Unable to execute file `%s'"
 msgstr "Impossibile eseguire il file `%s'"
 
-#: ../thunar/thunar-file.c:756
+#: ../thunar/thunar-file.c:722
 msgid "The root folder has no parent"
 msgstr "La directory radice non ha padre"
 
-#: ../thunar/thunar-file.c:1050
+#: ../thunar/thunar-file.c:1016
 msgid "File System"
 msgstr "Filesystem"
 
@@ -1077,8 +1077,7 @@ msgid "%s (%u Bytes)"
 msgstr "%s (%u Byte)"
 
 #. display an error message
-#: ../thunar/thunar-properties-dialog.c:791
-#: ../thunar/thunar-standard-view.c:2562
+#: ../thunar/thunar-properties-dialog.c:788
 #, c-format
 msgid "Failed to rename `%s'"
 msgstr "Impossibile rinominare `%s'"
@@ -1114,150 +1113,151 @@ msgstr "La path '%s' non si riferisce ad una directory"
 msgid "Failed to add new shortcut"
 msgstr "Impossibile aggiungere nuovo shortcut"
 
-#: ../thunar/thunar-standard-view.c:276
+#: ../thunar/thunar-standard-view.c:273
 msgid "File Context Menu"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:277
+#: ../thunar/thunar-standard-view.c:274
 msgid "Folder Context Menu"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:275
 #, fuzzy
 msgid "Create _Folder..."
 msgstr "Crea directory..."
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:275
 msgid "Create an empty folder within the current folder"
 msgstr "Crea una directory vuota dentro la directory corrente"
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:276
 msgid "_Properties..."
 msgstr "_Proprietà..."
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:276
 msgid "View the properties of the selected file"
 msgstr "Mostra le proprietà dell'elemento selezionato"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:277
 msgid "_Copy Files"
 msgstr "_Copia file"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:277
 msgid "Copy the selected files"
 msgstr "Copia gli elementi selezionati"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:278
 msgid "Cu_t Files"
 msgstr "_Taglia file"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:278
 msgid "Cut the selected files"
 msgstr "Taglia gli elementi selezionati"
 
-#: ../thunar/thunar-standard-view.c:282
+#: ../thunar/thunar-standard-view.c:279
 #, fuzzy
 msgid "_Paste Files"
 msgstr "Incolla file"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:280
 #, fuzzy
 msgid "_Delete Files"
 msgstr "Elimina file"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:280
 msgid "Delete the selected files"
 msgstr "Elimina gli elementi selezionati"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:281
 msgid "Paste Files into Folder"
 msgstr "Incolla file dentro la directory"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:281
 msgid "Paste files into the selected folder"
 msgstr "Incolla file dentro la directory selezionata"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:282
 msgid "Select _all Files"
 msgstr "Selezion_a tutti"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:282
 msgid "Select all files in this window"
 msgstr "Seleziona tutti i file in questa finestra"
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select _by Pattern..."
 msgstr "Seleziona in _base ad un pattern..."
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select all files that match a certain pattern"
 msgstr "Seleziona tutti i file che corrispondono a un certo pattern"
 
-#: ../thunar/thunar-standard-view.c:287 ../thunar/thunar-standard-view.c:2844
+#: ../thunar/thunar-standard-view.c:284 ../thunar/thunar-standard-view.c:2911
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] "Du_plica file"
 msgstr[1] "Du_plica file"
 
-#: ../thunar/thunar-standard-view.c:287
+#: ../thunar/thunar-standard-view.c:284
 msgid "Duplicate each selected file"
 msgstr "Duplica ogni file selezionato"
 
-#: ../thunar/thunar-standard-view.c:288 ../thunar/thunar-standard-view.c:2850
+#: ../thunar/thunar-standard-view.c:285 ../thunar/thunar-standard-view.c:2917
 #, fuzzy
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "Crea link"
 msgstr[1] "Crea link"
 
-#: ../thunar/thunar-standard-view.c:288
+#: ../thunar/thunar-standard-view.c:285
 msgid "Create a symbolic link for each selected file"
 msgstr "Crea un link simbolico per ognuno dei file selezionati"
 
-#: ../thunar/thunar-standard-view.c:289
-msgid "_Rename"
+#: ../thunar/thunar-standard-view.c:286
+#, fuzzy
+msgid "_Rename..."
 msgstr "_Rinomina"
 
-#: ../thunar/thunar-standard-view.c:289
+#: ../thunar/thunar-standard-view.c:286
 msgid "Rename the selected file"
 msgstr "Rinomina il file selezionato"
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:504
+#: ../thunar/thunar-standard-view.c:499
 #, fuzzy
 msgid "Create _Document"
 msgstr "Crea azione"
 
-#: ../thunar/thunar-standard-view.c:960
+#: ../thunar/thunar-standard-view.c:956
 msgid "Loading folder contents..."
 msgstr "Caricamento dei contenuti della cartella in corso..."
 
 #. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1472
+#: ../thunar/thunar-standard-view.c:1468
 msgid "New Empty File"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1472
+#: ../thunar/thunar-standard-view.c:1468
 #, fuzzy
 msgid "New Empty File..."
 msgstr "Nuova directory..."
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1523
+#: ../thunar/thunar-standard-view.c:1519
 msgid "New Folder"
 msgstr "Nuova directory"
 
-#: ../thunar/thunar-standard-view.c:1523
+#: ../thunar/thunar-standard-view.c:1519
 msgid "New Folder..."
 msgstr "Nuova directory..."
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1572
+#: ../thunar/thunar-standard-view.c:1568
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1735
+#: ../thunar/thunar-standard-view.c:1731
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
@@ -1266,7 +1266,7 @@ msgstr ""
 "Sei sicuro di voler eliminare\n"
 "permanentemente \"%s\"?"
 
-#: ../thunar/thunar-standard-view.c:1741
+#: ../thunar/thunar-standard-view.c:1737
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1293,24 +1293,36 @@ msgstr "Seleziona in base ad un pattern"
 msgid "Pattern:"
 msgstr "Pattern:"
 
-#: ../thunar/thunar-standard-view.c:2517
+#. create a new dialog window
+#: ../thunar/thunar-standard-view.c:1985
+#, fuzzy, c-format
+msgid "Rename \"%s\""
+msgstr "_Rinomina"
+
+#. display an error message
+#: ../thunar/thunar-standard-view.c:2056
+#, fuzzy, c-format
+msgid "Failed to rename \"%s\""
+msgstr "Impossibile rinominare `%s'"
+
+#: ../thunar/thunar-standard-view.c:2651
 #, c-format
 msgid "Failed to open directory `%s'"
 msgstr "Impossibile aprire la directory %s."
 
-#: ../thunar/thunar-standard-view.c:2817
+#: ../thunar/thunar-standard-view.c:2884
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] "_Copia file"
 msgstr[1] "_Copia file"
 
-#: ../thunar/thunar-standard-view.c:2823
+#: ../thunar/thunar-standard-view.c:2890
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] "Taglia file"
 msgstr[1] "_Taglia file"
 
-#: ../thunar/thunar-standard-view.c:2832
+#: ../thunar/thunar-standard-view.c:2899
 #, fuzzy
 msgid "_Delete File"
 msgid_plural "_Delete Files"
diff --git a/po/ja.po b/po/ja.po
index edde3e54dad567ddc7c53004c2c81e6a24cbd2bc..29b2c82a37ff14dbd380f3312e1b1639fa9c8963 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-01 01:05+0900\n"
+"POT-Creation-Date: 2006-02-01 22:26+0100\n"
 "PO-Revision-Date: 2006-01-29 11:44+0900\n"
 "Last-Translator: Daichi Kawahata <daichi@xfce.org>\n"
 "Language-Team: Japanese <xfce-users-jp@ml.fdiary.net>\n"
@@ -101,30 +101,30 @@ msgstr ""
 "これを飛ばしますか？"
 
 #. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:303
+#: ../thunar-vfs/thunar-vfs-info.c:302
 msgid "No Exec field specified"
 msgstr "デスクトップファイルの「Exec」フィールドが指定されていません。"
 
 #. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:322
+#: ../thunar-vfs/thunar-vfs-info.c:321
 #, fuzzy
 msgid "No URL field specified"
 msgstr "デスクトップファイルの「Exec」フィールドが指定されていません。"
 
-#: ../thunar-vfs/thunar-vfs-info.c:327 ../thunar-vfs/thunar-vfs-info.c:447
+#: ../thunar-vfs/thunar-vfs-info.c:326 ../thunar-vfs/thunar-vfs-info.c:446
 msgid "Invalid desktop file"
 msgstr "無効なデスクトップファイルです。"
 
-#: ../thunar-vfs/thunar-vfs-info.c:335
+#: ../thunar-vfs/thunar-vfs-info.c:334
 msgid "Unable to parse file"
 msgstr "ファイルを解析できません。"
 
-#: ../thunar-vfs/thunar-vfs-info.c:425
+#: ../thunar-vfs/thunar-vfs-info.c:424
 msgid "Invalid file name"
 msgstr "無効なファイル名です。"
 
 #. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:682
+#: ../thunar-vfs/thunar-vfs-info.c:680
 #, c-format
 msgid "Failed to stat file `%s': %s"
 msgstr "ファイル「%s」の状態を取得するのに失敗しました: %s"
@@ -481,7 +481,7 @@ msgstr "他のアプリケーション:"
 msgid "There is nothing on the clipboard to paste"
 msgstr "クリップボードに貼り付けるものはありません。"
 
-#: ../thunar/thunar-create-dialog.c:177
+#: ../thunar/thunar-create-dialog.c:177 ../thunar/thunar-standard-view.c:2014
 msgid "Enter the new name:"
 msgstr "新しい名前を入力して下さい:"
 
@@ -545,11 +545,11 @@ msgstr "ここにリンク(_L)"
 msgid "Unable to execute file `%s'"
 msgstr "ファイル「%s」を実行できません。"
 
-#: ../thunar/thunar-file.c:756
+#: ../thunar/thunar-file.c:722
 msgid "The root folder has no parent"
 msgstr "ルートフォルダに上位のフォルダがありません。"
 
-#: ../thunar/thunar-file.c:1050
+#: ../thunar/thunar-file.c:1016
 msgid "File System"
 msgstr "ファイルシステム"
 
@@ -1081,8 +1081,7 @@ msgid "%s (%u Bytes)"
 msgstr "%s (%u バイト)"
 
 #. display an error message
-#: ../thunar/thunar-properties-dialog.c:791
-#: ../thunar/thunar-standard-view.c:2562
+#: ../thunar/thunar-properties-dialog.c:788
 #, c-format
 msgid "Failed to rename `%s'"
 msgstr "「%s」の名前変更に失敗しました。"
@@ -1120,142 +1119,143 @@ msgstr "パス「%s」はフォルダを参照していません。"
 msgid "Failed to add new shortcut"
 msgstr "ショートカットの追加に失敗しました。"
 
-#: ../thunar/thunar-standard-view.c:276
+#: ../thunar/thunar-standard-view.c:273
 msgid "File Context Menu"
 msgstr "ファイルの右クリックメニュー"
 
-#: ../thunar/thunar-standard-view.c:277
+#: ../thunar/thunar-standard-view.c:274
 msgid "Folder Context Menu"
 msgstr "フォルダの右クリックメニュー"
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:275
 msgid "Create _Folder..."
 msgstr "フォルダを作成(_F)..."
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:275
 msgid "Create an empty folder within the current folder"
 msgstr "現在のフォルダに空のフォルダを作成します。"
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:276
 msgid "_Properties..."
 msgstr "プロパティ(_P)..."
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:276
 msgid "View the properties of the selected file"
 msgstr "選択したファイルのプロパティを表示します。"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:277
 msgid "_Copy Files"
 msgstr "コピー(_C)"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:277
 msgid "Copy the selected files"
 msgstr "選択したファイルをコピーします。"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:278
 msgid "Cu_t Files"
 msgstr "切り取り(_T)"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:278
 msgid "Cut the selected files"
 msgstr "選択したファイルを切り取ります。"
 
-#: ../thunar/thunar-standard-view.c:282
+#: ../thunar/thunar-standard-view.c:279
 msgid "_Paste Files"
 msgstr "貼り付け(_P)"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:280
 msgid "_Delete Files"
 msgstr "削除(_D)"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:280
 msgid "Delete the selected files"
 msgstr "選択したファイルを削除します。"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:281
 msgid "Paste Files into Folder"
 msgstr "ファイルをフォルダに貼り付け"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:281
 msgid "Paste files into the selected folder"
 msgstr "選択したフォルダにファイルを貼り付けます。"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:282
 msgid "Select _all Files"
 msgstr "全てのファイルを選択(_A)"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:282
 msgid "Select all files in this window"
 msgstr "このウィンドウの全てのファイルを選択します。"
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select _by Pattern..."
 msgstr "パターンで選択(_B)..."
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select all files that match a certain pattern"
 msgstr "ある特定のパターンに一致する全てのファイルを選択します。"
 
-#: ../thunar/thunar-standard-view.c:287 ../thunar/thunar-standard-view.c:2844
+#: ../thunar/thunar-standard-view.c:284 ../thunar/thunar-standard-view.c:2911
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] "コピーを作成(_P)"
 
-#: ../thunar/thunar-standard-view.c:287
+#: ../thunar/thunar-standard-view.c:284
 msgid "Duplicate each selected file"
 msgstr "選択したそれぞれのファイルのコピーを作成します。"
 
-#: ../thunar/thunar-standard-view.c:288 ../thunar/thunar-standard-view.c:2850
+#: ../thunar/thunar-standard-view.c:285 ../thunar/thunar-standard-view.c:2917
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "リンクを作成(_K)"
 
-#: ../thunar/thunar-standard-view.c:288
+#: ../thunar/thunar-standard-view.c:285
 msgid "Create a symbolic link for each selected file"
 msgstr "選択したそれぞれのファイルのリンクを作成します。"
 
-#: ../thunar/thunar-standard-view.c:289
-msgid "_Rename"
+#: ../thunar/thunar-standard-view.c:286
+#, fuzzy
+msgid "_Rename..."
 msgstr "名前変更(_R)"
 
-#: ../thunar/thunar-standard-view.c:289
+#: ../thunar/thunar-standard-view.c:286
 msgid "Rename the selected file"
 msgstr "選択したファイルの名前を変更します。"
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:504
+#: ../thunar/thunar-standard-view.c:499
 msgid "Create _Document"
 msgstr "文書を作成(_D)"
 
-#: ../thunar/thunar-standard-view.c:960
+#: ../thunar/thunar-standard-view.c:956
 msgid "Loading folder contents..."
 msgstr "フォルダの内容を読み込んでいます..."
 
 #. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1472
+#: ../thunar/thunar-standard-view.c:1468
 msgid "New Empty File"
 msgstr "新規ファイル"
 
-#: ../thunar/thunar-standard-view.c:1472
+#: ../thunar/thunar-standard-view.c:1468
 msgid "New Empty File..."
 msgstr "新規ファイル..."
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1523
+#: ../thunar/thunar-standard-view.c:1519
 msgid "New Folder"
 msgstr "新規フォルダ"
 
-#: ../thunar/thunar-standard-view.c:1523
+#: ../thunar/thunar-standard-view.c:1519
 msgid "New Folder..."
 msgstr "新規フォルダ..."
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1572
+#: ../thunar/thunar-standard-view.c:1568
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr "テンプレート「%s」から文書を作成"
 
-#: ../thunar/thunar-standard-view.c:1735
+#: ../thunar/thunar-standard-view.c:1731
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
@@ -1264,7 +1264,7 @@ msgstr ""
 "「%s」は永久に削除されます\n"
 "それでもよろしいですか？"
 
-#: ../thunar/thunar-standard-view.c:1741
+#: ../thunar/thunar-standard-view.c:1737
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1288,22 +1288,34 @@ msgstr "パターンで選択します"
 msgid "Pattern:"
 msgstr "パターン:"
 
-#: ../thunar/thunar-standard-view.c:2517
+#. create a new dialog window
+#: ../thunar/thunar-standard-view.c:1985
+#, fuzzy, c-format
+msgid "Rename \"%s\""
+msgstr "名前変更(_R)"
+
+#. display an error message
+#: ../thunar/thunar-standard-view.c:2056
+#, fuzzy, c-format
+msgid "Failed to rename \"%s\""
+msgstr "「%s」の名前変更に失敗しました。"
+
+#: ../thunar/thunar-standard-view.c:2651
 #, c-format
 msgid "Failed to open directory `%s'"
 msgstr "フォルダ「%s」を開くのに失敗しました。"
 
-#: ../thunar/thunar-standard-view.c:2817
+#: ../thunar/thunar-standard-view.c:2884
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] "コピー(_C)"
 
-#: ../thunar/thunar-standard-view.c:2823
+#: ../thunar/thunar-standard-view.c:2890
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] "切り取り(_T)"
 
-#: ../thunar/thunar-standard-view.c:2832
+#: ../thunar/thunar-standard-view.c:2899
 msgid "_Delete File"
 msgid_plural "_Delete Files"
 msgstr[0] "削除(_D)"
diff --git a/po/nl.po b/po/nl.po
index 7722c646f247c5b5b51b73a7dedac3ad4f93220d..08475cd0159bcd678d4cc01a3d404f859836044e 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-01 01:05+0900\n"
+"POT-Creation-Date: 2006-02-01 22:26+0100\n"
 "PO-Revision-Date: 2006-01-31 14:07+0100\n"
 "Last-Translator: Vincent Tunru <imnotb@gmail.com>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -95,7 +95,7 @@ msgstr ""
 # Unknown word "Exec"
 # Obekend woord: "Exec"
 #. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:303
+#: ../thunar-vfs/thunar-vfs-info.c:302
 #, fuzzy
 msgid "No Exec field specified"
 msgstr "Geen <Exec> veld geselecteerd"
@@ -103,27 +103,27 @@ msgstr "Geen <Exec> veld geselecteerd"
 # Unknown word "Exec"
 # Obekend woord: "Exec"
 #. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:322
+#: ../thunar-vfs/thunar-vfs-info.c:321
 #, fuzzy
 msgid "No URL field specified"
 msgstr "Geen <Exec> veld geselecteerd"
 
-#: ../thunar-vfs/thunar-vfs-info.c:327 ../thunar-vfs/thunar-vfs-info.c:447
+#: ../thunar-vfs/thunar-vfs-info.c:326 ../thunar-vfs/thunar-vfs-info.c:446
 msgid "Invalid desktop file"
 msgstr "Ongeldig bureublad-bestand"
 
-#: ../thunar-vfs/thunar-vfs-info.c:335
+#: ../thunar-vfs/thunar-vfs-info.c:334
 msgid "Unable to parse file"
 msgstr "Verwerken van bestand niet mogelijk"
 
-#: ../thunar-vfs/thunar-vfs-info.c:425
+#: ../thunar-vfs/thunar-vfs-info.c:424
 msgid "Invalid file name"
 msgstr "Ongeldige bestandsnaam"
 
 # Unknown word "stat"
 # Obekend woord: "stat"
 #. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:682
+#: ../thunar-vfs/thunar-vfs-info.c:680
 #, fuzzy, c-format
 msgid "Failed to stat file `%s': %s"
 msgstr "Het <stat> van bestand `%s' is mislukt: %s"
@@ -484,7 +484,7 @@ msgstr "Andere Programma's:"
 msgid "There is nothing on the clipboard to paste"
 msgstr "Er is niets op het klembord om te plakken"
 
-#: ../thunar/thunar-create-dialog.c:177
+#: ../thunar/thunar-create-dialog.c:177 ../thunar/thunar-standard-view.c:2014
 msgid "Enter the new name:"
 msgstr "Nieuwe naam invoeren:"
 
@@ -548,11 +548,11 @@ msgstr "Hierheen een snelkoppeling maken"
 msgid "Unable to execute file `%s'"
 msgstr "Uitvoeren van bestand `%s' niet mogelijk"
 
-#: ../thunar/thunar-file.c:756
+#: ../thunar/thunar-file.c:722
 msgid "The root folder has no parent"
 msgstr "Het hoofdmap heeft geen bovenliggende map"
 
-#: ../thunar/thunar-file.c:1050
+#: ../thunar/thunar-file.c:1016
 msgid "File System"
 msgstr "Bestandssysteem"
 
@@ -1093,8 +1093,7 @@ msgid "%s (%u Bytes)"
 msgstr "%s (%u Bytes)"
 
 #. display an error message
-#: ../thunar/thunar-properties-dialog.c:791
-#: ../thunar/thunar-standard-view.c:2562
+#: ../thunar/thunar-properties-dialog.c:788
 #, c-format
 msgid "Failed to rename `%s'"
 msgstr "Fout bij het wijzigen van de naam van `%s'"
@@ -1132,144 +1131,145 @@ msgstr "Het pad '%s' verwijst niet naar een map"
 msgid "Failed to add new shortcut"
 msgstr "Fout bij het toevoegen van nieuwe snelkoppeling"
 
-#: ../thunar/thunar-standard-view.c:276
+#: ../thunar/thunar-standard-view.c:273
 msgid "File Context Menu"
 msgstr "Bestand Context Menu"
 
-#: ../thunar/thunar-standard-view.c:277
+#: ../thunar/thunar-standard-view.c:274
 msgid "Folder Context Menu"
 msgstr "Map Context Menu"
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:275
 msgid "Create _Folder..."
 msgstr "Maak _Map..."
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:275
 msgid "Create an empty folder within the current folder"
 msgstr "Maak een lege map in de huidige map"
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:276
 msgid "_Properties..."
 msgstr "_Eigenschappen"
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:276
 msgid "View the properties of the selected file"
 msgstr "Bekijk de eigenschappen van het geselecteerde bestand"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:277
 msgid "_Copy Files"
 msgstr "Bestanden _Kopiëren"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:277
 msgid "Copy the selected files"
 msgstr "Geselecteerde bestanden kopiëren"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:278
 msgid "Cu_t Files"
 msgstr "Bestanden Kn_ippen"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:278
 msgid "Cut the selected files"
 msgstr "De geselecteerde bestanden knippen"
 
-#: ../thunar/thunar-standard-view.c:282
+#: ../thunar/thunar-standard-view.c:279
 msgid "_Paste Files"
 msgstr "Bestanden _Plakken"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:280
 msgid "_Delete Files"
 msgstr "Bestanden _Verwijderen"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:280
 msgid "Delete the selected files"
 msgstr "De geselecteerde bestanden verwijderen"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:281
 msgid "Paste Files into Folder"
 msgstr "Bestanden in Map Plakken"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:281
 msgid "Paste files into the selected folder"
 msgstr "Plak de bestanden in de geselecteerde map"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:282
 msgid "Select _all Files"
 msgstr "_Alle Bestanden Selecteren"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:282
 msgid "Select all files in this window"
 msgstr "Alle bestanden in dit venster selecteren"
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select _by Pattern..."
 msgstr "_Op Patroon Selecteren"
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select all files that match a certain pattern"
 msgstr "Alle bestanden die aan een bepaald patroon voldoen selecteren"
 
-#: ../thunar/thunar-standard-view.c:287 ../thunar/thunar-standard-view.c:2844
+#: ../thunar/thunar-standard-view.c:284 ../thunar/thunar-standard-view.c:2911
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] "Bestand Ver_dubbelen"
 msgstr[1] "Bestanden Ver_dubbelen"
 
-#: ../thunar/thunar-standard-view.c:287
+#: ../thunar/thunar-standard-view.c:284
 msgid "Duplicate each selected file"
 msgstr "Elk geselecteerde bestand verdubbelen"
 
-#: ../thunar/thunar-standard-view.c:288 ../thunar/thunar-standard-view.c:2850
+#: ../thunar/thunar-standard-view.c:285 ../thunar/thunar-standard-view.c:2917
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "Ma_ak Snelkoppeling"
 msgstr[1] "Ma_ak Snelkoppelingen"
 
-#: ../thunar/thunar-standard-view.c:288
+#: ../thunar/thunar-standard-view.c:285
 msgid "Create a symbolic link for each selected file"
 msgstr "Maak een symbolische snelkoppeling voor elk geselecteerd bestand"
 
-#: ../thunar/thunar-standard-view.c:289
-msgid "_Rename"
+#: ../thunar/thunar-standard-view.c:286
+#, fuzzy
+msgid "_Rename..."
 msgstr "Naam _Wijzigen"
 
-#: ../thunar/thunar-standard-view.c:289
+#: ../thunar/thunar-standard-view.c:286
 msgid "Rename the selected file"
 msgstr "Naam van geselecteerd bestand wijzigen"
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:504
+#: ../thunar/thunar-standard-view.c:499
 msgid "Create _Document"
 msgstr "Maak _Document"
 
-#: ../thunar/thunar-standard-view.c:960
+#: ../thunar/thunar-standard-view.c:956
 msgid "Loading folder contents..."
 msgstr "Inhoud van de map aan het laden..."
 
 #. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1472
+#: ../thunar/thunar-standard-view.c:1468
 msgid "New Empty File"
 msgstr "Nieuw Leeg Bestand"
 
-#: ../thunar/thunar-standard-view.c:1472
+#: ../thunar/thunar-standard-view.c:1468
 msgid "New Empty File..."
 msgstr "Nieuwe Leeg Bestand..."
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1523
+#: ../thunar/thunar-standard-view.c:1519
 msgid "New Folder"
 msgstr "Nieuwe Map"
 
-#: ../thunar/thunar-standard-view.c:1523
+#: ../thunar/thunar-standard-view.c:1519
 msgid "New Folder..."
 msgstr "Nieuwe Map..."
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1572
+#: ../thunar/thunar-standard-view.c:1568
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr "Document van sjabloon \"%s\" maken"
 
-#: ../thunar/thunar-standard-view.c:1735
+#: ../thunar/thunar-standard-view.c:1731
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
@@ -1278,7 +1278,7 @@ msgstr ""
 "Weet u zeker dat u\n"
 "\"%s\" voorgoed wilt verwijderen?"
 
-#: ../thunar/thunar-standard-view.c:1741
+#: ../thunar/thunar-standard-view.c:1737
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1305,24 +1305,36 @@ msgstr "Selecteren op Patroon"
 msgid "Pattern:"
 msgstr "Patroon:"
 
-#: ../thunar/thunar-standard-view.c:2517
+#. create a new dialog window
+#: ../thunar/thunar-standard-view.c:1985
+#, fuzzy, c-format
+msgid "Rename \"%s\""
+msgstr "Naam _Wijzigen"
+
+#. display an error message
+#: ../thunar/thunar-standard-view.c:2056
+#, fuzzy, c-format
+msgid "Failed to rename \"%s\""
+msgstr "Fout bij het wijzigen van de naam van `%s'"
+
+#: ../thunar/thunar-standard-view.c:2651
 #, c-format
 msgid "Failed to open directory `%s'"
 msgstr "Fout bij het openen van de map `%s'"
 
-#: ../thunar/thunar-standard-view.c:2817
+#: ../thunar/thunar-standard-view.c:2884
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] "Bestand _Kopiëren"
 msgstr[1] "Bestanden _Kopiëren"
 
-#: ../thunar/thunar-standard-view.c:2823
+#: ../thunar/thunar-standard-view.c:2890
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] "Bestand Kn_ippen"
 msgstr[1] "Bestanden Kn_ippen"
 
-#: ../thunar/thunar-standard-view.c:2832
+#: ../thunar/thunar-standard-view.c:2899
 msgid "_Delete File"
 msgid_plural "_Delete Files"
 msgstr[0] "Bestand _Verwijderen"
diff --git a/po/pl.po b/po/pl.po
index 309e36b22a6c5f211494912ace7c9d8321e5a5a1..086e14537764bc661590fbbb834261c91eb2d56d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-01 01:05+0900\n"
+"POT-Creation-Date: 2006-02-01 22:26+0100\n"
 "PO-Revision-Date: 2006-01-13 14:21+0100\n"
 "Last-Translator: Tomasz Michał Łukaszewski <T.Lukaszewski@aster.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -92,30 +92,30 @@ msgstr ""
 "Czy chcesz go pominąć?"
 
 #. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:303
+#: ../thunar-vfs/thunar-vfs-info.c:302
 msgid "No Exec field specified"
 msgstr "Brak pola Exec"
 
 #. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:322
+#: ../thunar-vfs/thunar-vfs-info.c:321
 #, fuzzy
 msgid "No URL field specified"
 msgstr "Brak pola Exec"
 
-#: ../thunar-vfs/thunar-vfs-info.c:327 ../thunar-vfs/thunar-vfs-info.c:447
+#: ../thunar-vfs/thunar-vfs-info.c:326 ../thunar-vfs/thunar-vfs-info.c:446
 msgid "Invalid desktop file"
 msgstr "Nieprawidłowy plik .desktop"
 
-#: ../thunar-vfs/thunar-vfs-info.c:335
+#: ../thunar-vfs/thunar-vfs-info.c:334
 msgid "Unable to parse file"
 msgstr "Nie mogę wczytać pliku"
 
-#: ../thunar-vfs/thunar-vfs-info.c:425
+#: ../thunar-vfs/thunar-vfs-info.c:424
 msgid "Invalid file name"
 msgstr "Nieprawidłowa nazwa pliku"
 
 #. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:682
+#: ../thunar-vfs/thunar-vfs-info.c:680
 #, c-format
 msgid "Failed to stat file `%s': %s"
 msgstr "Nie mogę odczytać atrybutów pliku '%s': %s"
@@ -479,7 +479,7 @@ msgstr "Inne aplikacje:"
 msgid "There is nothing on the clipboard to paste"
 msgstr "W schowku nie ma nic do wklejenia"
 
-#: ../thunar/thunar-create-dialog.c:177
+#: ../thunar/thunar-create-dialog.c:177 ../thunar/thunar-standard-view.c:2014
 msgid "Enter the new name:"
 msgstr ""
 
@@ -543,11 +543,11 @@ msgstr "Utwórz _łacze"
 msgid "Unable to execute file `%s'"
 msgstr "Nie mogę wykonać pliku \"%s\"."
 
-#: ../thunar/thunar-file.c:756
+#: ../thunar/thunar-file.c:722
 msgid "The root folder has no parent"
 msgstr "Katalog główny nie ma katalogu nadrzędnego"
 
-#: ../thunar/thunar-file.c:1050
+#: ../thunar/thunar-file.c:1016
 #, fuzzy
 msgid "File System"
 msgstr "System plików"
@@ -1093,8 +1093,7 @@ msgid "%s (%u Bytes)"
 msgstr "%s (%u bajtów)"
 
 #. display an error message
-#: ../thunar/thunar-properties-dialog.c:791
-#: ../thunar/thunar-standard-view.c:2562
+#: ../thunar/thunar-properties-dialog.c:788
 #, fuzzy, c-format
 msgid "Failed to rename `%s'"
 msgstr "Nie udało się zmienić nazwy %s."
@@ -1133,158 +1132,159 @@ msgstr "Identyfikator URI '%s' nie wskazuje na katalog"
 msgid "Failed to add new shortcut"
 msgstr "Nie udało się dodać aplikacji %s."
 
-#: ../thunar/thunar-standard-view.c:276
+#: ../thunar/thunar-standard-view.c:273
 msgid "File Context Menu"
 msgstr "Menu kontekstowe pliku"
 
-#: ../thunar/thunar-standard-view.c:277
+#: ../thunar/thunar-standard-view.c:274
 msgid "Folder Context Menu"
 msgstr "Menu kontekstowe katalogu"
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:275
 msgid "Create _Folder..."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:275
 msgid "Create an empty folder within the current folder"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:276
 #, fuzzy
 msgid "_Properties..."
 msgstr "_Właściwości"
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:276
 msgid "View the properties of the selected file"
 msgstr "Wyświetl właściwości zaznaczonego elementu"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:277
 msgid "_Copy Files"
 msgstr "S_kopiuj pliki"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:277
 msgid "Copy the selected files"
 msgstr "Skopiuj zaznaczone pliki"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:278
 msgid "Cu_t Files"
 msgstr "_Wytnij pliki"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:278
 msgid "Cut the selected files"
 msgstr "Wytnij zaznaczone pliki"
 
-#: ../thunar/thunar-standard-view.c:282
+#: ../thunar/thunar-standard-view.c:279
 msgid "_Paste Files"
 msgstr "W_klej pliki"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:280
 msgid "_Delete Files"
 msgstr "_Usuń pliki"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:280
 msgid "Delete the selected files"
 msgstr "Usuń zaznaczone pliki"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:281
 msgid "Paste Files into Folder"
 msgstr "Wklej pliki do katalogu"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:281
 msgid "Paste files into the selected folder"
 msgstr "Wklej pliki do wybranego katalogu"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:282
 msgid "Select _all Files"
 msgstr "Zaznacz wszystkie pliki"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:282
 msgid "Select all files in this window"
 msgstr "Zaznacz wszystkie pliki w tym katalogu"
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:283
 #, fuzzy
 msgid "Select _by Pattern..."
 msgstr "Zaznacz według wzorca"
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select all files that match a certain pattern"
 msgstr "Zaznacz wszystkie pliki pasujÄ…ce do wzorca"
 
-#: ../thunar/thunar-standard-view.c:287 ../thunar/thunar-standard-view.c:2844
+#: ../thunar/thunar-standard-view.c:284 ../thunar/thunar-standard-view.c:2911
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] "Z_duplikuj plik"
 msgstr[1] "Z_duplikuj pliki"
 msgstr[2] "Z_duplikuj pliki"
 
-#: ../thunar/thunar-standard-view.c:287
+#: ../thunar/thunar-standard-view.c:284
 msgid "Duplicate each selected file"
 msgstr "Zduplikuj wszystkie zaznaczone pliki"
 
-#: ../thunar/thunar-standard-view.c:288 ../thunar/thunar-standard-view.c:2850
+#: ../thunar/thunar-standard-view.c:285 ../thunar/thunar-standard-view.c:2917
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "Utwórz _łącze"
 msgstr[1] "Utwórz _łącza"
 msgstr[2] "Utwórz _łącza"
 
-#: ../thunar/thunar-standard-view.c:288
+#: ../thunar/thunar-standard-view.c:285
 msgid "Create a symbolic link for each selected file"
 msgstr "Utwórz dowiązania do wszystkich zaznaczonych plików"
 
-#: ../thunar/thunar-standard-view.c:289
-msgid "_Rename"
+#: ../thunar/thunar-standard-view.c:286
+#, fuzzy
+msgid "_Rename..."
 msgstr "Zmień _nazwę"
 
-#: ../thunar/thunar-standard-view.c:289
+#: ../thunar/thunar-standard-view.c:286
 msgid "Rename the selected file"
 msgstr "Zmień nazwę zaznaczonego pliku"
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:504
+#: ../thunar/thunar-standard-view.c:499
 msgid "Create _Document"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:960
+#: ../thunar/thunar-standard-view.c:956
 msgid "Loading folder contents..."
 msgstr "Wczytuję zawartość katalogu..."
 
 #. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1472
+#: ../thunar/thunar-standard-view.c:1468
 msgid "New Empty File"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1472
+#: ../thunar/thunar-standard-view.c:1468
 #, fuzzy
 msgid "New Empty File..."
 msgstr "Katalog"
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1523
+#: ../thunar/thunar-standard-view.c:1519
 #, fuzzy
 msgid "New Folder"
 msgstr "Katalog"
 
-#: ../thunar/thunar-standard-view.c:1523
+#: ../thunar/thunar-standard-view.c:1519
 #, fuzzy
 msgid "New Folder..."
 msgstr "Katalog"
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1572
+#: ../thunar/thunar-standard-view.c:1568
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1735
+#: ../thunar/thunar-standard-view.c:1731
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
 "permanently delete \"%s\"?"
 msgstr "Czy na pewno chcesz trwale usunąć \"%s\"?"
 
-#: ../thunar/thunar-standard-view.c:1741
+#: ../thunar/thunar-standard-view.c:1737
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1308,26 +1308,38 @@ msgstr "Zaznacz według wzorca"
 msgid "Pattern:"
 msgstr "Wzorzec nazwy:"
 
-#: ../thunar/thunar-standard-view.c:2517
+#. create a new dialog window
+#: ../thunar/thunar-standard-view.c:1985
+#, fuzzy, c-format
+msgid "Rename \"%s\""
+msgstr "Zmień _nazwę"
+
+#. display an error message
+#: ../thunar/thunar-standard-view.c:2056
+#, fuzzy, c-format
+msgid "Failed to rename \"%s\""
+msgstr "Nie udało się zmienić nazwy %s."
+
+#: ../thunar/thunar-standard-view.c:2651
 #, fuzzy, c-format
 msgid "Failed to open directory `%s'"
 msgstr "Nie udało się otworzyć katalogu '%s': %s"
 
-#: ../thunar/thunar-standard-view.c:2817
+#: ../thunar/thunar-standard-view.c:2884
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] "S_kopiuj plik"
 msgstr[1] "S_kopiuj pliki"
 msgstr[2] "S_kopiuj pliki"
 
-#: ../thunar/thunar-standard-view.c:2823
+#: ../thunar/thunar-standard-view.c:2890
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] "_Wytnij plik"
 msgstr[1] "_Wytnij pliki"
 msgstr[2] "_Wytnij pliki"
 
-#: ../thunar/thunar-standard-view.c:2832
+#: ../thunar/thunar-standard-view.c:2899
 msgid "_Delete File"
 msgid_plural "_Delete Files"
 msgstr[0] "_Usuń plik"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 658313de81bc3b4cc59cf916dfe1ae029ae733b1..f0181bdd5024f9f475abfacdd15a75c56706d6c8 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-01 01:05+0900\n"
+"POT-Creation-Date: 2006-02-01 22:26+0100\n"
 "PO-Revision-Date: 2005-11-17 16:55+0900\n"
 "Last-Translator: Joao Pedrosa <joaopedrosa@gmail.com>\n"
 "Language-Team: os-cillation <info@os-cillation.com>\n"
@@ -92,30 +92,30 @@ msgstr ""
 "Você quer pulá-lo?"
 
 #. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:303
+#: ../thunar-vfs/thunar-vfs-info.c:302
 msgid "No Exec field specified"
 msgstr "Nenhum campo Exec especificado"
 
 #. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:322
+#: ../thunar-vfs/thunar-vfs-info.c:321
 #, fuzzy
 msgid "No URL field specified"
 msgstr "Nenhum campo Exec especificado"
 
-#: ../thunar-vfs/thunar-vfs-info.c:327 ../thunar-vfs/thunar-vfs-info.c:447
+#: ../thunar-vfs/thunar-vfs-info.c:326 ../thunar-vfs/thunar-vfs-info.c:446
 msgid "Invalid desktop file"
 msgstr "Arquivo de área de trabalho inválido"
 
-#: ../thunar-vfs/thunar-vfs-info.c:335
+#: ../thunar-vfs/thunar-vfs-info.c:334
 msgid "Unable to parse file"
 msgstr "Incapaz de \"parse\" arquivo"
 
-#: ../thunar-vfs/thunar-vfs-info.c:425
+#: ../thunar-vfs/thunar-vfs-info.c:424
 msgid "Invalid file name"
 msgstr "Nome de arquivo inválido"
 
 #. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:682
+#: ../thunar-vfs/thunar-vfs-info.c:680
 #, c-format
 msgid "Failed to stat file `%s': %s"
 msgstr "Falha em \"stat\" arquivo `%s': %s"
@@ -475,7 +475,7 @@ msgstr "Outras Aplicações:"
 msgid "There is nothing on the clipboard to paste"
 msgstr "Não há nada na área de transferência para colar"
 
-#: ../thunar/thunar-create-dialog.c:177
+#: ../thunar/thunar-create-dialog.c:177 ../thunar/thunar-standard-view.c:2014
 msgid "Enter the new name:"
 msgstr "Entre com o novo nome:"
 
@@ -539,11 +539,11 @@ msgstr "_Ligue aqui"
 msgid "Unable to execute file `%s'"
 msgstr "Incapaz de executar arquivo `%s'"
 
-#: ../thunar/thunar-file.c:756
+#: ../thunar/thunar-file.c:722
 msgid "The root folder has no parent"
 msgstr "A pasta raiz não tem parente"
 
-#: ../thunar/thunar-file.c:1050
+#: ../thunar/thunar-file.c:1016
 #, fuzzy
 msgid "File System"
 msgstr "Sistema de Arquivos"
@@ -1083,8 +1083,7 @@ msgid "%s (%u Bytes)"
 msgstr "%s (%u Bytes)"
 
 #. display an error message
-#: ../thunar/thunar-properties-dialog.c:791
-#: ../thunar/thunar-standard-view.c:2562
+#: ../thunar/thunar-properties-dialog.c:788
 #, c-format
 msgid "Failed to rename `%s'"
 msgstr "Falha em renomear `%s'"
@@ -1123,148 +1122,149 @@ msgstr "O caminho '%s' não se refere a um diretório"
 msgid "Failed to add new shortcut"
 msgstr "Falha em adicionar novo favorito"
 
-#: ../thunar/thunar-standard-view.c:276
+#: ../thunar/thunar-standard-view.c:273
 msgid "File Context Menu"
 msgstr "Menu de Contexto de Arquivo"
 
-#: ../thunar/thunar-standard-view.c:277
+#: ../thunar/thunar-standard-view.c:274
 msgid "Folder Context Menu"
 msgstr "Menu de Contexto de Pasta"
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:275
 msgid "Create _Folder..."
 msgstr "Criar _Pasta..."
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:275
 msgid "Create an empty folder within the current folder"
 msgstr "Criar uma pasta vazia dentro da pasta atual"
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:276
 #, fuzzy
 msgid "_Properties..."
 msgstr "_Propriedades"
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:276
 msgid "View the properties of the selected file"
 msgstr "Visualizar as propriedades do arquivo selecionado"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:277
 msgid "_Copy Files"
 msgstr "_Copiar Arquivos"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:277
 msgid "Copy the selected files"
 msgstr "Copiar os arquivos selecionados"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:278
 msgid "Cu_t Files"
 msgstr "Recor_tar Arquivos"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:278
 msgid "Cut the selected files"
 msgstr "Recortar os arquivos selecionados"
 
-#: ../thunar/thunar-standard-view.c:282
+#: ../thunar/thunar-standard-view.c:279
 msgid "_Paste Files"
 msgstr "C_olar Arquivos"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:280
 msgid "_Delete Files"
 msgstr "_Deletar Arquivos"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:280
 msgid "Delete the selected files"
 msgstr "Deletar os arquivos selecionados"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:281
 msgid "Paste Files into Folder"
 msgstr "Colar arquivos dentro da Pasta"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:281
 msgid "Paste files into the selected folder"
 msgstr "Colar arquivos dentro da pasta selecionada"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:282
 msgid "Select _all Files"
 msgstr "Selecionar todos os _arquivos"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:282
 msgid "Select all files in this window"
 msgstr "Selecionar todos os arquivos nesta janela"
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:283
 #, fuzzy
 msgid "Select _by Pattern..."
 msgstr "Selecionar por _Padrão"
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select all files that match a certain pattern"
 msgstr "Selecionar todos os arquivos que combinam com um certo padrão"
 
-#: ../thunar/thunar-standard-view.c:287 ../thunar/thunar-standard-view.c:2844
+#: ../thunar/thunar-standard-view.c:284 ../thunar/thunar-standard-view.c:2911
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] "Du_plicar Arquivo"
 msgstr[1] "Du_plicar Arquivos"
 
-#: ../thunar/thunar-standard-view.c:287
+#: ../thunar/thunar-standard-view.c:284
 msgid "Duplicate each selected file"
 msgstr "Duplicar cada arquivo selecionado"
 
-#: ../thunar/thunar-standard-view.c:288 ../thunar/thunar-standard-view.c:2850
+#: ../thunar/thunar-standard-view.c:285 ../thunar/thunar-standard-view.c:2917
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "Fazer _Ligação"
 msgstr[1] "Fazer _Ligações"
 
-#: ../thunar/thunar-standard-view.c:288
+#: ../thunar/thunar-standard-view.c:285
 msgid "Create a symbolic link for each selected file"
 msgstr "Criar uma ligação simbólica para cada arquivo selecionado"
 
-#: ../thunar/thunar-standard-view.c:289
-msgid "_Rename"
+#: ../thunar/thunar-standard-view.c:286
+#, fuzzy
+msgid "_Rename..."
 msgstr "_Renomear"
 
-#: ../thunar/thunar-standard-view.c:289
+#: ../thunar/thunar-standard-view.c:286
 msgid "Rename the selected file"
 msgstr "Renomear o arquivo selecionado"
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:504
+#: ../thunar/thunar-standard-view.c:499
 #, fuzzy
 msgid "Create _Document"
 msgstr "Criar _Pasta..."
 
-#: ../thunar/thunar-standard-view.c:960
+#: ../thunar/thunar-standard-view.c:956
 msgid "Loading folder contents..."
 msgstr "Carregando conteúdos de pasta..."
 
 #. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1472
+#: ../thunar/thunar-standard-view.c:1468
 msgid "New Empty File"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1472
+#: ../thunar/thunar-standard-view.c:1468
 #, fuzzy
 msgid "New Empty File..."
 msgstr "Nova Pasta..."
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1523
+#: ../thunar/thunar-standard-view.c:1519
 msgid "New Folder"
 msgstr "Nova Pasta"
 
-#: ../thunar/thunar-standard-view.c:1523
+#: ../thunar/thunar-standard-view.c:1519
 msgid "New Folder..."
 msgstr "Nova Pasta..."
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1572
+#: ../thunar/thunar-standard-view.c:1568
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1735
+#: ../thunar/thunar-standard-view.c:1731
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
@@ -1273,7 +1273,7 @@ msgstr ""
 "Você tem certeza que deseja\n"
 "deletar permanentemente \"%s\"?"
 
-#: ../thunar/thunar-standard-view.c:1741
+#: ../thunar/thunar-standard-view.c:1737
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1300,24 +1300,36 @@ msgstr "Selecione por Padrão"
 msgid "Pattern:"
 msgstr "Padrão:"
 
-#: ../thunar/thunar-standard-view.c:2517
+#. create a new dialog window
+#: ../thunar/thunar-standard-view.c:1985
+#, fuzzy, c-format
+msgid "Rename \"%s\""
+msgstr "_Renomear"
+
+#. display an error message
+#: ../thunar/thunar-standard-view.c:2056
+#, fuzzy, c-format
+msgid "Failed to rename \"%s\""
+msgstr "Falha em renomear `%s'"
+
+#: ../thunar/thunar-standard-view.c:2651
 #, c-format
 msgid "Failed to open directory `%s'"
 msgstr "Falha em abrir diretório `%s'"
 
-#: ../thunar/thunar-standard-view.c:2817
+#: ../thunar/thunar-standard-view.c:2884
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] "_Copiar Arquivo"
 msgstr[1] "_Copiar Arquivos"
 
-#: ../thunar/thunar-standard-view.c:2823
+#: ../thunar/thunar-standard-view.c:2890
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] "Recor_tar Arquivo"
 msgstr[1] "Recor_tar Arquivos"
 
-#: ../thunar/thunar-standard-view.c:2832
+#: ../thunar/thunar-standard-view.c:2899
 msgid "_Delete File"
 msgid_plural "_Delete Files"
 msgstr[0] "_Deletar Arquivo"
diff --git a/po/ru.po b/po/ru.po
index 0db0a95f6182af6726be4810a0626b1088e5ee49..980dd7ce0fa07d3097759d354c04581c6cf90bb3 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-01 01:05+0900\n"
+"POT-Creation-Date: 2006-02-01 22:26+0100\n"
 "PO-Revision-Date: 2006-01-29 17:47+0500\n"
 "Last-Translator: Andrey Fedoseev <andrey.fedoseev@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -94,29 +94,29 @@ msgstr ""
 "Пропустить?"
 
 #. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:303
+#: ../thunar-vfs/thunar-vfs-info.c:302
 msgid "No Exec field specified"
 msgstr ""
 
 #. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:322
+#: ../thunar-vfs/thunar-vfs-info.c:321
 msgid "No URL field specified"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-info.c:327 ../thunar-vfs/thunar-vfs-info.c:447
+#: ../thunar-vfs/thunar-vfs-info.c:326 ../thunar-vfs/thunar-vfs-info.c:446
 msgid "Invalid desktop file"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-info.c:335
+#: ../thunar-vfs/thunar-vfs-info.c:334
 msgid "Unable to parse file"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-info.c:425
+#: ../thunar-vfs/thunar-vfs-info.c:424
 msgid "Invalid file name"
 msgstr "Недопустимое имя файла"
 
 #. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:682
+#: ../thunar-vfs/thunar-vfs-info.c:680
 #, c-format
 msgid "Failed to stat file `%s': %s"
 msgstr ""
@@ -475,7 +475,7 @@ msgstr "Другие приложения:"
 msgid "There is nothing on the clipboard to paste"
 msgstr "Буфер обмена пуст"
 
-#: ../thunar/thunar-create-dialog.c:177
+#: ../thunar/thunar-create-dialog.c:177 ../thunar/thunar-standard-view.c:2014
 msgid "Enter the new name:"
 msgstr "Введите новое имя:"
 
@@ -539,11 +539,11 @@ msgstr ""
 msgid "Unable to execute file `%s'"
 msgstr "Не удалось запустить файл `%s'"
 
-#: ../thunar/thunar-file.c:756
+#: ../thunar/thunar-file.c:722
 msgid "The root folder has no parent"
 msgstr "Корневой каталог не имеет родительского каталога"
 
-#: ../thunar/thunar-file.c:1050
+#: ../thunar/thunar-file.c:1016
 msgid "File System"
 msgstr "Файловая система"
 
@@ -1072,8 +1072,7 @@ msgid "%s (%u Bytes)"
 msgstr "%s (%u байт)"
 
 #. display an error message
-#: ../thunar/thunar-properties-dialog.c:791
-#: ../thunar/thunar-standard-view.c:2562
+#: ../thunar/thunar-properties-dialog.c:788
 #, c-format
 msgid "Failed to rename `%s'"
 msgstr "Не удалось переименовать `%s'"
@@ -1109,154 +1108,155 @@ msgstr ""
 msgid "Failed to add new shortcut"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:276
+#: ../thunar/thunar-standard-view.c:273
 msgid "File Context Menu"
 msgstr "Контекстное меню файла"
 
-#: ../thunar/thunar-standard-view.c:277
+#: ../thunar/thunar-standard-view.c:274
 msgid "Folder Context Menu"
 msgstr "Контекстное меню папки"
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:275
 msgid "Create _Folder..."
 msgstr "Создать _каталог..."
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:275
 msgid "Create an empty folder within the current folder"
 msgstr "Создать пустой каталог внутри текущего"
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:276
 msgid "_Properties..."
 msgstr "_Свойства..."
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:276
 msgid "View the properties of the selected file"
 msgstr "Просмотреть свойства выбранного файла"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:277
 msgid "_Copy Files"
 msgstr "_Копировать файлы"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:277
 msgid "Copy the selected files"
 msgstr "Копировать выбранные файлы"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:278
 msgid "Cu_t Files"
 msgstr "_Вырезать файлы"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:278
 msgid "Cut the selected files"
 msgstr "Вырезать выбранные файлы"
 
-#: ../thunar/thunar-standard-view.c:282
+#: ../thunar/thunar-standard-view.c:279
 msgid "_Paste Files"
 msgstr "Вст_авить файлы"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:280
 msgid "_Delete Files"
 msgstr "_Удалить файлы"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:280
 msgid "Delete the selected files"
 msgstr "Удалить выбранные файлы"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:281
 msgid "Paste Files into Folder"
 msgstr "Вставить файлы в каталог"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:281
 msgid "Paste files into the selected folder"
 msgstr "Вставить файлы в выбранный каталог"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:282
 msgid "Select _all Files"
 msgstr "Выбрать вс_е файлы"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:282
 msgid "Select all files in this window"
 msgstr "Выбрать все файлы в этом окне"
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select _by Pattern..."
 msgstr "Выбрать по _шаблону..."
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select all files that match a certain pattern"
 msgstr "Выбрать все файлы, удовлетворяющие заданному шаблону"
 
-#: ../thunar/thunar-standard-view.c:287 ../thunar/thunar-standard-view.c:2844
+#: ../thunar/thunar-standard-view.c:284 ../thunar/thunar-standard-view.c:2911
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:287
+#: ../thunar/thunar-standard-view.c:284
 msgid "Duplicate each selected file"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:288 ../thunar/thunar-standard-view.c:2850
+#: ../thunar/thunar-standard-view.c:285 ../thunar/thunar-standard-view.c:2917
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:288
+#: ../thunar/thunar-standard-view.c:285
 msgid "Create a symbolic link for each selected file"
 msgstr "Создать символическую ссылку для каждого выбранного файла"
 
-#: ../thunar/thunar-standard-view.c:289
-msgid "_Rename"
+#: ../thunar/thunar-standard-view.c:286
+#, fuzzy
+msgid "_Rename..."
 msgstr "_Переименовать"
 
-#: ../thunar/thunar-standard-view.c:289
+#: ../thunar/thunar-standard-view.c:286
 msgid "Rename the selected file"
 msgstr "Переименовать выбранный файл"
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:504
+#: ../thunar/thunar-standard-view.c:499
 #, fuzzy
 msgid "Create _Document"
 msgstr "Создать _документ"
 
-#: ../thunar/thunar-standard-view.c:960
+#: ../thunar/thunar-standard-view.c:956
 msgid "Loading folder contents..."
 msgstr ""
 
 #. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1472
+#: ../thunar/thunar-standard-view.c:1468
 #, fuzzy
 msgid "New Empty File"
 msgstr "Новый файл"
 
-#: ../thunar/thunar-standard-view.c:1472
+#: ../thunar/thunar-standard-view.c:1468
 #, fuzzy
 msgid "New Empty File..."
 msgstr "Создание пустого файла..."
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1523
+#: ../thunar/thunar-standard-view.c:1519
 msgid "New Folder"
 msgstr "Новый каталог"
 
-#: ../thunar/thunar-standard-view.c:1523
+#: ../thunar/thunar-standard-view.c:1519
 msgid "New Folder..."
 msgstr "Создание каталога..."
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1572
+#: ../thunar/thunar-standard-view.c:1568
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr "Создать документ по шаблону \"%s\""
 
-#: ../thunar/thunar-standard-view.c:1735
+#: ../thunar/thunar-standard-view.c:1731
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
 "permanently delete \"%s\"?"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1741
+#: ../thunar/thunar-standard-view.c:1737
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1279,26 +1279,38 @@ msgstr "Выбрать по шаблону"
 msgid "Pattern:"
 msgstr "Шаблон:"
 
-#: ../thunar/thunar-standard-view.c:2517
+#. create a new dialog window
+#: ../thunar/thunar-standard-view.c:1985
+#, fuzzy, c-format
+msgid "Rename \"%s\""
+msgstr "_Переименовать"
+
+#. display an error message
+#: ../thunar/thunar-standard-view.c:2056
+#, fuzzy, c-format
+msgid "Failed to rename \"%s\""
+msgstr "Не удалось переименовать `%s'"
+
+#: ../thunar/thunar-standard-view.c:2651
 #, c-format
 msgid "Failed to open directory `%s'"
 msgstr "Не удалось открыть папку: '%s'"
 
-#: ../thunar/thunar-standard-view.c:2817
+#: ../thunar/thunar-standard-view.c:2884
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] "_Копировать файл"
 msgstr[1] "_Копировать файлы"
 msgstr[2] "_Копировать файлы"
 
-#: ../thunar/thunar-standard-view.c:2823
+#: ../thunar/thunar-standard-view.c:2890
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] "_Вырезать файл"
 msgstr[1] "_Вырезать файлы"
 msgstr[2] "_Вырезать файлы"
 
-#: ../thunar/thunar-standard-view.c:2832
+#: ../thunar/thunar-standard-view.c:2899
 msgid "_Delete File"
 msgid_plural "_Delete Files"
 msgstr[0] "_Удалить файл"
diff --git a/thunar/thunar-permissions-chooser.c b/thunar/thunar-permissions-chooser.c
index ee297085e436605e5f149cc9fb474747fb00fdd3..526c116788d3c1c81c0f42bfb5ae2d445de31efa 100644
--- a/thunar/thunar-permissions-chooser.c
+++ b/thunar/thunar-permissions-chooser.c
@@ -1142,7 +1142,7 @@ thunar_permissions_chooser_job_error (ThunarPermissionsChooser *chooser,
                                     GTK_DIALOG_MODAL
                                     | GTK_DIALOG_DESTROY_WITH_PARENT,
                                     GTK_MESSAGE_ERROR,
-                                    GTK_BUTTONS_OK,
+                                    GTK_BUTTONS_CLOSE,
                                     "%s", error->message);
   gtk_dialog_run (GTK_DIALOG (message));
   gtk_widget_destroy (message);
diff --git a/thunar/thunar-progress-dialog.c b/thunar/thunar-progress-dialog.c
index e87f6cad487bbfb5903d6a3f538f8b56eb03d7a7..44cf14e5fac69b8c51a4eb6bf96a1699155536b6 100644
--- a/thunar/thunar-progress-dialog.c
+++ b/thunar/thunar-progress-dialog.c
@@ -376,7 +376,7 @@ thunar_progress_dialog_error (ThunarProgressDialog *dialog,
                                     GTK_DIALOG_MODAL |
                                     GTK_DIALOG_DESTROY_WITH_PARENT,
                                     GTK_MESSAGE_ERROR,
-                                    GTK_BUTTONS_OK,
+                                    GTK_BUTTONS_CLOSE,
                                     "%s", error->message);
   gtk_dialog_run (GTK_DIALOG (message));
   gtk_widget_destroy (message);
diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c
index fc45dd4d6366f944e41c10b78223edb4c936ecf6..080f35310d0024abdb8f6b32c07f50497f212df2 100644
--- a/thunar/thunar-standard-view.c
+++ b/thunar/thunar-standard-view.c
@@ -215,10 +215,6 @@ static void             thunar_standard_view_drag_end                   (GtkWidg
 static void             thunar_standard_view_error                      (ThunarListModel          *model,
                                                                          const GError             *error,
                                                                          ThunarStandardView       *standard_view);
-static void             thunar_standard_view_renamed                    (ThunarTextRenderer       *text_renderer,
-                                                                         const gchar              *path_string,
-                                                                         const gchar              *text,
-                                                                         ThunarStandardView       *standard_view);
 static void             thunar_standard_view_loading_unbound            (gpointer                  user_data);
 static gboolean         thunar_standard_view_drag_timer                 (gpointer                  user_data);
 static void             thunar_standard_view_drag_timer_destroy         (gpointer                  user_data);
@@ -287,7 +283,7 @@ static const GtkActionEntry action_entries[] =
   { "select-by-pattern", NULL, N_ ("Select _by Pattern..."), "<control>S", N_ ("Select all files that match a certain pattern"), G_CALLBACK (thunar_standard_view_action_select_by_pattern), },
   { "duplicate", NULL, N_ ("Du_plicate File"), NULL, N_ ("Duplicate each selected file"), G_CALLBACK (thunar_standard_view_action_duplicate), },
   { "make-link", NULL, N_ ("Ma_ke Link"), NULL, N_ ("Create a symbolic link for each selected file"), G_CALLBACK (thunar_standard_view_action_make_link), },
-  { "rename", NULL, N_ ("_Rename"), "F2", N_ ("Rename the selected file"), G_CALLBACK (thunar_standard_view_action_rename), },
+  { "rename", NULL, N_ ("_Rename..."), "F2", N_ ("Rename the selected file"), G_CALLBACK (thunar_standard_view_action_rename), },
 };
 
 /* Target types for dragging from the view */
@@ -520,7 +516,6 @@ thunar_standard_view_init (ThunarStandardView *standard_view)
 
   /* setup the name renderer */
   standard_view->name_renderer = thunar_text_renderer_new ();
-  g_signal_connect (G_OBJECT (standard_view->name_renderer), "edited", G_CALLBACK (thunar_standard_view_renamed), standard_view);
   exo_gtk_object_ref_sink (GTK_OBJECT (standard_view->name_renderer));
 
   /* be sure to update the selection whenever the folder changes */
@@ -1751,8 +1746,12 @@ thunar_standard_view_action_delete (GtkAction          *action,
                                    GTK_DIALOG_MODAL
                                    | GTK_DIALOG_DESTROY_WITH_PARENT,
                                    GTK_MESSAGE_QUESTION,
-                                   GTK_BUTTONS_YES_NO,
+                                   GTK_BUTTONS_NONE,
                                    message);
+  gtk_dialog_add_buttons (GTK_DIALOG (dialog),
+                          GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                          GTK_STOCK_DELETE, GTK_RESPONSE_YES,
+                          NULL);
   gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES);
   gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), _("If you delete a file, it is permanently lost."));
   response = gtk_dialog_run (GTK_DIALOG (dialog));
@@ -1949,7 +1948,26 @@ static void
 thunar_standard_view_action_rename (GtkAction          *action,
                                     ThunarStandardView *standard_view)
 {
-  GList *selected_items;
+  ThunarIconFactory *icon_factory;
+  GtkIconTheme      *icon_theme;
+  const gchar       *filename;
+  const gchar       *text;
+  GtkTreeIter        iter;
+  ThunarFile        *file;
+  GtkWidget         *window;
+  GtkWidget         *dialog;
+  GtkWidget         *entry;
+  GtkWidget         *label;
+  GtkWidget         *image;
+  GtkWidget         *table;
+  GdkPixbuf         *icon;
+  GError            *error = NULL;
+  GList             *selected_items;
+  GList             *path_list;
+  GList              file_list;
+  glong              offset;
+  gchar             *title;
+  gint               response;
 
   g_return_if_fail (GTK_IS_ACTION (action));
   g_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
@@ -1957,7 +1975,122 @@ thunar_standard_view_action_rename (GtkAction          *action,
   /* start renaming if we have exactly one selected file */
   selected_items = (*THUNAR_STANDARD_VIEW_GET_CLASS (standard_view)->get_selected_items) (standard_view);
   if (G_LIKELY (selected_items != NULL && selected_items->next == NULL))
-    (*THUNAR_STANDARD_VIEW_GET_CLASS (standard_view)->set_cursor) (standard_view, selected_items->data, TRUE);
+    {
+      /* determine the file in question */
+      gtk_tree_model_get_iter (GTK_TREE_MODEL (standard_view->model), &iter, selected_items->data);
+      file = thunar_list_model_get_file (standard_view->model, &iter);
+      filename = thunar_file_get_display_name (file);
+
+      /* create a new dialog window */
+      title = g_strdup_printf (_("Rename \"%s\""), filename);
+      window = gtk_widget_get_toplevel (GTK_WIDGET (standard_view));
+      dialog = gtk_dialog_new_with_buttons (title,
+                                            GTK_WINDOW (window),
+                                            GTK_DIALOG_MODAL
+                                            | GTK_DIALOG_NO_SEPARATOR
+                                            | GTK_DIALOG_DESTROY_WITH_PARENT,
+                                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                            GTK_STOCK_OK, GTK_RESPONSE_OK,
+                                            NULL);
+      gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+      gtk_window_set_default_size (GTK_WINDOW (dialog), 300, -1);
+      g_free (title);
+
+      table = g_object_new (GTK_TYPE_TABLE, "border-width", 6, "column-spacing", 6, "row-spacing", 3, NULL);
+      gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, TRUE, TRUE, 0);
+      gtk_widget_show (table);
+
+      icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (dialog));
+      icon_factory = thunar_icon_factory_get_for_icon_theme (icon_theme);
+      icon = thunar_icon_factory_load_file_icon (icon_factory, file, THUNAR_FILE_ICON_STATE_DEFAULT, 48);
+      g_object_unref (G_OBJECT (icon_factory));
+
+      image = gtk_image_new_from_pixbuf (icon);
+      gtk_misc_set_padding (GTK_MISC (image), 6, 6);
+      gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 2, GTK_FILL, GTK_FILL, 0, 0);
+      g_object_unref (G_OBJECT (icon));
+      gtk_widget_show (image);
+
+      label = gtk_label_new (_("Enter the new name:"));
+      gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+      gtk_table_attach (GTK_TABLE (table), label, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+      gtk_widget_show (label);
+
+      entry = gtk_entry_new ();
+      gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
+      gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+      gtk_widget_show (entry);
+
+      /* setup the old filename */
+      gtk_entry_set_text (GTK_ENTRY (entry), filename);
+
+      /* check if the filename contains a dot */
+      text = g_utf8_strrchr (filename, -1, '.');
+      if (G_LIKELY (text != NULL))
+        {
+          /* grab focus to the entry first, else the selection will be altered later */
+          gtk_widget_grab_focus (entry);
+
+          /* determine the UTF-8 char offset */
+          offset = g_utf8_pointer_to_offset (filename, text);
+
+          /* select the text prior to the dot */
+          if (G_LIKELY (offset > 0))
+            gtk_entry_select_region (GTK_ENTRY (entry), 0, offset);
+        }
+
+      /* run the dialog */
+      response = gtk_dialog_run (GTK_DIALOG (dialog));
+      if (G_LIKELY (response == GTK_RESPONSE_OK))
+        {
+          /* determine the new filename */
+          text = gtk_entry_get_text (GTK_ENTRY (entry));
+
+          /* check if we have a new name here */
+          if (G_LIKELY (!exo_str_is_equal (filename, text)))
+            {
+              /* try to rename the file */
+              if (!thunar_file_rename (file, text, &error))
+                {
+                  /* display an error message */
+                  thunar_dialogs_show_error (GTK_WIDGET (standard_view), error, _("Failed to rename \"%s\""), filename);
+
+                  /* release the error */
+                  g_error_free (error);
+                }
+              else
+                {
+                  /* fake a file list with only the file in it */
+                  file_list.data = file;
+                  file_list.next = NULL;
+                  file_list.prev = NULL;
+
+                  /* determine the path for the file */
+                  path_list = thunar_list_model_get_paths_for_files (standard_view->model, &file_list);
+                  if (G_LIKELY (path_list != NULL))
+                    {
+                      /* place the cursor on the file and scroll the new position */
+                      (*THUNAR_STANDARD_VIEW_GET_CLASS (standard_view)->scroll_to_path) (standard_view, path_list->data);
+
+                      /* update the selection, so we get updated actions, statusbar,
+                       * etc. with the new file name and probably new mime type.
+                       */
+                      thunar_standard_view_selection_changed (standard_view);
+
+                      /* release the path list */
+                      g_list_foreach (path_list, (GFunc) gtk_tree_path_free, NULL);
+                      g_list_free (path_list);
+                    }
+                }
+            }
+        }
+
+      /* cleanup */
+      g_object_unref (G_OBJECT (file));
+      gtk_widget_destroy (dialog);
+    }
+
+  /* release the selected items */
   g_list_foreach (selected_items, (GFunc) gtk_tree_path_free, NULL);
   g_list_free (selected_items);
 }
@@ -2521,74 +2654,6 @@ thunar_standard_view_error (ThunarListModel    *model,
 
 
 
-static void
-thunar_standard_view_renamed (ThunarTextRenderer *text_renderer,
-                              const gchar        *path_string,
-                              const gchar        *text,
-                              ThunarStandardView *standard_view)
-{
-  const gchar *old_name;
-  GtkTreePath *path;
-  GtkTreeIter  iter;
-  ThunarFile  *file;
-  GError      *error = NULL;
-
-  g_return_if_fail (THUNAR_IS_TEXT_RENDERER (text_renderer));
-  g_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
-  g_return_if_fail (path_string != NULL);
-
-  /* verify that the user supplied a valid file name */
-  if (G_UNLIKELY (text == NULL || *text == '\0'))
-    return;
-
-  /* determine path and iterator for the edited item */
-  path = gtk_tree_path_new_from_string (path_string);
-  gtk_tree_model_get_iter (GTK_TREE_MODEL (standard_view->model), &iter, path);
-  gtk_tree_path_free (path);
-
-  /* this will only work if we have persistent iterators, so let's make sure we don't forget that! */
-  g_assert (gtk_tree_model_get_flags (GTK_TREE_MODEL (standard_view->model)) & GTK_TREE_MODEL_ITERS_PERSIST);
-
-  /* determine the file from the iter */
-  file = thunar_list_model_get_file (THUNAR_LIST_MODEL (standard_view->model), &iter);
-
-  /* check if the name changed */
-  old_name = thunar_file_get_display_name (file);
-  if (G_LIKELY (!exo_str_is_equal (old_name, text)))
-    {
-      /* try to rename the file */
-      if (!thunar_file_rename (file, text, &error))
-        {
-          /* display an error message */
-          thunar_dialogs_show_error (GTK_WIDGET (standard_view), error, _("Failed to rename `%s'"), old_name);
-
-          /* release the error */
-          g_error_free (error);
-        }
-      else
-        {
-          /* determine the path from the persistent(!) iterator again */
-          path = gtk_tree_model_get_path (GTK_TREE_MODEL (standard_view->model), &iter);
-          if (G_LIKELY (path != NULL))
-            {
-              /* place the cursor on the item again and scroll to the position */
-              (*THUNAR_STANDARD_VIEW_GET_CLASS (standard_view)->scroll_to_path) (standard_view, path);
-              gtk_tree_path_free (path);
-
-              /* update the selection, so we get updated actions, statusbar,
-               * etc. with the new file name and probably new mime type.
-               */
-              thunar_standard_view_selection_changed (standard_view);
-            }
-        }
-    }
-
-  /* cleanup */
-  g_object_unref (G_OBJECT (file));
-}
-
-
-
 static void
 thunar_standard_view_loading_unbound (gpointer user_data)
 {