From 1f945a5bb6d852b8de3b2480f0365e01688db74d Mon Sep 17 00:00:00 2001
From: Benedikt Meurer <benny@xfce.org>
Date: Sun, 26 Mar 2006 13:35:23 +0000
Subject: [PATCH] 2006-03-26	Benedikt Meurer <benny@xfce.org>

	* thunar-vfs/thunar-vfs-xfer.c(thunar_vfs_xfer_copy_regular): Use a
	  better error message for the case that the target file already
	  exists.
	* thunar/thunar-progress-dialog.c(thunar_progress_dialog_ask): Improve
	  the confirmation dialog as suggested by Fabian Novak.
	* po/Thunar.pot, po/*.po: Merge new strings.
	* po/de.po: Update german translations, thanks to Fabian Novak.




(Old svn revision: 20579)
---
 ChangeLog                       |  10 +
 po/ChangeLog                    |   5 +
 po/Thunar.pot                   |  57 +++--
 po/ca.po                        |  57 +++--
 po/de.po                        | 121 ++++-----
 po/el.po                        | 418 +++++++++++++++++++-------------
 po/es.po                        |  57 +++--
 po/eu.po                        |  57 +++--
 po/fi.po                        |  57 +++--
 po/fr.po                        |  57 +++--
 po/hu.po                        |  57 +++--
 po/it.po                        |  57 +++--
 po/ja.po                        |  57 +++--
 po/nl.po                        |  57 +++--
 po/pl.po                        |  57 +++--
 po/pt_BR.po                     |  57 +++--
 po/ru.po                        |  57 +++--
 po/sv.po                        |  57 +++--
 po/zh_TW.po                     |  57 +++--
 thunar-vfs/thunar-vfs-xfer.c    |  13 +-
 thunar/thunar-progress-dialog.c |  71 +++++-
 21 files changed, 879 insertions(+), 614 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 60d492249..f2c13c8c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-03-26	Benedikt Meurer <benny@xfce.org>
+
+	* thunar-vfs/thunar-vfs-xfer.c(thunar_vfs_xfer_copy_regular): Use a
+	  better error message for the case that the target file already
+	  exists.
+	* thunar/thunar-progress-dialog.c(thunar_progress_dialog_ask): Improve
+	  the confirmation dialog as suggested by Fabian Novak.
+	* po/Thunar.pot, po/*.po: Merge new strings.
+	* po/de.po: Update german translations, thanks to Fabian Novak.
+
 2006-03-26	Benedikt Meurer <benny@xfce.org>
 
 	* thunar-vfs/thunar-vfs-volume-hal.c: Add support for gnome-mount based
diff --git a/po/ChangeLog b/po/ChangeLog
index 1d7fc64f4..531bfe00d 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-26  Benedikt Meurer <benny@xfce.org>
+
+	* Thunar.pot, *.po: Merge new strings.
+	* de.po: Update german translations, thanks to Fabian Novak.
+
 2006-03-26  Daichi Kawahata <daichi@xfce.org>
 
 	* hu.po: Updated Hungarian translations by SZERVAC Attila
diff --git a/po/Thunar.pot b/po/Thunar.pot
index 1a9894cc8..910e6da81 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-03-25 22:21+0100\n"
+"POT-Creation-Date: 2006-03-26 14:23+0200\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"
@@ -89,13 +89,7 @@ msgstr ""
 msgid "Failed to read folder contents"
 msgstr ""
 
-#. no useful information, *narf*
 #: ../thunar-vfs/thunar-vfs-exec.c:509
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:237
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:304
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:347
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:436
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:476
 msgid "Unknown error"
 msgstr ""
 
@@ -239,11 +233,16 @@ msgid "Unknown user \"%s\""
 msgstr ""
 
 #. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:385
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
 #, c-format
 msgid "Failed to determine the mount point for %s"
 msgstr ""
 
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:812
+#, c-format
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr ""
+
 #: ../thunar-vfs/thunar-vfs-xfer.c:189
 #, c-format
 msgid "copy of %s"
@@ -307,52 +306,58 @@ msgstr ""
 msgid "Failed to open \"%s\" for reading"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:381
+#: ../thunar-vfs/thunar-vfs-xfer.c:385
+#, c-format
+msgid "The file \"%s\" already exists"
+msgstr ""
+
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-xfer.c:390
 #, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:400
+#: ../thunar-vfs/thunar-vfs-xfer.c:411
 #, c-format
 msgid "Failed to read data from \"%s\""
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:416
+#: ../thunar-vfs/thunar-vfs-xfer.c:427
 #, c-format
 msgid "Failed to write data to \"%s\""
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#: ../thunar-vfs/thunar-vfs-xfer.c:446
 #, c-format
 msgid "Failed to remove \"%s\""
 msgstr ""
 
 #. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:440
+#: ../thunar-vfs/thunar-vfs-xfer.c:451
 msgid "Operation canceled"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:480
+#: ../thunar-vfs/thunar-vfs-xfer.c:491
 #, c-format
 msgid "Failed to read link target from \"%s\""
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:488 ../thunar-vfs/thunar-vfs-xfer.c:601
+#: ../thunar-vfs/thunar-vfs-xfer.c:499 ../thunar-vfs/thunar-vfs-xfer.c:612
 #, c-format
 msgid "Failed to create symbolic link \"%s\""
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:496
+#: ../thunar-vfs/thunar-vfs-xfer.c:507
 #, c-format
 msgid "Failed to change mode of \"%s\""
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:530 ../thunar-vfs/thunar-vfs-xfer.c:590
+#: ../thunar-vfs/thunar-vfs-xfer.c:541 ../thunar-vfs/thunar-vfs-xfer.c:601
 #, c-format
 msgid "Failed to determine file info for \"%s\""
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:559
+#: ../thunar-vfs/thunar-vfs-xfer.c:570
 #, c-format
 msgid "Failed to copy special file \"%s\""
 msgstr ""
@@ -1144,7 +1149,7 @@ msgstr ""
 #. allocate the question dialog
 #: ../thunar/thunar-permissions-chooser.c:590
 #: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:294
+#: ../thunar/thunar-progress-dialog.c:305
 msgid "Question"
 msgstr ""
 
@@ -1200,22 +1205,22 @@ msgid ""
 msgstr ""
 
 #: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:320
+#: ../thunar/thunar-progress-dialog.c:372
 msgid "_Yes"
 msgstr ""
 
 #: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:324
+#: ../thunar/thunar-progress-dialog.c:377
 msgid "Yes to _all"
 msgstr ""
 
 #: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:328
+#: ../thunar/thunar-progress-dialog.c:382
 msgid "_No"
 msgstr ""
 
 #: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:332
+#: ../thunar/thunar-progress-dialog.c:387
 msgid "_Cancel"
 msgstr ""
 
@@ -1403,21 +1408,21 @@ msgstr ""
 msgid "Apply to Folder and Contents"
 msgstr ""
 
-#: ../thunar/thunar-progress-dialog.c:458
+#: ../thunar/thunar-progress-dialog.c:523
 #, c-format
 msgid "(%lu hour remaining)"
 msgid_plural "(%lu hours remaining)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-progress-dialog.c:463
+#: ../thunar/thunar-progress-dialog.c:528
 #, c-format
 msgid "(%lu minute remaining)"
 msgid_plural "(%lu minutes remaining)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-progress-dialog.c:468
+#: ../thunar/thunar-progress-dialog.c:533
 #, c-format
 msgid "(%lu second remaining)"
 msgid_plural "(%lu seconds remaining)"
diff --git a/po/ca.po b/po/ca.po
index 09c9aed59..a4412b441 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-25 22:21+0100\n"
+"POT-Creation-Date: 2006-03-26 14:23+0200\n"
 "PO-Revision-Date: 2006-03-19 17:52+0100\n"
 "Last-Translator: Pau Rul·lan Ferragut <paurullan@bulma.net>\n"
 "Language-Team: Catalan\n"
@@ -94,13 +94,7 @@ msgstr "Fallit a  buit fitxer n tu a ?"
 msgid "Failed to read folder contents"
 msgstr "S'estan carregant els continguts de la carpeta..."
 
-#. no useful information, *narf*
 #: ../thunar-vfs/thunar-vfs-exec.c:509
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:237
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:304
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:347
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:436
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:476
 #, fuzzy
 msgid "Unknown error"
 msgstr "Error desconegut"
@@ -256,11 +250,16 @@ msgid "Unknown user \"%s\""
 msgstr "Desconegut usuari"
 
 #. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:385
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
 #, fuzzy, c-format
 msgid "Failed to determine the mount point for %s"
 msgstr "Fallit a    punt per a"
 
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:812
+#, fuzzy, c-format
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr "Fallit a  mode de"
+
 #: ../thunar-vfs/thunar-vfs-xfer.c:189
 #, c-format
 msgid "copy of %s"
@@ -324,52 +323,58 @@ msgstr "Fallit a "
 msgid "Failed to open \"%s\" for reading"
 msgstr "Fallit a  obre per a"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:381
+#: ../thunar-vfs/thunar-vfs-xfer.c:385
+#, c-format
+msgid "The file \"%s\" already exists"
+msgstr ""
+
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-xfer.c:390
 #, fuzzy, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "Fallit a  obre per a"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:400
+#: ../thunar-vfs/thunar-vfs-xfer.c:411
 #, fuzzy, c-format
 msgid "Failed to read data from \"%s\""
 msgstr "Fallit a  dades de"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:416
+#: ../thunar-vfs/thunar-vfs-xfer.c:427
 #, fuzzy, c-format
 msgid "Failed to write data to \"%s\""
 msgstr "Fallit a  dades a "
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#: ../thunar-vfs/thunar-vfs-xfer.c:446
 #, fuzzy, c-format
 msgid "Failed to remove \"%s\""
 msgstr "Fallit a  elimina"
 
 #. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:440
+#: ../thunar-vfs/thunar-vfs-xfer.c:451
 msgid "Operation canceled"
 msgstr "S'ha cancel·lat l'operació"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:480
+#: ../thunar-vfs/thunar-vfs-xfer.c:491
 #, fuzzy, c-format
 msgid "Failed to read link target from \"%s\""
 msgstr "Fallit a  enllaç de"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:488 ../thunar-vfs/thunar-vfs-xfer.c:601
+#: ../thunar-vfs/thunar-vfs-xfer.c:499 ../thunar-vfs/thunar-vfs-xfer.c:612
 #, fuzzy, c-format
 msgid "Failed to create symbolic link \"%s\""
 msgstr "Fallit a  enllaç"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:496
+#: ../thunar-vfs/thunar-vfs-xfer.c:507
 #, fuzzy, c-format
 msgid "Failed to change mode of \"%s\""
 msgstr "Fallit a  mode de"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:530 ../thunar-vfs/thunar-vfs-xfer.c:590
+#: ../thunar-vfs/thunar-vfs-xfer.c:541 ../thunar-vfs/thunar-vfs-xfer.c:601
 #, fuzzy, c-format
 msgid "Failed to determine file info for \"%s\""
 msgstr "Fallit a  fitxer per a"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:559
+#: ../thunar-vfs/thunar-vfs-xfer.c:570
 #, fuzzy, c-format
 msgid "Failed to copy special file \"%s\""
 msgstr "Fallit a  còpia fitxer"
@@ -1237,7 +1242,7 @@ msgstr "Atura permisos."
 #. allocate the question dialog
 #: ../thunar/thunar-permissions-chooser.c:590
 #: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:294
+#: ../thunar/thunar-progress-dialog.c:305
 msgid "Question"
 msgstr "Pregunta"
 
@@ -1305,23 +1310,23 @@ msgstr ""
 "carpeta a  entra   carpeta."
 
 #: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:320
+#: ../thunar/thunar-progress-dialog.c:372
 msgid "_Yes"
 msgstr "_Sí"
 
 #: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:324
+#: ../thunar/thunar-progress-dialog.c:377
 #, fuzzy
 msgid "Yes to _all"
 msgstr "Sí a  all"
 
 #: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:328
+#: ../thunar/thunar-progress-dialog.c:382
 msgid "_No"
 msgstr "_No"
 
 #: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:332
+#: ../thunar/thunar-progress-dialog.c:387
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
@@ -1543,21 +1548,21 @@ msgstr "Aplica a  Carpeta Només"
 msgid "Apply to Folder and Contents"
 msgstr "Aplica a  Carpeta i Contingut"
 
-#: ../thunar/thunar-progress-dialog.c:458
+#: ../thunar/thunar-progress-dialog.c:523
 #, fuzzy, c-format
 msgid "(%lu hour remaining)"
 msgid_plural "(%lu hours remaining)"
 msgstr[0] "hora"
 msgstr[1] "hora"
 
-#: ../thunar/thunar-progress-dialog.c:463
+#: ../thunar/thunar-progress-dialog.c:528
 #, fuzzy, c-format
 msgid "(%lu minute remaining)"
 msgid_plural "(%lu minutes remaining)"
 msgstr[0] "minut"
 msgstr[1] "minut"
 
-#: ../thunar/thunar-progress-dialog.c:468
+#: ../thunar/thunar-progress-dialog.c:533
 #, fuzzy, c-format
 msgid "(%lu second remaining)"
 msgid_plural "(%lu seconds remaining)"
diff --git a/po/de.po b/po/de.po
index 908fabe12..526b80c6e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-25 22:21+0100\n"
-"PO-Revision-Date: 2006-03-25 22:50+0100\n"
+"POT-Creation-Date: 2006-03-26 14:23+0200\n"
+"PO-Revision-Date: 2006-03-26 14:35+0100\n"
 "Last-Translator: Benedikt Meurer <benny@xfce.org>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -100,13 +100,7 @@ msgstr ""
 msgid "Failed to read folder contents"
 msgstr "Konnte Ordnerinhalt nicht lesen"
 
-#. no useful information, *narf*
 #: ../thunar-vfs/thunar-vfs-exec.c:509
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:237
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:304
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:347
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:436
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:476
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
@@ -253,11 +247,16 @@ msgid "Unknown user \"%s\""
 msgstr "Unbekannter Benutzer »%s«"
 
 #. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:385
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
 #, c-format
 msgid "Failed to determine the mount point for %s"
 msgstr "Der Einhängepunkt für %s konnte nicht bestimmt werden"
 
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:812
+#, c-format
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr "Konnte keine Verbindung zum HAL Dienst aufbauen: %s"
+
 #: ../thunar-vfs/thunar-vfs-xfer.c:189
 #, c-format
 msgid "copy of %s"
@@ -321,59 +320,65 @@ msgstr "Die Datei »%s« konnte nicht umbenannt werden"
 msgid "Failed to open \"%s\" for reading"
 msgstr "Die Datei »%s« konnte nicht zum Lesen geöffnet werden"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:381
+#: ../thunar-vfs/thunar-vfs-xfer.c:385
+#, c-format
+msgid "The file \"%s\" already exists"
+msgstr "Die Datei »%s« existiert bereits"
+
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-xfer.c:390
 #, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "Die Datei »%s« konnte nicht zum Schreiben geöffnet werden"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:400
+#: ../thunar-vfs/thunar-vfs-xfer.c:411
 #, c-format
 msgid "Failed to read data from \"%s\""
 msgstr "Das Ziel der Verknüpfung »%s« konnte nicht bestimmt werden"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:416
+#: ../thunar-vfs/thunar-vfs-xfer.c:427
 #, c-format
 msgid "Failed to write data to \"%s\""
 msgstr "Die Datei »%s« konnte nicht umbenannt werden"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#: ../thunar-vfs/thunar-vfs-xfer.c:446
 #, c-format
 msgid "Failed to remove \"%s\""
 msgstr "Die Datei »%s« konnte nicht gelöscht werden"
 
 #. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:440
+#: ../thunar-vfs/thunar-vfs-xfer.c:451
 msgid "Operation canceled"
 msgstr "Operation abgebrochen"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:480
+#: ../thunar-vfs/thunar-vfs-xfer.c:491
 #, c-format
 msgid "Failed to read link target from \"%s\""
 msgstr "Das Ziel der Verknüpfung »%s« konnte nicht bestimmt werden"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:488 ../thunar-vfs/thunar-vfs-xfer.c:601
+#: ../thunar-vfs/thunar-vfs-xfer.c:499 ../thunar-vfs/thunar-vfs-xfer.c:612
 #, c-format
 msgid "Failed to create symbolic link \"%s\""
 msgstr "Die Verknüpfung »%s« konnte nicht erstellt werden"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:496
+#: ../thunar-vfs/thunar-vfs-xfer.c:507
 #, c-format
 msgid "Failed to change mode of \"%s\""
 msgstr "Die Berechtigungen für »%s« konnte nicht gesetzt werden"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:530 ../thunar-vfs/thunar-vfs-xfer.c:590
+#: ../thunar-vfs/thunar-vfs-xfer.c:541 ../thunar-vfs/thunar-vfs-xfer.c:601
 #, c-format
 msgid "Failed to determine file info for \"%s\""
 msgstr "Die Dateiinformationen für »%s« konnte nicht bestimmt werden"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:559
+#: ../thunar-vfs/thunar-vfs-xfer.c:570
 #, c-format
 msgid "Failed to copy special file \"%s\""
 msgstr "Die spezielle Datei »%s« konnte nicht kopiert werden"
 
 #: ../thunar/main.c:50
 msgid "Open the bulk rename dialog"
-msgstr "Den Bulk-Rename Dialog öffnen"
+msgstr "Den Bulk-Rename-Dialog öffnen"
 
 #: ../thunar/main.c:52
 msgid "Run in daemon mode"
@@ -385,11 +390,11 @@ msgstr "Als Hintergrundprozess starten (nicht unterstützt)"
 
 #: ../thunar/main.c:57
 msgid "Quit a running Thunar instance"
-msgstr "Einen laufenden Thunar Prozeß beenden"
+msgstr "Einen laufenden Prozeß von Thunar beenden"
 
 #: ../thunar/main.c:59
 msgid "Quit a running Thunar instance (not supported)"
-msgstr "Einen laufenden Thunar Prozeß beenden (nicht unterstützt)"
+msgstr "Einen laufenden Prozeß von Thunar beenden (nicht unterstützt)"
 
 #. setup application name
 #: ../thunar/main.c:81
@@ -653,7 +658,7 @@ msgid ""
 "use the user defined column widths."
 msgstr ""
 "Standardmäßig werden die Listenspalten automatisch\n"
-"vergrößert, falls notwendig, so daß der Text vollstän-\n"
+"vergrößert, falls notwendig, so dass der Text vollstän-\n"
 "dig angezeigt werden kann. Wird diese Einstellung de-\n"
 "aktiviert, merkt sich der Dateimanager die benutzerde-\n"
 "finierten Spaltengrößen."
@@ -678,8 +683,8 @@ msgstr "Neuen Namen eingeben:"
 #, c-format
 msgid "Cannot convert filename \"%s\" to the local encoding"
 msgstr ""
-"Der Dateiname »%s« kann nicht in den Dateisystem Zeichensatz umgewandelt "
-"werden"
+"Der Dateiname »%s« kann nicht in den Zeichensatz des Dateisystems "
+"umgewandelt werden"
 
 #: ../thunar/thunar-details-view.c:130
 msgid "Configure _Columns..."
@@ -691,7 +696,7 @@ msgstr "Die Listenspalten in der Detailansicht festlegen"
 
 #: ../thunar/thunar-details-view.c:414
 msgid "Detailed directory listing"
-msgstr "Detailierte Ordneransicht"
+msgstr "Detaillierte Ordneransicht"
 
 #: ../thunar/thunar-details-view.c:415
 msgid "Details view"
@@ -891,7 +896,7 @@ msgstr "In neuem Fenster öffnen"
 
 #: ../thunar/thunar-launcher.c:121
 msgid "Open the selected directories in new Thunar windows"
-msgstr "Die ausgewählten Ordner in neuen Thunar Fenstern öffnen"
+msgstr "Die ausgewählten Ordner in neuen Thunar-Fenstern öffnen"
 
 #: ../thunar/thunar-launcher.c:122 ../thunar/thunar-launcher.c:124
 msgid "Open With Other _Application..."
@@ -925,7 +930,7 @@ msgstr[1] "%d Dateien konnten nicht geöffnet werden"
 
 #: ../thunar/thunar-launcher.c:634
 msgid "Are you sure you want to open all folders?"
-msgstr "Sind Sie sicher, daß alle Ordner geöffnet werden sollen?"
+msgstr "Sind Sie sicher, dass alle Ordner geöffnet werden sollen?"
 
 #: ../thunar/thunar-launcher.c:636
 #, c-format
@@ -1180,7 +1185,7 @@ msgstr "Ordner-Berechtigungen korrigieren..."
 #: ../thunar/thunar-permissions-chooser.c:456
 msgid "Click here to automatically fix the folder permissions."
 msgstr ""
-"Hier klicken, um die Berrechtigungen für diesesn Ordner automatisch zu "
+"Hier klicken, um die Berechtigungen für diesen Ordner automatisch zu "
 "korrigieren."
 
 #: ../thunar/thunar-permissions-chooser.c:467
@@ -1194,7 +1199,7 @@ msgstr "Rekursives Anwenden der neuen Berechtigungen abbrechen."
 #. allocate the question dialog
 #: ../thunar/thunar-permissions-chooser.c:590
 #: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:294
+#: ../thunar/thunar-progress-dialog.c:305
 msgid "Question"
 msgstr "Frage"
 
@@ -1221,7 +1226,7 @@ msgid ""
 "afterwards."
 msgstr ""
 "Falls Sie diese Option wählen, wird ihre Wahl gespeichert und Sie werden "
-"nicht mehr gefragt. Sie können diese Wahl im Einstellungsdialog nachher "
+"nicht mehr gefragt. Sie können diese Wahl im Einstellungsdialog später "
 "ändern."
 
 #. display an error to the user
@@ -1258,22 +1263,22 @@ msgstr ""
 "lesen dürfen, diesen Ordner auch betreten."
 
 #: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:320
+#: ../thunar/thunar-progress-dialog.c:372
 msgid "_Yes"
 msgstr "_Ja"
 
 #: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:324
+#: ../thunar/thunar-progress-dialog.c:377
 msgid "Yes to _all"
 msgstr "Ja zu _allen"
 
 #: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:328
+#: ../thunar/thunar-progress-dialog.c:382
 msgid "_No"
 msgstr "_Nein"
 
 #: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:332
+#: ../thunar/thunar-progress-dialog.c:387
 msgid "_Cancel"
 msgstr "_Abbrechen"
 
@@ -1460,7 +1465,7 @@ msgid ""
 "folder. Select the default behavior below:"
 msgstr ""
 "Beim Ändern der Ordner-Berechtigungen kann\n"
-"diese Änderung auch auf den Inhalt des Ordner\n"
+"diese Änderung auch auf den Inhalt des Ordners\n"
 "angewandt werden. Das Standardverhalten kann\n"
 "hier festgelegt werden:"
 
@@ -1476,21 +1481,21 @@ msgstr "Nur auf Ordner anwenden"
 msgid "Apply to Folder and Contents"
 msgstr "Auf Ordner und Inhalt anwenden"
 
-#: ../thunar/thunar-progress-dialog.c:458
+#: ../thunar/thunar-progress-dialog.c:523
 #, c-format
 msgid "(%lu hour remaining)"
 msgid_plural "(%lu hours remaining)"
 msgstr[0] "(%lu Stunde verbleibend)"
 msgstr[1] "(%lu Stunden verbleibend)"
 
-#: ../thunar/thunar-progress-dialog.c:463
+#: ../thunar/thunar-progress-dialog.c:528
 #, c-format
 msgid "(%lu minute remaining)"
 msgid_plural "(%lu minutes remaining)"
 msgstr[0] "(%lu Minute verbleibend)"
 msgstr[1] "(%lu Minuten verbleibend)"
 
-#: ../thunar/thunar-progress-dialog.c:468
+#: ../thunar/thunar-progress-dialog.c:533
 #, c-format
 msgid "(%lu second remaining)"
 msgid_plural "(%lu seconds remaining)"
@@ -1610,7 +1615,7 @@ msgstr "Mehrere Dateien gleichzeitig umbenennen"
 #. add the "Rename Files" button
 #: ../thunar/thunar-renamer-dialog.c:372
 msgid "_Rename Files"
-msgstr "Dateien _umbennen"
+msgstr "Dateien _umbenennen"
 
 #: ../thunar/thunar-renamer-dialog.c:375
 msgid ""
@@ -1635,6 +1640,13 @@ msgid ""
 "installation or contact your system administrator. If you install Thunar\n"
 "from source, be sure to enable the \"Simple Builtin Renamers\" plugin."
 msgstr ""
+"Es wurden keine Module zum Umbenennen von Dateien auf Ihrem System "
+"gefunden.\n"
+"Überpüfen Sie bitte Ihre Installation oder setzen Sie sich mit Ihrem "
+"System-\n"
+"Administrator in Verbindung. Falls Sie Thunar aus den Quellen installiert\n"
+"haben, stellen Sie sicher, dass das Plugin »Einfaches Umbenennen« aktiviert\n"
+"ist."
 
 #. allocate the file chooser
 #: ../thunar/thunar-renamer-dialog.c:1091
@@ -1666,7 +1678,7 @@ msgid ""
 "tool to rename multiple files at once."
 msgstr ""
 "Thunar Bulk-Rename ist ein mächtiges, erweiterbares\n"
-"Werkzeug zum gleichzeitigen Umbennen mehrerer Dateien."
+"Werkzeug zum gleichzeitigen Umbenennen mehrerer Dateien."
 
 #: ../thunar/thunar-renamer-dialog.c:1556
 msgid "Remove File"
@@ -1907,7 +1919,7 @@ msgstr "Neue leere Datei..."
 #. ask the user to enter a name for the new folder
 #: ../thunar/thunar-standard-view.c:1768 ../thunar/thunar-tree-view.c:1222
 msgid "New Folder"
-msgstr "Neuen Ordner"
+msgstr "Neuer Ordner"
 
 #: ../thunar/thunar-standard-view.c:1768 ../thunar/thunar-tree-view.c:1222
 msgid "Create New Folder"
@@ -1925,7 +1937,7 @@ msgid ""
 "Are you sure that you want to\n"
 "permanently delete \"%s\"?"
 msgstr ""
-"Sind Sie sicher, daß Sie »%s«\n"
+"Sind Sie sicher, dass Sie »%s«\n"
 "dauerhaft löschen wollen?"
 
 #: ../thunar/thunar-standard-view.c:1973
@@ -1965,7 +1977,7 @@ msgstr "_Muster:"
 #: ../thunar/thunar-standard-view.c:2209
 #, c-format
 msgid "Rename \"%s\""
-msgstr "»%s« umbennen"
+msgstr "»%s« umbenennen"
 
 #: ../thunar/thunar-standard-view.c:2881
 #, c-format
@@ -2079,7 +2091,7 @@ msgstr "_Neu laden"
 
 #: ../thunar/thunar-window.c:253
 msgid "Reload the current folder"
-msgstr "Den aktuellen Ordner neuladen"
+msgstr "Den aktuellen Ordner neu einlesen"
 
 #: ../thunar/thunar-window.c:254
 msgid "_Location Selector"
@@ -2095,7 +2107,7 @@ msgstr "Ver_größern"
 
 #: ../thunar/thunar-window.c:256
 msgid "Show the contents in more detail"
-msgstr "Den Inhalt detailierter anzeigen"
+msgstr "Den Inhalt detaillierter anzeigen"
 
 #: ../thunar/thunar-window.c:257
 msgid "Zoom _Out"
@@ -2103,7 +2115,7 @@ msgstr "Ver_kleinern"
 
 #: ../thunar/thunar-window.c:257
 msgid "Show the contents in less detail"
-msgstr "Den Inhalt weniger detailiert anzeigen"
+msgstr "Den Inhalt weniger detailliert anzeigen"
 
 #: ../thunar/thunar-window.c:258
 msgid "Normal Si_ze"
@@ -2206,7 +2218,7 @@ msgstr "_Pfadleisten-Stil"
 
 #: ../thunar/thunar-window.c:557
 msgid "Modern approach with buttons that correspond to folders"
-msgstr "Moderner Ansatz mit Knöpfen, die Ordnern entsprechen "
+msgstr "Moderner Ansatz mit Knöpfen, die Ordnern entsprechen"
 
 #: ../thunar/thunar-window.c:563
 msgid "_Toolbar Style"
@@ -2259,7 +2271,7 @@ msgstr "Ãœber Vorlagen"
 
 #: ../thunar/thunar-window.c:1697
 msgid "All files in this folder will appear in the \"Create Document\" menu."
-msgstr "Alle Dateien in diesem Ordner erscheinen im »Dokument anlegen« Menü."
+msgstr "Alle Dateien in diesem Ordner erscheinen im Menü »Dokument anlegen«."
 
 #: ../thunar/thunar-window.c:1704
 msgid ""
@@ -2272,9 +2284,9 @@ msgid ""
 msgstr ""
 "Falls Sie häufig eine bestimmte Art von Dokument anlegen, legen Sie eine "
 "Kopie davon in diesem Ordner ab. Thunar erstellt einen Eintrag für dieses "
-"Dokument in dem »Dokument anlegen« Menü.\n"
+"Dokument in dem Menü »Dokument anlegen«.\n"
 "\n"
-"Sie können diesen Eintrag in dem »Dokument anlegen« Menü wählen und eine "
+"Sie können diesen Eintrag in dem Menü »Dokument anlegen« wählen und eine "
 "Kopie dieses Dokuments wird im gerade angezeigten Ordner angelegt."
 
 #: ../thunar/thunar-window.c:1716
@@ -2324,11 +2336,11 @@ msgstr "URL der Hilfe"
 
 #: ../thunarx/thunarx-renamer.c:163
 msgid "The URL to the documentation of the renamer"
-msgstr "Die URL der Dokumentation des Renamer-Moduls"
+msgstr "Die URL der Dokumentation des Umbenennungs-Moduls"
 
 #: ../thunarx/thunarx-renamer.c:178
 msgid "The user visible name of the renamer"
-msgstr "Der angezeigte Name des Renamer-Moduls"
+msgstr "Der angezeigte Name des Umbenennungs-Moduls"
 
 #: ../plugins/thunar-sbr/thunar-sbr-case-renamer.c:119
 msgid "Con_vert to:"
@@ -2721,7 +2733,7 @@ msgstr ""
 "einer Datei oder eines Ordners erscheint, muß min-\n"
 "destens ein Muster zum Datei- oder Ordnernamen\n"
 "passen.\n"
-"Weiterhin kann angegeben werden, daß eine Aktion\n"
+"Weiterhin kann angegeben werden, dass eine Aktion\n"
 "nur für bestimmte Dateitypen erscheinen soll."
 
 #: ../plugins/thunar-uca/thunar-uca-editor.c:650
@@ -2794,4 +2806,3 @@ msgstr "Ordner öffnen"
 #: ../Thunar-folder-handler.desktop.in.in.h:2
 msgid "Open the specified folders in Thunar"
 msgstr "Angegebene Ordner mit Thunar öffnen"
-
diff --git a/po/el.po b/po/el.po
index 64afbaf96..bcc942788 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-25 22:21+0100\n"
+"POT-Creation-Date: 2006-03-26 14:23+0200\n"
 "PO-Revision-Date: 2006-03-26 02:12+0200\n"
 "Last-Translator: Stavros Giannouris <stavrosg2002@freemail.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -65,8 +65,11 @@ msgstr "Η αλλαγή του γκρουπ του \"%s\" απέτυχε: %s"
 #. ask the user whether to override this path
 #: ../thunar-vfs/thunar-vfs-creat-job.c:188
 #, c-format
-msgid "The file \"%s\" already exists. Do you want to replace it with an empty file?"
-msgstr "Το αρχείο \"%s\" υπάρχει ήδη. Θέλετε να το αντικαταστήσετε με ένα κενό αρχείο;"
+msgid ""
+"The file \"%s\" already exists. Do you want to replace it with an empty file?"
+msgstr ""
+"Το αρχείο \"%s\" υπάρχει ήδη. Θέλετε να το αντικαταστήσετε με ένα κενό "
+"αρχείο;"
 
 #. ask the user whether to skip this path
 #: ../thunar-vfs/thunar-vfs-creat-job.c:199
@@ -98,13 +101,7 @@ msgstr ""
 msgid "Failed to read folder contents"
 msgstr "Η λήψη των περιεχομένων του φακέλου απέτυχε"
 
-#. no useful information, *narf*
 #: ../thunar-vfs/thunar-vfs-exec.c:509
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:237
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:304
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:347
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:436
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:476
 msgid "Unknown error"
 msgstr "Άγνωστο σφάλμα"
 
@@ -118,8 +115,7 @@ msgstr "Δεν έχει οριστεί το πεδίο Exec"
 msgid "No URL field specified"
 msgstr "Δεν έχει οριστεί το πεδίο URL"
 
-#: ../thunar-vfs/thunar-vfs-info.c:405
-#: ../thunar-vfs/thunar-vfs-info.c:530
+#: ../thunar-vfs/thunar-vfs-info.c:405 ../thunar-vfs/thunar-vfs-info.c:530
 msgid "Invalid desktop file"
 msgstr "Μη έγκυρο αρχείο συντόμευσης"
 
@@ -188,8 +184,7 @@ msgid "The icon of the mime handler"
 msgstr "Το εικονίδιο του χειριστή mime"
 
 #: ../thunar-vfs/thunar-vfs-mime-handler.c:176
-#: ../thunar/thunar-enum-types.c:94
-#: ../thunar/thunar-renamer-dialog.c:431
+#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:431
 #: ../thunarx/thunarx-renamer.c:177
 msgid "Name"
 msgstr "Όνομα"
@@ -216,8 +211,7 @@ msgstr "Η διαδρομή είναι υπερβολικά μεγάλη για
 msgid "URI too long to fit into buffer"
 msgstr "Το URI είναι υπερβολικά μεγάλο για να χωρέσει στην προσωρινή μνήμη"
 
-#: ../thunar-vfs/thunar-vfs-thumb.c:176
-#: ../thunar/thunar-enum-types.c:97
+#: ../thunar-vfs/thunar-vfs-thumb.c:176 ../thunar/thunar-enum-types.c:97
 msgid "Size"
 msgstr "Μέγεθος"
 
@@ -244,8 +238,7 @@ msgstr "Δεν είναι δυνατή η μεταφορά του ριζικού
 msgid "Preparing..."
 msgstr "Προετοιμασία..."
 
-#: ../thunar-vfs/thunar-vfs-util.c:251
-#: ../thunar/thunar-path-entry.c:1249
+#: ../thunar-vfs/thunar-vfs-util.c:251 ../thunar/thunar-path-entry.c:1249
 msgid "Invalid path"
 msgstr "Μη έγκυρη διαδρομή"
 
@@ -255,18 +248,22 @@ msgid "Unknown user \"%s\""
 msgstr "Άγνωστος χρήστης \"%s\""
 
 #. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:385
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
 #, c-format
 msgid "Failed to determine the mount point for %s"
 msgstr "Ο προσδιορισμός του σημείου σύνδεσης για το `%s' απέτυχε"
 
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:812
+#, fuzzy, c-format
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr "Η αλλαγή της κατάστασης του \"%s\" απέτυχε"
+
 #: ../thunar-vfs/thunar-vfs-xfer.c:189
 #, c-format
 msgid "copy of %s"
 msgstr "αντίγραφο του %s"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:190
-#: ../thunar/thunar-list-model.c:752
+#: ../thunar-vfs/thunar-vfs-xfer.c:190 ../thunar/thunar-list-model.c:752
 #: ../thunar/thunar-properties-dialog.c:665
 #, c-format
 msgid "link to %s"
@@ -293,8 +290,7 @@ msgid "third link to %s"
 msgstr "τρίτος δεσμός προς το %s"
 
 #. if we had no match on the NAMES, try the "%uth copy of %s" pattern
-#: ../thunar-vfs/thunar-vfs-xfer.c:237
-#: ../thunar-vfs/thunar-vfs-xfer.c:253
+#: ../thunar-vfs/thunar-vfs-xfer.c:237 ../thunar-vfs/thunar-vfs-xfer.c:253
 #, c-format
 msgid "%uth copy of %s"
 msgid_plural "%uth copy of %s"
@@ -325,54 +321,58 @@ msgstr "Δεν ήταν δυνατή η δημιουργία της διασωλ
 msgid "Failed to open \"%s\" for reading"
 msgstr "Το άνοιγμα του \"%s\" για ανάγνωση απέτυχε"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:381
+#: ../thunar-vfs/thunar-vfs-xfer.c:385
+#, c-format
+msgid "The file \"%s\" already exists"
+msgstr ""
+
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-xfer.c:390
 #, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "Το άνοιγμα του \"%s\" για εγγραφή απέτυχε"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:400
+#: ../thunar-vfs/thunar-vfs-xfer.c:411
 #, c-format
 msgid "Failed to read data from \"%s\""
 msgstr "Η ανάγνωση δεδομένων από το \"%s\" απέτυχε"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:416
+#: ../thunar-vfs/thunar-vfs-xfer.c:427
 #, c-format
 msgid "Failed to write data to \"%s\""
 msgstr "Η εγγραφή δεδομένων στο \"%s\" απέτυχε"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#: ../thunar-vfs/thunar-vfs-xfer.c:446
 #, c-format
 msgid "Failed to remove \"%s\""
 msgstr "Η διαγραφή του \"%s\" απέτυχε"
 
 #. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:440
+#: ../thunar-vfs/thunar-vfs-xfer.c:451
 msgid "Operation canceled"
 msgstr "Η ενέργεια ακυρώθηκε"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:480
+#: ../thunar-vfs/thunar-vfs-xfer.c:491
 #, c-format
 msgid "Failed to read link target from \"%s\""
 msgstr "Η ανάγνωση του συμβολικού δεσμού \"%s\" απέτυχε"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:488
-#: ../thunar-vfs/thunar-vfs-xfer.c:601
+#: ../thunar-vfs/thunar-vfs-xfer.c:499 ../thunar-vfs/thunar-vfs-xfer.c:612
 #, c-format
 msgid "Failed to create symbolic link \"%s\""
 msgstr "Η δημιουργία συμβολικού δεσμού \"%s\" απέτυχε"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:496
+#: ../thunar-vfs/thunar-vfs-xfer.c:507
 #, c-format
 msgid "Failed to change mode of \"%s\""
 msgstr "Η αλλαγή της κατάστασης του \"%s\" απέτυχε"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:530
-#: ../thunar-vfs/thunar-vfs-xfer.c:590
+#: ../thunar-vfs/thunar-vfs-xfer.c:541 ../thunar-vfs/thunar-vfs-xfer.c:601
 #, c-format
 msgid "Failed to determine file info for \"%s\""
 msgstr "Ο προσδιορισμός των πληροφοριών αρχείου για το \"%s\" απέτυχε"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:559
+#: ../thunar-vfs/thunar-vfs-xfer.c:570
 #, c-format
 msgid "Failed to copy special file \"%s\""
 msgstr "H αντιγραφή του ειδικού αρχείου \"%s\" ήταν αδύνατη"
@@ -434,8 +434,7 @@ msgstr "Το άνοιγμα του \"%s\" απέτυχε"
 msgid "Failed to open \"%s\": %s"
 msgstr "Η διαγραφή του \"%s\" απέτυχε: %s"
 
-#: ../thunar/thunar-application.c:836
-#: ../thunar/thunar-application.c:869
+#: ../thunar/thunar-application.c:836 ../thunar/thunar-application.c:869
 msgid "Copying files..."
 msgstr "Αντιγραφή αρχείων..."
 
@@ -461,8 +460,7 @@ msgstr "Δημιουργία καταλόγων..."
 
 #. tell the user that it didn't work
 #. display an error to the user
-#: ../thunar/thunar-chooser-button.c:282
-#: ../thunar/thunar-chooser-dialog.c:513
+#: ../thunar/thunar-chooser-button.c:282 ../thunar/thunar-chooser-dialog.c:513
 #, c-format
 msgid "Failed to set default application for \"%s\""
 msgstr "Ο ορισμός της προκαθορισμένης εφαρμογής για το \"%s\" απέτυχε."
@@ -474,16 +472,18 @@ msgstr "Δεν επιλέχθηκε εφαρμογή"
 #. setup a useful tooltip and ATK description
 #: ../thunar/thunar-chooser-button.c:373
 #, c-format
-msgid "The selected application is used to open this and other files of type \"%s\"."
-msgstr "Η επιλεγμένη εφαρμογή καλείται για να ανοίξει αυτό και τα άλλα αρχεία του τύπου \"%s\"."
+msgid ""
+"The selected application is used to open this and other files of type \"%s\"."
+msgstr ""
+"Η επιλεγμένη εφαρμογή καλείται για να ανοίξει αυτό και τα άλλα αρχεία του "
+"τύπου \"%s\"."
 
 #. add the "Other Application..." choice
 #: ../thunar/thunar-chooser-button.c:514
 msgid "_Other Application..."
 msgstr "_Άλλη Εφαρμογή..."
 
-#: ../thunar/thunar-chooser-dialog.c:216
-#: ../thunar/thunar-launcher.c:123
+#: ../thunar/thunar-chooser-dialog.c:216 ../thunar/thunar-launcher.c:123
 msgid "Open With"
 msgstr "Άνοιγμα Με"
 
@@ -493,8 +493,12 @@ msgid "Use a _custom command:"
 msgstr "Χρήση _προσαρμοσμένης εντολής:"
 
 #: ../thunar/thunar-chooser-dialog.c:281
-msgid "Use a custom command for an application that is not available from the above application list."
-msgstr "Χρήση μιας προσαρμοσμένης εντολής για εφαρμογή που δεν είναι διαθέσιμη στην παραπάνω λίστα."
+msgid ""
+"Use a custom command for an application that is not available from the above "
+"application list."
+msgstr ""
+"Χρήση μιας προσαρμοσμένης εντολής για εφαρμογή που δεν είναι διαθέσιμη στην "
+"παραπάνω λίστα."
 
 #. create the "Custom command" button
 #: ../thunar/thunar-chooser-dialog.c:300
@@ -527,13 +531,18 @@ msgstr "Άνοιγμα του <i>%s</i> και των άλλων αρχείων
 #. update the "Browse..." tooltip
 #: ../thunar/thunar-chooser-dialog.c:657
 #, c-format
-msgid "Browse the file system to select an application to open files of type \"%s\"."
-msgstr "Ερευνήστε το σύστημα αρχείων για να επιλέξετε την εφαρμογή που θα χρησιμοποιείτε για το άνοιγμα των αρχείων τύπου \"%s\"."
+msgid ""
+"Browse the file system to select an application to open files of type \"%s\"."
+msgstr ""
+"Ερευνήστε το σύστημα αρχείων για να επιλέξετε την εφαρμογή που θα "
+"χρησιμοποιείτε για το άνοιγμα των αρχείων τύπου \"%s\"."
 
 #. update the "Use as default for this kind of file" tooltip
 #: ../thunar/thunar-chooser-dialog.c:663
 #, c-format
-msgid "Change the default application for files of type \"%s\" to the selected application."
+msgid ""
+"Change the default application for files of type \"%s\" to the selected "
+"application."
 msgstr ""
 
 #: ../thunar/thunar-chooser-dialog.c:684
@@ -650,15 +659,13 @@ msgstr ""
 msgid "Automatically _expand columns as needed"
 msgstr "Αυτόματη _επέκταση στηλών"
 
-#: ../thunar/thunar-column-model.c:894
-#: ../thunar/thunar-list-model.c:702
+#: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:702
 #: ../thunar/thunar-list-model.c:731
 #: ../thunar/thunar-permissions-chooser.c:270
 msgid "Unknown"
 msgstr "Άγνωστο"
 
-#: ../thunar/thunar-create-dialog.c:180
-#: ../thunar/thunar-standard-view.c:2238
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2238
 msgid "Enter the new name:"
 msgstr "Εισάγετε νέο όνομα:"
 
@@ -666,7 +673,9 @@ msgstr "Εισάγετε νέο όνομα:"
 #: ../thunar/thunar-create-dialog.c:523
 #, c-format
 msgid "Cannot convert filename \"%s\" to the local encoding"
-msgstr "Δεν είναι δυνατή η μετατροπή του ονόματος αρχείου \"%s\" στην τοπική κωδικοποίηση"
+msgstr ""
+"Δεν είναι δυνατή η μετατροπή του ονόματος αρχείου \"%s\" στην τοπική "
+"κωδικοποίηση"
 
 #: ../thunar/thunar-details-view.c:130
 msgid "Configure _Columns..."
@@ -690,8 +699,7 @@ msgstr "Σταύρος Γιαννούρης <stavrosg2002@freemail.gr>"
 
 #. display an error message to the user
 #. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:270
-#: ../thunar/thunar-renamer-dialog.c:988
+#: ../thunar/thunar-dialogs.c:270 ../thunar/thunar-renamer-dialog.c:988
 msgid "Failed to open the documentation browser"
 msgstr "Το άνοιγμα του αναγνώστη τεκμηρίωσης απέτυχε"
 
@@ -709,8 +717,7 @@ msgstr "Δ_ημιουργία δεσμού εδώ"
 
 #. display an error to the user
 #. display an error message to the user
-#: ../thunar/thunar-dnd.c:191
-#: ../thunar/thunar-launcher.c:497
+#: ../thunar/thunar-dnd.c:191 ../thunar/thunar-launcher.c:497
 #, c-format
 msgid "Failed to execute file \"%s\""
 msgstr "Η εκτέλεση του \"%s\" απέτυχε"
@@ -750,8 +757,7 @@ msgstr "Ιδιοκτήτης"
 #.
 #. Permissions chooser
 #.
-#: ../thunar/thunar-enum-types.c:96
-#: ../thunar/thunar-properties-dialog.c:420
+#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:420
 msgid "Permissions"
 msgstr "Δικαιώματα"
 
@@ -859,11 +865,9 @@ msgid "Icon view"
 msgstr "Εικονίδια"
 
 #. append the "Open" menu action
-#: ../thunar/thunar-launcher.c:120
-#: ../thunar/thunar-launcher.c:756
+#: ../thunar/thunar-launcher.c:120 ../thunar/thunar-launcher.c:756
 #: ../thunar/thunar-location-buttons.c:1267
-#: ../thunar/thunar-shortcuts-view.c:794
-#: ../thunar/thunar-tree-view.c:898
+#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:898
 msgid "_Open"
 msgstr "_Άνοιγμα"
 
@@ -872,10 +876,8 @@ msgid "Open the selected files"
 msgstr "Άνοιγμα των επιλεγμένων αρχείων"
 
 #. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:121
-#: ../thunar/thunar-location-buttons.c:1280
-#: ../thunar/thunar-shortcuts-view.c:805
-#: ../thunar/thunar-tree-view.c:910
+#: ../thunar/thunar-launcher.c:121 ../thunar/thunar-location-buttons.c:1280
+#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:910
 msgid "Open in New Window"
 msgstr "Άνοιγμα σε Νέο Παράθυρο"
 
@@ -883,16 +885,15 @@ msgstr "Άνοιγμα σε Νέο Παράθυρο"
 msgid "Open the selected directories in new Thunar windows"
 msgstr "Άνοιγμα των επιλεγμένων καταλόγων σε νέα παράθυρα του Thunar"
 
-#: ../thunar/thunar-launcher.c:122
-#: ../thunar/thunar-launcher.c:124
+#: ../thunar/thunar-launcher.c:122 ../thunar/thunar-launcher.c:124
 msgid "Open With Other _Application..."
 msgstr "Άνοιγμα Με Άλλη Ε_φαρμογή..."
 
-#: ../thunar/thunar-launcher.c:122
-#: ../thunar/thunar-launcher.c:124
+#: ../thunar/thunar-launcher.c:122 ../thunar/thunar-launcher.c:124
 #: ../thunar/thunar-launcher.c:839
 msgid "Choose another application with which to open the selected file"
-msgstr "Επιλέξτε μια άλλη εφαρμογή με την οποία θα ανοίξετε το επιλεγμένο αρχείο"
+msgstr ""
+"Επιλέξτε μια άλλη εφαρμογή με την οποία θα ανοίξετε το επιλεγμένο αρχείο"
 
 #: ../thunar/thunar-launcher.c:123
 msgid "Choose a program with which to open the selected file"
@@ -970,8 +971,7 @@ msgstr[1] "Εκτέλεση των επιλεγμένων αρχείων"
 msgid "_Open With \"%s\""
 msgstr "_Άνοιγμα Με το \"%s\""
 
-#: ../thunar/thunar-launcher.c:815
-#: ../thunar/thunar-launcher.c:902
+#: ../thunar/thunar-launcher.c:815 ../thunar/thunar-launcher.c:902
 #, c-format
 msgid "Use \"%s\" to open the selected file"
 msgid_plural "Use \"%s\" to open the selected files"
@@ -997,8 +997,7 @@ msgstr[1] "Άνοιγμα των επιλεγμένων αρχείων με τι
 msgid "Open With \"%s\""
 msgstr "Άνοιγμα Με το \"%s\""
 
-#: ../thunar/thunar-list-model.c:750
-#: ../thunar/thunar-properties-dialog.c:663
+#: ../thunar/thunar-list-model.c:750 ../thunar/thunar-properties-dialog.c:663
 msgid "broken link"
 msgstr "σπασμένος δεσμός"
 
@@ -1068,12 +1067,14 @@ msgstr "Άνοιγμα του \"%s\" σε νέο το παράθυρο"
 #. add the "Open in New Window" action
 #: ../thunar/thunar-location-buttons.c:1294
 #, c-format
-msgid "Move or copy files previously selected by a Cut or Copy command into \"%s\""
-msgstr "Μετακίνηση ή αντιγραφή αρχείων που προηγουμένως επιλέχθηκαν με εντολή Αποκοπή Αρχείων ή Αντιγραφή Αρχείων στο \"%s\""
+msgid ""
+"Move or copy files previously selected by a Cut or Copy command into \"%s\""
+msgstr ""
+"Μετακίνηση ή αντιγραφή αρχείων που προηγουμένως επιλέχθηκαν με εντολή "
+"Αποκοπή Αρχείων ή Αντιγραφή Αρχείων στο \"%s\""
 
 #. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1295
-#: ../thunar/thunar-tree-view.c:958
+#: ../thunar/thunar-location-buttons.c:1295 ../thunar/thunar-tree-view.c:958
 msgid "_Paste Into Folder"
 msgstr "_Επικόλληση στο Φάκελο"
 
@@ -1085,8 +1086,7 @@ msgstr "Άνοιγμα Τοποθεσίας"
 msgid "_Location:"
 msgstr "_Τοποθεσία:"
 
-#: ../thunar/thunar-location-entry.c:423
-#: ../thunar/thunar-window.c:1159
+#: ../thunar/thunar-location-entry.c:423 ../thunar/thunar-window.c:1159
 #, c-format
 msgid "Failed to launch \"%s\""
 msgstr "Η εκκίνηση του \"%s\" απέτυχε"
@@ -1166,7 +1166,8 @@ msgstr "Επιδιόρθωση δικαιωμάτων φακέλου..."
 
 #: ../thunar/thunar-permissions-chooser.c:456
 msgid "Click here to automatically fix the folder permissions."
-msgstr "Πατήστε εδώ για να γίνει αυτόματη επιδιόρθωση των δικαιωμάτων του φακέλου."
+msgstr ""
+"Πατήστε εδώ για να γίνει αυτόματη επιδιόρθωση των δικαιωμάτων του φακέλου."
 
 #: ../thunar/thunar-permissions-chooser.c:467
 msgid "Please wait..."
@@ -1179,7 +1180,7 @@ msgstr "Διακοπή εφαρμογής δικαιωμάτων."
 #. allocate the question dialog
 #: ../thunar/thunar-permissions-chooser.c:590
 #: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:294
+#: ../thunar/thunar-progress-dialog.c:305
 msgid "Question"
 msgstr "Ερώτηση"
 
@@ -1200,7 +1201,10 @@ msgid "Do _not ask me again"
 msgstr "Μη_ν με ξαναρωτήσεις"
 
 #: ../thunar/thunar-permissions-chooser.c:626
-msgid "If you select this option your choice will be remembered and you won't be asked again. You can use the preferences dialog to alter your choice afterwards."
+msgid ""
+"If you select this option your choice will be remembered and you won't be "
+"asked again. You can use the preferences dialog to alter your choice "
+"afterwards."
 msgstr "Η επιλογή σας θα καταγραφεί και δεν θα ερωτηθείτε ξανά. Μπορείτε να "
 
 #. display an error to the user
@@ -1227,26 +1231,31 @@ msgid "Correct folder permissions"
 msgstr "Επιδιόρθωση δικαιωμάτων φακέλου"
 
 #: ../thunar/thunar-permissions-chooser.c:1072
-msgid "The folder permissions will be reset to a consistent state. Only users allowed to read the contents of this folder will be allowed to enter the folder afterwards."
-msgstr "Θα επαναφερθεί η συνοχή των δικαιωμάτων του φακέλου. Μόνο οι χρήστες που έχουν δικαίωμα ανάγνωσης των περιεχομένων θα έχουν και πρόσβαση στο φάκελο."
+msgid ""
+"The folder permissions will be reset to a consistent state. Only users "
+"allowed to read the contents of this folder will be allowed to enter the "
+"folder afterwards."
+msgstr ""
+"Θα επαναφερθεί η συνοχή των δικαιωμάτων του φακέλου. Μόνο οι χρήστες που "
+"έχουν δικαίωμα ανάγνωσης των περιεχομένων θα έχουν και πρόσβαση στο φάκελο."
 
 #: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:320
+#: ../thunar/thunar-progress-dialog.c:372
 msgid "_Yes"
 msgstr "_Ναι"
 
 #: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:324
+#: ../thunar/thunar-progress-dialog.c:377
 msgid "Yes to _all"
 msgstr "Ναι σε ό_λα"
 
 #: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:328
+#: ../thunar/thunar-progress-dialog.c:382
 msgid "_No"
 msgstr "_Όχι"
 
 #: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:332
+#: ../thunar/thunar-progress-dialog.c:387
 msgid "_Cancel"
 msgstr "_Ακύρωση"
 
@@ -1288,23 +1297,33 @@ msgstr "Ταξινόμηση _φακέλων πριν τα αρχεία"
 
 #: ../thunar/thunar-preferences-dialog.c:282
 msgid "Select this option to list folders before files when you sort a folder."
-msgstr "Επιλέξτε αυτό για να τοποθετούνται οι φάκελοι πριν από τα αρχεία κατά την ταξινόμηση ενός φακέλου."
+msgstr ""
+"Επιλέξτε αυτό για να τοποθετούνται οι φάκελοι πριν από τα αρχεία κατά την "
+"ταξινόμηση ενός φακέλου."
 
 #: ../thunar/thunar-preferences-dialog.c:286
 msgid "_Show thumbnails"
 msgstr "Εμφάνιση _μικρογραφιών:"
 
 #: ../thunar/thunar-preferences-dialog.c:288
-msgid "Select this option to display previewable files within a folder as automatically generated thumbnail icons."
-msgstr "Ενεργοποιήστε αυτή την επιλογή για να δημιουργούνται και να εμφανίζονται αυτόματα μικρογραφίες όσων αρχείων γίνεται."
+msgid ""
+"Select this option to display previewable files within a folder as "
+"automatically generated thumbnail icons."
+msgstr ""
+"Ενεργοποιήστε αυτή την επιλογή για να δημιουργούνται και να εμφανίζονται "
+"αυτόματα μικρογραφίες όσων αρχείων γίνεται."
 
 #: ../thunar/thunar-preferences-dialog.c:309
 msgid "_Text beside icons"
 msgstr "_Κείμενο δίπλα από εικονίδια"
 
 #: ../thunar/thunar-preferences-dialog.c:311
-msgid "Select this option to place the icon captions for items beside the icon rather than below the icon."
-msgstr "Ενεργοποιήστε αυτή την επιλογή για να προβάλλεται το κείμενο πλάι στα εικονίδια, και όχι από κάτω."
+msgid ""
+"Select this option to place the icon captions for items beside the icon "
+"rather than below the icon."
+msgstr ""
+"Ενεργοποιήστε αυτή την επιλογή για να προβάλλεται το κείμενο πλάι στα "
+"εικονίδια, και όχι από κάτω."
 
 #.
 #. Side Pane
@@ -1361,8 +1380,12 @@ msgid "Show Icon _Emblems"
 msgstr "Εμφάνιση Ε_μβλημάτων Εικονιδίων"
 
 #: ../thunar/thunar-preferences-dialog.c:372
-msgid "Select this option to display icon emblems in the shortcuts pane for all folders for which emblems have been defined in the folders properties dialog."
-msgstr "Εμφανίζει τα εμβλήματα στο ταμπλό συντομεύσεων για όσους φακέλους έχουν τεθεί μέσω των ιδιοτήτων τους."
+msgid ""
+"Select this option to display icon emblems in the shortcuts pane for all "
+"folders for which emblems have been defined in the folders properties dialog."
+msgstr ""
+"Εμφανίζει τα εμβλήματα στο ταμπλό συντομεύσεων για όσους φακέλους έχουν "
+"τεθεί μέσω των ιδιοτήτων τους."
 
 #: ../thunar/thunar-preferences-dialog.c:381
 msgid "Tree Pane"
@@ -1377,8 +1400,12 @@ msgid "Show Icon E_mblems"
 msgstr "Εμφάνιση Ε_μβλημάτων Εικονιδίων"
 
 #: ../thunar/thunar-preferences-dialog.c:423
-msgid "Select this option to display icon emblems in the tree pane for all folders for which emblems have been defined in the folders properties dialog."
-msgstr "Εμφανίζει τα εμβλήματα στο ταμπλό δέντρου για όσους φακέλους έχουν τεθεί μέσω των ιδιοτήτων τους."
+msgid ""
+"Select this option to display icon emblems in the tree pane for all folders "
+"for which emblems have been defined in the folders properties dialog."
+msgstr ""
+"Εμφανίζει τα εμβλήματα στο ταμπλό δέντρου για όσους φακέλους έχουν τεθεί "
+"μέσω των ιδιοτήτων τους."
 
 #.
 #. Behavior
@@ -1429,21 +1456,21 @@ msgstr "Εφαρμογή μόνο στο φάκελο"
 msgid "Apply to Folder and Contents"
 msgstr "Εφαρμογή στο Φάκελο και τα Περιεχόμενα"
 
-#: ../thunar/thunar-progress-dialog.c:458
+#: ../thunar/thunar-progress-dialog.c:523
 #, c-format
 msgid "(%lu hour remaining)"
 msgid_plural "(%lu hours remaining)"
 msgstr[0] "(απομένει %lu ώρα)"
 msgstr[1] "(απομένουν %lu ώρες)"
 
-#: ../thunar/thunar-progress-dialog.c:463
+#: ../thunar/thunar-progress-dialog.c:528
 #, c-format
 msgid "(%lu minute remaining)"
 msgid_plural "(%lu minutes remaining)"
 msgstr[0] "(απομένει %lu λεπτό)"
 msgstr[1] "(απομένουν %lu λεπτά)"
 
-#: ../thunar/thunar-progress-dialog.c:468
+#: ../thunar/thunar-progress-dialog.c:533
 #, c-format
 msgid "(%lu second remaining)"
 msgid_plural "(%lu seconds remaining)"
@@ -1513,13 +1540,11 @@ msgstr "Εμβλήματα"
 msgid "Failed to rename \"%s\""
 msgstr "Η μετονομασία του \"%s\" απέτυχε"
 
-#: ../thunar/thunar-renamer-dialog.c:173
-#: ../thunar/thunar-window.c:246
+#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-window.c:246
 msgid "_File"
 msgstr "_Αρχείο"
 
-#: ../thunar/thunar-renamer-dialog.c:174
-#: ../thunar/thunar-standard-view.c:305
+#: ../thunar/thunar-renamer-dialog.c:174 ../thunar/thunar-standard-view.c:305
 msgid "File Context Menu"
 msgstr "Μενού Ενεργειών Αρχείων"
 
@@ -1539,8 +1564,7 @@ msgstr "Καθαρισμός"
 msgid "Clear the file list below"
 msgstr "Καθαρισμός της παρακάτω λίστας αρχείων"
 
-#: ../thunar/thunar-renamer-dialog.c:178
-#: ../thunar/thunar-window.c:266
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-window.c:266
 msgid "_About"
 msgstr "_Περί"
 
@@ -1548,13 +1572,11 @@ msgstr "_Περί"
 msgid "Display information about Thunar Bulk Rename"
 msgstr "Εμφάνιση πληροφοριών σχετικά με τη Μαζική Μετονομασία του Thunar"
 
-#: ../thunar/thunar-renamer-dialog.c:179
-#: ../thunar/thunar-standard-view.c:308
+#: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-standard-view.c:308
 msgid "_Properties..."
 msgstr "_Ιδιότητες..."
 
-#: ../thunar/thunar-renamer-dialog.c:179
-#: ../thunar/thunar-standard-view.c:308
+#: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-standard-view.c:308
 msgid "View the properties of the selected file"
 msgstr "Προβολή των ιδιοτήτων του επιλεγμένου αρχείου"
 
@@ -1570,7 +1592,8 @@ msgid "_Rename Files"
 msgstr "_Μετονομασία Αρχείων"
 
 #: ../thunar/thunar-renamer-dialog.c:375
-msgid "Click here to actually rename the files listed above to their new names."
+msgid ""
+"Click here to actually rename the files listed above to their new names."
 msgstr ""
 
 #: ../thunar/thunar-renamer-dialog.c:447
@@ -1579,7 +1602,9 @@ msgstr "Νέο όνομα "
 
 #: ../thunar/thunar-renamer-dialog.c:512
 msgid "Click here to view the documentation for the selected rename operation."
-msgstr "Πατήστε εδώ για να δείτε την τεκμηρίωση της επιλεγμένης λειτουργίας μετονομασίας."
+msgstr ""
+"Πατήστε εδώ για να δείτε την τεκμηρίωση της επιλεγμένης λειτουργίας "
+"μετονομασίας."
 
 #. TRANSLATORS: You can test this string by temporarily removing thunar-sbr.* from $libdir/thunarx-1/,
 #. *              and opening the multi rename dialog by selecting multiple files and pressing F2.
@@ -1629,9 +1654,12 @@ msgstr[1] "Διαγραφή Αρχείων"
 
 #: ../thunar/thunar-renamer-dialog.c:1558
 msgid "Remove the selected file from the list of files that should be renamed"
-msgid_plural "Remove the selected files from the list of files that should be renamed"
-msgstr[0] "Αφαίρεση του επιλεγμένου αρχείου από τη λίστα αρχείων που θα μετονομαστούν"
-msgstr[1] "Αφαίρεση των επιλεγμένων αρχείων από τη λίστα αρχείων που θα μετονομαστούν"
+msgid_plural ""
+"Remove the selected files from the list of files that should be renamed"
+msgstr[0] ""
+"Αφαίρεση του επιλεγμένου αρχείου από τη λίστα αρχείων που θα μετονομαστούν"
+msgstr[1] ""
+"Αφαίρεση των επιλεγμένων αρχείων από τη λίστα αρχείων που θα μετονομαστούν"
 
 #. change title to reflect the standalone status
 #: ../thunar/thunar-renamer-dialog.c:1709
@@ -1644,7 +1672,10 @@ msgid "Failed to rename \"%s\" to \"%s\"."
 msgstr "Η μετονομασία του \"%s\" σε \"%s\" απέτυχε."
 
 #: ../thunar/thunar-renamer-progress.c:220
-msgid "You can either choose to skip this file and continue to rename the remaining files, or revert the previously renamed files to their previous names, or cancel the operation without reverting previous changes."
+msgid ""
+"You can either choose to skip this file and continue to rename the remaining "
+"files, or revert the previously renamed files to their previous names, or "
+"cancel the operation without reverting previous changes."
 msgstr ""
 
 #: ../thunar/thunar-renamer-progress.c:225
@@ -1657,18 +1688,19 @@ msgid "_Skip This File"
 msgstr "_Προσπέραση Αυτού του Αρχείου"
 
 #: ../thunar/thunar-renamer-progress.c:232
-msgid "Do you want to skip this file and continue to rename the remaining files?"
-msgstr "Θέλετε να προσπεράσετε αυτό το αρχείο και να συνεχίσετε τη μετονομασία των υπόλοιπων;"
+msgid ""
+"Do you want to skip this file and continue to rename the remaining files?"
+msgstr ""
+"Θέλετε να προσπεράσετε αυτό το αρχείο και να συνεχίσετε τη μετονομασία των "
+"υπόλοιπων;"
 
-#: ../thunar/thunar-shortcuts-pane.c:96
-#: ../thunar/thunar-shortcuts-pane.c:411
+#: ../thunar/thunar-shortcuts-pane.c:96 ../thunar/thunar-shortcuts-pane.c:411
 msgid "Add Folder to _Shortcuts"
 msgid_plural "Add Folders to _Shortcuts"
 msgstr[0] "Προσθήκη Φακέλου στις _Συντομεύσεις"
 msgstr[1] "Προσθήκη Φακέλων στις _Συντομεύσεις"
 
-#: ../thunar/thunar-shortcuts-pane.c:96
-#: ../thunar/thunar-shortcuts-pane.c:413
+#: ../thunar/thunar-shortcuts-pane.c:96 ../thunar/thunar-shortcuts-pane.c:413
 msgid "Add the selected folder to the shortcuts side pane"
 msgid_plural "Add the selected folders to the shortcuts side pane"
 msgstr[0] "Προσθήκη του επιλεγμένου φακέλου στη μπάρα συντομεύσεων"
@@ -1749,8 +1781,7 @@ msgid "Folder Context Menu"
 msgstr "Μενού Ενεργειών Φακέλων"
 
 #. append the "Create Folder" menu action
-#: ../thunar/thunar-standard-view.c:307
-#: ../thunar/thunar-tree-view.c:922
+#: ../thunar/thunar-standard-view.c:307 ../thunar/thunar-tree-view.c:922
 msgid "Create _Folder..."
 msgstr "Δημιουργία _Φακέλου..."
 
@@ -1759,14 +1790,12 @@ msgid "Create an empty folder within the current folder"
 msgstr "Δημιουργία ενός άδειου φακέλου μέσα στον τρέχον φάκελο"
 
 #. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:309
-#: ../thunar/thunar-tree-view.c:934
+#: ../thunar/thunar-standard-view.c:309 ../thunar/thunar-tree-view.c:934
 msgid "Cu_t"
 msgstr "_Αποκοπή"
 
 #. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:310
-#: ../thunar/thunar-tree-view.c:946
+#: ../thunar/thunar-standard-view.c:310 ../thunar/thunar-tree-view.c:946
 msgid "_Copy"
 msgstr "Α_ντιγραφή"
 
@@ -1776,7 +1805,9 @@ msgstr "_Επικόλληση"
 
 #: ../thunar/thunar-standard-view.c:311
 msgid "Move or copy files previously selected by a Cut or Copy command"
-msgstr "Μετακίνηση ή αντιγραφή αρχείων που προηγουμένως επιλέχθηκαν με εντολή Αποκοπή Αρχείων ή Αντιγραφή Αρχείων"
+msgstr ""
+"Μετακίνηση ή αντιγραφή αρχείων που προηγουμένως επιλέχθηκαν με εντολή "
+"Αποκοπή Αρχείων ή Αντιγραφή Αρχείων"
 
 #: ../thunar/thunar-standard-view.c:312
 msgid "_Delete"
@@ -1787,8 +1818,12 @@ msgid "Paste Into Folder"
 msgstr "Επικόλληση στο φάκελο"
 
 #: ../thunar/thunar-standard-view.c:313
-msgid "Move or copy files previously selected by a Cut or Copy command into the selected folder"
-msgstr "Μετακίνηση ή αντιγραφή αρχείων που προηγουμένως επιλέχθηκαν με εντολή Αποκοπή Αρχείων ή Αντιγραφή Αρχείων στον επιλεγμένο φάκελο"
+msgid ""
+"Move or copy files previously selected by a Cut or Copy command into the "
+"selected folder"
+msgstr ""
+"Μετακίνηση ή αντιγραφή αρχείων που προηγουμένως επιλέχθηκαν με εντολή "
+"Αποκοπή Αρχείων ή Αντιγραφή Αρχείων στον επιλεγμένο φάκελο"
 
 #: ../thunar/thunar-standard-view.c:314
 msgid "Select _all Files"
@@ -1810,8 +1845,7 @@ msgstr "Επιλογή όλων των αρχείων που ταιριάζου
 msgid "Du_plicate"
 msgstr "Δημιουργία Αν_τιγράφου"
 
-#: ../thunar/thunar-standard-view.c:317
-#: ../thunar/thunar-standard-view.c:3247
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-standard-view.c:3247
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "Δημιουργία _Δεσμού"
@@ -1844,13 +1878,11 @@ msgid "New Empty File..."
 msgstr "Νέο Κενό Αρχείο..."
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1768
-#: ../thunar/thunar-tree-view.c:1222
+#: ../thunar/thunar-standard-view.c:1768 ../thunar/thunar-tree-view.c:1222
 msgid "New Folder"
 msgstr "Νέος Φάκελος"
 
-#: ../thunar/thunar-standard-view.c:1768
-#: ../thunar/thunar-tree-view.c:1222
+#: ../thunar/thunar-standard-view.c:1768 ../thunar/thunar-tree-view.c:1222
 msgid "Create New Folder"
 msgstr "Δημιουργία Νέου Φακέλου"
 
@@ -1914,14 +1946,22 @@ msgstr "Το άνοιγμα του καταλόγου \"%s\" απέτυχε"
 #: ../thunar/thunar-standard-view.c:3207
 msgid "Prepare the selected file to be moved with a Paste command"
 msgid_plural "Prepare the selected files to be moved with a Paste command"
-msgstr[0] "Προετοιμασία του επιλεγμένου αρχείου για μετακίνηση με μια εντολή Επικόλλησης Αρχείου"
-msgstr[1] "Προετοιμασία των επιλεγμένων αρχείων για μετακίνηση με μια εντολή Επικόλλησης Αρχείων"
+msgstr[0] ""
+"Προετοιμασία του επιλεγμένου αρχείου για μετακίνηση με μια εντολή "
+"Επικόλλησης Αρχείου"
+msgstr[1] ""
+"Προετοιμασία των επιλεγμένων αρχείων για μετακίνηση με μια εντολή "
+"Επικόλλησης Αρχείων"
 
 #: ../thunar/thunar-standard-view.c:3215
 msgid "Prepare the selected file to be copied with a Paste command"
 msgid_plural "Prepare the selected files to be copied with a Paste command"
-msgstr[0] "Προετοιμασία του επιλεγμένου αρχείου προς αντιγραφή με μια εντολή Επικόλλησης Αρχείου"
-msgstr[1] "Προετοιμασία των επιλεγμένων αρχείων για αντιγραφή με μια  εντολή Επικόλλησης Αρχείων"
+msgstr[0] ""
+"Προετοιμασία του επιλεγμένου αρχείου προς αντιγραφή με μια εντολή "
+"Επικόλλησης Αρχείου"
+msgstr[1] ""
+"Προετοιμασία των επιλεγμένων αρχείων για αντιγραφή με μια  εντολή "
+"Επικόλλησης Αρχείων"
 
 #: ../thunar/thunar-standard-view.c:3226
 msgid "Delete the selected file permanently"
@@ -1974,7 +2014,8 @@ msgstr "Άνοιγμα νέου _παραθύρου"
 
 #: ../thunar/thunar-window.c:247
 msgid "Open a new Thunar window for the displayed location"
-msgstr "'Ανοιγμα ενός άλλου παράθυρου του Thunar για την προβαλλόμενη τοποθεσία"
+msgstr ""
+"'Ανοιγμα ενός άλλου παράθυρου του Thunar για την προβαλλόμενη τοποθεσία"
 
 #: ../thunar/thunar-window.c:248
 msgid "Close _All Windows"
@@ -2194,17 +2235,25 @@ msgstr "Περί Προτύπων"
 
 #: ../thunar/thunar-window.c:1697
 msgid "All files in this folder will appear in the \"Create Document\" menu."
-msgstr "Όλα τα αρχεία σε αυτόν τον κατάλογο θα εμφανιστούν στο μενού \"Δημιουργία Εγγράφου\"."
+msgstr ""
+"Όλα τα αρχεία σε αυτόν τον κατάλογο θα εμφανιστούν στο μενού \"Δημιουργία "
+"Εγγράφου\"."
 
 #: ../thunar/thunar-window.c:1704
 msgid ""
-"If you frequently create certain kinds of documents, make a copy of one and put it in this folder. Thunar will add an entry for this document in the \"Create Document\" menu.\n"
+"If you frequently create certain kinds of documents, make a copy of one and "
+"put it in this folder. Thunar will add an entry for this document in the "
+"\"Create Document\" menu.\n"
 "\n"
-"You can then select the entry from the \"Create Document\" menu and a copy of the document will be created in the directory you are viewing."
+"You can then select the entry from the \"Create Document\" menu and a copy "
+"of the document will be created in the directory you are viewing."
 msgstr ""
-"Εάν δημιουργείτε συχνά συγκεκριμένους τύπους εγγράφων, αντιγράψτε ένα μέσα σε αυτό το φάκελο. Ο Thunar θα προσθέσει μια επιλογή για αυτό το έγγραφο στο μενού \"Δημιουργία Εγγράφου\".\n"
+"Εάν δημιουργείτε συχνά συγκεκριμένους τύπους εγγράφων, αντιγράψτε ένα μέσα "
+"σε αυτό το φάκελο. Ο Thunar θα προσθέσει μια επιλογή για αυτό το έγγραφο στο "
+"μενού \"Δημιουργία Εγγράφου\".\n"
 "\n"
-"Όταν κάνετε την επιλογή από το μενού \"Δημιουργία Εγγράφου\" θα δημιουργηθεί ένα αντίγραφο αυτού του εγγράφου στον τρέχοντα φάκελο."
+"Όταν κάνετε την επιλογή από το μενού \"Δημιουργία Εγγράφου\" θα δημιουργηθεί "
+"ένα αντίγραφο αυτού του εγγράφου στον τρέχοντα φάκελο."
 
 #: ../thunar/thunar-window.c:1716
 msgid "Do _not display this message again"
@@ -2236,7 +2285,8 @@ msgstr "Γραφικό συστατικό ετικέτας"
 
 #: ../thunarx/thunarx-property-page.c:151
 msgid "A widget to display in place of the usual page label"
-msgstr "Ένα γραφικό συστατικό που θα εμφανίζεται στην θέση της συνήθους ετικέτας"
+msgstr ""
+"Ένα γραφικό συστατικό που θα εμφανίζεται στην θέση της συνήθους ετικέτας"
 
 #: ../thunarx/thunarx-provider-plugin.c:79
 msgid "Resident"
@@ -2386,7 +2436,10 @@ msgid "Regular _Expression"
 msgstr "_Κανονική Έκφραση"
 
 #: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:231
-msgid "If you enable this option, the pattern will be treated as a regular expression and matched using the Perl-compatible regular expressions (PCRE). Check the documentation for details about the regular expression syntax."
+msgid ""
+"If you enable this option, the pattern will be treated as a regular "
+"expression and matched using the Perl-compatible regular expressions (PCRE). "
+"Check the documentation for details about the regular expression syntax."
 msgstr ""
 
 #: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:238
@@ -2394,7 +2447,8 @@ msgid "Replace _With:"
 msgstr "Αντικατάσταση _με: "
 
 #: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:246
-msgid "Enter the text that should be used as replacement for the pattern above."
+msgid ""
+"Enter the text that should be used as replacement for the pattern above."
 msgstr ""
 
 #: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:258
@@ -2403,7 +2457,9 @@ msgid "C_ase Sensitive Search"
 msgstr "Σφάλμα εκτέλεσης αναζήτησης"
 
 #: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:260
-msgid "If you enable this option, the pattern will be searched in a case-sensitive manner. The default is to use a case-insensitive search."
+msgid ""
+"If you enable this option, the pattern will be searched in a case-sensitive "
+"manner. The default is to use a case-insensitive search."
 msgstr ""
 
 #. setup a tooltip with the error message
@@ -2480,20 +2536,38 @@ msgid "_Description:"
 msgstr "_Περιγραφή:"
 
 #: ../plugins/thunar-uca/thunar-uca-editor.c:168
-msgid "The description of the action that will be displayed as tooltip in the statusbar when selecting the item from the context menu."
-msgstr "Η περιγραφή της ενέργειας που θα εμφανίζεται σαν κειμενάκι βοήθειας στην μπάρα κατάστασης κατά την επιλογή του αντικειμένου από το μενού ενεργειών."
+msgid ""
+"The description of the action that will be displayed as tooltip in the "
+"statusbar when selecting the item from the context menu."
+msgstr ""
+"Η περιγραφή της ενέργειας που θα εμφανίζεται σαν κειμενάκι βοήθειας στην "
+"μπάρα κατάστασης κατά την επιλογή του αντικειμένου από το μενού ενεργειών."
 
 #: ../plugins/thunar-uca/thunar-uca-editor.c:181
 msgid "_Command:"
 msgstr "_Εντολή:"
 
 #: ../plugins/thunar-uca/thunar-uca-editor.c:190
-msgid "The command (including the necessary parameters) to perform the action. See the command parameter legend below for a list of supported parameter variables, which will be substituted when launching the command. When upper-case letters (e.g. %F, %D, %N) are used, the action will be applicable even if more than one item is selected. Else the action will only be applicable if exactly one item is selected."
-msgstr "Η εντολή (μαζί με τα απαραίτητα ορίσματα) που θα εκτελεί η δράση. Δείτε το υπόμνημα παραμέτρων παρακάτω για τη λίστα με τα υποστηριζόμενα ορίσματα, που θα αντικατασταθούν καθώς εκτελείται η εντολή. Όταν χρησιμοποιούνται κεφαλαία γράμματα (π.χ. %F, %D, %N), η δράση θα είναι διαθέσιμη ακόμα και εάν είναι παραπάνω από ένα αντικείμενα επιλεγμένα. Αλλιώς η δράση θα εμφανίζεται μόνο όταν είναι επιλεγμένο μόνο ένα αντικείμενο."
+msgid ""
+"The command (including the necessary parameters) to perform the action. See "
+"the command parameter legend below for a list of supported parameter "
+"variables, which will be substituted when launching the command. When upper-"
+"case letters (e.g. %F, %D, %N) are used, the action will be applicable even "
+"if more than one item is selected. Else the action will only be applicable "
+"if exactly one item is selected."
+msgstr ""
+"Η εντολή (μαζί με τα απαραίτητα ορίσματα) που θα εκτελεί η δράση. Δείτε το "
+"υπόμνημα παραμέτρων παρακάτω για τη λίστα με τα υποστηριζόμενα ορίσματα, που "
+"θα αντικατασταθούν καθώς εκτελείται η εντολή. Όταν χρησιμοποιούνται κεφαλαία "
+"γράμματα (π.χ. %F, %D, %N), η δράση θα είναι διαθέσιμη ακόμα και εάν είναι "
+"παραπάνω από ένα αντικείμενα επιλεγμένα. Αλλιώς η δράση θα εμφανίζεται μόνο "
+"όταν είναι επιλεγμένο μόνο ένα αντικείμενο."
 
 #: ../plugins/thunar-uca/thunar-uca-editor.c:201
 msgid "Browse the file system to select an application to use for this action."
-msgstr "Ερευνήστε το σύστημα αρχείων για να επιλέξετε την εφαρμογή που θα χρησιμοποιείτε για αυτή την ενέργεια."
+msgstr ""
+"Ερευνήστε το σύστημα αρχείων για να επιλέξετε την εφαρμογή που θα "
+"χρησιμοποιείτε για αυτή την ενέργεια."
 
 #: ../plugins/thunar-uca/thunar-uca-editor.c:217
 msgid "_Icon:"
@@ -2506,8 +2580,12 @@ msgid "No icon"
 msgstr "Χωρίς εικονίδιο"
 
 #: ../plugins/thunar-uca/thunar-uca-editor.c:226
-msgid "Click this button to select an icon file that will be displayed in the context menu in addition to the action name chosen above."
-msgstr "Πιέστε αυτό το κουμπί για να επιλέξετε το εικονίδιο που θα εμφανίζεται στο μενού δίπλα από το όνομα της ενέργειας."
+msgid ""
+"Click this button to select an icon file that will be displayed in the "
+"context menu in addition to the action name chosen above."
+msgstr ""
+"Πιέστε αυτό το κουμπί για να επιλέξετε το εικονίδιο που θα εμφανίζεται στο "
+"μενού δίπλα από το όνομα της ενέργειας."
 
 #: ../plugins/thunar-uca/thunar-uca-editor.c:257
 msgid ""
@@ -2552,8 +2630,16 @@ msgid "_File Pattern:"
 msgstr "_Μοτίβο:"
 
 #: ../plugins/thunar-uca/thunar-uca-editor.c:382
-msgid "Enter a list of patterns that will be used to determine whether this action should be displayed for a selected file. If you specify more than one pattern here, the list items must be separated with semicolons (e.g. *.txt;*.doc)."
-msgstr "Εισάγετε μια λίστα από μάσκες που θα χρησιμοποιηθούν για να προσδιοριστεί εάν θα εμφανίζεται η ενέργεια για το επιλεγμένο αρχείο. Εάν ορίσετε παραπάνω από μια μάσκα εδώ, τα αντικείμενα στη λίστα θα πρέπει να χωρίζονται με ερωτηματικά (π.χ. *.txt;*.doc)."
+msgid ""
+"Enter a list of patterns that will be used to determine whether this action "
+"should be displayed for a selected file. If you specify more than one "
+"pattern here, the list items must be separated with semicolons (e.g. *.txt;*."
+"doc)."
+msgstr ""
+"Εισάγετε μια λίστα από μάσκες που θα χρησιμοποιηθούν για να προσδιοριστεί "
+"εάν θα εμφανίζεται η ενέργεια για το επιλεγμένο αρχείο. Εάν ορίσετε παραπάνω "
+"από μια μάσκα εδώ, τα αντικείμενα στη λίστα θα πρέπει να χωρίζονται με "
+"ερωτηματικά (π.χ. *.txt;*.doc)."
 
 #: ../plugins/thunar-uca/thunar-uca-editor.c:401
 msgid "Appears if selection contains:"
@@ -2638,8 +2724,11 @@ msgid "Configure c_ustom actions..."
 msgstr "Ρυθμίσεις προσαρμο_σμένων ενεργειών..."
 
 #: ../plugins/thunar-uca/thunar-uca-provider.c:158
-msgid "Setup custom actions that will appear in the file managers context menus"
-msgstr "Ρύθμιση προσαρμοσμένων ενεργειών που θα εμφανίζονται στα μενού του διαχειριστή αρχείων"
+msgid ""
+"Setup custom actions that will appear in the file managers context menus"
+msgstr ""
+"Ρύθμιση προσαρμοσμένων ενεργειών που θα εμφανίζονται στα μενού του "
+"διαχειριστή αρχείων"
 
 #: ../plugins/thunar-uca/thunar-uca-provider.c:350
 #, c-format
@@ -2673,4 +2762,3 @@ msgstr "Άνοιγμα Φακέλου"
 #: ../Thunar-folder-handler.desktop.in.in.h:2
 msgid "Open the specified folders in Thunar"
 msgstr "Άνοιγμα των επιλεγμένων φακέλων στον Thunar"
-
diff --git a/po/es.po b/po/es.po
index ef02a9796..02d29c957 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-25 22:21+0100\n"
+"POT-Creation-Date: 2006-03-26 14:23+0200\n"
 "PO-Revision-Date: 2005-10-14 23:57+0900\n"
 "Last-Translator: Miguel Angel Ruiz Manzano <debianized@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -99,13 +99,7 @@ msgstr ""
 msgid "Failed to read folder contents"
 msgstr "Cargando el contenido de la carpeta..."
 
-#. no useful information, *narf*
 #: ../thunar-vfs/thunar-vfs-exec.c:509
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:237
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:304
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:347
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:436
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:476
 msgid "Unknown error"
 msgstr "Error desconocido"
 
@@ -257,11 +251,16 @@ msgid "Unknown user \"%s\""
 msgstr ""
 
 #. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:385
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
 #, fuzzy, c-format
 msgid "Failed to determine the mount point for %s"
 msgstr "Imposible renombrar %s."
 
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:812
+#, fuzzy, c-format
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr "Imposible renombrar %s."
+
 #: ../thunar-vfs/thunar-vfs-xfer.c:189
 #, c-format
 msgid "copy of %s"
@@ -325,52 +324,58 @@ msgstr "Imposible renombrar %s."
 msgid "Failed to open \"%s\" for reading"
 msgstr "Imposible renombrar %s."
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:381
+#: ../thunar-vfs/thunar-vfs-xfer.c:385
+#, c-format
+msgid "The file \"%s\" already exists"
+msgstr ""
+
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-xfer.c:390
 #, fuzzy, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "Imposible renombrar %s."
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:400
+#: ../thunar-vfs/thunar-vfs-xfer.c:411
 #, fuzzy, c-format
 msgid "Failed to read data from \"%s\""
 msgstr "Imposible renombrar %s."
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:416
+#: ../thunar-vfs/thunar-vfs-xfer.c:427
 #, fuzzy, c-format
 msgid "Failed to write data to \"%s\""
 msgstr "Imposible renombrar %s."
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#: ../thunar-vfs/thunar-vfs-xfer.c:446
 #, fuzzy, c-format
 msgid "Failed to remove \"%s\""
 msgstr "Imposible renombrar %s."
 
 #. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:440
+#: ../thunar-vfs/thunar-vfs-xfer.c:451
 msgid "Operation canceled"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:480
+#: ../thunar-vfs/thunar-vfs-xfer.c:491
 #, fuzzy, c-format
 msgid "Failed to read link target from \"%s\""
 msgstr "Imposible seguir el enlace de %s."
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:488 ../thunar-vfs/thunar-vfs-xfer.c:601
+#: ../thunar-vfs/thunar-vfs-xfer.c:499 ../thunar-vfs/thunar-vfs-xfer.c:612
 #, fuzzy, c-format
 msgid "Failed to create symbolic link \"%s\""
 msgstr "Imposible crear el enlace de %s."
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:496
+#: ../thunar-vfs/thunar-vfs-xfer.c:507
 #, fuzzy, c-format
 msgid "Failed to change mode of \"%s\""
 msgstr "Imposible renombrar %s."
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:530 ../thunar-vfs/thunar-vfs-xfer.c:590
+#: ../thunar-vfs/thunar-vfs-xfer.c:541 ../thunar-vfs/thunar-vfs-xfer.c:601
 #, fuzzy, c-format
 msgid "Failed to determine file info for \"%s\""
 msgstr "Imposible renombrar %s."
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:559
+#: ../thunar-vfs/thunar-vfs-xfer.c:570
 #, fuzzy, c-format
 msgid "Failed to copy special file \"%s\""
 msgstr "Imposible copiar el archivo %s."
@@ -1203,7 +1208,7 @@ msgstr "Imposible renombrar %s."
 #. allocate the question dialog
 #: ../thunar/thunar-permissions-chooser.c:590
 #: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:294
+#: ../thunar/thunar-progress-dialog.c:305
 msgid "Question"
 msgstr ""
 
@@ -1261,22 +1266,22 @@ msgid ""
 msgstr ""
 
 #: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:320
+#: ../thunar/thunar-progress-dialog.c:372
 msgid "_Yes"
 msgstr "_Si"
 
 #: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:324
+#: ../thunar/thunar-progress-dialog.c:377
 msgid "Yes to _all"
 msgstr "Si a_todo"
 
 #: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:328
+#: ../thunar/thunar-progress-dialog.c:382
 msgid "_No"
 msgstr "_No"
 
 #: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:332
+#: ../thunar/thunar-progress-dialog.c:387
 msgid "_Cancel"
 msgstr "_Cancelar"
 
@@ -1474,21 +1479,21 @@ msgstr ""
 msgid "Apply to Folder and Contents"
 msgstr ""
 
-#: ../thunar/thunar-progress-dialog.c:458
+#: ../thunar/thunar-progress-dialog.c:523
 #, c-format
 msgid "(%lu hour remaining)"
 msgid_plural "(%lu hours remaining)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-progress-dialog.c:463
+#: ../thunar/thunar-progress-dialog.c:528
 #, c-format
 msgid "(%lu minute remaining)"
 msgid_plural "(%lu minutes remaining)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-progress-dialog.c:468
+#: ../thunar/thunar-progress-dialog.c:533
 #, c-format
 msgid "(%lu second remaining)"
 msgid_plural "(%lu seconds remaining)"
diff --git a/po/eu.po b/po/eu.po
index 8c3938964..7f45ced0e 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-25 22:21+0100\n"
+"POT-Creation-Date: 2006-03-26 14:23+0200\n"
 "PO-Revision-Date: 2006-02-22 12:03+0100\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Basque <translation-team-eu@lists.sourceforge.net>\n"
@@ -101,13 +101,7 @@ msgstr ""
 msgid "Failed to read folder contents"
 msgstr "Karpeta edukiak kargatzen..."
 
-#. no useful information, *narf*
 #: ../thunar-vfs/thunar-vfs-exec.c:509
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:237
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:304
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:347
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:436
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:476
 msgid "Unknown error"
 msgstr "Errore ezezaguna"
 
@@ -254,11 +248,16 @@ msgid "Unknown user \"%s\""
 msgstr "`%s' erabiltzaile ezezaguna"
 
 #. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:385
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
 #, c-format
 msgid "Failed to determine the mount point for %s"
 msgstr "Huts %s-ren muntatze puntua zehazterakoan"
 
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:812
+#, fuzzy, c-format
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr "Huts \"%s\"-ren modua aldatzerakoan"
+
 #: ../thunar-vfs/thunar-vfs-xfer.c:189
 #, c-format
 msgid "copy of %s"
@@ -322,52 +321,58 @@ msgstr ""
 msgid "Failed to open \"%s\" for reading"
 msgstr "Huts \"%s\" irakurketarako irekitzerakoan"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:381
+#: ../thunar-vfs/thunar-vfs-xfer.c:385
+#, c-format
+msgid "The file \"%s\" already exists"
+msgstr ""
+
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-xfer.c:390
 #, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "Huts \"%s\" idazketarako irekitzerakoan"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:400
+#: ../thunar-vfs/thunar-vfs-xfer.c:411
 #, c-format
 msgid "Failed to read data from \"%s\""
 msgstr "Huts \"%s\"-tik datuak irakurtzerakoan"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:416
+#: ../thunar-vfs/thunar-vfs-xfer.c:427
 #, c-format
 msgid "Failed to write data to \"%s\""
 msgstr "Huts \"%s\"-ra datuak idazterakoan"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#: ../thunar-vfs/thunar-vfs-xfer.c:446
 #, c-format
 msgid "Failed to remove \"%s\""
 msgstr "Huts \"%s\" ezabatzerakoan"
 
 #. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:440
+#: ../thunar-vfs/thunar-vfs-xfer.c:451
 msgid "Operation canceled"
 msgstr "Ekintza ezaztaturik"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:480
+#: ../thunar-vfs/thunar-vfs-xfer.c:491
 #, c-format
 msgid "Failed to read link target from \"%s\""
 msgstr "Huts \"%s\"-tik lotura helburua irakurtzerakoan"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:488 ../thunar-vfs/thunar-vfs-xfer.c:601
+#: ../thunar-vfs/thunar-vfs-xfer.c:499 ../thunar-vfs/thunar-vfs-xfer.c:612
 #, c-format
 msgid "Failed to create symbolic link \"%s\""
 msgstr "Huts \"%s\" lotura sinbolikoa sortzerakoan"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:496
+#: ../thunar-vfs/thunar-vfs-xfer.c:507
 #, c-format
 msgid "Failed to change mode of \"%s\""
 msgstr "Huts \"%s\"-ren modua aldatzerakoan"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:530 ../thunar-vfs/thunar-vfs-xfer.c:590
+#: ../thunar-vfs/thunar-vfs-xfer.c:541 ../thunar-vfs/thunar-vfs-xfer.c:601
 #, c-format
 msgid "Failed to determine file info for \"%s\""
 msgstr "Huts \"%s\"-ren fitxategi argibideak zehazterakoan"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:559
+#: ../thunar-vfs/thunar-vfs-xfer.c:570
 #, c-format
 msgid "Failed to copy special file \"%s\""
 msgstr "Huts \"%s\" fitxategi berezia kopiatzerakoan"
@@ -1184,7 +1189,7 @@ msgstr "Gelditu baimenak errekurtsiboki ezartzea"
 #. allocate the question dialog
 #: ../thunar/thunar-permissions-chooser.c:590
 #: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:294
+#: ../thunar/thunar-progress-dialog.c:305
 msgid "Question"
 msgstr "Galdera"
 
@@ -1248,22 +1253,22 @@ msgstr ""
 "dira karpeta honetan hemendik aurrera."
 
 #: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:320
+#: ../thunar/thunar-progress-dialog.c:372
 msgid "_Yes"
 msgstr "_Bai"
 
 #: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:324
+#: ../thunar/thunar-progress-dialog.c:377
 msgid "Yes to _all"
 msgstr "Bai dan_ari"
 
 #: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:328
+#: ../thunar/thunar-progress-dialog.c:382
 msgid "_No"
 msgstr "_Ez"
 
 #: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:332
+#: ../thunar/thunar-progress-dialog.c:387
 msgid "_Cancel"
 msgstr "_Utzi"
 
@@ -1462,21 +1467,21 @@ msgstr ""
 msgid "Apply to Folder and Contents"
 msgstr ""
 
-#: ../thunar/thunar-progress-dialog.c:458
+#: ../thunar/thunar-progress-dialog.c:523
 #, c-format
 msgid "(%lu hour remaining)"
 msgid_plural "(%lu hours remaining)"
 msgstr[0] "(ordu %lu falta da)"
 msgstr[1] "(%lu ordu falta dira)"
 
-#: ../thunar/thunar-progress-dialog.c:463
+#: ../thunar/thunar-progress-dialog.c:528
 #, c-format
 msgid "(%lu minute remaining)"
 msgid_plural "(%lu minutes remaining)"
 msgstr[0] "(minutu %lu falta da)"
 msgstr[1] "(%lu minutu falta dira)"
 
-#: ../thunar/thunar-progress-dialog.c:468
+#: ../thunar/thunar-progress-dialog.c:533
 #, c-format
 msgid "(%lu second remaining)"
 msgid_plural "(%lu seconds remaining)"
diff --git a/po/fi.po b/po/fi.po
index 4ec95770e..d57d09554 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-25 22:21+0100\n"
+"POT-Creation-Date: 2006-03-26 14:23+0200\n"
 "PO-Revision-Date: 2006-03-12 19:03+0200\n"
 "Last-Translator: Jari Rahkonen <jari.rahkonen@pp1.inet.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -98,13 +98,7 @@ msgstr ""
 msgid "Failed to read folder contents"
 msgstr "Ladataan hakemiston sisältöä..."
 
-#. no useful information, *narf*
 #: ../thunar-vfs/thunar-vfs-exec.c:509
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:237
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:304
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:347
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:436
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:476
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
@@ -251,11 +245,16 @@ msgid "Unknown user \"%s\""
 msgstr "Tuntematon käyttäjä \"%s\""
 
 #. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:385
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
 #, c-format
 msgid "Failed to determine the mount point for %s"
 msgstr "Liitoskohdan määrittäminen kohteelle %s epäonnistui"
 
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:812
+#, fuzzy, c-format
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr "Kohteen \"%s\" tilan muuttaminen epäonnistui"
+
 #: ../thunar-vfs/thunar-vfs-xfer.c:189
 #, c-format
 msgid "copy of %s"
@@ -319,52 +318,58 @@ msgstr "Nimetyn putken \"%s\" luominen epäonnistui"
 msgid "Failed to open \"%s\" for reading"
 msgstr "Kohteen \"%s\" avaaminen luettavaksi epäonnistui"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:381
+#: ../thunar-vfs/thunar-vfs-xfer.c:385
+#, c-format
+msgid "The file \"%s\" already exists"
+msgstr ""
+
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-xfer.c:390
 #, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "Kohteen \"%s\" avaaminen kirjoitettavaksi epäonnistui"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:400
+#: ../thunar-vfs/thunar-vfs-xfer.c:411
 #, c-format
 msgid "Failed to read data from \"%s\""
 msgstr "Kohteesta \"%s\" ei voi lukea"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:416
+#: ../thunar-vfs/thunar-vfs-xfer.c:427
 #, c-format
 msgid "Failed to write data to \"%s\""
 msgstr "Kohteeseen \"%s\" ei voi kirjoittaa"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#: ../thunar-vfs/thunar-vfs-xfer.c:446
 #, c-format
 msgid "Failed to remove \"%s\""
 msgstr "Kohdetta \"%s\" ei voi poistaa"
 
 #. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:440
+#: ../thunar-vfs/thunar-vfs-xfer.c:451
 msgid "Operation canceled"
 msgstr "Toiminto peruutettu"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:480
+#: ../thunar-vfs/thunar-vfs-xfer.c:491
 #, c-format
 msgid "Failed to read link target from \"%s\""
 msgstr "Linkin kohteen lukeminen lähteestä \"%s\" epäonnistui"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:488 ../thunar-vfs/thunar-vfs-xfer.c:601
+#: ../thunar-vfs/thunar-vfs-xfer.c:499 ../thunar-vfs/thunar-vfs-xfer.c:612
 #, c-format
 msgid "Failed to create symbolic link \"%s\""
 msgstr "Symbolisen linkin \"%s\" luominen epäonnistui"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:496
+#: ../thunar-vfs/thunar-vfs-xfer.c:507
 #, c-format
 msgid "Failed to change mode of \"%s\""
 msgstr "Kohteen \"%s\" tilan muuttaminen epäonnistui"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:530 ../thunar-vfs/thunar-vfs-xfer.c:590
+#: ../thunar-vfs/thunar-vfs-xfer.c:541 ../thunar-vfs/thunar-vfs-xfer.c:601
 #, c-format
 msgid "Failed to determine file info for \"%s\""
 msgstr "Tiedoston \"%s\" tietojen selvittäminen epäonnistui"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:559
+#: ../thunar-vfs/thunar-vfs-xfer.c:570
 #, c-format
 msgid "Failed to copy special file \"%s\""
 msgstr "Erikoistiedoston \"%s\" kopioiminen epäonnistui"
@@ -1181,7 +1186,7 @@ msgstr "Keskeytä oikeuksien muuttaminen alikansioista."
 #. allocate the question dialog
 #: ../thunar/thunar-permissions-chooser.c:590
 #: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:294
+#: ../thunar/thunar-progress-dialog.c:305
 msgid "Question"
 msgstr "Kysymys"
 
@@ -1243,22 +1248,22 @@ msgstr ""
 "pääsevät vain sellaiset käyttäjät, joilla on oikeus lukea hakemiston sisältö."
 
 #: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:320
+#: ../thunar/thunar-progress-dialog.c:372
 msgid "_Yes"
 msgstr "_Kyllä"
 
 #: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:324
+#: ../thunar/thunar-progress-dialog.c:377
 msgid "Yes to _all"
 msgstr "Kyllä k_aikkiin"
 
 #: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:328
+#: ../thunar/thunar-progress-dialog.c:382
 msgid "_No"
 msgstr "_Ei"
 
 #: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:332
+#: ../thunar/thunar-progress-dialog.c:387
 msgid "_Cancel"
 msgstr "_Peruuta"
 
@@ -1464,21 +1469,21 @@ msgstr "Aseta vain hakemistolle"
 msgid "Apply to Folder and Contents"
 msgstr "Aseta myös hakemiston sisällölle"
 
-#: ../thunar/thunar-progress-dialog.c:458
+#: ../thunar/thunar-progress-dialog.c:523
 #, c-format
 msgid "(%lu hour remaining)"
 msgid_plural "(%lu hours remaining)"
 msgstr[0] "(%lu tunti jäljellä)"
 msgstr[1] "(%lu tuntia jäljellä)"
 
-#: ../thunar/thunar-progress-dialog.c:463
+#: ../thunar/thunar-progress-dialog.c:528
 #, c-format
 msgid "(%lu minute remaining)"
 msgid_plural "(%lu minutes remaining)"
 msgstr[0] "(%lu minuutti jäljellä)"
 msgstr[1] "(%lu minuuttia jäljellä)"
 
-#: ../thunar/thunar-progress-dialog.c:468
+#: ../thunar/thunar-progress-dialog.c:533
 #, c-format
 msgid "(%lu second remaining)"
 msgid_plural "(%lu seconds remaining)"
diff --git a/po/fr.po b/po/fr.po
index 5d82b0655..530a050fb 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-25 22:21+0100\n"
+"POT-Creation-Date: 2006-03-26 14:23+0200\n"
 "PO-Revision-Date: 2006-03-02 11:55+0100\n"
 "Last-Translator: Stephane Roy <sroy@j2n.net>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -99,13 +99,7 @@ msgstr ""
 msgid "Failed to read folder contents"
 msgstr "Chargement du contenu du dossier..."
 
-#. no useful information, *narf*
 #: ../thunar-vfs/thunar-vfs-exec.c:509
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:237
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:304
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:347
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:436
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:476
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
@@ -252,11 +246,16 @@ msgid "Unknown user \"%s\""
 msgstr "Utilisateur inconnu \"%s\""
 
 #. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:385
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
 #, c-format
 msgid "Failed to determine the mount point for %s"
 msgstr "Échec pour déterminer un point de montage pour %s"
 
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:812
+#, fuzzy, c-format
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr "Échec au changement de mode de \"%s\""
+
 #: ../thunar-vfs/thunar-vfs-xfer.c:189
 #, c-format
 msgid "copy of %s"
@@ -320,52 +319,58 @@ msgstr "Échec à la création du tube nommé \"%s\""
 msgid "Failed to open \"%s\" for reading"
 msgstr "Échec à l'ouverture de \"%s\" en lecture"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:381
+#: ../thunar-vfs/thunar-vfs-xfer.c:385
+#, c-format
+msgid "The file \"%s\" already exists"
+msgstr ""
+
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-xfer.c:390
 #, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "Échec à l'ouverture de \"%s\" en écriture"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:400
+#: ../thunar-vfs/thunar-vfs-xfer.c:411
 #, c-format
 msgid "Failed to read data from \"%s\""
 msgstr "Échec à la lecture de données de \"%s\""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:416
+#: ../thunar-vfs/thunar-vfs-xfer.c:427
 #, c-format
 msgid "Failed to write data to \"%s\""
 msgstr "Échec à l'écriture de données vers \"%s\""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#: ../thunar-vfs/thunar-vfs-xfer.c:446
 #, c-format
 msgid "Failed to remove \"%s\""
 msgstr "Échec à la suppression de \"%s\""
 
 #. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:440
+#: ../thunar-vfs/thunar-vfs-xfer.c:451
 msgid "Operation canceled"
 msgstr "Opération annulée"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:480
+#: ../thunar-vfs/thunar-vfs-xfer.c:491
 #, c-format
 msgid "Failed to read link target from \"%s\""
 msgstr "Échec à la lecture de la cible du lien de \"%s\""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:488 ../thunar-vfs/thunar-vfs-xfer.c:601
+#: ../thunar-vfs/thunar-vfs-xfer.c:499 ../thunar-vfs/thunar-vfs-xfer.c:612
 #, c-format
 msgid "Failed to create symbolic link \"%s\""
 msgstr "Échec à la création du lien symbolique \"%s\""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:496
+#: ../thunar-vfs/thunar-vfs-xfer.c:507
 #, c-format
 msgid "Failed to change mode of \"%s\""
 msgstr "Échec au changement de mode de \"%s\""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:530 ../thunar-vfs/thunar-vfs-xfer.c:590
+#: ../thunar-vfs/thunar-vfs-xfer.c:541 ../thunar-vfs/thunar-vfs-xfer.c:601
 #, c-format
 msgid "Failed to determine file info for \"%s\""
 msgstr "Échec à la détermination d'informations sur le fichier \"%s\""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:559
+#: ../thunar-vfs/thunar-vfs-xfer.c:570
 #, c-format
 msgid "Failed to copy special file \"%s\""
 msgstr "Échec à la copie du fichier spécial \"%s\""
@@ -1188,7 +1193,7 @@ msgstr "Arrêter d'appliquer les droits récursivement."
 #. allocate the question dialog
 #: ../thunar/thunar-permissions-chooser.c:590
 #: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:294
+#: ../thunar/thunar-progress-dialog.c:305
 msgid "Question"
 msgstr "Question"
 
@@ -1252,22 +1257,22 @@ msgstr ""
 "entrer dans le dossier."
 
 #: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:320
+#: ../thunar/thunar-progress-dialog.c:372
 msgid "_Yes"
 msgstr "_Oui"
 
 #: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:324
+#: ../thunar/thunar-progress-dialog.c:377
 msgid "Yes to _all"
 msgstr "Oui pour _tout"
 
 #: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:328
+#: ../thunar/thunar-progress-dialog.c:382
 msgid "_No"
 msgstr "_Non"
 
 #: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:332
+#: ../thunar/thunar-progress-dialog.c:387
 msgid "_Cancel"
 msgstr "_Annuler"
 
@@ -1478,21 +1483,21 @@ msgstr ""
 msgid "Apply to Folder and Contents"
 msgstr ""
 
-#: ../thunar/thunar-progress-dialog.c:458
+#: ../thunar/thunar-progress-dialog.c:523
 #, c-format
 msgid "(%lu hour remaining)"
 msgid_plural "(%lu hours remaining)"
 msgstr[0] "(%lu houre restante)"
 msgstr[1] "(%lu heures restantes)"
 
-#: ../thunar/thunar-progress-dialog.c:463
+#: ../thunar/thunar-progress-dialog.c:528
 #, c-format
 msgid "(%lu minute remaining)"
 msgid_plural "(%lu minutes remaining)"
 msgstr[0] "(%lu minute restante)"
 msgstr[1] "(%lu minutes restantes)"
 
-#: ../thunar/thunar-progress-dialog.c:468
+#: ../thunar/thunar-progress-dialog.c:533
 #, c-format
 msgid "(%lu second remaining)"
 msgid_plural "(%lu seconds remaining)"
diff --git a/po/hu.po b/po/hu.po
index a39f2c262..e4b94917a 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-25 22:21+0100\n"
+"POT-Creation-Date: 2006-03-26 14:23+0200\n"
 "PO-Revision-Date: 2006-03-26 10:26+0100\n"
 "Last-Translator: SZERVÑC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -99,13 +99,7 @@ msgstr ""
 msgid "Failed to read folder contents"
 msgstr "A mappa olvasása sikertelen"
 
-#. no useful information, *narf*
 #: ../thunar-vfs/thunar-vfs-exec.c:509
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:237
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:304
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:347
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:436
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:476
 msgid "Unknown error"
 msgstr "Ismeretlen hiba"
 
@@ -252,11 +246,16 @@ msgid "Unknown user \"%s\""
 msgstr "Ismeretlen felhasználó: \"%s\""
 
 #. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:385
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
 #, c-format
 msgid "Failed to determine the mount point for %s"
 msgstr "Nem sikerült meghatározni a csatolási pontot ehhez: %s"
 
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:812
+#, fuzzy, c-format
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr "Nem módosíthatók a jogok: \"%s\""
+
 #: ../thunar-vfs/thunar-vfs-xfer.c:189
 #, c-format
 msgid "copy of %s"
@@ -318,52 +317,58 @@ msgstr "Nem hozható létre e fifo: \"%s\""
 msgid "Failed to open \"%s\" for reading"
 msgstr "Nem tudom megnyitni \"%s\"-t olvasásra"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:381
+#: ../thunar-vfs/thunar-vfs-xfer.c:385
+#, c-format
+msgid "The file \"%s\" already exists"
+msgstr ""
+
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-xfer.c:390
 #, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "Nem tudom megnyitni \"%s\"-t írásra"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:400
+#: ../thunar-vfs/thunar-vfs-xfer.c:411
 #, c-format
 msgid "Failed to read data from \"%s\""
 msgstr "Nem tudok adatot olvasni innen: \"%s\""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:416
+#: ../thunar-vfs/thunar-vfs-xfer.c:427
 #, c-format
 msgid "Failed to write data to \"%s\""
 msgstr "Nem tudok adatot írni ide: \"%s\""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#: ../thunar-vfs/thunar-vfs-xfer.c:446
 #, c-format
 msgid "Failed to remove \"%s\""
 msgstr "Nem törölhető: \"%s\""
 
 #. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:440
+#: ../thunar-vfs/thunar-vfs-xfer.c:451
 msgid "Operation canceled"
 msgstr "Művelet törölve"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:480
+#: ../thunar-vfs/thunar-vfs-xfer.c:491
 #, c-format
 msgid "Failed to read link target from \"%s\""
 msgstr "A lánc céljának olvasása sikertelen: \"%s\""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:488 ../thunar-vfs/thunar-vfs-xfer.c:601
+#: ../thunar-vfs/thunar-vfs-xfer.c:499 ../thunar-vfs/thunar-vfs-xfer.c:612
 #, c-format
 msgid "Failed to create symbolic link \"%s\""
 msgstr "Nem hozható létre jelképes lánc: \"%s\""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:496
+#: ../thunar-vfs/thunar-vfs-xfer.c:507
 #, c-format
 msgid "Failed to change mode of \"%s\""
 msgstr "Nem módosíthatók a jogok: \"%s\""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:530 ../thunar-vfs/thunar-vfs-xfer.c:590
+#: ../thunar-vfs/thunar-vfs-xfer.c:541 ../thunar-vfs/thunar-vfs-xfer.c:601
 #, c-format
 msgid "Failed to determine file info for \"%s\""
 msgstr "Nem sikerült meghatározni a fájl infót ehhez: %s"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:559
+#: ../thunar-vfs/thunar-vfs-xfer.c:570
 #, c-format
 msgid "Failed to copy special file \"%s\""
 msgstr "Nem sikerült e speciális fájl másolása: \"%s\""
@@ -1161,7 +1166,7 @@ msgstr "Jogok rekurzív alkalmazásának leállítása."
 #. allocate the question dialog
 #: ../thunar/thunar-permissions-chooser.c:590
 #: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:294
+#: ../thunar/thunar-progress-dialog.c:305
 msgid "Question"
 msgstr "Kérdés"
 
@@ -1223,22 +1228,22 @@ msgstr ""
 "olvasni jogosult felhasználók léphetnek majd bele."
 
 #: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:320
+#: ../thunar/thunar-progress-dialog.c:372
 msgid "_Yes"
 msgstr "_Igen"
 
 #: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:324
+#: ../thunar/thunar-progress-dialog.c:377
 msgid "Yes to _all"
 msgstr "_Mind"
 
 #: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:328
+#: ../thunar/thunar-progress-dialog.c:382
 msgid "_No"
 msgstr "_Nem"
 
 #: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:332
+#: ../thunar/thunar-progress-dialog.c:387
 msgid "_Cancel"
 msgstr "_Csendet!"
 
@@ -1434,19 +1439,19 @@ msgstr "Csak a könyvtárra"
 msgid "Apply to Folder and Contents"
 msgstr "A könyvtárra és tartalmára"
 
-#: ../thunar/thunar-progress-dialog.c:458
+#: ../thunar/thunar-progress-dialog.c:523
 #, c-format
 msgid "(%lu hour remaining)"
 msgid_plural "(%lu hours remaining)"
 msgstr[0] "(%lu óra van hátra)"
 
-#: ../thunar/thunar-progress-dialog.c:463
+#: ../thunar/thunar-progress-dialog.c:528
 #, c-format
 msgid "(%lu minute remaining)"
 msgid_plural "(%lu minutes remaining)"
 msgstr[0] "(%lu perc van hátra)"
 
-#: ../thunar/thunar-progress-dialog.c:468
+#: ../thunar/thunar-progress-dialog.c:533
 #, c-format
 msgid "(%lu second remaining)"
 msgid_plural "(%lu seconds remaining)"
diff --git a/po/it.po b/po/it.po
index 192261d05..cffe6367e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-25 22:21+0100\n"
+"POT-Creation-Date: 2006-03-26 14:23+0200\n"
 "PO-Revision-Date: 2006-03-04 13:55+0100\n"
 "Last-Translator: Roberto Pariset <r.pariset@gmail.com>\n"
 "Language-Team: GUFI <traduzioni@gufi.org>\n"
@@ -101,13 +101,7 @@ msgstr ""
 msgid "Failed to read folder contents"
 msgstr "Caricamento dei contenuti della cartella in corso..."
 
-#. no useful information, *narf*
 #: ../thunar-vfs/thunar-vfs-exec.c:509
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:237
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:304
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:347
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:436
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:476
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
@@ -254,11 +248,16 @@ msgid "Unknown user \"%s\""
 msgstr "Utente \"%s\" sconosciuto"
 
 #. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:385
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
 #, c-format
 msgid "Failed to determine the mount point for %s"
 msgstr "Impossibile determinare il mount point di `%s'"
 
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:812
+#, fuzzy, c-format
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr "Impossibile cambiare modalità di \"%s\""
+
 #: ../thunar-vfs/thunar-vfs-xfer.c:189
 #, c-format
 msgid "copy of %s"
@@ -322,52 +321,58 @@ msgstr "Impossibile creare pipe con nome \"%s\""
 msgid "Failed to open \"%s\" for reading"
 msgstr "Impossibile aprire \"%s\" in lettura"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:381
+#: ../thunar-vfs/thunar-vfs-xfer.c:385
+#, c-format
+msgid "The file \"%s\" already exists"
+msgstr ""
+
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-xfer.c:390
 #, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "Impossibile aprire \"%s\" in scrittura"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:400
+#: ../thunar-vfs/thunar-vfs-xfer.c:411
 #, c-format
 msgid "Failed to read data from \"%s\""
 msgstr "Impossibile leggere dati da \"%s\""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:416
+#: ../thunar-vfs/thunar-vfs-xfer.c:427
 #, c-format
 msgid "Failed to write data to \"%s\""
 msgstr "Impossibile scrivere dati su \"%s\""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#: ../thunar-vfs/thunar-vfs-xfer.c:446
 #, c-format
 msgid "Failed to remove \"%s\""
 msgstr "Impossibile rimuovere \"%s\""
 
 #. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:440
+#: ../thunar-vfs/thunar-vfs-xfer.c:451
 msgid "Operation canceled"
 msgstr "Operazione annullata"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:480
+#: ../thunar-vfs/thunar-vfs-xfer.c:491
 #, c-format
 msgid "Failed to read link target from \"%s\""
 msgstr "Impossibile leggere la destinazione del link \"%s\""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:488 ../thunar-vfs/thunar-vfs-xfer.c:601
+#: ../thunar-vfs/thunar-vfs-xfer.c:499 ../thunar-vfs/thunar-vfs-xfer.c:612
 #, c-format
 msgid "Failed to create symbolic link \"%s\""
 msgstr "Impossibile creare link simbolico \"%s\""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:496
+#: ../thunar-vfs/thunar-vfs-xfer.c:507
 #, c-format
 msgid "Failed to change mode of \"%s\""
 msgstr "Impossibile cambiare modalità di \"%s\""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:530 ../thunar-vfs/thunar-vfs-xfer.c:590
+#: ../thunar-vfs/thunar-vfs-xfer.c:541 ../thunar-vfs/thunar-vfs-xfer.c:601
 #, c-format
 msgid "Failed to determine file info for \"%s\""
 msgstr "Impossibile reperire informazioni per il file \"%s\""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:559
+#: ../thunar-vfs/thunar-vfs-xfer.c:570
 #, c-format
 msgid "Failed to copy special file \"%s\""
 msgstr "Impossibile copiare il file speciale \"%s\""
@@ -1191,7 +1196,7 @@ msgstr "Interrompi l'applicazione ricorsiva dei permessi."
 #. allocate the question dialog
 #: ../thunar/thunar-permissions-chooser.c:590
 #: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:294
+#: ../thunar/thunar-progress-dialog.c:305
 msgid "Question"
 msgstr "Domanda"
 
@@ -1254,22 +1259,22 @@ msgstr ""
 "concesso di accedervi."
 
 #: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:320
+#: ../thunar/thunar-progress-dialog.c:372
 msgid "_Yes"
 msgstr "_Sì"
 
 #: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:324
+#: ../thunar/thunar-progress-dialog.c:377
 msgid "Yes to _all"
 msgstr "Sì _a tutti"
 
 #: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:328
+#: ../thunar/thunar-progress-dialog.c:382
 msgid "_No"
 msgstr "_No"
 
 #: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:332
+#: ../thunar/thunar-progress-dialog.c:387
 msgid "_Cancel"
 msgstr "_Cancella"
 
@@ -1478,21 +1483,21 @@ msgstr ""
 msgid "Apply to Folder and Contents"
 msgstr ""
 
-#: ../thunar/thunar-progress-dialog.c:458
+#: ../thunar/thunar-progress-dialog.c:523
 #, c-format
 msgid "(%lu hour remaining)"
 msgid_plural "(%lu hours remaining)"
 msgstr[0] "(%lu ora rimanente)"
 msgstr[1] "(%lu ore rimanenti)"
 
-#: ../thunar/thunar-progress-dialog.c:463
+#: ../thunar/thunar-progress-dialog.c:528
 #, c-format
 msgid "(%lu minute remaining)"
 msgid_plural "(%lu minutes remaining)"
 msgstr[0] "(%lu minuto rimanente)"
 msgstr[1] "(%lu minuti rimanenti)"
 
-#: ../thunar/thunar-progress-dialog.c:468
+#: ../thunar/thunar-progress-dialog.c:533
 #, c-format
 msgid "(%lu second remaining)"
 msgid_plural "(%lu seconds remaining)"
diff --git a/po/ja.po b/po/ja.po
index 3d504d296..40318733d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-25 22:21+0100\n"
+"POT-Creation-Date: 2006-03-26 14:23+0200\n"
 "PO-Revision-Date: 2006-03-26 12:17+0900\n"
 "Last-Translator: Daichi Kawahata <daichi@xfce.org>\n"
 "Language-Team: Japanese <xfce-users-jp@ml.fdiary.net>\n"
@@ -109,13 +109,7 @@ msgstr ""
 msgid "Failed to read folder contents"
 msgstr "フォルダの内容を読み込むのに失敗しました。"
 
-#. no useful information, *narf*
 #: ../thunar-vfs/thunar-vfs-exec.c:509
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:237
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:304
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:347
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:436
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:476
 msgid "Unknown error"
 msgstr "原因不明のエラーが発生しました。"
 
@@ -270,11 +264,16 @@ msgid "Unknown user \"%s\""
 msgstr "ユーザー「%s」は不明です。"
 
 #. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:385
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
 #, c-format
 msgid "Failed to determine the mount point for %s"
 msgstr "「%s」のマウント位置を確定できません。"
 
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:812
+#, fuzzy, c-format
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr "「%s」のモードを変更するのに失敗しました。"
+
 #: ../thunar-vfs/thunar-vfs-xfer.c:189
 #, c-format
 msgid "copy of %s"
@@ -336,52 +335,58 @@ msgstr "名前つきパイプ「%s」の作成に失敗しました。"
 msgid "Failed to open \"%s\" for reading"
 msgstr "読み込むために「%s」を開くのに失敗しました。"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:381
+#: ../thunar-vfs/thunar-vfs-xfer.c:385
+#, c-format
+msgid "The file \"%s\" already exists"
+msgstr ""
+
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-xfer.c:390
 #, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "書き込むために「%s」を開くのに失敗しました。"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:400
+#: ../thunar-vfs/thunar-vfs-xfer.c:411
 #, c-format
 msgid "Failed to read data from \"%s\""
 msgstr "「%s」からデータを読み込むのに失敗しました。"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:416
+#: ../thunar-vfs/thunar-vfs-xfer.c:427
 #, c-format
 msgid "Failed to write data to \"%s\""
 msgstr "「%s」へデータを書き込むのに失敗しました。"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#: ../thunar-vfs/thunar-vfs-xfer.c:446
 #, c-format
 msgid "Failed to remove \"%s\""
 msgstr "「%s」の削除に失敗しました。"
 
 #. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:440
+#: ../thunar-vfs/thunar-vfs-xfer.c:451
 msgid "Operation canceled"
 msgstr "操作は取り消されました。"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:480
+#: ../thunar-vfs/thunar-vfs-xfer.c:491
 #, c-format
 msgid "Failed to read link target from \"%s\""
 msgstr "「%s」のリンク先の読み込みに失敗しました。"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:488 ../thunar-vfs/thunar-vfs-xfer.c:601
+#: ../thunar-vfs/thunar-vfs-xfer.c:499 ../thunar-vfs/thunar-vfs-xfer.c:612
 #, c-format
 msgid "Failed to create symbolic link \"%s\""
 msgstr "リンク「%s」の作成に失敗しました。"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:496
+#: ../thunar-vfs/thunar-vfs-xfer.c:507
 #, c-format
 msgid "Failed to change mode of \"%s\""
 msgstr "「%s」のモードを変更するのに失敗しました。"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:530 ../thunar-vfs/thunar-vfs-xfer.c:590
+#: ../thunar-vfs/thunar-vfs-xfer.c:541 ../thunar-vfs/thunar-vfs-xfer.c:601
 #, c-format
 msgid "Failed to determine file info for \"%s\""
 msgstr "「%s」のファイル情報を確定するのに失敗しました。"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:559
+#: ../thunar-vfs/thunar-vfs-xfer.c:570
 #, c-format
 msgid "Failed to copy special file \"%s\""
 msgstr "特殊ファイル「%s」のコピーに失敗しました。"
@@ -1185,7 +1190,7 @@ msgstr "アクセス権を再帰的に変更していくのを止めます。"
 #. allocate the question dialog
 #: ../thunar/thunar-permissions-chooser.c:590
 #: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:294
+#: ../thunar/thunar-progress-dialog.c:305
 msgid "Question"
 msgstr "質問"
 
@@ -1247,22 +1252,22 @@ msgstr ""
 "フォルダの内容を見られます、また、後でこのフォルダに入る事ができます。"
 
 #: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:320
+#: ../thunar/thunar-progress-dialog.c:372
 msgid "_Yes"
 msgstr "はい(_Y)"
 
 #: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:324
+#: ../thunar/thunar-progress-dialog.c:377
 msgid "Yes to _all"
 msgstr "全てにはい(_A)"
 
 #: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:328
+#: ../thunar/thunar-progress-dialog.c:382
 msgid "_No"
 msgstr "いいえ(_N)"
 
 #: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:332
+#: ../thunar/thunar-progress-dialog.c:387
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
 
@@ -1470,19 +1475,19 @@ msgstr "フォルダのみに適用する"
 msgid "Apply to Folder and Contents"
 msgstr "フォルダ内のファイルにも適用する"
 
-#: ../thunar/thunar-progress-dialog.c:458
+#: ../thunar/thunar-progress-dialog.c:523
 #, c-format
 msgid "(%lu hour remaining)"
 msgid_plural "(%lu hours remaining)"
 msgstr[0] "(残り %lu 時間)"
 
-#: ../thunar/thunar-progress-dialog.c:463
+#: ../thunar/thunar-progress-dialog.c:528
 #, c-format
 msgid "(%lu minute remaining)"
 msgid_plural "(%lu minutes remaining)"
 msgstr[0] "(残り %lu 分)"
 
-#: ../thunar/thunar-progress-dialog.c:468
+#: ../thunar/thunar-progress-dialog.c:533
 #, c-format
 msgid "(%lu second remaining)"
 msgid_plural "(%lu seconds remaining)"
diff --git a/po/nl.po b/po/nl.po
index f81b14fb2..813eb2ff0 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-25 22:21+0100\n"
+"POT-Creation-Date: 2006-03-26 14:23+0200\n"
 "PO-Revision-Date: 2006-03-25 18:02+0100\n"
 "Last-Translator: Vincent Tunru <imnotb@gmail.com>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -99,13 +99,7 @@ msgstr ""
 msgid "Failed to read folder contents"
 msgstr "Inhoud van de map aan het laden..."
 
-#. no useful information, *narf*
 #: ../thunar-vfs/thunar-vfs-exec.c:509
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:237
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:304
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:347
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:436
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:476
 #, fuzzy
 msgid "Unknown error"
 msgstr "Onbekende eigenaar"
@@ -268,11 +262,16 @@ msgid "Unknown user \"%s\""
 msgstr "Onbekende gebruiker '%s'"
 
 #. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:385
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
 #, fuzzy, c-format
 msgid "Failed to determine the mount point for %s"
 msgstr "Fout bij het ophalen van bestandsinfo van `%s'"
 
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:812
+#, fuzzy, c-format
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr "Fout bij het veranderen van de modus van `%s'"
+
 #: ../thunar-vfs/thunar-vfs-xfer.c:189
 #, c-format
 msgid "copy of %s"
@@ -338,52 +337,58 @@ msgstr "Fout bij het maken van genoemde <fifo> `%s'"
 msgid "Failed to open \"%s\" for reading"
 msgstr "Fout bij het openen van `%s' om te lezen"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:381
+#: ../thunar-vfs/thunar-vfs-xfer.c:385
+#, c-format
+msgid "The file \"%s\" already exists"
+msgstr ""
+
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-xfer.c:390
 #, fuzzy, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "Fout bij het openen van `%s' om te schrijven"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:400
+#: ../thunar-vfs/thunar-vfs-xfer.c:411
 #, fuzzy, c-format
 msgid "Failed to read data from \"%s\""
 msgstr "Fout bij het lezen van `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:416
+#: ../thunar-vfs/thunar-vfs-xfer.c:427
 #, fuzzy, c-format
 msgid "Failed to write data to \"%s\""
 msgstr "Fout bij het schrijven naar `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#: ../thunar-vfs/thunar-vfs-xfer.c:446
 #, fuzzy, c-format
 msgid "Failed to remove \"%s\""
 msgstr "Het verwijderen van `%s' is mislukt: %s"
 
 #. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:440
+#: ../thunar-vfs/thunar-vfs-xfer.c:451
 msgid "Operation canceled"
 msgstr "Actie geannulleerd"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:480
+#: ../thunar-vfs/thunar-vfs-xfer.c:491
 #, fuzzy, c-format
 msgid "Failed to read link target from \"%s\""
 msgstr "Fout bij het lezen van snelkopplingsdoel `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:488 ../thunar-vfs/thunar-vfs-xfer.c:601
+#: ../thunar-vfs/thunar-vfs-xfer.c:499 ../thunar-vfs/thunar-vfs-xfer.c:612
 #, fuzzy, c-format
 msgid "Failed to create symbolic link \"%s\""
 msgstr "Fout bij het maken van symbolische snelkoppeling `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:496
+#: ../thunar-vfs/thunar-vfs-xfer.c:507
 #, fuzzy, c-format
 msgid "Failed to change mode of \"%s\""
 msgstr "Fout bij het veranderen van de modus van `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:530 ../thunar-vfs/thunar-vfs-xfer.c:590
+#: ../thunar-vfs/thunar-vfs-xfer.c:541 ../thunar-vfs/thunar-vfs-xfer.c:601
 #, fuzzy, c-format
 msgid "Failed to determine file info for \"%s\""
 msgstr "Fout bij het ophalen van bestandsinfo van `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:559
+#: ../thunar-vfs/thunar-vfs-xfer.c:570
 #, fuzzy, c-format
 msgid "Failed to copy special file \"%s\""
 msgstr "Fout bij het kopiëren van speciaal bestand `%s'"
@@ -1221,7 +1226,7 @@ msgstr "Stop met het recursief toepassen van toestemmingen."
 #. allocate the question dialog
 #: ../thunar/thunar-permissions-chooser.c:590
 #: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:294
+#: ../thunar/thunar-progress-dialog.c:305
 msgid "Question"
 msgstr "Vraag"
 
@@ -1284,22 +1289,22 @@ msgstr ""
 "gebruikers met toestemming om de inhoud te lezen toegang tot de map krijgen."
 
 #: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:320
+#: ../thunar/thunar-progress-dialog.c:372
 msgid "_Yes"
 msgstr "_Ja"
 
 #: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:324
+#: ../thunar/thunar-progress-dialog.c:377
 msgid "Yes to _all"
 msgstr "Ja op _alles"
 
 #: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:328
+#: ../thunar/thunar-progress-dialog.c:382
 msgid "_No"
 msgstr "_Nee"
 
 #: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:332
+#: ../thunar/thunar-progress-dialog.c:387
 msgid "_Cancel"
 msgstr "_Annuleren"
 
@@ -1511,21 +1516,21 @@ msgstr "Alleen op map toepassen"
 msgid "Apply to Folder and Contents"
 msgstr "Toepassen op map en inhoud"
 
-#: ../thunar/thunar-progress-dialog.c:458
+#: ../thunar/thunar-progress-dialog.c:523
 #, c-format
 msgid "(%lu hour remaining)"
 msgid_plural "(%lu hours remaining)"
 msgstr[0] "(%lu uur over)"
 msgstr[1] "(%lu uur over)"
 
-#: ../thunar/thunar-progress-dialog.c:463
+#: ../thunar/thunar-progress-dialog.c:528
 #, c-format
 msgid "(%lu minute remaining)"
 msgid_plural "(%lu minutes remaining)"
 msgstr[0] "(%lu minuut over)"
 msgstr[1] "(%lu minuten over)"
 
-#: ../thunar/thunar-progress-dialog.c:468
+#: ../thunar/thunar-progress-dialog.c:533
 #, c-format
 msgid "(%lu second remaining)"
 msgid_plural "(%lu seconds remaining)"
diff --git a/po/pl.po b/po/pl.po
index 6acfbaca6..4d306bc50 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-25 22:21+0100\n"
+"POT-Creation-Date: 2006-03-26 14:23+0200\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"
@@ -98,13 +98,7 @@ msgstr ""
 msgid "Failed to read folder contents"
 msgstr "Wczytuję zawartość katalogu..."
 
-#. no useful information, *narf*
 #: ../thunar-vfs/thunar-vfs-exec.c:509
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:237
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:304
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:347
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:436
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:476
 #, fuzzy
 msgid "Unknown error"
 msgstr "data nieznana"
@@ -256,11 +250,16 @@ msgid "Unknown user \"%s\""
 msgstr "data nieznana"
 
 #. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:385
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
 #, fuzzy, c-format
 msgid "Failed to determine the mount point for %s"
 msgstr "Nie udało się odczytać atrybutów pliku '%s'"
 
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:812
+#, fuzzy, c-format
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr "Nie udało się zmienić praw dostępu do '%s'"
+
 #: ../thunar-vfs/thunar-vfs-xfer.c:189
 #, c-format
 msgid "copy of %s"
@@ -326,52 +325,58 @@ msgstr "Nie udało się utworzyć kolejki FIFO '%s'"
 msgid "Failed to open \"%s\" for reading"
 msgstr "Nie można otworzyć '%s' do odczytu"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:381
+#: ../thunar-vfs/thunar-vfs-xfer.c:385
+#, c-format
+msgid "The file \"%s\" already exists"
+msgstr ""
+
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-xfer.c:390
 #, fuzzy, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "Nie można otworzyć '%s' do zapisu"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:400
+#: ../thunar-vfs/thunar-vfs-xfer.c:411
 #, fuzzy, c-format
 msgid "Failed to read data from \"%s\""
 msgstr "BÅ‚Ä…d odczytu z pliku '%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:416
+#: ../thunar-vfs/thunar-vfs-xfer.c:427
 #, fuzzy, c-format
 msgid "Failed to write data to \"%s\""
 msgstr "BÅ‚Ä…d zapisu do pliku '%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#: ../thunar-vfs/thunar-vfs-xfer.c:446
 #, fuzzy, c-format
 msgid "Failed to remove \"%s\""
 msgstr "Nie udało się usunąć pliku '%s': %s"
 
 #. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:440
+#: ../thunar-vfs/thunar-vfs-xfer.c:451
 msgid "Operation canceled"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:480
+#: ../thunar-vfs/thunar-vfs-xfer.c:491
 #, fuzzy, c-format
 msgid "Failed to read link target from \"%s\""
 msgstr "Nie można odczytać obiektu, na który wskazuje '%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:488 ../thunar-vfs/thunar-vfs-xfer.c:601
+#: ../thunar-vfs/thunar-vfs-xfer.c:499 ../thunar-vfs/thunar-vfs-xfer.c:612
 #, fuzzy, c-format
 msgid "Failed to create symbolic link \"%s\""
 msgstr "Nie udało się utworzyć dowiązania symbolicznego '%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:496
+#: ../thunar-vfs/thunar-vfs-xfer.c:507
 #, fuzzy, c-format
 msgid "Failed to change mode of \"%s\""
 msgstr "Nie udało się zmienić praw dostępu do '%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:530 ../thunar-vfs/thunar-vfs-xfer.c:590
+#: ../thunar-vfs/thunar-vfs-xfer.c:541 ../thunar-vfs/thunar-vfs-xfer.c:601
 #, fuzzy, c-format
 msgid "Failed to determine file info for \"%s\""
 msgstr "Nie udało się odczytać atrybutów pliku '%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:559
+#: ../thunar-vfs/thunar-vfs-xfer.c:570
 #, fuzzy, c-format
 msgid "Failed to copy special file \"%s\""
 msgstr "Nie udało się skopiować pliku specjalnego '%s'"
@@ -1203,7 +1208,7 @@ msgstr ""
 #. allocate the question dialog
 #: ../thunar/thunar-permissions-chooser.c:590
 #: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:294
+#: ../thunar/thunar-progress-dialog.c:305
 msgid "Question"
 msgstr "Pytanie"
 
@@ -1261,22 +1266,22 @@ msgid ""
 msgstr ""
 
 #: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:320
+#: ../thunar/thunar-progress-dialog.c:372
 msgid "_Yes"
 msgstr "_Tak"
 
 #: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:324
+#: ../thunar/thunar-progress-dialog.c:377
 msgid "Yes to _all"
 msgstr "_Tak dla _wszystkich"
 
 #: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:328
+#: ../thunar/thunar-progress-dialog.c:382
 msgid "_No"
 msgstr "_Nie"
 
 #: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:332
+#: ../thunar/thunar-progress-dialog.c:387
 msgid "_Cancel"
 msgstr "_Anuluj"
 
@@ -1474,7 +1479,7 @@ msgstr ""
 msgid "Apply to Folder and Contents"
 msgstr ""
 
-#: ../thunar/thunar-progress-dialog.c:458
+#: ../thunar/thunar-progress-dialog.c:523
 #, c-format
 msgid "(%lu hour remaining)"
 msgid_plural "(%lu hours remaining)"
@@ -1482,7 +1487,7 @@ msgstr[0] "(pozostała %lu godzina)"
 msgstr[1] "(pozostały %lu godziny)"
 msgstr[2] "(pozostało %lu godzin)"
 
-#: ../thunar/thunar-progress-dialog.c:463
+#: ../thunar/thunar-progress-dialog.c:528
 #, c-format
 msgid "(%lu minute remaining)"
 msgid_plural "(%lu minutes remaining)"
@@ -1490,7 +1495,7 @@ msgstr[0] "(pozostała %lu minuta)"
 msgstr[1] "(pozostały %lu minuty)"
 msgstr[2] "(pozostało %lu minut)"
 
-#: ../thunar/thunar-progress-dialog.c:468
+#: ../thunar/thunar-progress-dialog.c:533
 #, c-format
 msgid "(%lu second remaining)"
 msgid_plural "(%lu seconds remaining)"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 3d3f3db12..b9fa2b153 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-25 22:21+0100\n"
+"POT-Creation-Date: 2006-03-26 14:23+0200\n"
 "PO-Revision-Date: 2006-02-10 22:34-0200\n"
 "Last-Translator: Rodrigo Coacci <rcoacci@gmail.com>\n"
 "Language-Team: os-cillation <info@os-cillation.com>\n"
@@ -99,13 +99,7 @@ msgstr ""
 msgid "Failed to read folder contents"
 msgstr "Carregando conteúdo da pasta..."
 
-#. no useful information, *narf*
 #: ../thunar-vfs/thunar-vfs-exec.c:509
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:237
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:304
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:347
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:436
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:476
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
@@ -254,11 +248,16 @@ msgid "Unknown user \"%s\""
 msgstr "Usuário desconhecido `%s'"
 
 #. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:385
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
 #, fuzzy, c-format
 msgid "Failed to determine the mount point for %s"
 msgstr "Falha em determinar informação de arquivo para `%s'"
 
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:812
+#, fuzzy, c-format
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr "Falha em trocar modo de `%s'"
+
 #: ../thunar-vfs/thunar-vfs-xfer.c:189
 #, c-format
 msgid "copy of %s"
@@ -322,52 +321,58 @@ msgstr "Falha em criar \"fifo\" nomeado `%s'"
 msgid "Failed to open \"%s\" for reading"
 msgstr "Falha em abrir `%s' para leitura"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:381
+#: ../thunar-vfs/thunar-vfs-xfer.c:385
+#, c-format
+msgid "The file \"%s\" already exists"
+msgstr ""
+
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-xfer.c:390
 #, fuzzy, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "Falha em abrir `%s' para escrita"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:400
+#: ../thunar-vfs/thunar-vfs-xfer.c:411
 #, fuzzy, c-format
 msgid "Failed to read data from \"%s\""
 msgstr "Falha em ler dados de `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:416
+#: ../thunar-vfs/thunar-vfs-xfer.c:427
 #, fuzzy, c-format
 msgid "Failed to write data to \"%s\""
 msgstr "Falha em escrever dados em `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#: ../thunar-vfs/thunar-vfs-xfer.c:446
 #, fuzzy, c-format
 msgid "Failed to remove \"%s\""
 msgstr "Falha em remover `%s': %s"
 
 #. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:440
+#: ../thunar-vfs/thunar-vfs-xfer.c:451
 msgid "Operation canceled"
 msgstr "Operação cancelada"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:480
+#: ../thunar-vfs/thunar-vfs-xfer.c:491
 #, fuzzy, c-format
 msgid "Failed to read link target from \"%s\""
 msgstr "Falha em ler ligação alvo de `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:488 ../thunar-vfs/thunar-vfs-xfer.c:601
+#: ../thunar-vfs/thunar-vfs-xfer.c:499 ../thunar-vfs/thunar-vfs-xfer.c:612
 #, fuzzy, c-format
 msgid "Failed to create symbolic link \"%s\""
 msgstr "Falha em criar ligação simbólica `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:496
+#: ../thunar-vfs/thunar-vfs-xfer.c:507
 #, fuzzy, c-format
 msgid "Failed to change mode of \"%s\""
 msgstr "Falha em trocar modo de `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:530 ../thunar-vfs/thunar-vfs-xfer.c:590
+#: ../thunar-vfs/thunar-vfs-xfer.c:541 ../thunar-vfs/thunar-vfs-xfer.c:601
 #, fuzzy, c-format
 msgid "Failed to determine file info for \"%s\""
 msgstr "Falha em determinar informação de arquivo para `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:559
+#: ../thunar-vfs/thunar-vfs-xfer.c:570
 #, fuzzy, c-format
 msgid "Failed to copy special file \"%s\""
 msgstr "Falha em copiar arquivo especial `%s'"
@@ -1185,7 +1190,7 @@ msgstr "Pare de aplicar permissões recursivamente."
 #. allocate the question dialog
 #: ../thunar/thunar-permissions-chooser.c:590
 #: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:294
+#: ../thunar/thunar-progress-dialog.c:305
 msgid "Question"
 msgstr "Questão"
 
@@ -1246,22 +1251,22 @@ msgid ""
 msgstr ""
 
 #: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:320
+#: ../thunar/thunar-progress-dialog.c:372
 msgid "_Yes"
 msgstr "_Sim"
 
 #: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:324
+#: ../thunar/thunar-progress-dialog.c:377
 msgid "Yes to _all"
 msgstr "Sim para _todos"
 
 #: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:328
+#: ../thunar/thunar-progress-dialog.c:382
 msgid "_No"
 msgstr "_Não"
 
 #: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:332
+#: ../thunar/thunar-progress-dialog.c:387
 msgid "_Cancel"
 msgstr "_Cancelar"
 
@@ -1462,21 +1467,21 @@ msgstr ""
 msgid "Apply to Folder and Contents"
 msgstr ""
 
-#: ../thunar/thunar-progress-dialog.c:458
+#: ../thunar/thunar-progress-dialog.c:523
 #, c-format
 msgid "(%lu hour remaining)"
 msgid_plural "(%lu hours remaining)"
 msgstr[0] "(Restando %lu hora)"
 msgstr[1] "(Restando %lu horas)"
 
-#: ../thunar/thunar-progress-dialog.c:463
+#: ../thunar/thunar-progress-dialog.c:528
 #, c-format
 msgid "(%lu minute remaining)"
 msgid_plural "(%lu minutes remaining)"
 msgstr[0] "(Restando %lu minuto)"
 msgstr[1] "(Restando %lu minutos)"
 
-#: ../thunar/thunar-progress-dialog.c:468
+#: ../thunar/thunar-progress-dialog.c:533
 #, c-format
 msgid "(%lu second remaining)"
 msgid_plural "(%lu seconds remaining)"
diff --git a/po/ru.po b/po/ru.po
index 9fb3b2ca8..5d7e46524 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-25 22:21+0100\n"
+"POT-Creation-Date: 2006-03-26 14:23+0200\n"
 "PO-Revision-Date: 2006-02-24 16:14+0500\n"
 "Last-Translator: Sergey Fedoseev <fedoseev.sergey@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -101,13 +101,7 @@ msgstr ""
 msgid "Failed to read folder contents"
 msgstr "Загрузка содержимого папки..."
 
-#. no useful information, *narf*
 #: ../thunar-vfs/thunar-vfs-exec.c:509
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:237
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:304
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:347
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:436
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:476
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
@@ -254,11 +248,16 @@ msgid "Unknown user \"%s\""
 msgstr "Неизвестный пользователь \"%s\""
 
 #. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:385
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
 #, c-format
 msgid "Failed to determine the mount point for %s"
 msgstr "Не удалось определить точку монтирования для %s"
 
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:812
+#, fuzzy, c-format
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr "Не удалось изменить права \"%s\""
+
 #: ../thunar-vfs/thunar-vfs-xfer.c:189
 #, c-format
 msgid "copy of %s"
@@ -324,52 +323,58 @@ msgstr "Не удалось создать fifo \"%s\""
 msgid "Failed to open \"%s\" for reading"
 msgstr "Не удалось открыть \"%s\" для чтения"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:381
+#: ../thunar-vfs/thunar-vfs-xfer.c:385
+#, c-format
+msgid "The file \"%s\" already exists"
+msgstr ""
+
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-xfer.c:390
 #, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "Не удалось открыть \"%s\" для записи"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:400
+#: ../thunar-vfs/thunar-vfs-xfer.c:411
 #, fuzzy, c-format
 msgid "Failed to read data from \"%s\""
 msgstr "Не удалось прочитать данные из \"%s\""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:416
+#: ../thunar-vfs/thunar-vfs-xfer.c:427
 #, c-format
 msgid "Failed to write data to \"%s\""
 msgstr "Не удалось записать данные в \"%s\""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#: ../thunar-vfs/thunar-vfs-xfer.c:446
 #, c-format
 msgid "Failed to remove \"%s\""
 msgstr "Не удалось удалить \"%s\""
 
 #. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:440
+#: ../thunar-vfs/thunar-vfs-xfer.c:451
 msgid "Operation canceled"
 msgstr "Операция отменена"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:480
+#: ../thunar-vfs/thunar-vfs-xfer.c:491
 #, c-format
 msgid "Failed to read link target from \"%s\""
 msgstr "Не удалось прочитать данные из \"%s\""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:488 ../thunar-vfs/thunar-vfs-xfer.c:601
+#: ../thunar-vfs/thunar-vfs-xfer.c:499 ../thunar-vfs/thunar-vfs-xfer.c:612
 #, c-format
 msgid "Failed to create symbolic link \"%s\""
 msgstr "Не удалось создать символическую ссылку \"%s\""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:496
+#: ../thunar-vfs/thunar-vfs-xfer.c:507
 #, c-format
 msgid "Failed to change mode of \"%s\""
 msgstr "Не удалось изменить права \"%s\""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:530 ../thunar-vfs/thunar-vfs-xfer.c:590
+#: ../thunar-vfs/thunar-vfs-xfer.c:541 ../thunar-vfs/thunar-vfs-xfer.c:601
 #, c-format
 msgid "Failed to determine file info for \"%s\""
 msgstr "Не удалось определить информацию о файле \"%s\""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:559
+#: ../thunar-vfs/thunar-vfs-xfer.c:570
 #, c-format
 msgid "Failed to copy special file \"%s\""
 msgstr "Не удалось cкопировать специальный файл \"%s\""
@@ -1188,7 +1193,7 @@ msgstr "Прекратить рекурсивное изменение прав.
 #. allocate the question dialog
 #: ../thunar/thunar-permissions-chooser.c:590
 #: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:294
+#: ../thunar/thunar-progress-dialog.c:305
 msgid "Question"
 msgstr "Вопрос"
 
@@ -1249,22 +1254,22 @@ msgid ""
 msgstr ""
 
 #: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:320
+#: ../thunar/thunar-progress-dialog.c:372
 msgid "_Yes"
 msgstr "_Да"
 
 #: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:324
+#: ../thunar/thunar-progress-dialog.c:377
 msgid "Yes to _all"
 msgstr "Да для _всех"
 
 #: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:328
+#: ../thunar/thunar-progress-dialog.c:382
 msgid "_No"
 msgstr "_Нет"
 
 #: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:332
+#: ../thunar/thunar-progress-dialog.c:387
 msgid "_Cancel"
 msgstr "_Отменить"
 
@@ -1461,7 +1466,7 @@ msgstr "Применять только к самой папке"
 msgid "Apply to Folder and Contents"
 msgstr "Применять к папке и ее содержимому"
 
-#: ../thunar/thunar-progress-dialog.c:458
+#: ../thunar/thunar-progress-dialog.c:523
 #, c-format
 msgid "(%lu hour remaining)"
 msgid_plural "(%lu hours remaining)"
@@ -1469,7 +1474,7 @@ msgstr[0] "(остаётся %lu час)"
 msgstr[1] "(остаётся %lu часа)"
 msgstr[2] "(остаётся %lu часов)"
 
-#: ../thunar/thunar-progress-dialog.c:463
+#: ../thunar/thunar-progress-dialog.c:528
 #, c-format
 msgid "(%lu minute remaining)"
 msgid_plural "(%lu minutes remaining)"
@@ -1477,7 +1482,7 @@ msgstr[0] "(остаётся %lu минута)"
 msgstr[1] "(остаётся %lu минуты)"
 msgstr[2] "(остаётся %lu минут)"
 
-#: ../thunar/thunar-progress-dialog.c:468
+#: ../thunar/thunar-progress-dialog.c:533
 #, c-format
 msgid "(%lu second remaining)"
 msgid_plural "(%lu seconds remaining)"
diff --git a/po/sv.po b/po/sv.po
index a05d4412c..e9c6eefb5 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-25 22:21+0100\n"
+"POT-Creation-Date: 2006-03-26 14:23+0200\n"
 "PO-Revision-Date: 2006-02-22 16:28+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -98,13 +98,7 @@ msgstr ""
 msgid "Failed to read folder contents"
 msgstr "Läser in mappinnehåll..."
 
-#. no useful information, *narf*
 #: ../thunar-vfs/thunar-vfs-exec.c:509
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:237
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:304
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:347
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:436
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:476
 msgid "Unknown error"
 msgstr "Okänt fel"
 
@@ -251,11 +245,16 @@ msgid "Unknown user \"%s\""
 msgstr "Okänd användare \"%s\""
 
 #. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:385
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
 #, c-format
 msgid "Failed to determine the mount point for %s"
 msgstr "Misslyckades att fastställa monteringspunkten för %s"
 
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:812
+#, fuzzy, c-format
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr "Misslyckades att ändra rättigheter på \"%s\""
+
 #: ../thunar-vfs/thunar-vfs-xfer.c:189
 #, c-format
 msgid "copy of %s"
@@ -319,52 +318,58 @@ msgstr "Misslyckades att skapa namngivet rör \"%s\""
 msgid "Failed to open \"%s\" for reading"
 msgstr "Misslyckades att öppna \"%s\" för läsning"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:381
+#: ../thunar-vfs/thunar-vfs-xfer.c:385
+#, c-format
+msgid "The file \"%s\" already exists"
+msgstr ""
+
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-xfer.c:390
 #, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "Misslyckades att öppna \"%s\" för skrivning"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:400
+#: ../thunar-vfs/thunar-vfs-xfer.c:411
 #, c-format
 msgid "Failed to read data from \"%s\""
 msgstr "Misslyckades att läsa data från \"%s\""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:416
+#: ../thunar-vfs/thunar-vfs-xfer.c:427
 #, c-format
 msgid "Failed to write data to \"%s\""
 msgstr "Misslyckades att skriva data till \"%s\""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#: ../thunar-vfs/thunar-vfs-xfer.c:446
 #, c-format
 msgid "Failed to remove \"%s\""
 msgstr "misslyckades att ta bort \"%s\""
 
 #. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:440
+#: ../thunar-vfs/thunar-vfs-xfer.c:451
 msgid "Operation canceled"
 msgstr "Operationen avbröts"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:480
+#: ../thunar-vfs/thunar-vfs-xfer.c:491
 #, c-format
 msgid "Failed to read link target from \"%s\""
 msgstr "Misslyckades att läsa länkmål från \"%s\""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:488 ../thunar-vfs/thunar-vfs-xfer.c:601
+#: ../thunar-vfs/thunar-vfs-xfer.c:499 ../thunar-vfs/thunar-vfs-xfer.c:612
 #, c-format
 msgid "Failed to create symbolic link \"%s\""
 msgstr "Misslyckades att skapa symbolisk länk \"%s\""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:496
+#: ../thunar-vfs/thunar-vfs-xfer.c:507
 #, c-format
 msgid "Failed to change mode of \"%s\""
 msgstr "Misslyckades att ändra rättigheter på \"%s\""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:530 ../thunar-vfs/thunar-vfs-xfer.c:590
+#: ../thunar-vfs/thunar-vfs-xfer.c:541 ../thunar-vfs/thunar-vfs-xfer.c:601
 #, c-format
 msgid "Failed to determine file info for \"%s\""
 msgstr "Misslyckades att fastställa filinformation för \"%s\""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:559
+#: ../thunar-vfs/thunar-vfs-xfer.c:570
 #, c-format
 msgid "Failed to copy special file \"%s\""
 msgstr "Misslyckades att kopiera specialfil \"%s\""
@@ -1183,7 +1188,7 @@ msgstr "Sluta verkställa rättigheter rekursivt."
 #. allocate the question dialog
 #: ../thunar/thunar-permissions-chooser.c:590
 #: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:294
+#: ../thunar/thunar-progress-dialog.c:305
 msgid "Question"
 msgstr "Fråga"
 
@@ -1247,22 +1252,22 @@ msgstr ""
 "till mappen efteråt."
 
 #: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:320
+#: ../thunar/thunar-progress-dialog.c:372
 msgid "_Yes"
 msgstr "_Ja"
 
 #: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:324
+#: ../thunar/thunar-progress-dialog.c:377
 msgid "Yes to _all"
 msgstr "Ja till _alla"
 
 #: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:328
+#: ../thunar/thunar-progress-dialog.c:382
 msgid "_No"
 msgstr "_Nej"
 
 #: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:332
+#: ../thunar/thunar-progress-dialog.c:387
 msgid "_Cancel"
 msgstr "_Avbryt"
 
@@ -1471,21 +1476,21 @@ msgstr ""
 msgid "Apply to Folder and Contents"
 msgstr ""
 
-#: ../thunar/thunar-progress-dialog.c:458
+#: ../thunar/thunar-progress-dialog.c:523
 #, c-format
 msgid "(%lu hour remaining)"
 msgid_plural "(%lu hours remaining)"
 msgstr[0] "(%lu timme återstår)"
 msgstr[1] "(%lu timmar återstår)"
 
-#: ../thunar/thunar-progress-dialog.c:463
+#: ../thunar/thunar-progress-dialog.c:528
 #, c-format
 msgid "(%lu minute remaining)"
 msgid_plural "(%lu minutes remaining)"
 msgstr[0] "(%lu minut återstår)"
 msgstr[1] "(%lu minuter återstår)"
 
-#: ../thunar/thunar-progress-dialog.c:468
+#: ../thunar/thunar-progress-dialog.c:533
 #, c-format
 msgid "(%lu second remaining)"
 msgid_plural "(%lu seconds remaining)"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 40865ebc0..ada0e229f 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-25 22:21+0100\n"
+"POT-Creation-Date: 2006-03-26 14:23+0200\n"
 "PO-Revision-Date: 2006-03-15 00:56+0800\n"
 "Last-Translator: Hydonsingore Cia <hydonsingore@mail.educities.edu.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -98,13 +98,7 @@ msgstr ""
 msgid "Failed to read folder contents"
 msgstr "無法從 \"%s\" 讀取資料"
 
-#. no useful information, *narf*
 #: ../thunar-vfs/thunar-vfs-exec.c:509
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:237
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:304
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:347
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:436
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:476
 msgid "Unknown error"
 msgstr "未知的錯誤"
 
@@ -251,11 +245,16 @@ msgid "Unknown user \"%s\""
 msgstr "未知的使用者 \"%s\""
 
 #. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:385
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
 #, c-format
 msgid "Failed to determine the mount point for %s"
 msgstr "無法決定 %s 的掛載點"
 
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:812
+#, fuzzy, c-format
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr "無法更改 \"%s\" 的模式"
+
 #: ../thunar-vfs/thunar-vfs-xfer.c:189
 #, c-format
 msgid "copy of %s"
@@ -317,52 +316,58 @@ msgstr ""
 msgid "Failed to open \"%s\" for reading"
 msgstr "無法開啟 \"%s\" 來讀取"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:381
+#: ../thunar-vfs/thunar-vfs-xfer.c:385
+#, c-format
+msgid "The file \"%s\" already exists"
+msgstr ""
+
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-xfer.c:390
 #, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "無法開啟 \"%s\" 來寫入"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:400
+#: ../thunar-vfs/thunar-vfs-xfer.c:411
 #, c-format
 msgid "Failed to read data from \"%s\""
 msgstr "無法從 \"%s\" 讀取資料"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:416
+#: ../thunar-vfs/thunar-vfs-xfer.c:427
 #, c-format
 msgid "Failed to write data to \"%s\""
 msgstr "無法將資料寫入 \"%s\""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#: ../thunar-vfs/thunar-vfs-xfer.c:446
 #, c-format
 msgid "Failed to remove \"%s\""
 msgstr "無法移除 \"%s\""
 
 #. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:440
+#: ../thunar-vfs/thunar-vfs-xfer.c:451
 msgid "Operation canceled"
 msgstr "操作取消"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:480
+#: ../thunar-vfs/thunar-vfs-xfer.c:491
 #, c-format
 msgid "Failed to read link target from \"%s\""
 msgstr "無法讀取連結目標 \"%s\""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:488 ../thunar-vfs/thunar-vfs-xfer.c:601
+#: ../thunar-vfs/thunar-vfs-xfer.c:499 ../thunar-vfs/thunar-vfs-xfer.c:612
 #, c-format
 msgid "Failed to create symbolic link \"%s\""
 msgstr "無法建立符號連結 \"%s\""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:496
+#: ../thunar-vfs/thunar-vfs-xfer.c:507
 #, c-format
 msgid "Failed to change mode of \"%s\""
 msgstr "無法更改 \"%s\" 的模式"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:530 ../thunar-vfs/thunar-vfs-xfer.c:590
+#: ../thunar-vfs/thunar-vfs-xfer.c:541 ../thunar-vfs/thunar-vfs-xfer.c:601
 #, c-format
 msgid "Failed to determine file info for \"%s\""
 msgstr "無法決定 \"%s\" 的檔案資訊"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:559
+#: ../thunar-vfs/thunar-vfs-xfer.c:570
 #, c-format
 msgid "Failed to copy special file \"%s\""
 msgstr "無法複製特殊檔案 \"%s\""
@@ -1148,7 +1153,7 @@ msgstr ""
 #. allocate the question dialog
 #: ../thunar/thunar-permissions-chooser.c:590
 #: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:294
+#: ../thunar/thunar-progress-dialog.c:305
 msgid "Question"
 msgstr ""
 
@@ -1204,22 +1209,22 @@ msgid ""
 msgstr ""
 
 #: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:320
+#: ../thunar/thunar-progress-dialog.c:372
 msgid "_Yes"
 msgstr ""
 
 #: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:324
+#: ../thunar/thunar-progress-dialog.c:377
 msgid "Yes to _all"
 msgstr ""
 
 #: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:328
+#: ../thunar/thunar-progress-dialog.c:382
 msgid "_No"
 msgstr ""
 
 #: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:332
+#: ../thunar/thunar-progress-dialog.c:387
 msgid "_Cancel"
 msgstr ""
 
@@ -1410,21 +1415,21 @@ msgstr ""
 msgid "Apply to Folder and Contents"
 msgstr ""
 
-#: ../thunar/thunar-progress-dialog.c:458
+#: ../thunar/thunar-progress-dialog.c:523
 #, c-format
 msgid "(%lu hour remaining)"
 msgid_plural "(%lu hours remaining)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-progress-dialog.c:463
+#: ../thunar/thunar-progress-dialog.c:528
 #, c-format
 msgid "(%lu minute remaining)"
 msgid_plural "(%lu minutes remaining)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-progress-dialog.c:468
+#: ../thunar/thunar-progress-dialog.c:533
 #, c-format
 msgid "(%lu second remaining)"
 msgid_plural "(%lu seconds remaining)"
diff --git a/thunar-vfs/thunar-vfs-xfer.c b/thunar-vfs/thunar-vfs-xfer.c
index f0c993650..53b907d34 100644
--- a/thunar-vfs/thunar-vfs-xfer.c
+++ b/thunar-vfs/thunar-vfs-xfer.c
@@ -378,7 +378,18 @@ thunar_vfs_xfer_copy_regular (const gchar          *source_absolute_path,
       if (G_UNLIKELY (errno == EISDIR || errno == EMLINK || errno == ETXTBSY))
         errno = EEXIST;
 
-      tvxc_set_error_from_errno (error, _("Failed to open \"%s\" for writing"), target_absolute_path);
+      /* EEXIST gets a better error message */
+      if (G_LIKELY (errno == EEXIST))
+        {
+          g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
+                       _("The file \"%s\" already exists"), target_absolute_path);
+        }
+      else
+        {
+          /* use the generic error message */
+          tvxc_set_error_from_errno (error, _("Failed to open \"%s\" for writing"), target_absolute_path);
+        }
+
       goto end1;
     }
 
diff --git a/thunar/thunar-progress-dialog.c b/thunar/thunar-progress-dialog.c
index defe5627a..a5bb1a0a5 100644
--- a/thunar/thunar-progress-dialog.c
+++ b/thunar/thunar-progress-dialog.c
@@ -21,6 +21,12 @@
 #include <config.h>
 #endif
 
+#ifdef HAVE_MEMORY_H
+#include <memory.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
 #ifdef HAVE_TIME_H
 #include <time.h>
 #endif
@@ -272,11 +278,16 @@ thunar_progress_dialog_ask (ThunarProgressDialog           *dialog,
                             ThunarVfsJob                   *job)
 {
   const gchar *mnemonic;
+  const gchar *messagep;
+  const gchar *stock_id;
   GtkWidget   *question;
   GtkWidget   *hbox;
+  GtkWidget   *vbox;
   GtkWidget   *image;
   GtkWidget   *label;
   GtkWidget   *button;
+  gchar       *title;
+  gchar       *text;
   gint         response;
   gint         n;
 
@@ -295,18 +306,59 @@ thunar_progress_dialog_ask (ThunarProgressDialog           *dialog,
                            NULL);
   gtk_window_set_transient_for (GTK_WINDOW (question), GTK_WINDOW (dialog));
 
-  hbox = g_object_new (GTK_TYPE_HBOX, "border-width", 12, "spacing", 12, NULL);
+  hbox = gtk_hbox_new (FALSE, 12);
+  gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
   gtk_box_pack_start (GTK_BOX (GTK_DIALOG (question)->vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
   image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG);
+  gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
   gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
   gtk_widget_show (image);
 
-  label = g_object_new (GTK_TYPE_LABEL, "label", message, "xalign", 0, "yalign", 0, NULL);
-  gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
+  vbox = gtk_vbox_new (FALSE, 12);
+  gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
+  gtk_widget_show (vbox);
+
+  /* split the message */
+  messagep = strstr (message, "\n\n");
+  if (G_LIKELY (messagep != NULL))
+    {
+      title = g_strndup (message, messagep - message);
+      text = g_strdup (messagep + 2);
+    }
+  else
+    {
+      title = g_strdup (message);
+      text = NULL;
+    }
+
+  label = gtk_label_new (title);
+  gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+  gtk_label_set_selectable (GTK_LABEL (label), TRUE);
+  gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.0f);
+  gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, FALSE, 0);
   gtk_widget_show (label);
 
+  /* check if we have two parts */
+  if (G_LIKELY (text != NULL))
+    {
+      /* make the title bold */
+      gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_bold ());
+
+      /* add the text */
+      label = gtk_label_new (text);
+      gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+      gtk_label_set_selectable (GTK_LABEL (label), TRUE);
+      gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.0f);
+      gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0);
+      gtk_widget_show (label);
+    }
+
+  /* cleanup */
+  g_free (title);
+  g_free (text);
+
   /* add the buttons based on the possible choices */
   for (n = 3; n >= 0; --n)
     {
@@ -318,18 +370,23 @@ thunar_progress_dialog_ask (ThunarProgressDialog           *dialog,
         {
         case THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_YES:
           mnemonic = _("_Yes");
+          stock_id = GTK_STOCK_YES;
           break;
 
         case THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_YES_ALL:
           mnemonic = _("Yes to _all");
+          stock_id = NULL;
           break;
 
         case THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_NO:
           mnemonic = _("_No");
+          stock_id = GTK_STOCK_NO;
           break;
 
         case THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_CANCEL:
           mnemonic = _("_Cancel");
+          stock_id = GTK_STOCK_CANCEL;
+          break;
           break;
 
         default:
@@ -342,6 +399,14 @@ thunar_progress_dialog_ask (ThunarProgressDialog           *dialog,
       gtk_dialog_add_action_widget (GTK_DIALOG (question), button, response);
       gtk_widget_show (button);
 
+      /* check if we should add an image to the button */
+      if (G_LIKELY (stock_id != NULL))
+        {
+          image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON);
+          gtk_button_set_image (GTK_BUTTON (button), image);
+          gtk_widget_show (image);
+        }
+
       gtk_dialog_set_default_response (GTK_DIALOG (question), response);
     }
 
-- 
GitLab