From 67e795eb7f28ebfb426a72e6f9637fc14cc3fb93 Mon Sep 17 00:00:00 2001
From: Benedikt Meurer <benny@xfce.org>
Date: Wed, 23 May 2007 21:30:42 +0000
Subject: [PATCH] 2007-05-23 Benedikt Meurer <benny@xfce.org>
* thunar-vfs/thunar-vfs-io-jobs.c, thunar-vfs/thunar-vfs-job.{c,h},
thunar-vfs/thunar-vfs-job-private.h, thunar/thunar-dialogs.c,
thunar-vfs/thunar-vfs-transfer-job.c: Add support to retry job
based operations.
* thunar-vfs/thunar-vfs-job-private.h, thunar-vfs-job.{c,h},
thunar-vfs/thunar-vfs-transfer-job.c, thunar/thunar-dialogs.{c,h},
thunar/thunar-progress-dialog.c, thunar-vfs/thunar-vfs-marshal.list:
Display more details when asking the user whether to replace an
existing file with another file. Bug #3268.
* po/tr.po: Revert broken file.
* po/*.po, po/*.pot: Merge new strings.
* po/de.po: Update german translations.
(Old svn revision: 25750)
---
ChangeLog | 15 +
po/ChangeLog | 11 +-
po/Thunar.pot | 103 +++--
po/ar.po | 106 +++--
po/be.po | 111 ++++--
po/ca.po | 106 +++--
po/cs.po | 111 ++++--
po/de.po | 111 ++++--
po/dz.po | 106 +++--
po/el.po | 106 +++--
po/en_GB.po | 106 +++--
po/eo.po | 115 ++++--
po/es.po | 110 ++++--
po/et.po | 110 ++++--
po/eu.po | 106 +++--
po/fi.po | 106 +++--
po/fr.po | 106 +++--
po/gl.po | 112 ++++--
po/he.po | 106 +++--
po/hu.po | 563 +++++++++++++++++----------
po/it.po | 112 ++++--
po/ja.po | 106 +++--
po/ka.po | 103 +++--
po/ko.po | 106 +++--
po/lt.po | 103 +++--
po/mk.po | 106 +++--
po/nb_NO.po | 106 +++--
po/nl.po | 106 +++--
po/pa.po | 106 +++--
po/pl.po | 111 ++++--
po/pt_BR.po | 106 +++--
po/ro.po | 106 +++--
po/ru.po | 106 +++--
po/sq.po | 106 +++--
po/sv.po | 106 +++--
po/tr.po | 349 ++++++++++++-----
po/uk.po | 106 +++--
po/zh_CN.po | 111 ++++--
po/zh_TW.po | 111 ++++--
thunar-vfs/thunar-vfs-io-jobs.c | 49 ++-
thunar-vfs/thunar-vfs-job-private.h | 7 +-
thunar-vfs/thunar-vfs-job.c | 185 ++++++++-
thunar-vfs/thunar-vfs-job.h | 20 +-
thunar-vfs/thunar-vfs-marshal.list | 1 +
thunar-vfs/thunar-vfs-transfer-job.c | 41 +-
thunar/thunar-dialogs.c | 174 ++++++++-
thunar/thunar-dialogs.h | 45 ++-
thunar/thunar-progress-dialog.c | 26 +-
48 files changed, 3791 insertions(+), 1455 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d811fa50a..b83f2c8eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2007-05-23 Benedikt Meurer <benny@xfce.org>
+
+ * thunar-vfs/thunar-vfs-io-jobs.c, thunar-vfs/thunar-vfs-job.{c,h},
+ thunar-vfs/thunar-vfs-job-private.h, thunar/thunar-dialogs.c,
+ thunar-vfs/thunar-vfs-transfer-job.c: Add support to retry job
+ based operations.
+ * thunar-vfs/thunar-vfs-job-private.h, thunar-vfs-job.{c,h},
+ thunar-vfs/thunar-vfs-transfer-job.c, thunar/thunar-dialogs.{c,h},
+ thunar/thunar-progress-dialog.c, thunar-vfs/thunar-vfs-marshal.list:
+ Display more details when asking the user whether to replace an
+ existing file with another file. Bug #3268.
+ * po/tr.po: Revert broken file.
+ * po/*.po, po/*.pot: Merge new strings.
+ * po/de.po: Update german translations.
+
2007-05-22 Benedikt Meurer <benny@xfce.org>
* configure.in.in, docs/README.thunarrc, thunar/: Add support for
diff --git a/po/ChangeLog b/po/ChangeLog
index daf70e57a..a9541cbfc 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,5 +1,12 @@
-2007-05-22 Eren Türkay <erenturkay@xfce.org>
- * tr.po: Updated.
+2007-05-23 Benedikt Meurer <benny@xfce.org>
+
+ * tr.po: Revert broken file.
+ * *.po, *.pot: Merge new strings.
+ * de.po: Update german translations.
+
+2007-05-22 Eren Turkay <erenturkay@xfce.org>
+
+ * tr.po: Updated.
2007-05-22 Benedikt Meurer <benny@xfce.org>
diff --git a/po/Thunar.pot b/po/Thunar.pot
index 7d74ec74d..d8efa1eae 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: 2007-05-22 18:30+0200\n"
+"POT-Creation-Date: 2007-05-23 23:24+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"
@@ -57,29 +57,29 @@ msgstr ""
msgid "Preparing..."
msgstr ""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:228
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:537
#, c-format
msgid "Failed to change permissions of \"%s\""
msgstr ""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:355
#, c-format
msgid "Failed to change file owner of \"%s\""
msgstr ""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:356
#, c-format
msgid "Failed to change file group of \"%s\""
msgstr ""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:444
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:190
#, c-format
msgid "The file \"%s\" already exists"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:462
#, c-format
msgid "Failed to create empty file \"%s\""
msgstr ""
@@ -237,11 +237,20 @@ msgstr ""
msgid "Cannot move or copy files within the trash"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-job.c:831
+#. no "ask-replace" handler, fallback to "ask"
+#: ../thunar-vfs/thunar-vfs-job.c:401
+#, c-format
+msgid ""
+"The file \"%s\" already exists. Would you like to replace it?\n"
+"\n"
+"If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-job.c:897
msgid "Do you want to overwrite it?"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-job.c:896
+#: ../thunar-vfs/thunar-vfs-job.c:1042
msgid "Do you want to skip it?"
msgstr ""
@@ -858,36 +867,83 @@ msgstr ""
msgid "Details view"
msgstr ""
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr ""
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:959
+#: ../thunar/thunar-dialogs.c:231 ../thunar/thunar-renamer-dialog.c:959
msgid "Failed to open the documentation browser"
msgstr ""
-#: ../thunar/thunar-dialogs.c:325
+#: ../thunar/thunar-dialogs.c:328
msgid "_Yes"
msgstr ""
-#: ../thunar/thunar-dialogs.c:329
+#: ../thunar/thunar-dialogs.c:332
msgid "Yes to _all"
msgstr ""
-#: ../thunar/thunar-dialogs.c:333
+#: ../thunar/thunar-dialogs.c:336
msgid "_No"
msgstr ""
-#: ../thunar/thunar-dialogs.c:337
+#: ../thunar/thunar-dialogs.c:340
msgid "N_o to all"
msgstr ""
-#: ../thunar/thunar-dialogs.c:342
+#: ../thunar/thunar-dialogs.c:344
+msgid "_Retry"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:349
msgid "_Cancel"
msgstr ""
+#. setup the confirmation dialog
+#: ../thunar/thunar-dialogs.c:429
+msgid "Confirm to replace files"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:435
+msgid "_Skip"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:436
+msgid "Replace _All"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:437
+msgid "_Replace"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:467
+#, c-format
+msgid "This folder already contains a file \"%s\"."
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:475
+msgid "ReplaceDialogPart1|Do you want to replace the existing file"
+msgstr ""
+
+#.
+#. Fourth box (size, volume, free space)
+#.
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:440
+msgid "Size:"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:401
+msgid "Modified:"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:500
+msgid "ReplaceDialogPart2|with the following file?"
+msgstr ""
+
#: ../thunar/thunar-dnd.c:70
msgid "_Copy here"
msgstr ""
@@ -1689,21 +1745,21 @@ msgstr ""
msgid "Failed to display the volume management settings"
msgstr ""
-#: ../thunar/thunar-progress-dialog.c:375
+#: ../thunar/thunar-progress-dialog.c:398
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
msgstr[0] ""
msgstr[1] ""
-#: ../thunar/thunar-progress-dialog.c:380
+#: ../thunar/thunar-progress-dialog.c:403
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
msgstr[0] ""
msgstr[1] ""
-#: ../thunar/thunar-progress-dialog.c:385
+#: ../thunar/thunar-progress-dialog.c:408
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1740,21 +1796,10 @@ msgstr ""
msgid "Deleted:"
msgstr ""
-#: ../thunar/thunar-properties-dialog.c:401
-msgid "Modified:"
-msgstr ""
-
#: ../thunar/thunar-properties-dialog.c:415
msgid "Accessed:"
msgstr ""
-#.
-#. Fourth box (size, volume, free space)
-#.
-#: ../thunar/thunar-properties-dialog.c:440
-msgid "Size:"
-msgstr ""
-
#: ../thunar/thunar-properties-dialog.c:453
msgid "Volume:"
msgstr ""
diff --git a/po/ar.po b/po/ar.po
index 95977b1a9..54537bc3a 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ar\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-22 18:30+0200\n"
+"POT-Creation-Date: 2007-05-23 23:24+0200\n"
"PO-Revision-Date: 2007-02-09 01:41+0200\n"
"Last-Translator: Mohamed Magdy <alnokta@yahoo.com>\n"
"Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -61,29 +61,29 @@ msgstr "اختر الملÙات لتغيير اسمها"
msgid "Preparing..."
msgstr "تØضير..."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:228
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:537
#, fuzzy, c-format
msgid "Failed to change permissions of \"%s\""
msgstr "أخÙÙ‚ ÙÙŠ تغيير صلاØيات المل٠\"%s\": %s"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:355
#, fuzzy, c-format
msgid "Failed to change file owner of \"%s\""
msgstr "أخÙÙ‚ ÙÙŠ تغيير ملكية المل٠\"%s\": %s"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:356
#, fuzzy, c-format
msgid "Failed to change file group of \"%s\""
msgstr "أخÙÙ‚ ÙÙŠ تغيير مجموعة المل٠\"%s\": %s"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:444
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:190
#, c-format
msgid "The file \"%s\" already exists"
msgstr "المل٠\"%s\" موجود مسبقا"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:462
#, c-format
msgid "Failed to create empty file \"%s\""
msgstr "Ùشل ÙÙŠ انشاء المجلد \"%s\""
@@ -243,7 +243,16 @@ msgstr ""
msgid "Cannot move or copy files within the trash"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-job.c:831
+#. no "ask-replace" handler, fallback to "ask"
+#: ../thunar-vfs/thunar-vfs-job.c:401
+#, c-format
+msgid ""
+"The file \"%s\" already exists. Would you like to replace it?\n"
+"\n"
+"If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-job.c:897
#, fuzzy
msgid "Do you want to overwrite it?"
msgstr ""
@@ -251,7 +260,7 @@ msgstr ""
"↵\n"
"هل تريد إستبداله؟"
-#: ../thunar-vfs/thunar-vfs-job.c:896
+#: ../thunar-vfs/thunar-vfs-job.c:1042
#, fuzzy
msgid "Do you want to skip it?"
msgstr ""
@@ -881,37 +890,87 @@ msgstr "لائØØ© Ù…Ùصلة للمجلدات"
msgid "Details view"
msgstr "تÙاصيل"
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr "المشاركون ÙÙŠ الترجمة"
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:959
+#: ../thunar/thunar-dialogs.c:231 ../thunar/thunar-renamer-dialog.c:959
msgid "Failed to open the documentation browser"
msgstr ""
-#: ../thunar/thunar-dialogs.c:325
+#: ../thunar/thunar-dialogs.c:328
msgid "_Yes"
msgstr "_نعم"
-#: ../thunar/thunar-dialogs.c:329
+#: ../thunar/thunar-dialogs.c:332
msgid "Yes to _all"
msgstr "نعم لل_جميع"
-#: ../thunar/thunar-dialogs.c:333
+#: ../thunar/thunar-dialogs.c:336
msgid "_No"
msgstr "_ï»»"
-#: ../thunar/thunar-dialogs.c:337
+#: ../thunar/thunar-dialogs.c:340
#, fuzzy
msgid "N_o to all"
msgstr "نعم لل_جميع"
-#: ../thunar/thunar-dialogs.c:342
+#: ../thunar/thunar-dialogs.c:344
+#, fuzzy
+msgid "_Retry"
+msgstr "_مجلدات"
+
+#: ../thunar/thunar-dialogs.c:349
msgid "_Cancel"
msgstr "_إلغاء"
+#. setup the confirmation dialog
+#: ../thunar/thunar-dialogs.c:429
+msgid "Confirm to replace files"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:435
+msgid "_Skip"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:436
+#, fuzzy
+msgid "Replace _All"
+msgstr "عوض_بـ: "
+
+#: ../thunar/thunar-dialogs.c:437
+#, fuzzy
+msgid "_Replace"
+msgstr "غير إسم"
+
+#: ../thunar/thunar-dialogs.c:467
+#, c-format
+msgid "This folder already contains a file \"%s\"."
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:475
+msgid "ReplaceDialogPart1|Do you want to replace the existing file"
+msgstr ""
+
+#.
+#. Fourth box (size, volume, free space)
+#.
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:440
+msgid "Size:"
+msgstr "Øجم:"
+
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:401
+msgid "Modified:"
+msgstr "تغير:"
+
+#: ../thunar/thunar-dialogs.c:500
+msgid "ReplaceDialogPart2|with the following file?"
+msgstr ""
+
#: ../thunar/thunar-dnd.c:70
msgid "_Copy here"
msgstr "_إنسخ هنا"
@@ -1737,7 +1796,7 @@ msgstr ""
msgid "Failed to display the volume management settings"
msgstr ""
-#: ../thunar/thunar-progress-dialog.c:375
+#: ../thunar/thunar-progress-dialog.c:398
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
@@ -1745,7 +1804,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../thunar/thunar-progress-dialog.c:380
+#: ../thunar/thunar-progress-dialog.c:403
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
@@ -1753,7 +1812,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../thunar/thunar-progress-dialog.c:385
+#: ../thunar/thunar-progress-dialog.c:408
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1792,21 +1851,10 @@ msgstr "هد٠الوصلة:"
msgid "Deleted:"
msgstr "_ØØ°Ù"
-#: ../thunar/thunar-properties-dialog.c:401
-msgid "Modified:"
-msgstr "تغير:"
-
#: ../thunar/thunar-properties-dialog.c:415
msgid "Accessed:"
msgstr ""
-#.
-#. Fourth box (size, volume, free space)
-#.
-#: ../thunar/thunar-properties-dialog.c:440
-msgid "Size:"
-msgstr "Øجم:"
-
#: ../thunar/thunar-properties-dialog.c:453
msgid "Volume:"
msgstr ""
diff --git a/po/be.po b/po/be.po
index 0facd8f38..f24752c07 100644
--- a/po/be.po
+++ b/po/be.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-22 18:30+0200\n"
+"POT-Creation-Date: 2007-05-23 23:24+0200\n"
"PO-Revision-Date: 2007-03-31 02:00+0300\n"
"Last-Translator: Alexander Nyakhaychyk <nyakhaychyk@gmail.com>\n"
"Language-Team: Belarusian <be@li.org>\n"
@@ -58,29 +58,29 @@ msgstr "Перайменаваць можна толькі тутÑÐ¹ÑˆÑ‹Ñ Ñ„Ð°
msgid "Preparing..."
msgstr "Ðдбываецца падрыхтоўка..."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:228
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:537
#, c-format
msgid "Failed to change permissions of \"%s\""
msgstr "Ðемагчыма зьмÑніць правы на \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:355
#, c-format
msgid "Failed to change file owner of \"%s\""
msgstr "Ðемагчыма зьмÑніць уладальніка \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:356
#, c-format
msgid "Failed to change file group of \"%s\""
msgstr "Ðемагчыма зьмÑніць групу \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:444
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:190
#, c-format
msgid "The file \"%s\" already exists"
msgstr "Файл \"%s\" ужо Ñ–Ñнуе"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:462
#, c-format
msgid "Failed to create empty file \"%s\""
msgstr "Ðемагчыма Ñтварыць пуÑÑ‚Ñ‹ файл\"%s\""
@@ -240,11 +240,20 @@ msgstr "Сьметніца"
msgid "Cannot move or copy files within the trash"
msgstr "Ðемагчыма перамÑÑьціць або ÑкапіÑваць файлы Ñž Ñьметніцу"
-#: ../thunar-vfs/thunar-vfs-job.c:831
+#. no "ask-replace" handler, fallback to "ask"
+#: ../thunar-vfs/thunar-vfs-job.c:401
+#, fuzzy, c-format
+msgid ""
+"The file \"%s\" already exists. Would you like to replace it?\n"
+"\n"
+"If you replace an existing file, its contents will be overwritten."
+msgstr "Файл \"%s\" ужо Ñ–Ñнуе. Ці жадаеце замÑніць Ñго пуÑтым файлам?"
+
+#: ../thunar-vfs/thunar-vfs-job.c:897
msgid "Do you want to overwrite it?"
msgstr "Ці жадаеце перазапіÑаць Ñго?"
-#: ../thunar-vfs/thunar-vfs-job.c:896
+#: ../thunar-vfs/thunar-vfs-job.c:1042
msgid "Do you want to skip it?"
msgstr "Ці жадаеце абмінуць Ñго?"
@@ -892,36 +901,86 @@ msgstr "ПадрабÑзны ÑÑŒÐ¿Ñ–Ñ Ð·ÑŒÐ¼ÐµÑту Ñ‚Ñчкі"
msgid "Details view"
msgstr "ПадрабÑзны выглÑд"
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr "Alexander Nyakhaychyk"
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:959
+#: ../thunar/thunar-dialogs.c:231 ../thunar/thunar-renamer-dialog.c:959
msgid "Failed to open the documentation browser"
msgstr "Ðемагчыма адкрыць гартач дакумÑнтаў"
-#: ../thunar/thunar-dialogs.c:325
+#: ../thunar/thunar-dialogs.c:328
msgid "_Yes"
msgstr "_Так"
-#: ../thunar/thunar-dialogs.c:329
+#: ../thunar/thunar-dialogs.c:332
msgid "Yes to _all"
msgstr "Так Ð´Ð»Ñ _ÑžÑÑ–Ñ…"
-#: ../thunar/thunar-dialogs.c:333
+#: ../thunar/thunar-dialogs.c:336
msgid "_No"
msgstr "_Ðе"
-#: ../thunar/thunar-dialogs.c:337
+#: ../thunar/thunar-dialogs.c:340
msgid "N_o to all"
msgstr "Ð_е, Ð´Ð»Ñ ÑžÑÑ–Ñ…"
-#: ../thunar/thunar-dialogs.c:342
+#: ../thunar/thunar-dialogs.c:344
+#, fuzzy
+msgid "_Retry"
+msgstr "Ðдна_віць"
+
+#: ../thunar/thunar-dialogs.c:349
msgid "_Cancel"
msgstr "_СкаÑаваць"
+#. setup the confirmation dialog
+#: ../thunar/thunar-dialogs.c:429
+msgid "Confirm to replace files"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:435
+msgid "_Skip"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:436
+#, fuzzy
+msgid "Replace _All"
+msgstr "ЗамÑніць _на:"
+
+#: ../thunar/thunar-dialogs.c:437
+#, fuzzy
+msgid "_Replace"
+msgstr "Перай_менаваць"
+
+#: ../thunar/thunar-dialogs.c:467
+#, c-format
+msgid "This folder already contains a file \"%s\"."
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:475
+msgid "ReplaceDialogPart1|Do you want to replace the existing file"
+msgstr ""
+
+#.
+#. Fourth box (size, volume, free space)
+#.
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:440
+msgid "Size:"
+msgstr "Памер:"
+
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:401
+msgid "Modified:"
+msgstr "Зьменены:"
+
+#: ../thunar/thunar-dialogs.c:500
+msgid "ReplaceDialogPart2|with the following file?"
+msgstr ""
+
#: ../thunar/thunar-dnd.c:70
msgid "_Copy here"
msgstr "С_капіÑваць Ñюды"
@@ -1778,7 +1837,7 @@ msgstr ""
msgid "Failed to display the volume management settings"
msgstr "Ðемагчыма адлюÑтарваць наÑтаўленьні кіраўніка ноÑьбітаў"
-#: ../thunar/thunar-progress-dialog.c:375
+#: ../thunar/thunar-progress-dialog.c:398
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
@@ -1786,7 +1845,7 @@ msgstr[0] "(заÑталаÑÑ %lu гадзіна)"
msgstr[1] "(заÑталоÑÑ %lu гадзіны)"
msgstr[2] "(заÑталоÑÑ %lu гадзін)"
-#: ../thunar/thunar-progress-dialog.c:380
+#: ../thunar/thunar-progress-dialog.c:403
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
@@ -1794,7 +1853,7 @@ msgstr[0] "(заÑталаÑÑ %lu хвіліна)"
msgstr[1] "(заÑталоÑÑ %lu хвіліны)"
msgstr[2] "(заÑталоÑÑ %lu хвілін)"
-#: ../thunar/thunar-progress-dialog.c:385
+#: ../thunar/thunar-progress-dialog.c:408
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1832,21 +1891,10 @@ msgstr "ÐœÑта ÑпаÑылкі:"
msgid "Deleted:"
msgstr "Выдалены:"
-#: ../thunar/thunar-properties-dialog.c:401
-msgid "Modified:"
-msgstr "Зьменены:"
-
#: ../thunar/thunar-properties-dialog.c:415
msgid "Accessed:"
msgstr "Ðпошні доÑтуп:"
-#.
-#. Fourth box (size, volume, free space)
-#.
-#: ../thunar/thunar-properties-dialog.c:440
-msgid "Size:"
-msgstr "Памер:"
-
#: ../thunar/thunar-properties-dialog.c:453
msgid "Volume:"
msgstr "Том:"
@@ -3419,11 +3467,6 @@ msgstr "Ðдкрыць Ð²Ñ‹Ð·Ð½Ð°Ñ‡Ð°Ð½Ñ‹Ñ Ñ‚Ñчкі Ñž Thunar"
#~ msgid "Failed to determine file info of \"%s\": %s"
#~ msgstr "Ðемагчыма вызначыць зьвеÑткі Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð° \"%s\": %s"
-#~ msgid ""
-#~ "The file \"%s\" already exists. Do you want to replace it with an empty "
-#~ "file?"
-#~ msgstr "Файл \"%s\" ужо Ñ–Ñнуе. Ці жадаеце замÑніць Ñго пуÑтым файлам?"
-
#~ msgid ""
#~ "Failed to remove \"%s\".\n"
#~ "\n"
diff --git a/po/ca.po b/po/ca.po
index c9345d86d..358dcfd3c 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-22 18:30+0200\n"
+"POT-Creation-Date: 2007-05-23 23:24+0200\n"
"PO-Revision-Date: 2007-04-05 13:55+0200\n"
"Last-Translator: Pau Ruŀlan Ferragut <paurullan@bulma.net>\n"
"Language-Team: Catalan\n"
@@ -59,29 +59,29 @@ msgstr "Sols podeu canviar el nom als fitxers locals"
msgid "Preparing..."
msgstr "S’està preparant"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:228
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:537
#, c-format
msgid "Failed to change permissions of \"%s\""
msgstr "No s’han pogut canviar els permisos del fitxer «%s»"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:355
#, c-format
msgid "Failed to change file owner of \"%s\""
msgstr "No s’ha pogut canviar el propietari del fitxer «%s»"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:356
#, c-format
msgid "Failed to change file group of \"%s\""
msgstr "No s’ha pogut canviar el grup del fitxer «%s»"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:444
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:190
#, c-format
msgid "The file \"%s\" already exists"
msgstr "El fitxer «%s» ja existeix"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:462
#, c-format
msgid "Failed to create empty file \"%s\""
msgstr "No s’ha pogut crear el fitxer buit «%s»"
@@ -239,11 +239,20 @@ msgstr "Paperera"
msgid "Cannot move or copy files within the trash"
msgstr "No es pot ni copiar ni moure fitxers dintre la paperera"
-#: ../thunar-vfs/thunar-vfs-job.c:831
+#. no "ask-replace" handler, fallback to "ask"
+#: ../thunar-vfs/thunar-vfs-job.c:401
+#, c-format
+msgid ""
+"The file \"%s\" already exists. Would you like to replace it?\n"
+"\n"
+"If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-job.c:897
msgid "Do you want to overwrite it?"
msgstr "Voleu sobreescriure-ho?"
-#: ../thunar-vfs/thunar-vfs-job.c:896
+#: ../thunar-vfs/thunar-vfs-job.c:1042
msgid "Do you want to skip it?"
msgstr "Voleu ometre-ho?"
@@ -889,36 +898,86 @@ msgstr "Llistat detallat de directoris"
msgid "Details view"
msgstr "Mostra detalls"
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr "Crèdits de traductors"
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:959
+#: ../thunar/thunar-dialogs.c:231 ../thunar/thunar-renamer-dialog.c:959
msgid "Failed to open the documentation browser"
msgstr "No s’ha pogut obrir el visor de documentació"
-#: ../thunar/thunar-dialogs.c:325
+#: ../thunar/thunar-dialogs.c:328
msgid "_Yes"
msgstr "_SÃ"
-#: ../thunar/thunar-dialogs.c:329
+#: ../thunar/thunar-dialogs.c:332
msgid "Yes to _all"
msgstr "Si _a tot"
-#: ../thunar/thunar-dialogs.c:333
+#: ../thunar/thunar-dialogs.c:336
msgid "_No"
msgstr "_No"
-#: ../thunar/thunar-dialogs.c:337
+#: ../thunar/thunar-dialogs.c:340
msgid "N_o to all"
msgstr "N_o a tot"
-#: ../thunar/thunar-dialogs.c:342
+#: ../thunar/thunar-dialogs.c:344
+#, fuzzy
+msgid "_Retry"
+msgstr "_Restaurar"
+
+#: ../thunar/thunar-dialogs.c:349
msgid "_Cancel"
msgstr "_Canceŀla"
+#. setup the confirmation dialog
+#: ../thunar/thunar-dialogs.c:429
+msgid "Confirm to replace files"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:435
+msgid "_Skip"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:436
+#, fuzzy
+msgid "Replace _All"
+msgstr "_Reemplaça amb:"
+
+#: ../thunar/thunar-dialogs.c:437
+#, fuzzy
+msgid "_Replace"
+msgstr "_Canvia el nom"
+
+#: ../thunar/thunar-dialogs.c:467
+#, c-format
+msgid "This folder already contains a file \"%s\"."
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:475
+msgid "ReplaceDialogPart1|Do you want to replace the existing file"
+msgstr ""
+
+#.
+#. Fourth box (size, volume, free space)
+#.
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:440
+msgid "Size:"
+msgstr "Mida:"
+
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:401
+msgid "Modified:"
+msgstr "Modificat:"
+
+#: ../thunar/thunar-dialogs.c:500
+msgid "ReplaceDialogPart2|with the following file?"
+msgstr ""
+
#: ../thunar/thunar-dnd.c:70
msgid "_Copy here"
msgstr "_Copiar aquÃ"
@@ -1765,21 +1824,21 @@ msgstr ""
msgid "Failed to display the volume management settings"
msgstr "No s’han pogut mostrar els parà metres del gestor de volums"
-#: ../thunar/thunar-progress-dialog.c:375
+#: ../thunar/thunar-progress-dialog.c:398
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
msgstr[0] "(queda %lu hora)"
msgstr[1] "(queden %lu hores)"
-#: ../thunar/thunar-progress-dialog.c:380
+#: ../thunar/thunar-progress-dialog.c:403
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
msgstr[0] "(queda %lu minut)"
msgstr[1] "(queden %lu minuts)"
-#: ../thunar/thunar-progress-dialog.c:385
+#: ../thunar/thunar-progress-dialog.c:408
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1816,21 +1875,10 @@ msgstr "Objectiu de l’enllaç:"
msgid "Deleted:"
msgstr "_Suprimit:"
-#: ../thunar/thunar-properties-dialog.c:401
-msgid "Modified:"
-msgstr "Modificat:"
-
#: ../thunar/thunar-properties-dialog.c:415
msgid "Accessed:"
msgstr "Accedit:"
-#.
-#. Fourth box (size, volume, free space)
-#.
-#: ../thunar/thunar-properties-dialog.c:440
-msgid "Size:"
-msgstr "Mida:"
-
#: ../thunar/thunar-properties-dialog.c:453
msgid "Volume:"
msgstr "Volum:"
diff --git a/po/cs.po b/po/cs.po
index a868692fd..eefda63b4 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-22 18:30+0200\n"
+"POT-Creation-Date: 2007-05-23 23:24+0200\n"
"PO-Revision-Date: 2007-01-14 19:19+0100\n"
"Last-Translator: Michal Várady <miko.vaji@gmail.com>\n"
"Language-Team: Čeština <translation-team-cs@lists.sourceforge.net>\n"
@@ -56,29 +56,29 @@ msgstr "PÅ™ejmenovány mohou být pouze mÃstnà soubory"
msgid "Preparing..."
msgstr "Připravuji..."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:228
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:537
#, c-format
msgid "Failed to change permissions of \"%s\""
msgstr "NepodaÅ™ilo se nastavit pÅ™Ãstupová práva k souboru \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:355
#, c-format
msgid "Failed to change file owner of \"%s\""
msgstr "NepodaÅ™ilo se zmÄ›nit vlastnÃka souboru \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:356
#, c-format
msgid "Failed to change file group of \"%s\""
msgstr "Nepodařilo se změnit skupinu souboru \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:444
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:190
#, c-format
msgid "The file \"%s\" already exists"
msgstr "Soubor \"%s\" již existuje"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:462
#, c-format
msgid "Failed to create empty file \"%s\""
msgstr "Nepodařilo se vytvořit prázdný soubor \"%s\""
@@ -238,11 +238,20 @@ msgstr "Koš"
msgid "Cannot move or copy files within the trash"
msgstr "Soubory nelze pÅ™esunout nebo zkopÃrovat do koÅ¡e"
-#: ../thunar-vfs/thunar-vfs-job.c:831
+#. no "ask-replace" handler, fallback to "ask"
+#: ../thunar-vfs/thunar-vfs-job.c:401
+#, fuzzy, c-format
+msgid ""
+"The file \"%s\" already exists. Would you like to replace it?\n"
+"\n"
+"If you replace an existing file, its contents will be overwritten."
+msgstr "Soubor \"%s\" již existuje. Chcete jej nahradit prázdným souborem?"
+
+#: ../thunar-vfs/thunar-vfs-job.c:897
msgid "Do you want to overwrite it?"
msgstr "Chcete jej přepsat?"
-#: ../thunar-vfs/thunar-vfs-job.c:896
+#: ../thunar-vfs/thunar-vfs-job.c:1042
msgid "Do you want to skip it?"
msgstr "Chcete jej pÅ™eskoÄit?"
@@ -879,36 +888,86 @@ msgstr "Podrobný výpis adresáře"
msgid "Details view"
msgstr "Zobrazit podrobnosti"
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr "translator-credits"
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:959
+#: ../thunar/thunar-dialogs.c:231 ../thunar/thunar-renamer-dialog.c:959
msgid "Failed to open the documentation browser"
msgstr "NepodaÅ™ilo se otevÅ™Ãt prohlÞeÄ dokumentace"
-#: ../thunar/thunar-dialogs.c:325
+#: ../thunar/thunar-dialogs.c:328
msgid "_Yes"
msgstr "_Ano"
-#: ../thunar/thunar-dialogs.c:329
+#: ../thunar/thunar-dialogs.c:332
msgid "Yes to _all"
msgstr "Ano pro _všechny"
-#: ../thunar/thunar-dialogs.c:333
+#: ../thunar/thunar-dialogs.c:336
msgid "_No"
msgstr "_Ne"
-#: ../thunar/thunar-dialogs.c:337
+#: ../thunar/thunar-dialogs.c:340
msgid "N_o to all"
msgstr "N_e pro všechny"
-#: ../thunar/thunar-dialogs.c:342
+#: ../thunar/thunar-dialogs.c:344
+#, fuzzy
+msgid "_Retry"
+msgstr "_Obnovit"
+
+#: ../thunar/thunar-dialogs.c:349
msgid "_Cancel"
msgstr "_Zrušit"
+#. setup the confirmation dialog
+#: ../thunar/thunar-dialogs.c:429
+msgid "Confirm to replace files"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:435
+msgid "_Skip"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:436
+#, fuzzy
+msgid "Replace _All"
+msgstr "Nahra_dit:"
+
+#: ../thunar/thunar-dialogs.c:437
+#, fuzzy
+msgid "_Replace"
+msgstr "_Přejmenovat"
+
+#: ../thunar/thunar-dialogs.c:467
+#, c-format
+msgid "This folder already contains a file \"%s\"."
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:475
+msgid "ReplaceDialogPart1|Do you want to replace the existing file"
+msgstr ""
+
+#.
+#. Fourth box (size, volume, free space)
+#.
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:440
+msgid "Size:"
+msgstr "Velikost:"
+
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:401
+msgid "Modified:"
+msgstr "Změněno:"
+
+#: ../thunar/thunar-dialogs.c:500
+msgid "ReplaceDialogPart2|with the following file?"
+msgstr ""
+
#: ../thunar/thunar-dnd.c:70
msgid "_Copy here"
msgstr "ZkopÃrovat _sem"
@@ -1768,7 +1827,7 @@ msgstr ""
msgid "Failed to display the volume management settings"
msgstr "Nepodařilo se zobrazit nastavenà správy svazků"
-#: ../thunar/thunar-progress-dialog.c:375
+#: ../thunar/thunar-progress-dialog.c:398
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
@@ -1776,7 +1835,7 @@ msgstr[0] "(zbývá %lu hodina)"
msgstr[1] "(zbývajà %lu hodiny)"
msgstr[2] "(zbýváà %lu hodin)"
-#: ../thunar/thunar-progress-dialog.c:380
+#: ../thunar/thunar-progress-dialog.c:403
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
@@ -1784,7 +1843,7 @@ msgstr[0] "(zbývá %lu minuta)"
msgstr[1] "(zbývajà %lu minuty)"
msgstr[2] "(zbývá %lu minut)"
-#: ../thunar/thunar-progress-dialog.c:385
+#: ../thunar/thunar-progress-dialog.c:408
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1822,21 +1881,10 @@ msgstr "CÃl odkazu:"
msgid "Deleted:"
msgstr "Smazané:"
-#: ../thunar/thunar-properties-dialog.c:401
-msgid "Modified:"
-msgstr "Změněno:"
-
#: ../thunar/thunar-properties-dialog.c:415
msgid "Accessed:"
msgstr "Poslednà pÅ™Ãstup:"
-#.
-#. Fourth box (size, volume, free space)
-#.
-#: ../thunar/thunar-properties-dialog.c:440
-msgid "Size:"
-msgstr "Velikost:"
-
#: ../thunar/thunar-properties-dialog.c:453
msgid "Volume:"
msgstr "Svazek:"
@@ -3444,11 +3492,6 @@ msgstr "OtevÅ™Ãt specifikované adresáře aplikacà Thunar"
#~ msgid "Failed to determine file info of \"%s\": %s"
#~ msgstr "NezdaÅ™ilo se zÃskat informace o souboru \"%s\": %s"
-#~ msgid ""
-#~ "The file \"%s\" already exists. Do you want to replace it with an empty "
-#~ "file?"
-#~ msgstr "Soubor \"%s\" již existuje. Chcete jej nahradit prázdným souborem?"
-
#~ msgid ""
#~ "Failed to remove \"%s\".\n"
#~ "\n"
diff --git a/po/de.po b/po/de.po
index 981575dff..11409f363 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-22 18:30+0200\n"
-"PO-Revision-Date: 2007-05-22 18:16+0100\n"
+"POT-Creation-Date: 2007-05-23 23:24+0200\n"
+"PO-Revision-Date: 2007-05-23 23:10+0100\n"
"Last-Translator: Benedikt Meurer <benny@xfce.org>\n"
"Language-Team: German <de@li.org>\n"
"MIME-Version: 1.0\n"
@@ -58,29 +58,29 @@ msgstr "Ausschließlich lokale Dateien können umbenannt werden"
msgid "Preparing..."
msgstr "Vorbereiten..."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:228
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:537
#, c-format
msgid "Failed to change permissions of \"%s\""
msgstr "Die Berechtigungen von »%s« konnte nicht geändert werden"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:355
#, c-format
msgid "Failed to change file owner of \"%s\""
msgstr "Der Besitzer von »%s« konnte nicht geändert werden"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:356
#, c-format
msgid "Failed to change file group of \"%s\""
msgstr "Die Gruppe von »%s« konnte nicht geändert werden"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:444
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:190
#, c-format
msgid "The file \"%s\" already exists"
msgstr "Die Datei »%s« existiert bereits"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:462
#, c-format
msgid "Failed to create empty file \"%s\""
msgstr "Die Datei »%s« konnte nicht erstellt werden"
@@ -238,11 +238,23 @@ msgstr "Papierkorb"
msgid "Cannot move or copy files within the trash"
msgstr "Dateien können nicht innerhalb des Papierkorbs verschoben werden"
-#: ../thunar-vfs/thunar-vfs-job.c:831
+#. no "ask-replace" handler, fallback to "ask"
+#: ../thunar-vfs/thunar-vfs-job.c:401
+#, c-format
+msgid ""
+"The file \"%s\" already exists. Would you like to replace it?\n"
+"\n"
+"If you replace an existing file, its contents will be overwritten."
+msgstr ""
+"Die Datei »%s« existiert bereits. Wollen Sie sie ersetzen?\n"
+"\n"
+"Falls Sie eine existierende Datei ersetzen, wird deren Inhalt überschrieben."
+
+#: ../thunar-vfs/thunar-vfs-job.c:897
msgid "Do you want to overwrite it?"
msgstr "Wollen Sie diese überschreiben?"
-#: ../thunar-vfs/thunar-vfs-job.c:896
+#: ../thunar-vfs/thunar-vfs-job.c:1042
msgid "Do you want to skip it?"
msgstr "Wollen Sie diese überspringen?"
@@ -895,7 +907,7 @@ msgstr "Detaillierte Ordneransicht"
msgid "Details view"
msgstr "Detailansicht"
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr ""
"Benedikt Meurer <benny@xfce.org>\n"
@@ -904,30 +916,77 @@ msgstr ""
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:959
+#: ../thunar/thunar-dialogs.c:231 ../thunar/thunar-renamer-dialog.c:959
msgid "Failed to open the documentation browser"
msgstr "Die Dokumentation konnte nicht angezeigt werden"
-#: ../thunar/thunar-dialogs.c:325
+#: ../thunar/thunar-dialogs.c:328
msgid "_Yes"
msgstr "_Ja"
-#: ../thunar/thunar-dialogs.c:329
+#: ../thunar/thunar-dialogs.c:332
msgid "Yes to _all"
-msgstr "Ja zu _allen"
+msgstr "Ja _zu allen"
-#: ../thunar/thunar-dialogs.c:333
+#: ../thunar/thunar-dialogs.c:336
msgid "_No"
msgstr "_Nein"
-#: ../thunar/thunar-dialogs.c:337
+#: ../thunar/thunar-dialogs.c:340
msgid "N_o to all"
msgstr "Nein zu a_llen"
-#: ../thunar/thunar-dialogs.c:342
+#: ../thunar/thunar-dialogs.c:344
+msgid "_Retry"
+msgstr "_Wiederholen"
+
+#: ../thunar/thunar-dialogs.c:349
msgid "_Cancel"
msgstr "_Abbrechen"
+#. setup the confirmation dialog
+#: ../thunar/thunar-dialogs.c:429
+msgid "Confirm to replace files"
+msgstr "Ersetzen von Dateien bestätigen"
+
+#: ../thunar/thunar-dialogs.c:435
+msgid "_Skip"
+msgstr "Ü_berspringen"
+
+#: ../thunar/thunar-dialogs.c:436
+msgid "Replace _All"
+msgstr "A_lle ersetzen"
+
+#: ../thunar/thunar-dialogs.c:437
+msgid "_Replace"
+msgstr "_Ersetzen"
+
+#: ../thunar/thunar-dialogs.c:467
+#, c-format
+msgid "This folder already contains a file \"%s\"."
+msgstr "Dieser Ordner enthält bereits eine Datei »%s«."
+
+#: ../thunar/thunar-dialogs.c:475
+msgid "ReplaceDialogPart1|Do you want to replace the existing file"
+msgstr "Wollen Sie die existierende Datei"
+
+#.
+#. Fourth box (size, volume, free space)
+#.
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:440
+msgid "Size:"
+msgstr "Größe:"
+
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:401
+msgid "Modified:"
+msgstr "Geändert:"
+
+#: ../thunar/thunar-dialogs.c:500
+msgid "ReplaceDialogPart2|with the following file?"
+msgstr "mit dieser ersetzen?"
+
#: ../thunar/thunar-dnd.c:70
msgid "_Copy here"
msgstr "Hierher _kopieren"
@@ -1784,21 +1843,21 @@ msgid "Failed to display the volume management settings"
msgstr ""
"Die Einstellungen der Datenträgerverwaltung konnten nicht geöffnet werden"
-#: ../thunar/thunar-progress-dialog.c:375
+#: ../thunar/thunar-progress-dialog.c:398
#, 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:380
+#: ../thunar/thunar-progress-dialog.c:403
#, 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:385
+#: ../thunar/thunar-progress-dialog.c:408
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1835,21 +1894,10 @@ msgstr "Verknüpfungsziel:"
msgid "Deleted:"
msgstr "Gelöscht:"
-#: ../thunar/thunar-properties-dialog.c:401
-msgid "Modified:"
-msgstr "Geändert:"
-
#: ../thunar/thunar-properties-dialog.c:415
msgid "Accessed:"
msgstr "Zugegriffen:"
-#.
-#. Fourth box (size, volume, free space)
-#.
-#: ../thunar/thunar-properties-dialog.c:440
-msgid "Size:"
-msgstr "Größe:"
-
#: ../thunar/thunar-properties-dialog.c:453
msgid "Volume:"
msgstr "Datenträger:"
@@ -3424,4 +3472,3 @@ msgstr "Ordner in Thunar öffnen"
#: ../Thunar-folder-handler.desktop.in.in.h:3
msgid "Open the specified folders in Thunar"
msgstr "Angegebene Ordner mit Thunar öffnen"
-
diff --git a/po/dz.po b/po/dz.po
index a94d37345..f6a0e0b31 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-22 18:30+0200\n"
+"POT-Creation-Date: 2007-05-23 23:24+0200\n"
"PO-Revision-Date: 2006-10-24 16:21+0530\n"
"Last-Translator: sonam pelden <sonaa_peldn@yahoo.com>\n"
"Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
@@ -59,29 +59,29 @@ msgstr "ཉེ་གནས་ཡིག་སྣོད་ཚུ་རà¾à¾±à½„མ
msgid "Preparing..."
msgstr "གྲ་སྒྲིག་འབད་དོ..."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:228
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:537
#, c-format
msgid "Failed to change permissions of \"%s\""
msgstr "\"%s\" གི་སྣང་བ་བསྒྱུར་བཅོས་འབད་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½ བྱུང་ནུག"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:355
#, c-format
msgid "Failed to change file owner of \"%s\""
msgstr "\"%s\"གི་ ཡིག་སྣོད་བདག་པོ་བསྒྱུར་བཅོས་འབད་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½ བྱུང་ནུག"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:356
#, c-format
msgid "Failed to change file group of \"%s\""
msgstr "\"%s\"གི་ ཡིག་སྣོད་སྡེ་ཚན་བསྒྱུར་བཅོས་འབད་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½ བྱུང་ནུག"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:444
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:190
#, c-format
msgid "The file \"%s\" already exists"
msgstr "ཡིག་སྣོད་ \"%s\" འདི་ཧེ་མ་ལས་རང་གནས་à½à½ºà¼‹à½ དུག"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:462
#, c-format
msgid "Failed to create empty file \"%s\""
msgstr "\"%s\"ཡིག་སྣོད་སྟོངམ་གསར་བསà¾à¾²à½´à½“་འབད་ནི་ལུ་ འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½ བྱུང་ནུག"
@@ -239,11 +239,20 @@ msgstr "ཕྱགས་ཧོདà¼"
msgid "Cannot move or copy files within the trash"
msgstr "ཕྱགས་ཧོད་ནང་འà½à½¼à½‘་ལུ་ ཡིག་སྣོད་ཚུ་འདྲ་བཤུས་བརà¾à¾±à½–་ནི་ཡང་ན་ སྤོ་བཤུད་འབད་མི་ཚུགསà¼"
-#: ../thunar-vfs/thunar-vfs-job.c:831
+#. no "ask-replace" handler, fallback to "ask"
+#: ../thunar-vfs/thunar-vfs-job.c:401
+#, c-format
+msgid ""
+"The file \"%s\" already exists. Would you like to replace it?\n"
+"\n"
+"If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-job.c:897
msgid "Do you want to overwrite it?"
msgstr "à½à¾±à½¼à½‘་ཀྱིས་ཚབ་སྲུང་འབད་ནི་ཨིན་ན?"
-#: ../thunar-vfs/thunar-vfs-job.c:896
+#: ../thunar-vfs/thunar-vfs-job.c:1042
msgid "Do you want to skip it?"
msgstr "à½à¾±à½¼à½‘་ཀྱིས་གོམ་འགྱོ་ནི་ཨིན་ན?"
@@ -888,36 +897,86 @@ msgstr "རྒྱས་བཤད་འབད་ཡོད་པའི་སྣོ
msgid "Details view"
msgstr "མà½à½¼à½„་སྣང་ཚུ་ རྒྱས་བཤད་འབདà½à¼‹à½¨à½²à½“à¼"
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr "སà¾à½‘་བསྒྱུར་པའི་-ངོ་བསྟོད་ཚུà¼"
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:959
+#: ../thunar/thunar-dialogs.c:231 ../thunar/thunar-renamer-dialog.c:959
msgid "Failed to open the documentation browser"
msgstr "ཡིག་à½à½¼à½‚་བཀོད་པའི་བརྡ་འཚོལ་པ་འདི་à½à¼‹à½•à¾±à½ºà¼‹à½“ི་ལུ་ འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½ བྱུང་ནུག"
-#: ../thunar/thunar-dialogs.c:325
+#: ../thunar/thunar-dialogs.c:328
msgid "_Yes"
msgstr "བà½à½´à½–à¼(_Y)"
-#: ../thunar/thunar-dialogs.c:329
+#: ../thunar/thunar-dialogs.c:332
msgid "Yes to _all"
msgstr "ཆ་མཉམ་ལུ་བà½à½´à½–à¼(_a)"
-#: ../thunar/thunar-dialogs.c:333
+#: ../thunar/thunar-dialogs.c:336
msgid "_No"
msgstr "མི་བà½à½´à½–à¼(_N)"
-#: ../thunar/thunar-dialogs.c:337
+#: ../thunar/thunar-dialogs.c:340
msgid "N_o to all"
msgstr "ཆ་མཉམ་ལུ་མི་བà½à½´à½–à¼(_o)"
-#: ../thunar/thunar-dialogs.c:342
+#: ../thunar/thunar-dialogs.c:344
+#, fuzzy
+msgid "_Retry"
+msgstr "སོར་ཆུད་འབདà¼(_R)"
+
+#: ../thunar/thunar-dialogs.c:349
msgid "_Cancel"
msgstr "ཆ་མེད་གà½à½„་à¼(_C)"
+#. setup the confirmation dialog
+#: ../thunar/thunar-dialogs.c:429
+msgid "Confirm to replace files"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:435
+msgid "_Skip"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:436
+#, fuzzy
+msgid "Replace _All"
+msgstr "དང་བཅས་ཚབ་བཙུགས:(_W)"
+
+#: ../thunar/thunar-dialogs.c:437
+#, fuzzy
+msgid "_Replace"
+msgstr "བསà¾à¾±à½¢à¼‹à½˜à½²à½„་བà½à½‚སà¼(_R)"
+
+#: ../thunar/thunar-dialogs.c:467
+#, c-format
+msgid "This folder already contains a file \"%s\"."
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:475
+msgid "ReplaceDialogPart1|Do you want to replace the existing file"
+msgstr ""
+
+#.
+#. Fourth box (size, volume, free space)
+#.
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:440
+msgid "Size:"
+msgstr "ཚད:"
+
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:401
+msgid "Modified:"
+msgstr "ལེགས་བཅོས་འབད་ནུག:"
+
+#: ../thunar/thunar-dialogs.c:500
+msgid "ReplaceDialogPart2|with the following file?"
+msgstr ""
+
#: ../thunar/thunar-dnd.c:70
msgid "_Copy here"
msgstr "ནཱ་ལུ་འདྲ་བཤུས་བརà¾à¾±à½–à¼(_C)"
@@ -1757,21 +1816,21 @@ msgstr ""
msgid "Failed to display the volume management settings"
msgstr "ཕྱགས་ཧོད་ལུ་མà½à½´à½‘་བྱེད་འབད་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½ བྱུང་ནུག"
-#: ../thunar/thunar-progress-dialog.c:375
+#: ../thunar/thunar-progress-dialog.c:398
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
msgstr[0] "(%lu ཆུ་ཚོད་ལྷག་ལུས་ )"
msgstr[1] "(%lu ཆུ་ཚོད་(ཚུ་) ལྷག་ལུསà¼)"
-#: ../thunar/thunar-progress-dialog.c:380
+#: ../thunar/thunar-progress-dialog.c:403
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
msgstr[0] "(%lu སà¾à½¢à¼‹à½˜à¼‹à½£à¾·à½‚་ལུས་)"
msgstr[1] "(%lu སà¾à½¢à¼‹à½˜à¼‹(ཚུ་)ལྷག་ལུསà¼)"
-#: ../thunar/thunar-progress-dialog.c:385
+#: ../thunar/thunar-progress-dialog.c:408
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1808,21 +1867,10 @@ msgstr "དམིགས་གà½à½‘་འབྲེལ་མà½à½´à½‘་འབད
msgid "Deleted:"
msgstr "བà½à½¼à½“་གà½à½„་ནུག:"
-#: ../thunar/thunar-properties-dialog.c:401
-msgid "Modified:"
-msgstr "ལེགས་བཅོས་འབད་ནུག:"
-
#: ../thunar/thunar-properties-dialog.c:415
msgid "Accessed:"
msgstr "འཛུལ་སྤྱོད་འབད་ནུག:"
-#.
-#. Fourth box (size, volume, free space)
-#.
-#: ../thunar/thunar-properties-dialog.c:440
-msgid "Size:"
-msgstr "ཚད:"
-
#: ../thunar/thunar-properties-dialog.c:453
msgid "Volume:"
msgstr "སà¾à½‘་ཤུགསà¼"
diff --git a/po/el.po b/po/el.po
index fba24f4bc..480483886 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-22 18:30+0200\n"
+"POT-Creation-Date: 2007-05-23 23:24+0200\n"
"PO-Revision-Date: 2007-01-19 10:21+0200\n"
"Last-Translator: Stavros Giannouris <stavrosg2002@freemail.gr>\n"
"Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -58,29 +58,29 @@ msgstr "Μόνο τα τοπικά αÏχεία μποÏοÏν να μετονο
msgid "Preparing..."
msgstr "Î Ïοετοιμασία..."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:228
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:537
#, c-format
msgid "Failed to change permissions of \"%s\""
msgstr "Η αλλαγή των δικαιωμάτων του \"%s\" απÎτυχε."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:355
#, c-format
msgid "Failed to change file owner of \"%s\""
msgstr "Η αλλαγή του ιδιοκτήτη του \"%s\" απÎτυχε"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:356
#, c-format
msgid "Failed to change file group of \"%s\""
msgstr "Η αλλαγή του γκÏουπ του \"%s\" απÎτυχε."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:444
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:190
#, c-format
msgid "The file \"%s\" already exists"
msgstr "Το αÏχείο \"%s\" υπάÏχει ήδη"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:462
#, c-format
msgid "Failed to create empty file \"%s\""
msgstr "Δεν είναι δυνατή η δημιουÏγία του άδειου αÏχείου \"%s\""
@@ -238,11 +238,20 @@ msgstr "ΑποÏÏίμματα"
msgid "Cannot move or copy files within the trash"
msgstr "Δεν είναι δυνατή η μετακίνηση ή αντιγÏαφή αÏχείων μÎσα στα αποÏίμματα"
-#: ../thunar-vfs/thunar-vfs-job.c:831
+#. no "ask-replace" handler, fallback to "ask"
+#: ../thunar-vfs/thunar-vfs-job.c:401
+#, c-format
+msgid ""
+"The file \"%s\" already exists. Would you like to replace it?\n"
+"\n"
+"If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-job.c:897
msgid "Do you want to overwrite it?"
msgstr "ΘÎλετε να το αντικαταστήσετε;"
-#: ../thunar-vfs/thunar-vfs-job.c:896
+#: ../thunar-vfs/thunar-vfs-job.c:1042
msgid "Do you want to skip it?"
msgstr "ΘÎλετε να το Ï€ÏοσπεÏάσετε;"
@@ -890,7 +899,7 @@ msgstr "ΛεπτομεÏής απεικόνιση καταλόγων"
msgid "Details view"
msgstr "Î Ïοβολή λεπτομεÏειών"
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr ""
"ΣταÏÏος ΓιαννοÏÏης <stavrosg@hellug.gr>\n"
@@ -898,30 +907,80 @@ msgstr ""
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:959
+#: ../thunar/thunar-dialogs.c:231 ../thunar/thunar-renamer-dialog.c:959
msgid "Failed to open the documentation browser"
msgstr "Το άνοιγμα του αναγνώστη τεκμηÏίωσης απÎτυχε"
-#: ../thunar/thunar-dialogs.c:325
+#: ../thunar/thunar-dialogs.c:328
msgid "_Yes"
msgstr "_Îαι"
-#: ../thunar/thunar-dialogs.c:329
+#: ../thunar/thunar-dialogs.c:332
msgid "Yes to _all"
msgstr "Îαι σε ÏŒ_λα"
-#: ../thunar/thunar-dialogs.c:333
+#: ../thunar/thunar-dialogs.c:336
msgid "_No"
msgstr "_Όχι"
-#: ../thunar/thunar-dialogs.c:337
+#: ../thunar/thunar-dialogs.c:340
msgid "N_o to all"
msgstr "Ό_χι σε όλα"
-#: ../thunar/thunar-dialogs.c:342
+#: ../thunar/thunar-dialogs.c:344
+#, fuzzy
+msgid "_Retry"
+msgstr "_ΕπαναφοÏά"
+
+#: ../thunar/thunar-dialogs.c:349
msgid "_Cancel"
msgstr "_ΑκÏÏωση"
+#. setup the confirmation dialog
+#: ../thunar/thunar-dialogs.c:429
+msgid "Confirm to replace files"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:435
+msgid "_Skip"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:436
+#, fuzzy
+msgid "Replace _All"
+msgstr "Αντικατάσταση _με: "
+
+#: ../thunar/thunar-dialogs.c:437
+#, fuzzy
+msgid "_Replace"
+msgstr "_Μετονομασία"
+
+#: ../thunar/thunar-dialogs.c:467
+#, c-format
+msgid "This folder already contains a file \"%s\"."
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:475
+msgid "ReplaceDialogPart1|Do you want to replace the existing file"
+msgstr ""
+
+#.
+#. Fourth box (size, volume, free space)
+#.
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:440
+msgid "Size:"
+msgstr "ÎœÎγεθος:"
+
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:401
+msgid "Modified:"
+msgstr "ΤÏοποποιήθηκε:"
+
+#: ../thunar/thunar-dialogs.c:500
+msgid "ReplaceDialogPart2|with the following file?"
+msgstr ""
+
#: ../thunar/thunar-dnd.c:70
msgid "_Copy here"
msgstr "_ΑντιγÏαφή εδώ"
@@ -1771,21 +1830,21 @@ msgstr ""
msgid "Failed to display the volume management settings"
msgstr "Το άνοιγμα των Ïυθμίσεων της διαχείÏισης τόμων απÎτυχε"
-#: ../thunar/thunar-progress-dialog.c:375
+#: ../thunar/thunar-progress-dialog.c:398
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
msgstr[0] "(απομÎνει %lu ÏŽÏα)"
msgstr[1] "(απομÎνουν %lu ÏŽÏες)"
-#: ../thunar/thunar-progress-dialog.c:380
+#: ../thunar/thunar-progress-dialog.c:403
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
msgstr[0] "(απομÎνει %lu λεπτό)"
msgstr[1] "(απομÎνουν %lu λεπτά)"
-#: ../thunar/thunar-progress-dialog.c:385
+#: ../thunar/thunar-progress-dialog.c:408
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1822,21 +1881,10 @@ msgstr "Î ÏοοÏισμός δεσμοÏ:"
msgid "Deleted:"
msgstr "ΔιαγÏάφηκε:"
-#: ../thunar/thunar-properties-dialog.c:401
-msgid "Modified:"
-msgstr "ΤÏοποποιήθηκε:"
-
#: ../thunar/thunar-properties-dialog.c:415
msgid "Accessed:"
msgstr "Î Ïοσπελάστηκε:"
-#.
-#. Fourth box (size, volume, free space)
-#.
-#: ../thunar/thunar-properties-dialog.c:440
-msgid "Size:"
-msgstr "ÎœÎγεθος:"
-
#: ../thunar/thunar-properties-dialog.c:453
msgid "Volume:"
msgstr "Τόμος:"
diff --git a/po/en_GB.po b/po/en_GB.po
index bc92ecdab..9d362bbd1 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: thunar 0.8\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-22 18:30+0200\n"
+"POT-Creation-Date: 2007-05-23 23:24+0200\n"
"PO-Revision-Date: 2007-03-26 18:54+1000\n"
"Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
"Language-Team: English/GB\n"
@@ -58,29 +58,29 @@ msgstr "Only local files may be renamed"
msgid "Preparing..."
msgstr "Preparing..."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:228
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:537
#, c-format
msgid "Failed to change permissions of \"%s\""
msgstr "Failed to change permissions of \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:355
#, c-format
msgid "Failed to change file owner of \"%s\""
msgstr "Failed to change file owner of \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:356
#, c-format
msgid "Failed to change file group of \"%s\""
msgstr "Failed to change file group of \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:444
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:190
#, c-format
msgid "The file \"%s\" already exists"
msgstr "The file \"%s\" already exists"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:462
#, c-format
msgid "Failed to create empty file \"%s\""
msgstr "Failed to create empty file \"%s\""
@@ -238,11 +238,20 @@ msgstr "Wastebasket"
msgid "Cannot move or copy files within the trash"
msgstr "Cannot move or copy files within the Wastebasket"
-#: ../thunar-vfs/thunar-vfs-job.c:831
+#. no "ask-replace" handler, fallback to "ask"
+#: ../thunar-vfs/thunar-vfs-job.c:401
+#, c-format
+msgid ""
+"The file \"%s\" already exists. Would you like to replace it?\n"
+"\n"
+"If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-job.c:897
msgid "Do you want to overwrite it?"
msgstr "Do you want to overwrite it?"
-#: ../thunar-vfs/thunar-vfs-job.c:896
+#: ../thunar-vfs/thunar-vfs-job.c:1042
msgid "Do you want to skip it?"
msgstr "Do you want to skip it?"
@@ -886,36 +895,86 @@ msgstr "Detailed directory listing"
msgid "Details view"
msgstr "Details view"
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr "Jeff Bailes <thepizzaking@gmail.com>"
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:959
+#: ../thunar/thunar-dialogs.c:231 ../thunar/thunar-renamer-dialog.c:959
msgid "Failed to open the documentation browser"
msgstr "Failed to open the documentation browser"
-#: ../thunar/thunar-dialogs.c:325
+#: ../thunar/thunar-dialogs.c:328
msgid "_Yes"
msgstr "_Yes"
-#: ../thunar/thunar-dialogs.c:329
+#: ../thunar/thunar-dialogs.c:332
msgid "Yes to _all"
msgstr "Yes to _all"
-#: ../thunar/thunar-dialogs.c:333
+#: ../thunar/thunar-dialogs.c:336
msgid "_No"
msgstr "_No"
-#: ../thunar/thunar-dialogs.c:337
+#: ../thunar/thunar-dialogs.c:340
msgid "N_o to all"
msgstr "N_o to all"
-#: ../thunar/thunar-dialogs.c:342
+#: ../thunar/thunar-dialogs.c:344
+#, fuzzy
+msgid "_Retry"
+msgstr "_Restore"
+
+#: ../thunar/thunar-dialogs.c:349
msgid "_Cancel"
msgstr "_Cancel"
+#. setup the confirmation dialog
+#: ../thunar/thunar-dialogs.c:429
+msgid "Confirm to replace files"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:435
+msgid "_Skip"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:436
+#, fuzzy
+msgid "Replace _All"
+msgstr "Replace _With:"
+
+#: ../thunar/thunar-dialogs.c:437
+#, fuzzy
+msgid "_Replace"
+msgstr "_Rename"
+
+#: ../thunar/thunar-dialogs.c:467
+#, c-format
+msgid "This folder already contains a file \"%s\"."
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:475
+msgid "ReplaceDialogPart1|Do you want to replace the existing file"
+msgstr ""
+
+#.
+#. Fourth box (size, volume, free space)
+#.
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:440
+msgid "Size:"
+msgstr "Size:"
+
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:401
+msgid "Modified:"
+msgstr "Modified:"
+
+#: ../thunar/thunar-dialogs.c:500
+msgid "ReplaceDialogPart2|with the following file?"
+msgstr ""
+
#: ../thunar/thunar-dnd.c:70
msgid "_Copy here"
msgstr "_Copy here"
@@ -1758,21 +1817,21 @@ msgstr ""
msgid "Failed to display the volume management settings"
msgstr "Failed to display the volume management settings"
-#: ../thunar/thunar-progress-dialog.c:375
+#: ../thunar/thunar-progress-dialog.c:398
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
msgstr[0] "(%lu hour remaining)"
msgstr[1] "(%lu hours remaining)"
-#: ../thunar/thunar-progress-dialog.c:380
+#: ../thunar/thunar-progress-dialog.c:403
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
msgstr[0] "(%lu minute remaining)"
msgstr[1] "(%lu minutes remaining)"
-#: ../thunar/thunar-progress-dialog.c:385
+#: ../thunar/thunar-progress-dialog.c:408
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1809,21 +1868,10 @@ msgstr "Link Target:"
msgid "Deleted:"
msgstr "Deleted:"
-#: ../thunar/thunar-properties-dialog.c:401
-msgid "Modified:"
-msgstr "Modified:"
-
#: ../thunar/thunar-properties-dialog.c:415
msgid "Accessed:"
msgstr "Accessed:"
-#.
-#. Fourth box (size, volume, free space)
-#.
-#: ../thunar/thunar-properties-dialog.c:440
-msgid "Size:"
-msgstr "Size:"
-
#: ../thunar/thunar-properties-dialog.c:453
msgid "Volume:"
msgstr "Volume:"
diff --git a/po/eo.po b/po/eo.po
index ea70b9dc1..8aed0d007 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-22 18:30+0200\n"
+"POT-Creation-Date: 2007-05-23 23:24+0200\n"
"PO-Revision-Date: 2006-09-20 22:42+0200\n"
"Last-Translator: Antono Vasiljev <antono.vasiljev@gmail.com>\n"
"Language-Team: Esperanto <debian-l10n-esperanto@lists.debian.org>\n"
@@ -58,29 +58,29 @@ msgstr "Nur lokajn dosierojn oni povas renomigi"
msgid "Preparing..."
msgstr "Preparadas..."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:228
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:537
#, c-format
msgid "Failed to change permissions of \"%s\""
msgstr "Ne eblas ÅanÄi la permesojn de \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:355
#, c-format
msgid "Failed to change file owner of \"%s\""
msgstr "Ne eblas ÅanÄi la posedanton de \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:356
#, c-format
msgid "Failed to change file group of \"%s\""
msgstr "Ne eblas ÅanÄi la grupon de \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:444
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:190
#, c-format
msgid "The file \"%s\" already exists"
msgstr "La dosiero \"%s\" jam ekzistas"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:462
#, c-format
msgid "Failed to create empty file \"%s\""
msgstr "Ne sukcesis krei nomitan fifo \"%s\""
@@ -238,11 +238,22 @@ msgstr "Rubujo"
msgid "Cannot move or copy files within the trash"
msgstr "Ne eblas movi aÅ kopii dosierojn en la rubujo"
-#: ../thunar-vfs/thunar-vfs-job.c:831
+#. no "ask-replace" handler, fallback to "ask"
+#: ../thunar-vfs/thunar-vfs-job.c:401
+#, fuzzy, c-format
+msgid ""
+"The file \"%s\" already exists. Would you like to replace it?\n"
+"\n"
+"If you replace an existing file, its contents will be overwritten."
+msgstr ""
+"La dosiero \"%s\" jam ekzistas. Ĉu vi volas anstataÅigi Äin per malplena "
+"dosiero?"
+
+#: ../thunar-vfs/thunar-vfs-job.c:897
msgid "Do you want to overwrite it?"
msgstr "Ĉu vi volas reskribi Äin?"
-#: ../thunar-vfs/thunar-vfs-job.c:896
+#: ../thunar-vfs/thunar-vfs-job.c:1042
msgid "Do you want to skip it?"
msgstr "Ĉu vi volas trapasi Äin?"
@@ -886,7 +897,7 @@ msgstr "Detala listo de dosierujoj"
msgid "Details view"
msgstr "Montru detalojn"
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr ""
"Antono Vasiljev <antono.vasiljev@gmail.com>\n"
@@ -895,30 +906,80 @@ msgstr ""
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:959
+#: ../thunar/thunar-dialogs.c:231 ../thunar/thunar-renamer-dialog.c:959
msgid "Failed to open the documentation browser"
msgstr "Ne eblas malfermi krozilon por dokumentaro"
-#: ../thunar/thunar-dialogs.c:325
+#: ../thunar/thunar-dialogs.c:328
msgid "_Yes"
msgstr "_Jes"
-#: ../thunar/thunar-dialogs.c:329
+#: ../thunar/thunar-dialogs.c:332
msgid "Yes to _all"
msgstr "Jes por ĉ_iuj"
-#: ../thunar/thunar-dialogs.c:333
+#: ../thunar/thunar-dialogs.c:336
msgid "_No"
msgstr "_Ne"
-#: ../thunar/thunar-dialogs.c:337
+#: ../thunar/thunar-dialogs.c:340
msgid "N_o to all"
msgstr "Ne por ĉ_iuj"
-#: ../thunar/thunar-dialogs.c:342
+#: ../thunar/thunar-dialogs.c:344
+#, fuzzy
+msgid "_Retry"
+msgstr "_Riparu"
+
+#: ../thunar/thunar-dialogs.c:349
msgid "_Cancel"
msgstr "_Nuligu"
+#. setup the confirmation dialog
+#: ../thunar/thunar-dialogs.c:429
+msgid "Confirm to replace files"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:435
+msgid "_Skip"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:436
+#, fuzzy
+msgid "Replace _All"
+msgstr "_AnstataÅigu per:"
+
+#: ../thunar/thunar-dialogs.c:437
+#, fuzzy
+msgid "_Replace"
+msgstr "_Renomigu"
+
+#: ../thunar/thunar-dialogs.c:467
+#, c-format
+msgid "This folder already contains a file \"%s\"."
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:475
+msgid "ReplaceDialogPart1|Do you want to replace the existing file"
+msgstr ""
+
+#.
+#. Fourth box (size, volume, free space)
+#.
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:440
+msgid "Size:"
+msgstr "Amplekso:"
+
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:401
+msgid "Modified:"
+msgstr "Modifita:"
+
+#: ../thunar/thunar-dialogs.c:500
+msgid "ReplaceDialogPart2|with the following file?"
+msgstr ""
+
#: ../thunar/thunar-dnd.c:70
msgid "_Copy here"
msgstr "_Kopiu ĉi tien"
@@ -1754,21 +1815,21 @@ msgstr ""
msgid "Failed to display the volume management settings"
msgstr "Ne sukcesis konektiÄi kun la Rubujo"
-#: ../thunar/thunar-progress-dialog.c:375
+#: ../thunar/thunar-progress-dialog.c:398
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
msgstr[0] "(restas %lu horo)"
msgstr[1] "(restas %lu horoj)"
-#: ../thunar/thunar-progress-dialog.c:380
+#: ../thunar/thunar-progress-dialog.c:403
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
msgstr[0] "(restas %lu minuto)"
msgstr[1] "(restas %lu minutoj)"
-#: ../thunar/thunar-progress-dialog.c:385
+#: ../thunar/thunar-progress-dialog.c:408
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1805,21 +1866,10 @@ msgstr "Celo de la Ligilo:"
msgid "Deleted:"
msgstr "_ForviÅita"
-#: ../thunar/thunar-properties-dialog.c:401
-msgid "Modified:"
-msgstr "Modifita:"
-
#: ../thunar/thunar-properties-dialog.c:415
msgid "Accessed:"
msgstr "Atingita:"
-#.
-#. Fourth box (size, volume, free space)
-#.
-#: ../thunar/thunar-properties-dialog.c:440
-msgid "Size:"
-msgstr "Amplekso:"
-
#: ../thunar/thunar-properties-dialog.c:453
msgid "Volume:"
msgstr "Volumo:"
@@ -3393,13 +3443,6 @@ msgstr "Malfermu definitajn dosierujojn per Thunar"
#~ msgid "Failed to determine file info of \"%s\": %s"
#~ msgstr "Ne eblas determini dosier-informon pri \"%s\": %s"
-#~ msgid ""
-#~ "The file \"%s\" already exists. Do you want to replace it with an empty "
-#~ "file?"
-#~ msgstr ""
-#~ "La dosiero \"%s\" jam ekzistas. Ĉu vi volas anstataÅigi Äin per malplena "
-#~ "dosiero?"
-
#~ msgid ""
#~ "Failed to remove \"%s\".\n"
#~ "\n"
diff --git a/po/es.po b/po/es.po
index 0fccd99d7..194a241c2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-22 18:30+0200\n"
+"POT-Creation-Date: 2007-05-23 23:24+0200\n"
"PO-Revision-Date: 2006-05-04 14:12+0000\n"
"Last-Translator: Daniel Fuertes Pérez (DaniFP) <danifp25@yahoo.es>\n"
"Language-Team: Spanish <es@li.org>\n"
@@ -59,29 +59,29 @@ msgstr "Selecccione archivos a renombrar"
msgid "Preparing..."
msgstr "Preparando..."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:228
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:537
#, fuzzy, c-format
msgid "Failed to change permissions of \"%s\""
msgstr "No se pudieron cambiar los permisos de \"%s\": %s"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:355
#, fuzzy, c-format
msgid "Failed to change file owner of \"%s\""
msgstr "No se pudo cambiar el propietario del archivo \"%s\": %s"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:356
#, fuzzy, c-format
msgid "Failed to change file group of \"%s\""
msgstr "No se pudo cambiar el grupo del archivo \"%s\": %s"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:444
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:190
#, c-format
msgid "The file \"%s\" already exists"
msgstr "El archivo \"%s\" ya existe"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:462
#, fuzzy, c-format
msgid "Failed to create empty file \"%s\""
msgstr "No se pudo crear la tuberia (fifo) con nombre \"%s\""
@@ -239,7 +239,16 @@ msgstr ""
msgid "Cannot move or copy files within the trash"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-job.c:831
+#. no "ask-replace" handler, fallback to "ask"
+#: ../thunar-vfs/thunar-vfs-job.c:401
+#, fuzzy, c-format
+msgid ""
+"The file \"%s\" already exists. Would you like to replace it?\n"
+"\n"
+"If you replace an existing file, its contents will be overwritten."
+msgstr "El archivo \"%s\" existe. ¿Desea reemplazarlo por un archivo vacÃo?"
+
+#: ../thunar-vfs/thunar-vfs-job.c:897
#, fuzzy
msgid "Do you want to overwrite it?"
msgstr ""
@@ -247,7 +256,7 @@ msgstr ""
"\n"
"¿Desea sobreescribirlo?"
-#: ../thunar-vfs/thunar-vfs-job.c:896
+#: ../thunar-vfs/thunar-vfs-job.c:1042
#, fuzzy
msgid "Do you want to skip it?"
msgstr ""
@@ -896,37 +905,86 @@ msgstr "Listado detallado del directorio"
msgid "Details view"
msgstr "Vista detallada"
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr "Daniel Fuertes Pérez <danifp25@yahoo.es>"
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:959
+#: ../thunar/thunar-dialogs.c:231 ../thunar/thunar-renamer-dialog.c:959
msgid "Failed to open the documentation browser"
msgstr "No se pudo abrir el visor de documentación"
-#: ../thunar/thunar-dialogs.c:325
+#: ../thunar/thunar-dialogs.c:328
msgid "_Yes"
msgstr "_SÃ"
-#: ../thunar/thunar-dialogs.c:329
+#: ../thunar/thunar-dialogs.c:332
msgid "Yes to _all"
msgstr "Si _a todo"
-#: ../thunar/thunar-dialogs.c:333
+#: ../thunar/thunar-dialogs.c:336
msgid "_No"
msgstr "_No"
-#: ../thunar/thunar-dialogs.c:337
+#: ../thunar/thunar-dialogs.c:340
#, fuzzy
msgid "N_o to all"
msgstr "Si _a todo"
-#: ../thunar/thunar-dialogs.c:342
+#: ../thunar/thunar-dialogs.c:344
+msgid "_Retry"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:349
msgid "_Cancel"
msgstr "_Cancelar"
+#. setup the confirmation dialog
+#: ../thunar/thunar-dialogs.c:429
+msgid "Confirm to replace files"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:435
+msgid "_Skip"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:436
+#, fuzzy
+msgid "Replace _All"
+msgstr "Reempla_zar Con:"
+
+#: ../thunar/thunar-dialogs.c:437
+#, fuzzy
+msgid "_Replace"
+msgstr "Renombrar"
+
+#: ../thunar/thunar-dialogs.c:467
+#, c-format
+msgid "This folder already contains a file \"%s\"."
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:475
+msgid "ReplaceDialogPart1|Do you want to replace the existing file"
+msgstr ""
+
+#.
+#. Fourth box (size, volume, free space)
+#.
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:440
+msgid "Size:"
+msgstr "Tamaño:"
+
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:401
+msgid "Modified:"
+msgstr "Modificado:"
+
+#: ../thunar/thunar-dialogs.c:500
+msgid "ReplaceDialogPart2|with the following file?"
+msgstr ""
+
#: ../thunar/thunar-dnd.c:70
msgid "_Copy here"
msgstr "_Copiar aquÃ"
@@ -1766,21 +1824,21 @@ msgstr ""
msgid "Failed to display the volume management settings"
msgstr "No se pudo conectar con el demonio HAL: %s"
-#: ../thunar/thunar-progress-dialog.c:375
+#: ../thunar/thunar-progress-dialog.c:398
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
msgstr[0] "(falta %lu hour)"
msgstr[1] "(faltan %lu hours)"
-#: ../thunar/thunar-progress-dialog.c:380
+#: ../thunar/thunar-progress-dialog.c:403
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
msgstr[0] "(falta %lu minuto)"
msgstr[1] "(faltan %lu minutos)"
-#: ../thunar/thunar-progress-dialog.c:385
+#: ../thunar/thunar-progress-dialog.c:408
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1818,21 +1876,10 @@ msgstr "Destino del Enlace:"
msgid "Deleted:"
msgstr "_Eliminar"
-#: ../thunar/thunar-properties-dialog.c:401
-msgid "Modified:"
-msgstr "Modificado:"
-
#: ../thunar/thunar-properties-dialog.c:415
msgid "Accessed:"
msgstr "Accedido:"
-#.
-#. Fourth box (size, volume, free space)
-#.
-#: ../thunar/thunar-properties-dialog.c:440
-msgid "Size:"
-msgstr "Tamaño:"
-
#: ../thunar/thunar-properties-dialog.c:453
msgid "Volume:"
msgstr "Volumen:"
@@ -3440,11 +3487,6 @@ msgstr "Abrir el directorio especificado en Thunar"
#~ msgid "Failed to determine file info of \"%s\": %s"
#~ msgstr "No se pudo determinar la información del archivo \"%s\": %s"
-#~ msgid ""
-#~ "The file \"%s\" already exists. Do you want to replace it with an empty "
-#~ "file?"
-#~ msgstr "El archivo \"%s\" existe. ¿Desea reemplazarlo por un archivo vacÃo?"
-
#~ msgid ""
#~ "Failed to remove \"%s\".\n"
#~ "\n"
diff --git a/po/et.po b/po/et.po
index 923ed3f5c..d2f955bec 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-22 18:30+0200\n"
+"POT-Creation-Date: 2007-05-23 23:24+0200\n"
"PO-Revision-Date: 2006-04-18 16:37+0300\n"
"Last-Translator: Peeter Vois <Peeter.Vois@proekspert.ee>\n"
"Language-Team: Estonian <et@li.org>\n"
@@ -57,29 +57,29 @@ msgstr "Vali failid ümbernimetamiseks"
msgid "Preparing..."
msgstr "Valmistan ette..."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:228
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:537
#, fuzzy, c-format
msgid "Failed to change permissions of \"%s\""
msgstr "Faili \"%s\" õiguste muutmine ebaõnnestus: %s"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:355
#, fuzzy, c-format
msgid "Failed to change file owner of \"%s\""
msgstr "Faili \"%s\" omaniku muutmine ebaõnnestus: %s"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:356
#, fuzzy, c-format
msgid "Failed to change file group of \"%s\""
msgstr "Faili \"%s\" grupi muutmine ebaõnnestus: %s"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:444
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:190
#, c-format
msgid "The file \"%s\" already exists"
msgstr "Fail \"%s\" on juba olemas"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:462
#, fuzzy, c-format
msgid "Failed to create empty file \"%s\""
msgstr "Fifo \"%s\" tegemine läks nässu"
@@ -238,7 +238,16 @@ msgstr ""
msgid "Cannot move or copy files within the trash"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-job.c:831
+#. no "ask-replace" handler, fallback to "ask"
+#: ../thunar-vfs/thunar-vfs-job.c:401
+#, fuzzy, c-format
+msgid ""
+"The file \"%s\" already exists. Would you like to replace it?\n"
+"\n"
+"If you replace an existing file, its contents will be overwritten."
+msgstr "Fail \"%s\" on juba olemas. Kas te soovite seda tühjaks teha?"
+
+#: ../thunar-vfs/thunar-vfs-job.c:897
#, fuzzy
msgid "Do you want to overwrite it?"
msgstr ""
@@ -246,7 +255,7 @@ msgstr ""
"\n"
"Kas te soovite seda üle kirjutada?"
-#: ../thunar-vfs/thunar-vfs-job.c:896
+#: ../thunar-vfs/thunar-vfs-job.c:1042
#, fuzzy
msgid "Do you want to skip it?"
msgstr ""
@@ -891,37 +900,86 @@ msgstr "Kataloogi detailne nimistu"
msgid "Details view"
msgstr "Detailide vaade"
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr "tõlkijatest kreeditorid"
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:959
+#: ../thunar/thunar-dialogs.c:231 ../thunar/thunar-renamer-dialog.c:959
msgid "Failed to open the documentation browser"
msgstr "Dokumentide sirvuri avamine läks nässu"
-#: ../thunar/thunar-dialogs.c:325
+#: ../thunar/thunar-dialogs.c:328
msgid "_Yes"
msgstr "_Jah"
-#: ../thunar/thunar-dialogs.c:329
+#: ../thunar/thunar-dialogs.c:332
msgid "Yes to _all"
msgstr "Jah _kõigile"
-#: ../thunar/thunar-dialogs.c:333
+#: ../thunar/thunar-dialogs.c:336
msgid "_No"
msgstr "_Ei"
-#: ../thunar/thunar-dialogs.c:337
+#: ../thunar/thunar-dialogs.c:340
#, fuzzy
msgid "N_o to all"
msgstr "Jah _kõigile"
-#: ../thunar/thunar-dialogs.c:342
+#: ../thunar/thunar-dialogs.c:344
+msgid "_Retry"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:349
msgid "_Cancel"
msgstr "_Loobu"
+#. setup the confirmation dialog
+#: ../thunar/thunar-dialogs.c:429
+msgid "Confirm to replace files"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:435
+msgid "_Skip"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:436
+#, fuzzy
+msgid "Replace _All"
+msgstr "Asenda _järgnevaga:"
+
+#: ../thunar/thunar-dialogs.c:437
+#, fuzzy
+msgid "_Replace"
+msgstr "Nimeta ümber"
+
+#: ../thunar/thunar-dialogs.c:467
+#, c-format
+msgid "This folder already contains a file \"%s\"."
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:475
+msgid "ReplaceDialogPart1|Do you want to replace the existing file"
+msgstr ""
+
+#.
+#. Fourth box (size, volume, free space)
+#.
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:440
+msgid "Size:"
+msgstr "Suurus:"
+
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:401
+msgid "Modified:"
+msgstr "Muudetud:"
+
+#: ../thunar/thunar-dialogs.c:500
+msgid "ReplaceDialogPart2|with the following file?"
+msgstr ""
+
#: ../thunar/thunar-dnd.c:70
msgid "_Copy here"
msgstr "_Kopeeri siia"
@@ -1761,21 +1819,21 @@ msgstr ""
msgid "Failed to display the volume management settings"
msgstr "HAL deemoni %s külge ühendumine läks nässu"
-#: ../thunar/thunar-progress-dialog.c:375
+#: ../thunar/thunar-progress-dialog.c:398
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
msgstr[0] "(%lu tundi järel)"
msgstr[1] "(%lu tundi järel)"
-#: ../thunar/thunar-progress-dialog.c:380
+#: ../thunar/thunar-progress-dialog.c:403
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
msgstr[0] "(%lu minutit järel)"
msgstr[1] "(%lu minutit järel)"
-#: ../thunar/thunar-progress-dialog.c:385
+#: ../thunar/thunar-progress-dialog.c:408
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1813,21 +1871,10 @@ msgstr "Lingi sihtmärk:"
msgid "Deleted:"
msgstr "K_ustuta"
-#: ../thunar/thunar-properties-dialog.c:401
-msgid "Modified:"
-msgstr "Muudetud:"
-
#: ../thunar/thunar-properties-dialog.c:415
msgid "Accessed:"
msgstr "Kasutatud:"
-#.
-#. Fourth box (size, volume, free space)
-#.
-#: ../thunar/thunar-properties-dialog.c:440
-msgid "Size:"
-msgstr "Suurus:"
-
#: ../thunar/thunar-properties-dialog.c:453
msgid "Volume:"
msgstr "Kogus:"
@@ -3412,11 +3459,6 @@ msgstr "Ava valitud kaustad thunaris"
#~ msgid "Failed to determine file info of \"%s\": %s"
#~ msgstr "Faili \"%s\" info määramine ebaõnnestus: %s"
-#~ msgid ""
-#~ "The file \"%s\" already exists. Do you want to replace it with an empty "
-#~ "file?"
-#~ msgstr "Fail \"%s\" on juba olemas. Kas te soovite seda tühjaks teha?"
-
#~ msgid ""
#~ "Failed to remove \"%s\".\n"
#~ "\n"
diff --git a/po/eu.po b/po/eu.po
index 8fe03474a..26ea900ae 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-22 18:30+0200\n"
+"POT-Creation-Date: 2007-05-23 23:24+0200\n"
"PO-Revision-Date: 2006-11-03 23:54+0100\n"
"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
"Language-Team: librezale <librezale@librezale.org>\n"
@@ -58,29 +58,29 @@ msgstr "Fitxategi lokalak bakarrik berrizenda daitezke"
msgid "Preparing..."
msgstr "Prestatzen..."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:228
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:537
#, c-format
msgid "Failed to change permissions of \"%s\""
msgstr "Huts \"%s\"-ren baimenak aldatzerakoan"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:355
#, c-format
msgid "Failed to change file owner of \"%s\""
msgstr "Huts \"%s\"-ren jabea aldatzerakoan"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:356
#, c-format
msgid "Failed to change file group of \"%s\""
msgstr "Huts \"%s\"-ren taldea aldatzerakoan"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:444
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:190
#, c-format
msgid "The file \"%s\" already exists"
msgstr "\"%s\" fitxategia badago dagoeneko"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:462
#, c-format
msgid "Failed to create empty file \"%s\""
msgstr "Huts \"%s\" fitxategi hutsa sortzerakoan"
@@ -238,11 +238,20 @@ msgstr "Zakarrontzia"
msgid "Cannot move or copy files within the trash"
msgstr "Ezinda zakarrontzi gabe fitxategirik mugitu edo kopiatu"
-#: ../thunar-vfs/thunar-vfs-job.c:831
+#. no "ask-replace" handler, fallback to "ask"
+#: ../thunar-vfs/thunar-vfs-job.c:401
+#, c-format
+msgid ""
+"The file \"%s\" already exists. Would you like to replace it?\n"
+"\n"
+"If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-job.c:897
msgid "Do you want to overwrite it?"
msgstr "Gainidatzi nahi al duzu?"
-#: ../thunar-vfs/thunar-vfs-job.c:896
+#: ../thunar-vfs/thunar-vfs-job.c:1042
msgid "Do you want to skip it?"
msgstr "Salto egin nahi al duzu?"
@@ -889,36 +898,86 @@ msgstr "Xeheturiko direktorio zerrendatzea"
msgid "Details view"
msgstr "Xeheturiko ikuspegia"
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr "itzulpen kredituak"
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:959
+#: ../thunar/thunar-dialogs.c:231 ../thunar/thunar-renamer-dialog.c:959
msgid "Failed to open the documentation browser"
msgstr "Huts dokumentazio nabigatzailea irekitzerakoan"
-#: ../thunar/thunar-dialogs.c:325
+#: ../thunar/thunar-dialogs.c:328
msgid "_Yes"
msgstr "_Bai"
-#: ../thunar/thunar-dialogs.c:329
+#: ../thunar/thunar-dialogs.c:332
msgid "Yes to _all"
msgstr "Bai dan_ari"
-#: ../thunar/thunar-dialogs.c:333
+#: ../thunar/thunar-dialogs.c:336
msgid "_No"
msgstr "_Ez"
-#: ../thunar/thunar-dialogs.c:337
+#: ../thunar/thunar-dialogs.c:340
msgid "N_o to all"
msgstr "E_z danari"
-#: ../thunar/thunar-dialogs.c:342
+#: ../thunar/thunar-dialogs.c:344
+#, fuzzy
+msgid "_Retry"
+msgstr "Be_rreskuratu"
+
+#: ../thunar/thunar-dialogs.c:349
msgid "_Cancel"
msgstr "_Utzi"
+#. setup the confirmation dialog
+#: ../thunar/thunar-dialogs.c:429
+msgid "Confirm to replace files"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:435
+msgid "_Skip"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:436
+#, fuzzy
+msgid "Replace _All"
+msgstr "Honengatik A_ldatu:"
+
+#: ../thunar/thunar-dialogs.c:437
+#, fuzzy
+msgid "_Replace"
+msgstr "Be_rrizendatu"
+
+#: ../thunar/thunar-dialogs.c:467
+#, c-format
+msgid "This folder already contains a file \"%s\"."
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:475
+msgid "ReplaceDialogPart1|Do you want to replace the existing file"
+msgstr ""
+
+#.
+#. Fourth box (size, volume, free space)
+#.
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:440
+msgid "Size:"
+msgstr "Tamaina:"
+
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:401
+msgid "Modified:"
+msgstr "Aldaketa:"
+
+#: ../thunar/thunar-dialogs.c:500
+msgid "ReplaceDialogPart2|with the following file?"
+msgstr ""
+
#: ../thunar/thunar-dnd.c:70
msgid "_Copy here"
msgstr "Hona _kopiatu"
@@ -1764,21 +1823,21 @@ msgstr ""
msgid "Failed to display the volume management settings"
msgstr "Huts zakarrontziaren edukia bistaratzerakoan"
-#: ../thunar/thunar-progress-dialog.c:375
+#: ../thunar/thunar-progress-dialog.c:398
#, 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:380
+#: ../thunar/thunar-progress-dialog.c:403
#, 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:385
+#: ../thunar/thunar-progress-dialog.c:408
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1815,21 +1874,10 @@ msgstr "Lotura Helburua:"
msgid "Deleted:"
msgstr "Ezabaturik:"
-#: ../thunar/thunar-properties-dialog.c:401
-msgid "Modified:"
-msgstr "Aldaketa:"
-
#: ../thunar/thunar-properties-dialog.c:415
msgid "Accessed:"
msgstr "Erabilia:"
-#.
-#. Fourth box (size, volume, free space)
-#.
-#: ../thunar/thunar-properties-dialog.c:440
-msgid "Size:"
-msgstr "Tamaina:"
-
#: ../thunar/thunar-properties-dialog.c:453
msgid "Volume:"
msgstr "Bolumena:"
diff --git a/po/fi.po b/po/fi.po
index 8b658181b..46abdff48 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-22 18:30+0200\n"
+"POT-Creation-Date: 2007-05-23 23:24+0200\n"
"PO-Revision-Date: 2007-01-12 12:01+0200\n"
"Last-Translator: Jari Rahkonen <jari.rahkonen@pp1.inet.fi>\n"
"Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -56,29 +56,29 @@ msgstr "Voit nimetä uudelleen vain paikallisia tiedostoja"
msgid "Preparing..."
msgstr "Valmistellaan..."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:228
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:537
#, c-format
msgid "Failed to change permissions of \"%s\""
msgstr "Tiedoston \"%s\" käyttöoikeuksien muuttaminen epäonnistui"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:355
#, c-format
msgid "Failed to change file owner of \"%s\""
msgstr "Tiedoston \"%s\" omistajan vaihtaminen epäonnistui"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:356
#, c-format
msgid "Failed to change file group of \"%s\""
msgstr "Tiedoston \"%s\" ryhmän vaihtaminen epäonnistui"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:444
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:190
#, c-format
msgid "The file \"%s\" already exists"
msgstr "Tiedosto \"%s\" on jo olemassa"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:462
#, c-format
msgid "Failed to create empty file \"%s\""
msgstr "Tyhjän tiedoston \"%s\" luominen epäonnistui"
@@ -236,11 +236,20 @@ msgstr "Roskakori"
msgid "Cannot move or copy files within the trash"
msgstr "Tiedostoja ei voi kopioida tai siirtää roskakorissa"
-#: ../thunar-vfs/thunar-vfs-job.c:831
+#. no "ask-replace" handler, fallback to "ask"
+#: ../thunar-vfs/thunar-vfs-job.c:401
+#, c-format
+msgid ""
+"The file \"%s\" already exists. Would you like to replace it?\n"
+"\n"
+"If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-job.c:897
msgid "Do you want to overwrite it?"
msgstr "Haluatko korvata sen?"
-#: ../thunar-vfs/thunar-vfs-job.c:896
+#: ../thunar-vfs/thunar-vfs-job.c:1042
msgid "Do you want to skip it?"
msgstr "Haluatko ohittaa sen?"
@@ -887,36 +896,86 @@ msgstr "Yksityiskohtainen hakemistolistaus"
msgid "Details view"
msgstr "Yksityiskohtainen näkymä"
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr "Jari Rahkonen <jari.rahkonen@pp1.inet.fi>"
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:959
+#: ../thunar/thunar-dialogs.c:231 ../thunar/thunar-renamer-dialog.c:959
msgid "Failed to open the documentation browser"
msgstr "Dokumentaatioselaimen avaaminen epäonnistui"
-#: ../thunar/thunar-dialogs.c:325
+#: ../thunar/thunar-dialogs.c:328
msgid "_Yes"
msgstr "_Kyllä"
-#: ../thunar/thunar-dialogs.c:329
+#: ../thunar/thunar-dialogs.c:332
msgid "Yes to _all"
msgstr "Kyllä k_aikkiin"
-#: ../thunar/thunar-dialogs.c:333
+#: ../thunar/thunar-dialogs.c:336
msgid "_No"
msgstr "_Ei"
-#: ../thunar/thunar-dialogs.c:337
+#: ../thunar/thunar-dialogs.c:340
msgid "N_o to all"
msgstr "Ei kaikkii_n"
-#: ../thunar/thunar-dialogs.c:342
+#: ../thunar/thunar-dialogs.c:344
+#, fuzzy
+msgid "_Retry"
+msgstr "_Palauta"
+
+#: ../thunar/thunar-dialogs.c:349
msgid "_Cancel"
msgstr "_Peruuta"
+#. setup the confirmation dialog
+#: ../thunar/thunar-dialogs.c:429
+msgid "Confirm to replace files"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:435
+msgid "_Skip"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:436
+#, fuzzy
+msgid "Replace _All"
+msgstr "_Korvaa tällä:"
+
+#: ../thunar/thunar-dialogs.c:437
+#, fuzzy
+msgid "_Replace"
+msgstr "_Nimeä uudelleen"
+
+#: ../thunar/thunar-dialogs.c:467
+#, c-format
+msgid "This folder already contains a file \"%s\"."
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:475
+msgid "ReplaceDialogPart1|Do you want to replace the existing file"
+msgstr ""
+
+#.
+#. Fourth box (size, volume, free space)
+#.
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:440
+msgid "Size:"
+msgstr "Koko:"
+
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:401
+msgid "Modified:"
+msgstr "Muokattu:"
+
+#: ../thunar/thunar-dialogs.c:500
+msgid "ReplaceDialogPart2|with the following file?"
+msgstr ""
+
#: ../thunar/thunar-dnd.c:70
msgid "_Copy here"
msgstr "_Kopioi tähän"
@@ -1760,21 +1819,21 @@ msgstr ""
msgid "Failed to display the volume management settings"
msgstr "Taltionhallinnan asetusten näyttäminen epäonnistui"
-#: ../thunar/thunar-progress-dialog.c:375
+#: ../thunar/thunar-progress-dialog.c:398
#, 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:380
+#: ../thunar/thunar-progress-dialog.c:403
#, 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:385
+#: ../thunar/thunar-progress-dialog.c:408
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1811,21 +1870,10 @@ msgstr "Linkin kohde:"
msgid "Deleted:"
msgstr "Poistettu:"
-#: ../thunar/thunar-properties-dialog.c:401
-msgid "Modified:"
-msgstr "Muokattu:"
-
#: ../thunar/thunar-properties-dialog.c:415
msgid "Accessed:"
msgstr "Käytetty:"
-#.
-#. Fourth box (size, volume, free space)
-#.
-#: ../thunar/thunar-properties-dialog.c:440
-msgid "Size:"
-msgstr "Koko:"
-
#: ../thunar/thunar-properties-dialog.c:453
msgid "Volume:"
msgstr "Taltio:"
diff --git a/po/fr.po b/po/fr.po
index 743ef7353..5acd54939 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-22 18:30+0200\n"
+"POT-Creation-Date: 2007-05-23 23:24+0200\n"
"PO-Revision-Date: 2007-02-07 16:02+0100\n"
"Last-Translator: Maximilian Schleiss <maxschleiss@solnet.ch>\n"
"Language-Team: French <xfce-i18n@xfce.org>\n"
@@ -59,29 +59,29 @@ msgstr "Seuls les fichiers locaux peuvent être renommés"
msgid "Preparing..."
msgstr "Préparation..."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:228
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:537
#, c-format
msgid "Failed to change permissions of \"%s\""
msgstr "Échec au changement des droits de \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:355
#, c-format
msgid "Failed to change file owner of \"%s\""
msgstr "Échec au changement de propriétaire de \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:356
#, c-format
msgid "Failed to change file group of \"%s\""
msgstr "Échec au changement de groupe de \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:444
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:190
#, c-format
msgid "The file \"%s\" already exists"
msgstr "Le fichier \"%s\" existe déjà "
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:462
#, c-format
msgid "Failed to create empty file \"%s\""
msgstr "Échec à la création du fichier vide \"%s\""
@@ -241,11 +241,20 @@ msgstr "Corbeille"
msgid "Cannot move or copy files within the trash"
msgstr "Copier ou déplacer des fichiers dans la corbeille n'est pas autorisé"
-#: ../thunar-vfs/thunar-vfs-job.c:831
+#. no "ask-replace" handler, fallback to "ask"
+#: ../thunar-vfs/thunar-vfs-job.c:401
+#, c-format
+msgid ""
+"The file \"%s\" already exists. Would you like to replace it?\n"
+"\n"
+"If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-job.c:897
msgid "Do you want to overwrite it?"
msgstr "Voulez-vous l'écraser ?"
-#: ../thunar-vfs/thunar-vfs-job.c:896
+#: ../thunar-vfs/thunar-vfs-job.c:1042
msgid "Do you want to skip it?"
msgstr "Voulez-vous l'ignorer ?"
@@ -891,7 +900,7 @@ msgstr "Liste détaillée des répertoires"
msgid "Details view"
msgstr "Vue détails"
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr ""
"Stephane Roy <sroy@j2n.net>\n"
@@ -900,30 +909,80 @@ msgstr ""
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:959
+#: ../thunar/thunar-dialogs.c:231 ../thunar/thunar-renamer-dialog.c:959
msgid "Failed to open the documentation browser"
msgstr "Échec à l'ouverture du navigateur de la documentation"
-#: ../thunar/thunar-dialogs.c:325
+#: ../thunar/thunar-dialogs.c:328
msgid "_Yes"
msgstr "_Oui"
-#: ../thunar/thunar-dialogs.c:329
+#: ../thunar/thunar-dialogs.c:332
msgid "Yes to _all"
msgstr "Oui pour _tout"
-#: ../thunar/thunar-dialogs.c:333
+#: ../thunar/thunar-dialogs.c:336
msgid "_No"
msgstr "_Non"
-#: ../thunar/thunar-dialogs.c:337
+#: ../thunar/thunar-dialogs.c:340
msgid "N_o to all"
msgstr "N_on pour tous"
-#: ../thunar/thunar-dialogs.c:342
+#: ../thunar/thunar-dialogs.c:344
+#, fuzzy
+msgid "_Retry"
+msgstr "_Restaurer"
+
+#: ../thunar/thunar-dialogs.c:349
msgid "_Cancel"
msgstr "_Annuler"
+#. setup the confirmation dialog
+#: ../thunar/thunar-dialogs.c:429
+msgid "Confirm to replace files"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:435
+msgid "_Skip"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:436
+#, fuzzy
+msgid "Replace _All"
+msgstr "Remplacer _par :"
+
+#: ../thunar/thunar-dialogs.c:437
+#, fuzzy
+msgid "_Replace"
+msgstr "_Renommer"
+
+#: ../thunar/thunar-dialogs.c:467
+#, c-format
+msgid "This folder already contains a file \"%s\"."
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:475
+msgid "ReplaceDialogPart1|Do you want to replace the existing file"
+msgstr ""
+
+#.
+#. Fourth box (size, volume, free space)
+#.
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:440
+msgid "Size:"
+msgstr "Taille :"
+
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:401
+msgid "Modified:"
+msgstr "Modifié :"
+
+#: ../thunar/thunar-dialogs.c:500
+msgid "ReplaceDialogPart2|with the following file?"
+msgstr ""
+
#: ../thunar/thunar-dnd.c:70
msgid "_Copy here"
msgstr "_Copier ici"
@@ -1774,21 +1833,21 @@ msgstr ""
msgid "Failed to display the volume management settings"
msgstr "Échec à l'affichage des paramètres du gestionnaire de volume"
-#: ../thunar/thunar-progress-dialog.c:375
+#: ../thunar/thunar-progress-dialog.c:398
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
msgstr[0] "(%lu heure restante)"
msgstr[1] "(%lu heures restantes)"
-#: ../thunar/thunar-progress-dialog.c:380
+#: ../thunar/thunar-progress-dialog.c:403
#, 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:385
+#: ../thunar/thunar-progress-dialog.c:408
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1825,21 +1884,10 @@ msgstr "Cible du lien :"
msgid "Deleted:"
msgstr "Effacé :"
-#: ../thunar/thunar-properties-dialog.c:401
-msgid "Modified:"
-msgstr "Modifié :"
-
#: ../thunar/thunar-properties-dialog.c:415
msgid "Accessed:"
msgstr "Accédé :"
-#.
-#. Fourth box (size, volume, free space)
-#.
-#: ../thunar/thunar-properties-dialog.c:440
-msgid "Size:"
-msgstr "Taille :"
-
#: ../thunar/thunar-properties-dialog.c:453
msgid "Volume:"
msgstr "Volume :"
diff --git a/po/gl.po b/po/gl.po
index a63dc5ab6..59f6067b5 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-22 18:30+0200\n"
+"POT-Creation-Date: 2007-05-23 23:24+0200\n"
"PO-Revision-Date: 2006-07-05 14:54+0000\n"
"Last-Translator: Iván_one2 <talivan.ivan@gmail.com>\n"
"Language-Team: Galician <gl@li.org>\n"
@@ -57,29 +57,29 @@ msgstr "Seleccione os ficheiros a renomear"
msgid "Preparing..."
msgstr "Preparando..."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:228
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:537
#, fuzzy, c-format
msgid "Failed to change permissions of \"%s\""
msgstr "Non se puideron muda-los permisos de «%s»: %s"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:355
#, fuzzy, c-format
msgid "Failed to change file owner of \"%s\""
msgstr "Non se puido muda-lo dono de «%s»: %s"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:356
#, fuzzy, c-format
msgid "Failed to change file group of \"%s\""
msgstr "Non se puido muda-lo grupo de «%s»: %s"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:444
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:190
#, c-format
msgid "The file \"%s\" already exists"
msgstr "O ficheiro «%s» xa existe"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:462
#, fuzzy, c-format
msgid "Failed to create empty file \"%s\""
msgstr "Non se puido crea-lo tubo chamado «%s»"
@@ -237,7 +237,17 @@ msgstr ""
msgid "Cannot move or copy files within the trash"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-job.c:831
+#. no "ask-replace" handler, fallback to "ask"
+#: ../thunar-vfs/thunar-vfs-job.c:401
+#, fuzzy, c-format
+msgid ""
+"The file \"%s\" already exists. Would you like to replace it?\n"
+"\n"
+"If you replace an existing file, its contents will be overwritten."
+msgstr ""
+"O ficheiro «%s» xa existe. ¿Desexa substituÃlo por un ficheiro baleiro?"
+
+#: ../thunar-vfs/thunar-vfs-job.c:897
#, fuzzy
msgid "Do you want to overwrite it?"
msgstr ""
@@ -245,7 +255,7 @@ msgstr ""
"\n"
"¿Desexa sobrescribilo?"
-#: ../thunar-vfs/thunar-vfs-job.c:896
+#: ../thunar-vfs/thunar-vfs-job.c:1042
#, fuzzy
msgid "Do you want to skip it?"
msgstr ""
@@ -898,37 +908,86 @@ msgstr "Listaxe de directorios detallada"
msgid "Details view"
msgstr "Vista de detalles"
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr "Iván Seoane <ovellanegra@gmail.com>"
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:959
+#: ../thunar/thunar-dialogs.c:231 ../thunar/thunar-renamer-dialog.c:959
msgid "Failed to open the documentation browser"
msgstr "Non se puido abri-lo visor de documentación"
-#: ../thunar/thunar-dialogs.c:325
+#: ../thunar/thunar-dialogs.c:328
msgid "_Yes"
msgstr "_Si"
-#: ../thunar/thunar-dialogs.c:329
+#: ../thunar/thunar-dialogs.c:332
msgid "Yes to _all"
msgstr "Si _a todo"
-#: ../thunar/thunar-dialogs.c:333
+#: ../thunar/thunar-dialogs.c:336
msgid "_No"
msgstr "_Non"
-#: ../thunar/thunar-dialogs.c:337
+#: ../thunar/thunar-dialogs.c:340
#, fuzzy
msgid "N_o to all"
msgstr "Si _a todo"
-#: ../thunar/thunar-dialogs.c:342
+#: ../thunar/thunar-dialogs.c:344
+msgid "_Retry"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:349
msgid "_Cancel"
msgstr "_Cancelar"
+#. setup the confirmation dialog
+#: ../thunar/thunar-dialogs.c:429
+msgid "Confirm to replace files"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:435
+msgid "_Skip"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:436
+#, fuzzy
+msgid "Replace _All"
+msgstr "SubstituÃr _con:"
+
+#: ../thunar/thunar-dialogs.c:437
+#, fuzzy
+msgid "_Replace"
+msgstr "Renomear"
+
+#: ../thunar/thunar-dialogs.c:467
+#, c-format
+msgid "This folder already contains a file \"%s\"."
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:475
+msgid "ReplaceDialogPart1|Do you want to replace the existing file"
+msgstr ""
+
+#.
+#. Fourth box (size, volume, free space)
+#.
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:440
+msgid "Size:"
+msgstr "Tamaño:"
+
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:401
+msgid "Modified:"
+msgstr "Modificado:"
+
+#: ../thunar/thunar-dialogs.c:500
+msgid "ReplaceDialogPart2|with the following file?"
+msgstr ""
+
#: ../thunar/thunar-dnd.c:70
msgid "_Copy here"
msgstr "_Copiar aquÃ"
@@ -1774,21 +1833,21 @@ msgstr ""
msgid "Failed to display the volume management settings"
msgstr "Non se puido conectar co daemon HAL: %s"
-#: ../thunar/thunar-progress-dialog.c:375
+#: ../thunar/thunar-progress-dialog.c:398
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
msgstr[0] "(resta %lu hora)"
msgstr[1] "(restan %lu horas)"
-#: ../thunar/thunar-progress-dialog.c:380
+#: ../thunar/thunar-progress-dialog.c:403
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
msgstr[0] "(resta %lu minuto)"
msgstr[1] "(restan %lu minutos)"
-#: ../thunar/thunar-progress-dialog.c:385
+#: ../thunar/thunar-progress-dialog.c:408
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1826,21 +1885,10 @@ msgstr "Destino da ligazón:"
msgid "Deleted:"
msgstr "_Eliminar"
-#: ../thunar/thunar-properties-dialog.c:401
-msgid "Modified:"
-msgstr "Modificado:"
-
#: ../thunar/thunar-properties-dialog.c:415
msgid "Accessed:"
msgstr "Accedido:"
-#.
-#. Fourth box (size, volume, free space)
-#.
-#: ../thunar/thunar-properties-dialog.c:440
-msgid "Size:"
-msgstr "Tamaño:"
-
#: ../thunar/thunar-properties-dialog.c:453
msgid "Volume:"
msgstr "Volume:"
@@ -3434,12 +3482,6 @@ msgstr "Abri-los cartafoles especificados no Thunar"
#~ msgid "Failed to determine file info of \"%s\": %s"
#~ msgstr "Non se puido determina-la información do ficheiro «%s»: %s"
-#~ msgid ""
-#~ "The file \"%s\" already exists. Do you want to replace it with an empty "
-#~ "file?"
-#~ msgstr ""
-#~ "O ficheiro «%s» xa existe. ¿Desexa substituÃlo por un ficheiro baleiro?"
-
#~ msgid ""
#~ "Failed to remove \"%s\".\n"
#~ "\n"
diff --git a/po/he.po b/po/he.po
index 10bd75304..8c94a51c1 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-22 18:30+0200\n"
+"POT-Creation-Date: 2007-05-23 23:24+0200\n"
"PO-Revision-Date: 2007-01-20 14:29+0200\n"
"Last-Translator: Yuval Tanny <tanai@int.gov.il>\n"
"Language-Team: Hebrew\n"
@@ -58,29 +58,29 @@ msgstr "×פשר ×œ×©× ×•×ª ×ת ×”×©× ×¨×§ ×œ×§×‘×¦×™× ×ž×§×•×ž×™×™×"
msgid "Preparing..."
msgstr "מכין..."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:228
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:537
#, c-format
msgid "Failed to change permissions of \"%s\""
msgstr "כישלון ×‘×©×™× ×•×™ ההרש×ות של \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:355
#, c-format
msgid "Failed to change file owner of \"%s\""
msgstr "כישלון ×‘×©×™× ×•×™ ×”×‘×¢×œ×™× ×©×œ \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:356
#, c-format
msgid "Failed to change file group of \"%s\""
msgstr "כישלון ×‘×©×™× ×•×™ הקבוצה של \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:444
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:190
#, c-format
msgid "The file \"%s\" already exists"
msgstr "הקובץ \"%s\" כבר קיי×."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:462
#, c-format
msgid "Failed to create empty file \"%s\""
msgstr "כישלון ביצירת קובץ ריק \"%s\""
@@ -238,11 +238,20 @@ msgstr "סל מחזור"
msgid "Cannot move or copy files within the trash"
msgstr "×ין ×פשרות להעביר ×ו להעתיק ×§×‘×¦×™× ×‘×ª×•×š סל המחזור"
-#: ../thunar-vfs/thunar-vfs-job.c:831
+#. no "ask-replace" handler, fallback to "ask"
+#: ../thunar-vfs/thunar-vfs-job.c:401
+#, c-format
+msgid ""
+"The file \"%s\" already exists. Would you like to replace it?\n"
+"\n"
+"If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-job.c:897
msgid "Do you want to overwrite it?"
msgstr "×”×× ×‘×¨×¦×•× ×š לדרוס ×ת ×–×”?"
-#: ../thunar-vfs/thunar-vfs-job.c:896
+#: ../thunar-vfs/thunar-vfs-job.c:1042
msgid "Do you want to skip it?"
msgstr "×”×× ×‘×¨×¦×•× ×š לדלג על ×–×”?"
@@ -877,36 +886,86 @@ msgstr "×ª×¨×©×™× ×¡×¤×¨×™×™×” מפורט"
msgid "Details view"
msgstr "תצוגת רשימה מפורטת"
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr "תודות למתרגמי×"
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:959
+#: ../thunar/thunar-dialogs.c:231 ../thunar/thunar-renamer-dialog.c:959
msgid "Failed to open the documentation browser"
msgstr "×œ× × ×™×ª×Ÿ לפתוח ×ת דפדפן התיעוד"
-#: ../thunar/thunar-dialogs.c:325
+#: ../thunar/thunar-dialogs.c:328
msgid "_Yes"
msgstr "_כן"
-#: ../thunar/thunar-dialogs.c:329
+#: ../thunar/thunar-dialogs.c:332
msgid "Yes to _all"
msgstr "כן ל_הכל"
-#: ../thunar/thunar-dialogs.c:333
+#: ../thunar/thunar-dialogs.c:336
msgid "_No"
msgstr "_ל×"
-#: ../thunar/thunar-dialogs.c:337
+#: ../thunar/thunar-dialogs.c:340
msgid "N_o to all"
msgstr "×œ× ×œ_הכל"
-#: ../thunar/thunar-dialogs.c:342
+#: ../thunar/thunar-dialogs.c:344
+#, fuzzy
+msgid "_Retry"
+msgstr "_שחזר"
+
+#: ../thunar/thunar-dialogs.c:349
msgid "_Cancel"
msgstr "_ביטול"
+#. setup the confirmation dialog
+#: ../thunar/thunar-dialogs.c:429
+msgid "Confirm to replace files"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:435
+msgid "_Skip"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:436
+#, fuzzy
+msgid "Replace _All"
+msgstr "לה_חליף ×¢×:"
+
+#: ../thunar/thunar-dialogs.c:437
+#, fuzzy
+msgid "_Replace"
+msgstr "ש_× ×” ש×"
+
+#: ../thunar/thunar-dialogs.c:467
+#, c-format
+msgid "This folder already contains a file \"%s\"."
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:475
+msgid "ReplaceDialogPart1|Do you want to replace the existing file"
+msgstr ""
+
+#.
+#. Fourth box (size, volume, free space)
+#.
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:440
+msgid "Size:"
+msgstr "גודל:"
+
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:401
+msgid "Modified:"
+msgstr "×©×•× ×”:"
+
+#: ../thunar/thunar-dialogs.c:500
+msgid "ReplaceDialogPart2|with the following file?"
+msgstr ""
+
#: ../thunar/thunar-dnd.c:70
msgid "_Copy here"
msgstr "_העתק לכ×ן"
@@ -1737,21 +1796,21 @@ msgstr ""
msgid "Failed to display the volume management settings"
msgstr "×œ× × ×™×ª×Ÿ להתחבר ×ל HAL: %s"
-#: ../thunar/thunar-progress-dialog.c:375
+#: ../thunar/thunar-progress-dialog.c:398
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
msgstr[0] ""
msgstr[1] ""
-#: ../thunar/thunar-progress-dialog.c:380
+#: ../thunar/thunar-progress-dialog.c:403
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
msgstr[0] ""
msgstr[1] ""
-#: ../thunar/thunar-progress-dialog.c:385
+#: ../thunar/thunar-progress-dialog.c:408
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1788,21 +1847,10 @@ msgstr "כתובת הקיצור:"
msgid "Deleted:"
msgstr "× ×ž×—×§:"
-#: ../thunar/thunar-properties-dialog.c:401
-msgid "Modified:"
-msgstr "×©×•× ×”:"
-
#: ../thunar/thunar-properties-dialog.c:415
msgid "Accessed:"
msgstr "הוגש:"
-#.
-#. Fourth box (size, volume, free space)
-#.
-#: ../thunar/thunar-properties-dialog.c:440
-msgid "Size:"
-msgstr "גודל:"
-
#: ../thunar/thunar-properties-dialog.c:453
msgid "Volume:"
msgstr "כרך:"
diff --git a/po/hu.po b/po/hu.po
index ac86d1c19..c1258f449 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-22 18:30+0200\n"
+"POT-Creation-Date: 2007-05-23 23:24+0200\n"
"PO-Revision-Date: 2007-05-22 20:11+0100\n"
"Last-Translator: SZERVÃC Attila <sas@321.hu>\n"
"Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -36,8 +36,7 @@ msgstr "Nincs Exec mező megadva"
msgid "No URL field specified"
msgstr "Nincs URL megadva"
-#: ../thunar-vfs/thunar-vfs-info.c:414
-#: ../thunar-vfs/thunar-vfs-private.c:384
+#: ../thunar-vfs/thunar-vfs-info.c:414 ../thunar-vfs/thunar-vfs-private.c:384
msgid "Invalid desktop file"
msgstr "Hibás .desktop fájl"
@@ -58,29 +57,29 @@ msgstr "Csak helyi fájlok nevezhetők át"
msgid "Preparing..."
msgstr "ElÅ‘készÃtés..."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:228
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:537
#, c-format
msgid "Failed to change permissions of \"%s\""
msgstr "\"%s\" jogainak cseréje sikertelen"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:355
#, c-format
msgid "Failed to change file owner of \"%s\""
msgstr "\"%s\" tulajdonosának cseréje sikertelen"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:356
#, c-format
msgid "Failed to change file group of \"%s\""
msgstr "\"%s\" csoportjának cseréje sikertelen"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:444
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:190
#, c-format
msgid "The file \"%s\" already exists"
msgstr "A \"%s\" fájl már létezik"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:462
#, c-format
msgid "Failed to create empty file \"%s\""
msgstr "Nem tudtam \"%s\" üres fájlt létrehozni"
@@ -106,8 +105,7 @@ msgstr "Nem tudok adatot Ãrni ide: \"%s\""
#. display an error to the user
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:239
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:302
-#: ../thunar-vfs/thunar-vfs-io-ops.c:496
-#: ../thunar/thunar-chooser-dialog.c:783
+#: ../thunar-vfs/thunar-vfs-io-ops.c:496 ../thunar/thunar-chooser-dialog.c:783
#, c-format
msgid "Failed to remove \"%s\""
msgstr "Nem törölhető: \"%s\""
@@ -123,8 +121,7 @@ msgid "copy of %s"
msgstr "%s másolata"
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:364
-#: ../thunar/thunar-list-model.c:786
-#: ../thunar/thunar-properties-dialog.c:861
+#: ../thunar/thunar-list-model.c:786 ../thunar/thunar-properties-dialog.c:861
#, c-format
msgid "link to %s"
msgstr "lánc ehhez: %s"
@@ -238,11 +235,20 @@ msgstr "Kuka"
msgid "Cannot move or copy files within the trash"
msgstr "A kukában való másolás vagy áthelyezés nem támogatott"
-#: ../thunar-vfs/thunar-vfs-job.c:831
+#. no "ask-replace" handler, fallback to "ask"
+#: ../thunar-vfs/thunar-vfs-job.c:401
+#, fuzzy, c-format
+msgid ""
+"The file \"%s\" already exists. Would you like to replace it?\n"
+"\n"
+"If you replace an existing file, its contents will be overwritten."
+msgstr "\"%s\" fájl már létezik. Üres fájllal cseréljük?"
+
+#: ../thunar-vfs/thunar-vfs-job.c:897
msgid "Do you want to overwrite it?"
msgstr "FelülÃrod?"
-#: ../thunar-vfs/thunar-vfs-job.c:896
+#: ../thunar-vfs/thunar-vfs-job.c:1042
msgid "Do you want to skip it?"
msgstr "Kihagyod?"
@@ -282,8 +288,7 @@ msgid "The icon of the mime handler"
msgstr "A mime kezelő ikonja"
#: ../thunar-vfs/thunar-vfs-mime-handler.c:174
-#: ../thunar/thunar-enum-types.c:118
-#: ../thunar/thunar-renamer-dialog.c:427
+#: ../thunar/thunar-enum-types.c:118 ../thunar/thunar-renamer-dialog.c:427
#: ../thunarx/thunarx-renamer.c:177
msgid "Name"
msgstr "Név"
@@ -319,8 +324,7 @@ msgstr "A művelet nem támogatott"
msgid "Invalidly escaped characters"
msgstr "Érvénytelen 'escape' karakterek"
-#: ../thunar-vfs/thunar-vfs-thumb.c:222
-#: ../thunar/thunar-enum-types.c:121
+#: ../thunar-vfs/thunar-vfs-thumb.c:222 ../thunar/thunar-enum-types.c:121
msgid "Size"
msgstr "Méret"
@@ -466,15 +470,13 @@ msgid "Sort items in descending order"
msgstr "Az elemeket csökkenően rendezi"
#. display an error message to the user
-#: ../thunar/thunar-application.c:409
-#: ../thunar/thunar-application.c:453
+#: ../thunar/thunar-application.c:409 ../thunar/thunar-application.c:453
msgid "Failed to launch operation"
msgstr "Nem sikerült a művelet indÃtása"
#. failed to launch exo-eject, inform the user about this
#. display an error to the user
-#: ../thunar/thunar-application.c:623
-#: ../thunar/thunar-chooser-dialog.c:534
+#: ../thunar/thunar-application.c:623 ../thunar/thunar-chooser-dialog.c:534
#, c-format
msgid "Failed to execute \"%s\""
msgstr "Sikertelen futtatás: \"%s\""
@@ -490,8 +492,7 @@ msgstr "Nem sikerült megnyitni ezt: \"%s\""
msgid "Failed to open \"%s\": %s"
msgstr "\"%s\" megnyitása sikertelen: %s"
-#: ../thunar/thunar-application.c:1153
-#: ../thunar/thunar-application.c:1186
+#: ../thunar/thunar-application.c:1153 ../thunar/thunar-application.c:1186
msgid "Copying files..."
msgstr "Fájlok másolása..."
@@ -548,17 +549,16 @@ msgstr "Mindent törölsz a kukából?"
#. append the "Empty Trash" menu action
#. add the "Empty Trash" menu item
-#: ../thunar/thunar-application.c:1515
-#: ../thunar/thunar-location-buttons.c:171
-#: ../thunar/thunar-shortcuts-view.c:865
-#: ../thunar/thunar-tree-view.c:1072
-#: ../thunar/thunar-window.c:269
-#: ../plugins/thunar-tpa/main.c:49
+#: ../thunar/thunar-application.c:1515 ../thunar/thunar-location-buttons.c:171
+#: ../thunar/thunar-shortcuts-view.c:865 ../thunar/thunar-tree-view.c:1072
+#: ../thunar/thunar-window.c:269 ../plugins/thunar-tpa/main.c:49
msgid "_Empty Trash"
msgstr "Ãœr_es kuka"
#: ../thunar/thunar-application.c:1519
-msgid "If you choose to empty the Trash, all items in it will be permanently lost. Please note that you can also delete them separately."
+msgid ""
+"If you choose to empty the Trash, all items in it will be permanently lost. "
+"Please note that you can also delete them separately."
msgstr "A kuka kiürÃtésével minden eleme elvész. Ezeket külön is törölheted."
#: ../thunar/thunar-application.c:1536
@@ -581,8 +581,12 @@ msgstr "Mappa lét_rehozása"
#: ../thunar/thunar-application.c:1628
#, c-format
-msgid "The folder \"%s\" does not exist anymore, but it is required to restore the file \"%s\" from the trash. Do you want to create the folder again?"
-msgstr "\"%s\" mappa már nem létezik, de \"%s\" fájl létrehozásához szükséges. Újra létrehozzuk?"
+msgid ""
+"The folder \"%s\" does not exist anymore, but it is required to restore the "
+"file \"%s\" from the trash. Do you want to create the folder again?"
+msgstr ""
+"\"%s\" mappa már nem létezik, de \"%s\" fájl létrehozásához szükséges. Újra "
+"létrehozzuk?"
#. display an error dialog
#: ../thunar/thunar-application.c:1665
@@ -596,8 +600,7 @@ msgstr "Fájlok visszaállÃtása..."
#. tell the user that it didn't work
#. display an error to the user
-#: ../thunar/thunar-chooser-button.c:275
-#: ../thunar/thunar-chooser-dialog.c:514
+#: ../thunar/thunar-chooser-button.c:275 ../thunar/thunar-chooser-dialog.c:514
#, c-format
msgid "Failed to set default application for \"%s\""
msgstr "Nem sikerült beállÃtani az alapalkalmazást ehhez: \"%s\""
@@ -608,7 +611,8 @@ msgstr "Nincs kijelölt alkalmazás"
#: ../thunar/thunar-chooser-button.c:366
#, c-format
-msgid "The selected application is used to open this and other files of type \"%s\"."
+msgid ""
+"The selected application is used to open this and other files of type \"%s\"."
msgstr "A kijelölt alkalmazás nyitja meg ezt és más \"%s\" tÃpusú fájlokat."
#. add the "Other Application..." choice
@@ -616,8 +620,7 @@ msgstr "A kijelölt alkalmazás nyitja meg ezt és más \"%s\" tÃpusú fájloka
msgid "_Other Application..."
msgstr "Más alkalmazás..."
-#: ../thunar/thunar-chooser-dialog.c:220
-#: ../thunar/thunar-launcher.c:143
+#: ../thunar/thunar-chooser-dialog.c:220 ../thunar/thunar-launcher.c:143
msgid "Open With"
msgstr "Megnyitás ezzel:"
@@ -627,8 +630,12 @@ msgid "Use a _custom command:"
msgstr "Egyéni parancs használata:"
#: ../thunar/thunar-chooser-dialog.c:295
-msgid "Use a custom command for an application that is not available from the above application list."
-msgstr "Egyéni parancs használata egy a fenti alkalmazás listában nem látható alkalmazáshoz."
+msgid ""
+"Use a custom command for an application that is not available from the above "
+"application list."
+msgstr ""
+"Egyéni parancs használata egy a fenti alkalmazás listában nem látható "
+"alkalmazáshoz."
#. create the "Custom command" button
#: ../thunar/thunar-chooser-dialog.c:314
@@ -659,13 +666,20 @@ msgstr "<i>%s</i> és más \"%s\" tÃpusú fájlok megnyitása ezzel:"
#: ../thunar/thunar-chooser-dialog.c:709
#, c-format
-msgid "Browse the file system to select an application to open files of type \"%s\"."
-msgstr "Böngészd a fájlrendszert \"%s\" tÃpusú fájlokat megnyitó alkalmazás kiválasztásához."
+msgid ""
+"Browse the file system to select an application to open files of type \"%s\"."
+msgstr ""
+"Böngészd a fájlrendszert \"%s\" tÃpusú fájlokat megnyitó alkalmazás "
+"kiválasztásához."
#: ../thunar/thunar-chooser-dialog.c:715
#, c-format
-msgid "Change the default application for files of type \"%s\" to the selected application."
-msgstr "Alapértelmezett alkalmazás váltása \"%s\" tÃpusú fájlokhoz a kijelölt alkalmazásra."
+msgid ""
+"Change the default application for files of type \"%s\" to the selected "
+"application."
+msgstr ""
+"Alapértelmezett alkalmazás váltása \"%s\" tÃpusú fájlokhoz a kijelölt "
+"alkalmazásra."
#: ../thunar/thunar-chooser-dialog.c:762
#, c-format
@@ -674,13 +688,17 @@ msgstr "Biztosan eltávolÃtod?: \"%s\"?"
#: ../thunar/thunar-chooser-dialog.c:768
msgid ""
-"This will remove the application launcher that appears in the file context menu, but will not uninstall the application itself.\n"
+"This will remove the application launcher that appears in the file context "
+"menu, but will not uninstall the application itself.\n"
"\n"
-"You can only remove application launchers that were created using the custom command box in the \"Open With\" dialog of the file manager."
+"You can only remove application launchers that were created using the custom "
+"command box in the \"Open With\" dialog of the file manager."
msgstr ""
-"Ez törölni fogja az alkalmazás a helyi menüben megjelenÅ‘ indÃtóját, de nem törli az alkalmazást magát.\n"
+"Ez törölni fogja az alkalmazás a helyi menüben megjelenÅ‘ indÃtóját, de nem "
+"törli az alkalmazást magát.\n"
"\n"
-"Csak a fájlkezelÅ‘ \"Megnyitás ezzel\" párbeszéde egyéni parancs gombjával létrehozott indÃtók törölhetÅ‘k Ãgy."
+"Csak a fájlkezelő \"Megnyitás ezzel\" párbeszéde egyéni parancs gombjával "
+"létrehozott indÃtók törölhetÅ‘k Ãgy."
#: ../thunar/thunar-chooser-dialog.c:809
#: ../plugins/thunar-uca/thunar-uca-editor.c:492
@@ -803,11 +821,9 @@ msgstr "Oszlopok nyújtása, ha szükséges"
#. the file_time is invalid
#. reset page title
#. tell the user that we're unable to determine the file info
-#: ../thunar/thunar-column-model.c:896
-#: ../thunar/thunar-list-model.c:737
+#: ../thunar/thunar-column-model.c:896 ../thunar/thunar-list-model.c:737
#: ../thunar/thunar-list-model.c:766
-#: ../thunar/thunar-permissions-chooser.c:269
-#: ../thunar/thunar-util.c:170
+#: ../thunar/thunar-permissions-chooser.c:269 ../thunar/thunar-util.c:170
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
#: ../plugins/thunar-apr/thunar-apr-image-page.c:287
#: ../plugins/thunar-apr/thunar-apr-image-page.c:288
@@ -827,8 +843,7 @@ msgstr "Tömör nézet"
msgid "C_reate"
msgstr "Lét_rehoz"
-#: ../thunar/thunar-create-dialog.c:178
-#: ../thunar/thunar-standard-view.c:2240
+#: ../thunar/thunar-create-dialog.c:178 ../thunar/thunar-standard-view.c:2240
msgid "Enter the new name:"
msgstr "Új fájlnév megadása:"
@@ -869,37 +884,86 @@ msgstr "Részletes könyvtárlista"
msgid "Details view"
msgstr "Részletes nézet"
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr "fordÃtó-lista"
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:228
-#: ../thunar/thunar-renamer-dialog.c:959
+#: ../thunar/thunar-dialogs.c:231 ../thunar/thunar-renamer-dialog.c:959
msgid "Failed to open the documentation browser"
msgstr "Nem sikerült megnyitni a dokumentáció böngészőt"
-#: ../thunar/thunar-dialogs.c:325
+#: ../thunar/thunar-dialogs.c:328
msgid "_Yes"
msgstr "_Igen"
-#: ../thunar/thunar-dialogs.c:329
+#: ../thunar/thunar-dialogs.c:332
msgid "Yes to _all"
msgstr "_Mind"
-#: ../thunar/thunar-dialogs.c:333
+#: ../thunar/thunar-dialogs.c:336
msgid "_No"
msgstr "_Nem"
-#: ../thunar/thunar-dialogs.c:337
+#: ../thunar/thunar-dialogs.c:340
msgid "N_o to all"
msgstr "_Egyet sem"
-#: ../thunar/thunar-dialogs.c:342
+#: ../thunar/thunar-dialogs.c:344
+#, fuzzy
+msgid "_Retry"
+msgstr "Hely_reállÃt"
+
+#: ../thunar/thunar-dialogs.c:349
msgid "_Cancel"
msgstr "_Csendet!"
+#. setup the confirmation dialog
+#: ../thunar/thunar-dialogs.c:429
+msgid "Confirm to replace files"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:435
+msgid "_Skip"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:436
+#, fuzzy
+msgid "Replace _All"
+msgstr "Csere erre:"
+
+#: ../thunar/thunar-dialogs.c:437
+#, fuzzy
+msgid "_Replace"
+msgstr "Ãt_nevez"
+
+#: ../thunar/thunar-dialogs.c:467
+#, c-format
+msgid "This folder already contains a file \"%s\"."
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:475
+msgid "ReplaceDialogPart1|Do you want to replace the existing file"
+msgstr ""
+
+#.
+#. Fourth box (size, volume, free space)
+#.
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:440
+msgid "Size:"
+msgstr "Méret:"
+
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:401
+msgid "Modified:"
+msgstr "MódosÃtva:"
+
+#: ../thunar/thunar-dialogs.c:500
+msgid "ReplaceDialogPart2|with the following file?"
+msgstr ""
+
#: ../thunar/thunar-dnd.c:70
msgid "_Copy here"
msgstr "Másolás ide"
@@ -914,8 +978,7 @@ msgstr "_Lánc ide"
#. display an error to the user
#. display an error message to the user
-#: ../thunar/thunar-dnd.c:252
-#: ../thunar/thunar-launcher.c:551
+#: ../thunar/thunar-dnd.c:252 ../thunar/thunar-launcher.c:551
#, c-format
msgid "Failed to execute file \"%s\""
msgstr "Nem futtatható fájl: \"%s\""
@@ -955,8 +1018,7 @@ msgstr "Tulajdonos"
#.
#. Permissions chooser
#.
-#: ../thunar/thunar-enum-types.c:120
-#: ../thunar/thunar-properties-dialog.c:513
+#: ../thunar/thunar-enum-types.c:120 ../thunar/thunar-properties-dialog.c:513
msgid "Permissions"
msgstr "Jogok"
@@ -997,7 +1059,8 @@ msgstr "Ugrás az ez utáni könyvtárra"
#: ../thunar/thunar-icon-factory.c:754
#, c-format
msgid "Failed to load fallback icon from \"%s\" (%s). Check your installation!"
-msgstr "Nem sikerült a pótikon betöltése innen: \"%s\" (%s). EllenÅ‘rizd a telepÃtést!"
+msgstr ""
+"Nem sikerült a pótikon betöltése innen: \"%s\" (%s). EllenÅ‘rizd a telepÃtést!"
#: ../thunar/thunar-icon-view.c:198
msgid "Icon based directory listing"
@@ -1008,19 +1071,15 @@ msgid "Icon view"
msgstr "Ikonnézet"
#. append the "Open" menu action
-#: ../thunar/thunar-launcher.c:140
-#: ../thunar/thunar-launcher.c:808
+#: ../thunar/thunar-launcher.c:140 ../thunar/thunar-launcher.c:808
#: ../thunar/thunar-location-buttons.c:168
-#: ../thunar/thunar-shortcuts-view.c:806
-#: ../thunar/thunar-tree-view.c:1012
+#: ../thunar/thunar-shortcuts-view.c:806 ../thunar/thunar-tree-view.c:1012
msgid "_Open"
msgstr "_Megnyit"
#. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:141
-#: ../thunar/thunar-location-buttons.c:169
-#: ../thunar/thunar-shortcuts-view.c:817
-#: ../thunar/thunar-tree-view.c:1024
+#: ../thunar/thunar-launcher.c:141 ../thunar/thunar-location-buttons.c:169
+#: ../thunar/thunar-shortcuts-view.c:817 ../thunar/thunar-tree-view.c:1024
msgid "Open in New Window"
msgstr "Megnyitás új ablakban"
@@ -1028,13 +1087,11 @@ msgstr "Megnyitás új ablakban"
msgid "Open the selected directory in a new window"
msgstr "Kijelölt könyvtár megnyitása új ablakban"
-#: ../thunar/thunar-launcher.c:142
-#: ../thunar/thunar-launcher.c:144
+#: ../thunar/thunar-launcher.c:142 ../thunar/thunar-launcher.c:144
msgid "Open With Other _Application..."
msgstr "Megnyitás más _alkalmazással..."
-#: ../thunar/thunar-launcher.c:142
-#: ../thunar/thunar-launcher.c:144
+#: ../thunar/thunar-launcher.c:142 ../thunar/thunar-launcher.c:144
#: ../thunar/thunar-launcher.c:891
msgid "Choose another application with which to open the selected file"
msgstr "Másik alkalmazás választása a kijelölt fájl megnyitásához"
@@ -1104,8 +1161,7 @@ msgstr[0] "A kijelölt fájlok futtatása"
msgid "_Open With \"%s\""
msgstr "_Megnyitás ezzel: \"%s\""
-#: ../thunar/thunar-launcher.c:867
-#: ../thunar/thunar-launcher.c:956
+#: ../thunar/thunar-launcher.c:867 ../thunar/thunar-launcher.c:956
#, c-format
msgid "Use \"%s\" to open the selected file"
msgid_plural "Use \"%s\" to open the selected files"
@@ -1131,10 +1187,8 @@ msgstr "Megnyitás ezzel: \"%s\""
#. tell the user that we were unable to mount the volume, which is required to send files to it
#. display an error dialog to inform the user
-#: ../thunar/thunar-launcher.c:1225
-#: ../thunar/thunar-location-entry.c:639
-#: ../thunar/thunar-shortcuts-view.c:1344
-#: ../thunar/thunar-tree-view.c:953
+#: ../thunar/thunar-launcher.c:1225 ../thunar/thunar-location-entry.c:639
+#: ../thunar/thunar-shortcuts-view.c:1344 ../thunar/thunar-tree-view.c:953
#: ../thunar/thunar-tree-view.c:1598
#, c-format
msgid "Failed to mount \"%s\""
@@ -1150,15 +1204,13 @@ msgid "Create a link to the selected file on the desktop"
msgid_plural "Create links to the selected files on the desktop"
msgstr[0] "Jelképes láncok készÃtése a kijelölt fájlokhoz az asztalon"
-#: ../thunar/thunar-launcher.c:1330
-#: ../thunar/thunar-launcher.c:1368
+#: ../thunar/thunar-launcher.c:1330 ../thunar/thunar-launcher.c:1368
#, c-format
msgid "Send the selected file to \"%s\""
msgid_plural "Send the selected files to \"%s\""
msgstr[0] "Kijelölt fájlok küldése ide: \"%s\""
-#: ../thunar/thunar-list-model.c:784
-#: ../thunar/thunar-properties-dialog.c:859
+#: ../thunar/thunar-list-model.c:784 ../thunar/thunar-properties-dialog.c:859
msgid "broken link"
msgstr "törött lánc"
@@ -1201,8 +1253,7 @@ msgstr "\"%s\" (%s) %s"
#. * where the trashed file/folder was located before it was moved to the trash), otherwise the
#. * properties dialog width will be messed up.
#.
-#: ../thunar/thunar-list-model.c:2297
-#: ../thunar/thunar-properties-dialog.c:362
+#: ../thunar/thunar-list-model.c:2297 ../thunar/thunar-properties-dialog.c:362
msgid "Original Path:"
msgstr "Eredeti útvonal:"
@@ -1226,13 +1277,11 @@ msgstr[0] "%d elem kijelölve"
#. append the "Create Folder" menu action
#: ../thunar/thunar-location-buttons.c:170
-#: ../thunar/thunar-standard-view.c:323
-#: ../thunar/thunar-tree-view.c:1088
+#: ../thunar/thunar-standard-view.c:323 ../thunar/thunar-tree-view.c:1088
msgid "Create _Folder..."
msgstr "Mappa létrehozása..."
-#: ../thunar/thunar-location-buttons.c:171
-#: ../thunar/thunar-window.c:269
+#: ../thunar/thunar-location-buttons.c:171 ../thunar/thunar-window.c:269
msgid "Delete all files and folders in the Trash"
msgstr "Minden fájlt és mappát töröl a Kukából"
@@ -1242,8 +1291,7 @@ msgid "Paste Into Folder"
msgstr "Mappába illesztés"
#: ../thunar/thunar-location-buttons.c:173
-#: ../thunar/thunar-renamer-dialog.c:179
-#: ../thunar/thunar-standard-view.c:324
+#: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-standard-view.c:324
msgid "_Properties..."
msgstr "Tulajdonságok..."
@@ -1272,8 +1320,11 @@ msgstr "Új mappa létrehozása itt: \"%s\""
#: ../thunar/thunar-location-buttons.c:1294
#, c-format
-msgid "Move or copy files previously selected by a Cut or Copy command into \"%s\""
-msgstr "A Vágás vagy Másolás paranccsal legutóbb kijelölt fájlok mozgatása vagy másolása ide: \"%s\""
+msgid ""
+"Move or copy files previously selected by a Cut or Copy command into \"%s\""
+msgstr ""
+"A Vágás vagy Másolás paranccsal legutóbb kijelölt fájlok mozgatása vagy "
+"másolása ide: \"%s\""
#: ../thunar/thunar-location-buttons.c:1300
#, c-format
@@ -1282,14 +1333,12 @@ msgstr "\"%s\" könyvtár tulajdonságainak megtekintése"
#. ask the user to enter a name for the new folder
#: ../thunar/thunar-location-buttons.c:1340
-#: ../thunar/thunar-standard-view.c:1818
-#: ../thunar/thunar-tree-view.c:1439
+#: ../thunar/thunar-standard-view.c:1818 ../thunar/thunar-tree-view.c:1439
msgid "New Folder"
msgstr "Új mappa"
#: ../thunar/thunar-location-buttons.c:1340
-#: ../thunar/thunar-standard-view.c:1818
-#: ../thunar/thunar-tree-view.c:1439
+#: ../thunar/thunar-standard-view.c:1818 ../thunar/thunar-tree-view.c:1439
msgid "Create New Folder"
msgstr "Új mappa létrehozása"
@@ -1301,8 +1350,7 @@ msgstr "Hely megnyitása"
msgid "_Location:"
msgstr "_CÃm:"
-#: ../thunar/thunar-location-entry.c:426
-#: ../thunar/thunar-window.c:1357
+#: ../thunar/thunar-location-entry.c:426 ../thunar/thunar-window.c:1357
#, c-format
msgid "Failed to launch \"%s\""
msgstr "Nem futtatható: \"%s\""
@@ -1415,8 +1463,13 @@ msgid "Do _not ask me again"
msgstr "_Ne kérdezd ismét"
#: ../thunar/thunar-permissions-chooser.c:586
-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 "Ha ezt a lehetÅ‘séget választod, megjegyzem azt, és nemkérdem többé. KésÅ‘bb a beállÃtások között módosÃthatod."
+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 ""
+"Ha ezt a lehetőséget választod, megjegyzem azt, és nemkérdem többé. Később a "
+"beállÃtások között módosÃthatod."
#. display an error to the user
#: ../thunar/thunar-permissions-chooser.c:666
@@ -1442,8 +1495,13 @@ msgid "Correct folder permissions"
msgstr "Könyvtár jogok javÃtása"
#: ../thunar/thunar-permissions-chooser.c:1036
-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 "A könyvtár jogait ismét összefüggÅ‘re állÃtom. Csak e könyvtár tartalmát olvasni jogosult felhasználók léphetnek majd bele."
+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 ""
+"A könyvtár jogait ismét összefüggÅ‘re állÃtom. Csak e könyvtár tartalmát "
+"olvasni jogosult felhasználók léphetnek majd bele."
#: ../thunar/thunar-preferences-dialog.c:228
msgid "File Manager Preferences"
@@ -1487,14 +1545,17 @@ msgstr "Előbb a mappák"
#: ../thunar/thunar-preferences-dialog.c:288
msgid "Select this option to list folders before files when you sort a folder."
-msgstr "Ha ezt választod, egy mappa rendezésekor a mappák a fájlok elé kerülnek."
+msgstr ""
+"Ha ezt választod, egy mappa rendezésekor a mappák a fájlok elé kerülnek."
#: ../thunar/thunar-preferences-dialog.c:292
msgid "_Show thumbnails"
msgstr "Előképek mutatá_sa"
#: ../thunar/thunar-preferences-dialog.c:294
-msgid "Select this option to display previewable files within a folder as automatically generated thumbnail icons."
+msgid ""
+"Select this option to display previewable files within a folder as "
+"automatically generated thumbnail icons."
msgstr "E lehetőség az előnézhető fájlokat előképi ikonokként mutatja."
#: ../thunar/thunar-preferences-dialog.c:315
@@ -1502,7 +1563,9 @@ msgid "_Text beside icons"
msgstr "Szöveg az ikonok mellett"
#: ../thunar/thunar-preferences-dialog.c:317
-msgid "Select this option to place the icon captions for items beside the icon rather than below the icon."
+msgid ""
+"Select this option to place the icon captions for items beside the icon "
+"rather than below the icon."
msgstr "A feliratok az ikon mellé kerüljenek, ne alá."
#: ../thunar/thunar-preferences-dialog.c:326
@@ -1568,8 +1631,12 @@ msgid "Show Icon _Emblems"
msgstr "Ikon j_elképek mutatása"
#: ../thunar/thunar-preferences-dialog.c:408
-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 "E lehetÅ‘ség minden, a mappa tulajdonságok közt megadott mappa ikon jelképet megjelenÃti a könyvjelzÅ‘ panelon."
+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 ""
+"E lehetőség minden, a mappa tulajdonságok közt megadott mappa ikon jelképet "
+"megjelenÃti a könyvjelzÅ‘ panelon."
#: ../thunar/thunar-preferences-dialog.c:417
msgid "Tree Pane"
@@ -1584,8 +1651,12 @@ msgid "Show Icon E_mblems"
msgstr "Ikon jelképek _mutatása"
#: ../thunar/thunar-preferences-dialog.c:453
-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 "E lehetÅ‘ség minden, a mappa tulajdonságok közt megadott mappa ikon jelképet megjelenÃti a fa panelon."
+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 ""
+"E lehetőség minden, a mappa tulajdonságok közt megadott mappa ikon jelképet "
+"megjelenÃti a fa panelon."
#.
#. Behavior
@@ -1611,8 +1682,17 @@ msgstr ""
"mikor ráviszed az egeret:"
#: ../thunar/thunar-preferences-dialog.c:516
-msgid "When single-click activation is enabled, pausing the mouse pointer over an item will automatically select that item after the chosen delay. You can disable this behavior by moving the slider to the left-most position. This behavior may be useful when single clicks activate items, and you want only to select the item without activating it."
-msgstr "Ha az egy-kattintós indÃtás be van kapcsolva, az egér megállÃtása egy elem felett automatikusan kiválasztja azt egy megadott késleltetés után. A viselkedés kikapcsolható a csúszka balra húzásával. Ez hasznos egy-kattintós módban, ha csak kijelölni akarod az elemet indÃtása nélkül."
+msgid ""
+"When single-click activation is enabled, pausing the mouse pointer over an "
+"item will automatically select that item after the chosen delay. You can "
+"disable this behavior by moving the slider to the left-most position. This "
+"behavior may be useful when single clicks activate items, and you want only "
+"to select the item without activating it."
+msgstr ""
+"Ha az egy-kattintós indÃtás be van kapcsolva, az egér megállÃtása egy elem "
+"felett automatikusan kiválasztja azt egy megadott késleltetés után. A "
+"viselkedés kikapcsolható a csúszka balra húzásával. Ez hasznos egy-kattintós "
+"módban, ha csak kijelölni akarod az elemet indÃtása nélkül."
#: ../thunar/thunar-preferences-dialog.c:534
msgid "Disabled"
@@ -1694,7 +1774,8 @@ msgid ""
"<a href=\"volman-config:\">Configure</a> the management of removable drives\n"
"and media (i.e. how cameras should be handled)."
msgstr ""
-"<a href=\"volman-config:\">ÃllÃtsd be</a> az eltávolÃtható meghajtók és média kezelését\n"
+"<a href=\"volman-config:\">ÃllÃtsd be</a> az eltávolÃtható meghajtók és "
+"média kezelését\n"
"(például hogyan kezeljük a kamerákat)."
#. tell the user that we failed to come up with the thunar-volman configuration dialog
@@ -1702,19 +1783,19 @@ msgstr ""
msgid "Failed to display the volume management settings"
msgstr "Nem sikerült megjelenÃteni a kötet kezelés beállÃtásait"
-#: ../thunar/thunar-progress-dialog.c:375
+#: ../thunar/thunar-progress-dialog.c:398
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
msgstr[0] "(%lu óra van hátra)"
-#: ../thunar/thunar-progress-dialog.c:380
+#: ../thunar/thunar-progress-dialog.c:403
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
msgstr[0] "(%lu perc van hátra)"
-#: ../thunar/thunar-progress-dialog.c:385
+#: ../thunar/thunar-progress-dialog.c:408
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1750,21 +1831,10 @@ msgstr "Lánc ide:"
msgid "Deleted:"
msgstr "Törölve"
-#: ../thunar/thunar-properties-dialog.c:401
-msgid "Modified:"
-msgstr "MódosÃtva:"
-
#: ../thunar/thunar-properties-dialog.c:415
msgid "Accessed:"
msgstr "Megnyitva:"
-#.
-#. Fourth box (size, volume, free space)
-#.
-#: ../thunar/thunar-properties-dialog.c:440
-msgid "Size:"
-msgstr "Méret:"
-
#: ../thunar/thunar-properties-dialog.c:453
msgid "Volume:"
msgstr "Kötet:"
@@ -1807,18 +1877,15 @@ msgstr "%s - Tulajdonságok"
msgid "Failed to rename \"%s\""
msgstr "Nem átnevezhető: \"%s\""
-#: ../thunar/thunar-renamer-dialog.c:172
-#: ../thunar/thunar-window.c:266
+#: ../thunar/thunar-renamer-dialog.c:172 ../thunar/thunar-window.c:266
msgid "_File"
msgstr "_Fájl"
-#: ../thunar/thunar-renamer-dialog.c:173
-#: ../thunar/thunar-window.c:268
+#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-window.c:268
msgid "_Send To"
msgstr "Küldé_s ide"
-#: ../thunar/thunar-renamer-dialog.c:174
-#: ../thunar/thunar-standard-view.c:321
+#: ../thunar/thunar-renamer-dialog.c:174 ../thunar/thunar-standard-view.c:321
msgid "File Context Menu"
msgstr "Helyi fájl menü"
@@ -1838,8 +1905,7 @@ msgstr "ÃœrÃt"
msgid "Clear the file list below"
msgstr "KiürÃti az alábbi fájl listát"
-#: ../thunar/thunar-renamer-dialog.c:178
-#: ../thunar/thunar-window.c:288
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-window.c:288
msgid "_About"
msgstr "_Névjegy"
@@ -1847,8 +1913,7 @@ msgstr "_Névjegy"
msgid "Display information about Thunar Bulk Rename"
msgstr "Információkat nyújt a Thunar csoportos átnevezésről"
-#: ../thunar/thunar-renamer-dialog.c:179
-#: ../thunar/thunar-standard-view.c:324
+#: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-standard-view.c:324
msgid "View the properties of the selected file"
msgstr "A kijelölt fájl tulajdonságainak megtekintése"
@@ -1864,7 +1929,8 @@ msgid "_Rename Files"
msgstr "Fájlok átnevezése"
#: ../thunar/thunar-renamer-dialog.c:371
-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 "Kattints ide a fent listázott fájlok átnevezéséhez most az új nevükre."
#: ../thunar/thunar-renamer-dialog.c:443
@@ -1937,8 +2003,13 @@ msgid "Failed to rename \"%s\" to \"%s\"."
msgstr "Nem sikerült átnevezni \"%s\"-t erre: \"%s\"."
#: ../thunar/thunar-renamer-progress.c:221
-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 "Kihagyhatod, visszavonhatod az átnevezéseket vagy dönthetsz úgy, hogy ezután mégsem folytatod a műveletet."
+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 ""
+"Kihagyhatod, visszavonhatod az átnevezéseket vagy dönthetsz úgy, hogy ezután "
+"mégsem folytatod a műveletet."
#: ../thunar/thunar-renamer-progress.c:226
msgid "_Revert Changes"
@@ -1950,7 +2021,8 @@ msgid "_Skip This File"
msgstr "E fájl kihagyása"
#: ../thunar/thunar-renamer-progress.c:233
-msgid "Do you want to skip this file and continue to rename the remaining files?"
+msgid ""
+"Do you want to skip this file and continue to rename the remaining files?"
msgstr "Kihagyod a fájlt és folytatod az átnevezést?"
#: ../thunar/thunar-shortcuts-pane.c:413
@@ -1964,20 +2036,17 @@ msgid_plural "Add the selected folders to the shortcuts side pane"
msgstr[0] "Kijelölt mappák hozzáadása a könyvjelzők panelhoz"
#. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:831
-#: ../thunar/thunar-tree-view.c:1038
+#: ../thunar/thunar-shortcuts-view.c:831 ../thunar/thunar-tree-view.c:1038
msgid "_Mount Volume"
msgstr "Kötet felcsatolása"
#. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:841
-#: ../thunar/thunar-tree-view.c:1048
+#: ../thunar/thunar-shortcuts-view.c:841 ../thunar/thunar-tree-view.c:1048
msgid "E_ject Volume"
msgstr "Lemez kiadása"
#. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:850
-#: ../thunar/thunar-tree-view.c:1057
+#: ../thunar/thunar-shortcuts-view.c:850 ../thunar/thunar-tree-view.c:1057
msgid "_Unmount Volume"
msgstr "Kötet lecsatolása"
@@ -2002,16 +2071,14 @@ msgid "Failed to add new shortcut"
msgstr "A könyvjelző hozzáadása sikertelen"
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1298
-#: ../thunar/thunar-tree-view.c:1547
+#: ../thunar/thunar-shortcuts-view.c:1298 ../thunar/thunar-tree-view.c:1547
#, c-format
msgid "Failed to eject \"%s\""
msgstr "Nem lehet kiadni: \"%s\""
#. display an error dialog to inform the user
#. display an error dialog
-#: ../thunar/thunar-shortcuts-view.c:1388
-#: ../thunar/thunar-tree-view.c:1738
+#: ../thunar/thunar-shortcuts-view.c:1388 ../thunar/thunar-tree-view.c:1738
#, c-format
msgid "Failed to unmount \"%s\""
msgstr "Nem leválasztható: \"%s\""
@@ -2050,14 +2117,12 @@ msgid "Create an empty folder within the current folder"
msgstr "Üres mappa létrehozása e mappán belül"
#. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:325
-#: ../thunar/thunar-tree-view.c:1109
+#: ../thunar/thunar-standard-view.c:325 ../thunar/thunar-tree-view.c:1109
msgid "Cu_t"
msgstr "Vágás"
#. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:326
-#: ../thunar/thunar-tree-view.c:1121
+#: ../thunar/thunar-standard-view.c:326 ../thunar/thunar-tree-view.c:1121
msgid "_Copy"
msgstr "Másolás"
@@ -2067,17 +2132,22 @@ msgstr "Beillesztés"
#: ../thunar/thunar-standard-view.c:327
msgid "Move or copy files previously selected by a Cut or Copy command"
-msgstr "A Vágás vagy Másolás paranccsal legutóbb kijelölt fájlok mozgatása vagy másolása"
+msgstr ""
+"A Vágás vagy Másolás paranccsal legutóbb kijelölt fájlok mozgatása vagy "
+"másolása"
#. append the "Delete" menu action
-#: ../thunar/thunar-standard-view.c:328
-#: ../thunar/thunar-tree-view.c:1156
+#: ../thunar/thunar-standard-view.c:328 ../thunar/thunar-tree-view.c:1156
msgid "_Delete"
msgstr "Töröl"
#: ../thunar/thunar-standard-view.c:329
-msgid "Move or copy files previously selected by a Cut or Copy command into the selected folder"
-msgstr "A Vágás vagy Másolás paranccsal legutóbb kijelölt fájlok mozgatása vagy másolása a kijelölt mappába"
+msgid ""
+"Move or copy files previously selected by a Cut or Copy command into the "
+"selected folder"
+msgstr ""
+"A Vágás vagy Másolás paranccsal legutóbb kijelölt fájlok mozgatása vagy "
+"másolása a kijelölt mappába"
#: ../thunar/thunar-standard-view.c:330
msgid "Select _all Files"
@@ -2099,8 +2169,7 @@ msgstr "Egy adott mintára illő valamennyi fájl kiválasztása"
msgid "Du_plicate"
msgstr "Kettőzés"
-#: ../thunar/thunar-standard-view.c:333
-#: ../thunar/thunar-standard-view.c:3387
+#: ../thunar/thunar-standard-view.c:333 ../thunar/thunar-standard-view.c:3387
msgid "Ma_ke Link"
msgid_plural "Ma_ke Links"
msgstr[0] "Lánc _készÃtése"
@@ -2178,7 +2247,8 @@ msgstr "Nem megnyitható könyvtár: \"%s\""
#: ../thunar/thunar-standard-view.c:3347
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] "ElÅ‘készÃti a kijelölt fájlt a Beillesztés paranccsal való mozgatáshoz"
+msgstr[0] ""
+"ElÅ‘készÃti a kijelölt fájlt a Beillesztés paranccsal való mozgatáshoz"
#: ../thunar/thunar-standard-view.c:3355
msgid "Prepare the selected file to be copied with a Paste command"
@@ -2508,13 +2578,18 @@ msgstr "E mappa minden fájlja megjelenik a \"Dokumentum létrehozása\" menübe
#: ../thunar/thunar-window.c:1867
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 ""
-"Ha sűrűn hozol létre egy bizonyos fajta dokumentumot, egy másolatát dobd ide. A Thunar Ãgy berakja a \"Dokumentum létrehozása\" menübe.\n"
+"Ha sűrűn hozol létre egy bizonyos fajta dokumentumot, egy másolatát dobd "
+"ide. A Thunar Ãgy berakja a \"Dokumentum létrehozása\" menübe.\n"
"\n"
-"Ezután a \"Dokumentum létrehozása\" menüben létre tudsz hozni egy ilyen dokumentumot a választott könyvtárban."
+"Ezután a \"Dokumentum létrehozása\" menüben létre tudsz hozni egy ilyen "
+"dokumentumot a választott könyvtárban."
#: ../thunar/thunar-window.c:1879
msgid "Do _not display this message again"
@@ -2538,8 +2613,7 @@ msgstr ""
"a Xfce Munkakörnyezethez."
#. set window title and icon
-#: ../thunar/thunar-window.c:2002
-#: ../Thunar.desktop.in.in.h:2
+#: ../thunar/thunar-window.c:2002 ../Thunar.desktop.in.in.h:2
msgid "File Manager"
msgstr "Fájlkezelő"
@@ -2584,8 +2658,11 @@ msgid "Description:"
msgstr "LeÃrás:"
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:165
-msgid "The generic name of the entry, for example \"Web Browser\" in case of Firefox."
-msgstr "A bejegyzés általános neve, például \"Webböngésző\" mondjuk a Firefox-hoz"
+msgid ""
+"The generic name of the entry, for example \"Web Browser\" in case of "
+"Firefox."
+msgstr ""
+"A bejegyzés általános neve, például \"Webböngésző\" mondjuk a Firefox-hoz"
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:181
msgid "Command:"
@@ -2608,8 +2685,12 @@ msgid "Comment:"
msgstr "Megjegyzés:"
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:232
-msgid "Tooltip for the entry, for example \"View sites on the Internet\" in case of Firefox. Should not be redundant with the name or the description."
-msgstr "Eszköztipp az elemhez, például: \"Webböngészés\" valamely böngészÅ‘höz, mondjuk a Firefox-hoz. Ne legyen azonos a névvel vagy leÃrással."
+msgid ""
+"Tooltip for the entry, for example \"View sites on the Internet\" in case of "
+"Firefox. Should not be redundant with the name or the description."
+msgstr ""
+"Eszköztipp az elemhez, például: \"Webböngészés\" valamely böngészőhöz, "
+"mondjuk a Firefox-hoz. Ne legyen azonos a névvel vagy leÃrással."
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:252
msgid "Options:"
@@ -2620,8 +2701,13 @@ msgid "Use _startup notification"
msgstr "IndÃtási emlékeztetÅ‘ használata"
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:259
-msgid "Select this option to enable startup notification when the command is run from the file manager or the menu. Not every application supports startup notification."
-msgstr "E lehetÅ‘ség nyújtja az indÃtási emlékeztetÅ‘t a parancs futtatásakor a fájlkezelÅ‘bÅ‘l vagy menübÅ‘l. Ezt nem minden alkalmazás támogatja."
+msgid ""
+"Select this option to enable startup notification when the command is run "
+"from the file manager or the menu. Not every application supports startup "
+"notification."
+msgstr ""
+"E lehetÅ‘ség nyújtja az indÃtási emlékeztetÅ‘t a parancs futtatásakor a "
+"fájlkezelőből vagy menüből. Ezt nem minden alkalmazás támogatja."
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:266
msgid "Run in _terminal"
@@ -2835,15 +2921,21 @@ msgid "Regular _Expression"
msgstr "Szabályos kifejezés"
#: ../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."
-msgstr "E lehetÅ‘séggel a Thunar a mintát Perl-stÃlusú szabályos kifejezésként (l. PCRE) kezeli. L. a dokumentációt a szabályos kifejezések nyelvtanához."
+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 ""
+"E lehetÅ‘séggel a Thunar a mintát Perl-stÃlusú szabályos kifejezésként (l. "
+"PCRE) kezeli. L. a dokumentációt a szabályos kifejezések nyelvtanához."
#: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:238
msgid "Replace _With:"
msgstr "Csere erre:"
#: ../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 "Add meg a szöveget, melyre a fenti mintát cseréljük."
#: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:258
@@ -2851,8 +2943,12 @@ msgid "C_ase Sensitive Search"
msgstr "kis/N_agybetűs Keresés"
#: ../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."
-msgstr "E lehetőség a mintát kis/Nagybetű-érzékenyen keresi. Az alapértelmezett a kis/Nagybetű-érzéketlen keresés."
+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 ""
+"E lehetőség a mintát kis/Nagybetű-érzékenyen keresi. Az alapértelmezett a "
+"kis/Nagybetű-érzéketlen keresés."
#. setup a tooltip with the error message
#: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:620
@@ -2879,8 +2975,13 @@ msgid "Send com_pressed"
msgstr "TömörÃtve küld"
#: ../plugins/thunar-sendto-email/main.c:181
-msgid "When sending a file via email, you can either choose to send the file directly, as is, or compress the file before attaching it to an email. It is highly recommended to compress large files before sending them."
-msgstr "Fájl email-ben küldésekor, küldheted közvetlenül vagy tömörÃtve. A nagy fájlokat nagyon ajánlott tömörÃteni küldés elÅ‘tt."
+msgid ""
+"When sending a file via email, you can either choose to send the file "
+"directly, as is, or compress the file before attaching it to an email. It is "
+"highly recommended to compress large files before sending them."
+msgstr ""
+"Fájl email-ben küldésekor, küldheted közvetlenül vagy tömörÃtve. A nagy "
+"fájlokat nagyon ajánlott tömörÃteni küldés elÅ‘tt."
#: ../plugins/thunar-sendto-email/main.c:192
#, c-format
@@ -2893,8 +2994,15 @@ msgid "Send as _archive"
msgstr "_ArchÃvumként küld"
#: ../plugins/thunar-sendto-email/main.c:200
-msgid "When sending multiple files via email, you can either choose to send the files directly, attaching multiple files to an email, or send all files compressed into a single archive file and attach the archive. It is highly recommended to send multiple large files as archive."
-msgstr "Több fájl küldésekor email-ben, küldheted azokat közvetlenül, egyesével csatolva, vagy egy archÃvumba tömörÃtve. Ha nagyobb fájlok is vannak, nagyon ajánlott, hogy tömörÃtett archÃvumot küldjünk."
+msgid ""
+"When sending multiple files via email, you can either choose to send the "
+"files directly, attaching multiple files to an email, or send all files "
+"compressed into a single archive file and attach the archive. It is highly "
+"recommended to send multiple large files as archive."
+msgstr ""
+"Több fájl küldésekor email-ben, küldheted azokat közvetlenül, egyesével "
+"csatolva, vagy egy archÃvumba tömörÃtve. Ha nagyobb fájlok is vannak, nagyon "
+"ajánlott, hogy tömörÃtett archÃvumot küldjünk."
#. allocate the progress dialog
#. setup the label
@@ -3024,16 +3132,30 @@ msgid "_Description:"
msgstr "LeÃrás:"
#: ../plugins/thunar-uca/thunar-uca-editor.c:167
-msgid "The description of the action that will be displayed as tooltip in the statusbar when selecting the item from the context menu."
-msgstr "A művelet leÃrása eszköztippként megjelenik az állapotsorban az elem kijelölésekor a helyi menübÅ‘l."
+msgid ""
+"The description of the action that will be displayed as tooltip in the "
+"statusbar when selecting the item from the context menu."
+msgstr ""
+"A művelet leÃrása eszköztippként megjelenik az állapotsorban az elem "
+"kijelölésekor a helyi menüből."
#: ../plugins/thunar-uca/thunar-uca-editor.c:180
msgid "_Command:"
msgstr "Paran_cs:"
#: ../plugins/thunar-uca/thunar-uca-editor.c:189
-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 "A műveletet végrehajtó parancs (a szükséges paraméterekkel). L. a parancs paramétereket alább a támogatott paraméter változókhoz, melyeket a parancs futtatásakor behelyettesÃtem. Nagybetűkre (pl.: %F, %D, %N) minden kijelölt elemre lefuttatom, amúgy csak 1 kijelölt elem esetén hajtom végre."
+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 ""
+"A műveletet végrehajtó parancs (a szükséges paraméterekkel). L. a parancs "
+"paramétereket alább a támogatott paraméter változókhoz, melyeket a parancs "
+"futtatásakor behelyettesÃtem. Nagybetűkre (pl.: %F, %D, %N) minden kijelölt "
+"elemre lefuttatom, amúgy csak 1 kijelölt elem esetén hajtom végre."
#: ../plugins/thunar-uca/thunar-uca-editor.c:200
msgid "Browse the file system to select an application to use for this action."
@@ -3050,8 +3172,12 @@ msgid "No icon"
msgstr "Nincs ikon"
#: ../plugins/thunar-uca/thunar-uca-editor.c:225
-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 "Kattints ide egy ikonfájl kijelöléséhez, mely megjelenik a helyi menüben a fenti műveletnévhez"
+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 ""
+"Kattints ide egy ikonfájl kijelöléséhez, mely megjelenik a helyi menüben a "
+"fenti műveletnévhez"
#: ../plugins/thunar-uca/thunar-uca-editor.c:256
msgid ""
@@ -3096,8 +3222,15 @@ msgid "_File Pattern:"
msgstr "_Fájl minta:"
#: ../plugins/thunar-uca/thunar-uca-editor.c:381
-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 "Adj meg egy vagy több végződést, amelyre megjelenjen e művelet. Amennyiben többet is megadsz, ezeket pontosvesszővel kell elválasztani (pl.: *.txt; *.odt, *.docx; *.rtf; *.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 ""
+"Adj meg egy vagy több végződést, amelyre megjelenjen e művelet. Amennyiben "
+"többet is megadsz, ezeket pontosvesszővel kell elválasztani (pl.: *.txt; *."
+"odt, *.docx; *.rtf; *.doc)."
#: ../plugins/thunar-uca/thunar-uca-editor.c:400
msgid "Appears if selection contains:"
@@ -3176,7 +3309,8 @@ msgid "Configure c_ustom actions..."
msgstr "Egyéni műveletek beállÃtása..."
#: ../plugins/thunar-uca/thunar-uca-provider.c:189
-msgid "Setup custom actions that will appear in the file managers context menus"
+msgid ""
+"Setup custom actions that will appear in the file managers context menus"
msgstr "Az egyéni műveletek megjelennek a fájlkezelő helyi menüiben"
#: ../plugins/thunar-uca/thunar-uca-provider.c:406
@@ -3214,34 +3348,49 @@ msgstr "Kijelölt mappák megnyitása a Thunar-ban"
#~ msgid "Views"
#~ msgstr "Nézetek"
+
#~ msgid "Copyright (c) 2004-2006"
#~ msgstr "Copyright (c) 2004-2006"
+
#~ msgid "Failed to open home directory"
#~ msgstr "Saját mappa megnyitása sikertelen"
+
#~ msgid "Switch to path entry mode"
#~ msgstr "Ösvénybeviteli mód"
+
#~ msgid "Go To:"
#~ msgstr "Ugrás:"
+
#~ msgid "Switch to path bar mode"
#~ msgstr "Ösvénysávra váltás"
+
#~ msgid "_Location..."
#~ msgstr "_Hely cÃm..."
+
#~ msgid "_Main Toolbar"
#~ msgstr "Fő eszközsor"
+
#~ msgid "Change the visibility of this window's main toolbar"
#~ msgstr "Ablak fő eszközsora láthatóságának váltása"
+
#~ msgid "_Location Bar"
#~ msgstr "_CÃmsor"
+
#~ msgid "Change the visibility of this window's location bar"
#~ msgstr "Ablak cÃmsora láthatóságának váltása"
+
#~ msgid "_Properties"
#~ msgstr "Tulajdonságok"
+
#~ msgid "_Hidden"
#~ msgstr "_Rejtett"
+
#~ msgid "Don't display any location selector"
#~ msgstr "Ne mutass semmilyen helyválasztót"
+
#~ msgid "Links from or to resources in the trash are not supported"
#~ msgstr "A kuka és más erőforrások közti láncok nem támogatottak"
+
#~ msgid "Delete the selected file permanently"
#~ msgid_plural "Delete the selected files permanently"
#~ msgstr[0] "Kijelölt fájl végleges törlése"
@@ -3249,12 +3398,10 @@ msgstr "Kijelölt mappák megnyitása a Thunar-ban"
#, fuzzy
#~ msgid "Failed to change permisions of \"%s\""
#~ msgstr "\"%s\" jogainak cseréje sikertelen: %s"
+
#~ msgid "Failed to determine file info of \"%s\": %s"
#~ msgstr "\"%s\" fájlinfó meghatározása sikertelen: %s"
-#~ msgid ""
-#~ "The file \"%s\" already exists. Do you want to replace it with an empty "
-#~ "file?"
-#~ msgstr "\"%s\" fájl már létezik. Üres fájllal cseréljük?"
+
#~ msgid ""
#~ "Failed to remove \"%s\".\n"
#~ "\n"
@@ -3263,6 +3410,7 @@ msgstr "Kijelölt mappák megnyitása a Thunar-ban"
#~ "Nem törölhető: \"%s\".\n"
#~ "\n"
#~ "Ãtugrod?"
+
#~ msgid ""
#~ "Failed to create empty file \"%s\".\n"
#~ "\n"
@@ -3271,20 +3419,27 @@ msgstr "Kijelölt mappák megnyitása a Thunar-ban"
#~ "Nem hozható létre az üres fájl: %s.\n"
#~ "\n"
#~ "Ãtugrod?"
+
#~ msgid "Failed to stat file \"%s\": %s"
#~ msgstr "\"%s\" elérése sikertelen: %s"
+
#~ msgid "Failed to create directory \"%s\": %s"
#~ msgstr "Az alábbi könyvtár létrehozása nem sikerült: \"%s\": %s"
+
#~ msgid "Deleting directories..."
#~ msgstr "Könyvtárak törlése..."
+
#~ msgid "Failed to remove directory \"%s\": %s"
#~ msgstr "Nem törölhető e könyvtár: \"%s\": %s"
+
#~ msgid "Cannot transfer the root directory"
#~ msgstr "A gyökér könyvtár nem mozgatható"
+
#~ msgid "Operation canceled"
#~ msgstr "Művelet törölve"
+
#~ msgid "Failed to read link target from \"%s\""
#~ msgstr "A lánc céljának olvasása sikertelen: \"%s\""
+
#~ msgid "Failed to copy special file \"%s\""
#~ msgstr "Nem sikerült e speciális fájl másolása: \"%s\""
-
diff --git a/po/it.po b/po/it.po
index 2319a5a36..01e6da787 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-22 18:30+0200\n"
+"POT-Creation-Date: 2007-05-23 23:24+0200\n"
"PO-Revision-Date: 2007-01-14 17:04+0100\n"
"Last-Translator: Roberto Pariset <robdebian@gmail.com>\n"
"Language-Team: GUFI <traduzioni@gufi.org>\n"
@@ -58,29 +58,29 @@ msgstr "Solo i file locali possono essere rinominati"
msgid "Preparing..."
msgstr "In preparazione..."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:228
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:537
#, c-format
msgid "Failed to change permissions of \"%s\""
msgstr "Impossibile cambiare permessi di \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:355
#, c-format
msgid "Failed to change file owner of \"%s\""
msgstr "Impossibile cambiare proprietario del file \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:356
#, c-format
msgid "Failed to change file group of \"%s\""
msgstr "Impossibile cambiare gruppo del file \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:444
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:190
#, c-format
msgid "The file \"%s\" already exists"
msgstr "Il file \"%s\" esiste già "
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:462
#, c-format
msgid "Failed to create empty file \"%s\""
msgstr "Impossibile creare file vuoto \"%s\""
@@ -238,11 +238,20 @@ msgstr "Cestino"
msgid "Cannot move or copy files within the trash"
msgstr "Impossibile spostare o copiare file all'interno del Cestino"
-#: ../thunar-vfs/thunar-vfs-job.c:831
+#. no "ask-replace" handler, fallback to "ask"
+#: ../thunar-vfs/thunar-vfs-job.c:401
+#, fuzzy, c-format
+msgid ""
+"The file \"%s\" already exists. Would you like to replace it?\n"
+"\n"
+"If you replace an existing file, its contents will be overwritten."
+msgstr "Il file \"%s\" esiste già . Si desidera rimpiazzarlo con un file vuoto?"
+
+#: ../thunar-vfs/thunar-vfs-job.c:897
msgid "Do you want to overwrite it?"
msgstr "Si desidera sovrascriverlo?"
-#: ../thunar-vfs/thunar-vfs-job.c:896
+#: ../thunar-vfs/thunar-vfs-job.c:1042
msgid "Do you want to skip it?"
msgstr "Si desidera saltarlo?"
@@ -889,36 +898,86 @@ msgstr "Lista dettagliata delle directory"
msgid "Details view"
msgstr "Visualizzazione dettagliata"
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr "Roberto Pariset <robdebian@gmail.com>"
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:959
+#: ../thunar/thunar-dialogs.c:231 ../thunar/thunar-renamer-dialog.c:959
msgid "Failed to open the documentation browser"
msgstr "Impossibile aprire il browser della documentazione"
-#: ../thunar/thunar-dialogs.c:325
+#: ../thunar/thunar-dialogs.c:328
msgid "_Yes"
msgstr "_Sì"
-#: ../thunar/thunar-dialogs.c:329
+#: ../thunar/thunar-dialogs.c:332
msgid "Yes to _all"
msgstr "Sì _a tutti"
-#: ../thunar/thunar-dialogs.c:333
+#: ../thunar/thunar-dialogs.c:336
msgid "_No"
msgstr "_No"
-#: ../thunar/thunar-dialogs.c:337
+#: ../thunar/thunar-dialogs.c:340
msgid "N_o to all"
msgstr "No a _tutti"
-#: ../thunar/thunar-dialogs.c:342
+#: ../thunar/thunar-dialogs.c:344
+#, fuzzy
+msgid "_Retry"
+msgstr "_Ripristina"
+
+#: ../thunar/thunar-dialogs.c:349
msgid "_Cancel"
msgstr "_Cancella"
+#. setup the confirmation dialog
+#: ../thunar/thunar-dialogs.c:429
+msgid "Confirm to replace files"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:435
+msgid "_Skip"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:436
+#, fuzzy
+msgid "Replace _All"
+msgstr "_Sostituisci con:"
+
+#: ../thunar/thunar-dialogs.c:437
+#, fuzzy
+msgid "_Replace"
+msgstr "_Rinomina"
+
+#: ../thunar/thunar-dialogs.c:467
+#, c-format
+msgid "This folder already contains a file \"%s\"."
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:475
+msgid "ReplaceDialogPart1|Do you want to replace the existing file"
+msgstr ""
+
+#.
+#. Fourth box (size, volume, free space)
+#.
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:440
+msgid "Size:"
+msgstr "Dimensione:"
+
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:401
+msgid "Modified:"
+msgstr "Modificato:"
+
+#: ../thunar/thunar-dialogs.c:500
+msgid "ReplaceDialogPart2|with the following file?"
+msgstr ""
+
#: ../thunar/thunar-dnd.c:70
msgid "_Copy here"
msgstr "_Copia qui"
@@ -1767,21 +1826,21 @@ msgstr ""
msgid "Failed to display the volume management settings"
msgstr "Impossibile mostrare le impostazioni della gestione dei volumi"
-#: ../thunar/thunar-progress-dialog.c:375
+#: ../thunar/thunar-progress-dialog.c:398
#, 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:380
+#: ../thunar/thunar-progress-dialog.c:403
#, 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:385
+#: ../thunar/thunar-progress-dialog.c:408
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1818,21 +1877,10 @@ msgstr "File linkato:"
msgid "Deleted:"
msgstr "Eliminato:"
-#: ../thunar/thunar-properties-dialog.c:401
-msgid "Modified:"
-msgstr "Modificato:"
-
#: ../thunar/thunar-properties-dialog.c:415
msgid "Accessed:"
msgstr "Acceduto:"
-#.
-#. Fourth box (size, volume, free space)
-#.
-#: ../thunar/thunar-properties-dialog.c:440
-msgid "Size:"
-msgstr "Dimensione:"
-
#: ../thunar/thunar-properties-dialog.c:453
msgid "Volume:"
msgstr "Volume:"
@@ -3437,12 +3485,6 @@ msgstr "Apri le directory specificate con Thunar"
#~ msgid "Failed to determine file info of \"%s\": %s"
#~ msgstr "Impossibile reperire informazioni del file \"%s\": %s"
-#~ msgid ""
-#~ "The file \"%s\" already exists. Do you want to replace it with an empty "
-#~ "file?"
-#~ msgstr ""
-#~ "Il file \"%s\" esiste già . Si desidera rimpiazzarlo con un file vuoto?"
-
#~ msgid ""
#~ "Failed to remove \"%s\".\n"
#~ "\n"
diff --git a/po/ja.po b/po/ja.po
index 48e5c2576..4abf1eff7 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-22 18:30+0200\n"
+"POT-Creation-Date: 2007-05-23 23:24+0200\n"
"PO-Revision-Date: 2007-04-07 17:49+0900\n"
"Last-Translator: Daichi Kawahata <daichi@xfce.org>\n"
"Language-Team: Japanese <xfce-users-jp@ml.fdiary.net>\n"
@@ -65,29 +65,29 @@ msgstr "ãƒãƒ¼ã‚«ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«åã®ã¿åå‰å¤‰æ›´ã§ãã¾ã™ã€‚"
msgid "Preparing..."
msgstr "準備ã—ã¦ã„ã¾ã™..."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:228
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:537
#, c-format
msgid "Failed to change permissions of \"%s\""
msgstr "「%sã€ã®ã‚¢ã‚¯ã‚»ã‚¹æ¨©ã‚’変更ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:355
#, c-format
msgid "Failed to change file owner of \"%s\""
msgstr "「%sã€ã®æ‰€æœ‰è€…を変更ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:356
#, c-format
msgid "Failed to change file group of \"%s\""
msgstr "「%sã€ã®æ‰€å±žã‚°ãƒ«ãƒ¼ãƒ—を変更ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:444
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:190
#, c-format
msgid "The file \"%s\" already exists"
msgstr "ファイル「%sã€ã¯æ—¢ã«å˜åœ¨ã—ã¾ã™ã€‚"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:462
#, c-format
msgid "Failed to create empty file \"%s\""
msgstr "空ã®ãƒ•ã‚¡ã‚¤ãƒ«ã€Œ%sã€ã‚’作æˆã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
@@ -244,11 +244,20 @@ msgstr "ゴミ箱"
msgid "Cannot move or copy files within the trash"
msgstr "ゴミ箱ã®ä¸ã§ã¯ãƒ•ã‚¡ã‚¤ãƒ«ã®ç§»å‹•ã‚„コピーを行ãˆã¾ã›ã‚“。"
-#: ../thunar-vfs/thunar-vfs-job.c:831
+#. no "ask-replace" handler, fallback to "ask"
+#: ../thunar-vfs/thunar-vfs-job.c:401
+#, c-format
+msgid ""
+"The file \"%s\" already exists. Would you like to replace it?\n"
+"\n"
+"If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-job.c:897
msgid "Do you want to overwrite it?"
msgstr "ã“れを上書ãã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹ï¼Ÿ"
-#: ../thunar-vfs/thunar-vfs-job.c:896
+#: ../thunar-vfs/thunar-vfs-job.c:1042
msgid "Do you want to skip it?"
msgstr "ã“れを飛ã°ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹ï¼Ÿ"
@@ -898,36 +907,86 @@ msgstr "詳細ãªãƒ•ã‚¡ã‚¤ãƒ«æƒ…å ±ã¨å…±ã«ãƒ•ã‚©ãƒ«ãƒ€ã‚’リスト表示ã—ã¾
msgid "Details view"
msgstr "詳細表示"
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr "Daichi Kawahata <daichi@xfce.org>"
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:959
+#: ../thunar/thunar-dialogs.c:231 ../thunar/thunar-renamer-dialog.c:959
msgid "Failed to open the documentation browser"
msgstr "文書を表示ã™ã‚‹ãƒ–ラウザーを起動ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
-#: ../thunar/thunar-dialogs.c:325
+#: ../thunar/thunar-dialogs.c:328
msgid "_Yes"
msgstr "ã¯ã„(_Y)"
-#: ../thunar/thunar-dialogs.c:329
+#: ../thunar/thunar-dialogs.c:332
msgid "Yes to _all"
msgstr "å…¨ã¦ã«ã¯ã„(_A)"
-#: ../thunar/thunar-dialogs.c:333
+#: ../thunar/thunar-dialogs.c:336
msgid "_No"
msgstr "ã„ã„ãˆ(_N)"
-#: ../thunar/thunar-dialogs.c:337
+#: ../thunar/thunar-dialogs.c:340
msgid "N_o to all"
msgstr "å…¨ã¦ã«ã„ã„ãˆ(_O)"
-#: ../thunar/thunar-dialogs.c:342
+#: ../thunar/thunar-dialogs.c:344
+#, fuzzy
+msgid "_Retry"
+msgstr "復元(_R)"
+
+#: ../thunar/thunar-dialogs.c:349
msgid "_Cancel"
msgstr "ã‚ャンセル(_C)"
+#. setup the confirmation dialog
+#: ../thunar/thunar-dialogs.c:429
+msgid "Confirm to replace files"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:435
+msgid "_Skip"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:436
+#, fuzzy
+msgid "Replace _All"
+msgstr "次ã§ç½®æ›(_W):"
+
+#: ../thunar/thunar-dialogs.c:437
+#, fuzzy
+msgid "_Replace"
+msgstr "åå‰å¤‰æ›´(_R)"
+
+#: ../thunar/thunar-dialogs.c:467
+#, c-format
+msgid "This folder already contains a file \"%s\"."
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:475
+msgid "ReplaceDialogPart1|Do you want to replace the existing file"
+msgstr ""
+
+#.
+#. Fourth box (size, volume, free space)
+#.
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:440
+msgid "Size:"
+msgstr "サイズ:"
+
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:401
+msgid "Modified:"
+msgstr "変更日時:"
+
+#: ../thunar/thunar-dialogs.c:500
+msgid "ReplaceDialogPart2|with the following file?"
+msgstr ""
+
#: ../thunar/thunar-dnd.c:70
msgid "_Copy here"
msgstr "ã“ã“ã«ã‚³ãƒ”ー(_C)"
@@ -1767,19 +1826,19 @@ msgstr ""
msgid "Failed to display the volume management settings"
msgstr "ボリュームã®å–り扱ã„è¨å®šã‚’表示ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
-#: ../thunar/thunar-progress-dialog.c:375
+#: ../thunar/thunar-progress-dialog.c:398
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
msgstr[0] "(残り %lu 時間)"
-#: ../thunar/thunar-progress-dialog.c:380
+#: ../thunar/thunar-progress-dialog.c:403
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
msgstr[0] "(残り %lu 分)"
-#: ../thunar/thunar-progress-dialog.c:385
+#: ../thunar/thunar-progress-dialog.c:408
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1816,21 +1875,10 @@ msgstr "リンク先:"
msgid "Deleted:"
msgstr "削除済ã¿:"
-#: ../thunar/thunar-properties-dialog.c:401
-msgid "Modified:"
-msgstr "変更日時:"
-
#: ../thunar/thunar-properties-dialog.c:415
msgid "Accessed:"
msgstr "アクセス日時:"
-#.
-#. Fourth box (size, volume, free space)
-#.
-#: ../thunar/thunar-properties-dialog.c:440
-msgid "Size:"
-msgstr "サイズ:"
-
#: ../thunar/thunar-properties-dialog.c:453
msgid "Volume:"
msgstr "容é‡:"
diff --git a/po/ka.po b/po/ka.po
index b7cdcbce4..b696a6aaf 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-22 18:30+0200\n"
+"POT-Creation-Date: 2007-05-23 23:24+0200\n"
"PO-Revision-Date: 2006-08-24 23:37+0400\n"
"Last-Translator: Dimitri Gogelia <delphi.knight@gmail.com>\n"
"Language-Team: Georgian <delphi.knight@gmail.com>\n"
@@ -52,29 +52,29 @@ msgstr ""
msgid "Preparing..."
msgstr ""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:228
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:537
#, c-format
msgid "Failed to change permissions of \"%s\""
msgstr ""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:355
#, c-format
msgid "Failed to change file owner of \"%s\""
msgstr ""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:356
#, c-format
msgid "Failed to change file group of \"%s\""
msgstr ""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:444
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:190
#, c-format
msgid "The file \"%s\" already exists"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:462
#, c-format
msgid "Failed to create empty file \"%s\""
msgstr ""
@@ -232,11 +232,20 @@ msgstr ""
msgid "Cannot move or copy files within the trash"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-job.c:831
+#. no "ask-replace" handler, fallback to "ask"
+#: ../thunar-vfs/thunar-vfs-job.c:401
+#, c-format
+msgid ""
+"The file \"%s\" already exists. Would you like to replace it?\n"
+"\n"
+"If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-job.c:897
msgid "Do you want to overwrite it?"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-job.c:896
+#: ../thunar-vfs/thunar-vfs-job.c:1042
msgid "Do you want to skip it?"
msgstr ""
@@ -853,36 +862,83 @@ msgstr ""
msgid "Details view"
msgstr ""
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr ""
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:959
+#: ../thunar/thunar-dialogs.c:231 ../thunar/thunar-renamer-dialog.c:959
msgid "Failed to open the documentation browser"
msgstr ""
-#: ../thunar/thunar-dialogs.c:325
+#: ../thunar/thunar-dialogs.c:328
msgid "_Yes"
msgstr ""
-#: ../thunar/thunar-dialogs.c:329
+#: ../thunar/thunar-dialogs.c:332
msgid "Yes to _all"
msgstr ""
-#: ../thunar/thunar-dialogs.c:333
+#: ../thunar/thunar-dialogs.c:336
msgid "_No"
msgstr ""
-#: ../thunar/thunar-dialogs.c:337
+#: ../thunar/thunar-dialogs.c:340
msgid "N_o to all"
msgstr ""
-#: ../thunar/thunar-dialogs.c:342
+#: ../thunar/thunar-dialogs.c:344
+msgid "_Retry"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:349
msgid "_Cancel"
msgstr ""
+#. setup the confirmation dialog
+#: ../thunar/thunar-dialogs.c:429
+msgid "Confirm to replace files"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:435
+msgid "_Skip"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:436
+msgid "Replace _All"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:437
+msgid "_Replace"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:467
+#, c-format
+msgid "This folder already contains a file \"%s\"."
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:475
+msgid "ReplaceDialogPart1|Do you want to replace the existing file"
+msgstr ""
+
+#.
+#. Fourth box (size, volume, free space)
+#.
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:440
+msgid "Size:"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:401
+msgid "Modified:"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:500
+msgid "ReplaceDialogPart2|with the following file?"
+msgstr ""
+
#: ../thunar/thunar-dnd.c:70
msgid "_Copy here"
msgstr ""
@@ -1684,21 +1740,21 @@ msgstr ""
msgid "Failed to display the volume management settings"
msgstr ""
-#: ../thunar/thunar-progress-dialog.c:375
+#: ../thunar/thunar-progress-dialog.c:398
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
msgstr[0] ""
msgstr[1] ""
-#: ../thunar/thunar-progress-dialog.c:380
+#: ../thunar/thunar-progress-dialog.c:403
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
msgstr[0] ""
msgstr[1] ""
-#: ../thunar/thunar-progress-dialog.c:385
+#: ../thunar/thunar-progress-dialog.c:408
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1735,21 +1791,10 @@ msgstr ""
msgid "Deleted:"
msgstr ""
-#: ../thunar/thunar-properties-dialog.c:401
-msgid "Modified:"
-msgstr ""
-
#: ../thunar/thunar-properties-dialog.c:415
msgid "Accessed:"
msgstr ""
-#.
-#. Fourth box (size, volume, free space)
-#.
-#: ../thunar/thunar-properties-dialog.c:440
-msgid "Size:"
-msgstr ""
-
#: ../thunar/thunar-properties-dialog.c:453
msgid "Volume:"
msgstr ""
diff --git a/po/ko.po b/po/ko.po
index 9d1218641..132c97089 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-22 18:30+0200\n"
+"POT-Creation-Date: 2007-05-23 23:24+0200\n"
"PO-Revision-Date: 2007-02-20 09:43+0900\n"
"Last-Translator: ByungHyun Choi <byunghyun.choi@gmail.com>\n"
"Language-Team: xfce4-users-kr-i18n <xfce4-users-kr-i18n@lists.sourceforge."
@@ -57,29 +57,29 @@ msgstr "로컬 í™”ì¼ë§Œ ì´ë¦„ì´ ë³€ê²½ë©ë‹ˆë‹¤."
msgid "Preparing..."
msgstr "준비중..."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:228
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:537
#, c-format
msgid "Failed to change permissions of \"%s\""
msgstr "\"%s\"ì˜ ì†Œìœ ê¶Œ ë³€ê²½ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:355
#, c-format
msgid "Failed to change file owner of \"%s\""
msgstr "\"%s\"ì˜ í™”ì¼ì†Œìœ ìž ë³€ê²½ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:356
#, c-format
msgid "Failed to change file group of \"%s\""
msgstr "\"%s\"ì˜ í™”ì¼ê·¸ë£¹ ë³€ê²½ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:444
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:190
#, c-format
msgid "The file \"%s\" already exists"
msgstr "í™”ì¼ \"%s\"ì´ ì´ë¯¸ 존재합니다."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:462
#, c-format
msgid "Failed to create empty file \"%s\""
msgstr "빈 \"%s\" í™”ì¼ì„ ìƒì„±í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤."
@@ -237,11 +237,20 @@ msgstr "ì“°ë ˆê¸°í†µ"
msgid "Cannot move or copy files within the trash"
msgstr "ì“°ë ˆê¸°í†µë‚´ì—서는 복사나 ì´ë™ì„ í• ìˆ˜ 없습니다."
-#: ../thunar-vfs/thunar-vfs-job.c:831
+#. no "ask-replace" handler, fallback to "ask"
+#: ../thunar-vfs/thunar-vfs-job.c:401
+#, c-format
+msgid ""
+"The file \"%s\" already exists. Would you like to replace it?\n"
+"\n"
+"If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-job.c:897
msgid "Do you want to overwrite it?"
msgstr "ë®ì–´ ì“°ì‹œë µë‹ˆê¹Œ?"
-#: ../thunar-vfs/thunar-vfs-job.c:896
+#: ../thunar-vfs/thunar-vfs-job.c:1042
msgid "Do you want to skip it?"
msgstr "무시 í•˜ì‹œë µë‹ˆê¹Œ?"
@@ -874,36 +883,86 @@ msgstr "ìžì„¸í•œ ë””ë ‰í† ë¦¬ 목ë¡"
msgid "Details view"
msgstr "ìžì„¸ížˆ 보기"
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr "번ì—í•˜ì‹ ë¶„ë“¤"
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:959
+#: ../thunar/thunar-dialogs.c:231 ../thunar/thunar-renamer-dialog.c:959
msgid "Failed to open the documentation browser"
msgstr "문서 íƒìƒ‰ê¸°ë¥¼ ì—¬ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤."
-#: ../thunar/thunar-dialogs.c:325
+#: ../thunar/thunar-dialogs.c:328
msgid "_Yes"
msgstr "예(_Y)"
-#: ../thunar/thunar-dialogs.c:329
+#: ../thunar/thunar-dialogs.c:332
msgid "Yes to _all"
msgstr "ëª¨ë‘ ì˜ˆ(_a)"
-#: ../thunar/thunar-dialogs.c:333
+#: ../thunar/thunar-dialogs.c:336
msgid "_No"
msgstr "아니오(_N)"
-#: ../thunar/thunar-dialogs.c:337
+#: ../thunar/thunar-dialogs.c:340
msgid "N_o to all"
msgstr "ëª¨ë‘ ì•„ë‹ˆì˜¤(_o)"
-#: ../thunar/thunar-dialogs.c:342
+#: ../thunar/thunar-dialogs.c:344
+#, fuzzy
+msgid "_Retry"
+msgstr "ë˜ëŒë¦¬ê¸°(_R)"
+
+#: ../thunar/thunar-dialogs.c:349
msgid "_Cancel"
msgstr "취소(_C)"
+#. setup the confirmation dialog
+#: ../thunar/thunar-dialogs.c:429
+msgid "Confirm to replace files"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:435
+msgid "_Skip"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:436
+#, fuzzy
+msgid "Replace _All"
+msgstr "~로 대체(_W):"
+
+#: ../thunar/thunar-dialogs.c:437
+#, fuzzy
+msgid "_Replace"
+msgstr "ì´ë¦„변경(_R)"
+
+#: ../thunar/thunar-dialogs.c:467
+#, c-format
+msgid "This folder already contains a file \"%s\"."
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:475
+msgid "ReplaceDialogPart1|Do you want to replace the existing file"
+msgstr ""
+
+#.
+#. Fourth box (size, volume, free space)
+#.
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:440
+msgid "Size:"
+msgstr "í¬ê¸°:"
+
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:401
+msgid "Modified:"
+msgstr "ìˆ˜ì •ë¨:"
+
+#: ../thunar/thunar-dialogs.c:500
+msgid "ReplaceDialogPart2|with the following file?"
+msgstr ""
+
#: ../thunar/thunar-dnd.c:70
msgid "_Copy here"
msgstr "여기로 복사(_C)"
@@ -1739,21 +1798,21 @@ msgstr ""
msgid "Failed to display the volume management settings"
msgstr "볼륨 ê´€ë¦¬ì„¤ì •ì„ í‘œì‹œí•˜ì§€ 못 했습니다."
-#: ../thunar/thunar-progress-dialog.c:375
+#: ../thunar/thunar-progress-dialog.c:398
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
msgstr[0] "(%lu 시간 남았ìŒ)"
msgstr[1] "(%lu 시간 남았ìŒ)"
-#: ../thunar/thunar-progress-dialog.c:380
+#: ../thunar/thunar-progress-dialog.c:403
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
msgstr[0] "(%lu 분 남았ìŒ)"
msgstr[1] "(%lu 분 남았ìŒ)"
-#: ../thunar/thunar-progress-dialog.c:385
+#: ../thunar/thunar-progress-dialog.c:408
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1790,21 +1849,10 @@ msgstr "ë§í¬ 목표:"
msgid "Deleted:"
msgstr "ì‚ì œë¨:"
-#: ../thunar/thunar-properties-dialog.c:401
-msgid "Modified:"
-msgstr "ìˆ˜ì •ë¨:"
-
#: ../thunar/thunar-properties-dialog.c:415
msgid "Accessed:"
msgstr "엑세스ë¨:"
-#.
-#. Fourth box (size, volume, free space)
-#.
-#: ../thunar/thunar-properties-dialog.c:440
-msgid "Size:"
-msgstr "í¬ê¸°:"
-
#: ../thunar/thunar-properties-dialog.c:453
msgid "Volume:"
msgstr "볼륨:"
diff --git a/po/lt.po b/po/lt.po
index 4432fc86c..e66b24401 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-22 18:30+0200\n"
+"POT-Creation-Date: 2007-05-23 23:24+0200\n"
"PO-Revision-Date: 2006-05-26 11:16+0300\n"
"Last-Translator: mantas <mantaz@users.sourceforge.net>\n"
"Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -58,29 +58,29 @@ msgstr ""
msgid "Preparing..."
msgstr ""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:228
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:537
#, c-format
msgid "Failed to change permissions of \"%s\""
msgstr ""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:355
#, c-format
msgid "Failed to change file owner of \"%s\""
msgstr ""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:356
#, c-format
msgid "Failed to change file group of \"%s\""
msgstr ""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:444
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:190
#, c-format
msgid "The file \"%s\" already exists"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:462
#, c-format
msgid "Failed to create empty file \"%s\""
msgstr ""
@@ -240,11 +240,20 @@ msgstr ""
msgid "Cannot move or copy files within the trash"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-job.c:831
+#. no "ask-replace" handler, fallback to "ask"
+#: ../thunar-vfs/thunar-vfs-job.c:401
+#, c-format
+msgid ""
+"The file \"%s\" already exists. Would you like to replace it?\n"
+"\n"
+"If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-job.c:897
msgid "Do you want to overwrite it?"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-job.c:896
+#: ../thunar-vfs/thunar-vfs-job.c:1042
msgid "Do you want to skip it?"
msgstr ""
@@ -862,36 +871,83 @@ msgstr ""
msgid "Details view"
msgstr ""
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr ""
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:959
+#: ../thunar/thunar-dialogs.c:231 ../thunar/thunar-renamer-dialog.c:959
msgid "Failed to open the documentation browser"
msgstr ""
-#: ../thunar/thunar-dialogs.c:325
+#: ../thunar/thunar-dialogs.c:328
msgid "_Yes"
msgstr ""
-#: ../thunar/thunar-dialogs.c:329
+#: ../thunar/thunar-dialogs.c:332
msgid "Yes to _all"
msgstr ""
-#: ../thunar/thunar-dialogs.c:333
+#: ../thunar/thunar-dialogs.c:336
msgid "_No"
msgstr ""
-#: ../thunar/thunar-dialogs.c:337
+#: ../thunar/thunar-dialogs.c:340
msgid "N_o to all"
msgstr ""
-#: ../thunar/thunar-dialogs.c:342
+#: ../thunar/thunar-dialogs.c:344
+msgid "_Retry"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:349
msgid "_Cancel"
msgstr ""
+#. setup the confirmation dialog
+#: ../thunar/thunar-dialogs.c:429
+msgid "Confirm to replace files"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:435
+msgid "_Skip"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:436
+msgid "Replace _All"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:437
+msgid "_Replace"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:467
+#, c-format
+msgid "This folder already contains a file \"%s\"."
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:475
+msgid "ReplaceDialogPart1|Do you want to replace the existing file"
+msgstr ""
+
+#.
+#. Fourth box (size, volume, free space)
+#.
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:440
+msgid "Size:"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:401
+msgid "Modified:"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:500
+msgid "ReplaceDialogPart2|with the following file?"
+msgstr ""
+
#: ../thunar/thunar-dnd.c:70
msgid "_Copy here"
msgstr ""
@@ -1707,7 +1763,7 @@ msgstr ""
msgid "Failed to display the volume management settings"
msgstr ""
-#: ../thunar/thunar-progress-dialog.c:375
+#: ../thunar/thunar-progress-dialog.c:398
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
@@ -1715,7 +1771,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../thunar/thunar-progress-dialog.c:380
+#: ../thunar/thunar-progress-dialog.c:403
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
@@ -1723,7 +1779,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../thunar/thunar-progress-dialog.c:385
+#: ../thunar/thunar-progress-dialog.c:408
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1761,21 +1817,10 @@ msgstr ""
msgid "Deleted:"
msgstr ""
-#: ../thunar/thunar-properties-dialog.c:401
-msgid "Modified:"
-msgstr ""
-
#: ../thunar/thunar-properties-dialog.c:415
msgid "Accessed:"
msgstr ""
-#.
-#. Fourth box (size, volume, free space)
-#.
-#: ../thunar/thunar-properties-dialog.c:440
-msgid "Size:"
-msgstr ""
-
#: ../thunar/thunar-properties-dialog.c:453
msgid "Volume:"
msgstr ""
diff --git a/po/mk.po b/po/mk.po
index c04465eb7..5fac5af86 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-22 18:30+0200\n"
+"POT-Creation-Date: 2007-05-23 23:24+0200\n"
"PO-Revision-Date: 2006-12-24 20:21+0100\n"
"Last-Translator: Jovan Naumovski <jovan@lugola.net>\n"
"Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
@@ -58,29 +58,29 @@ msgstr "Само локалните датотеки можат да бидат
msgid "Preparing..."
msgstr "Во подготовка..."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:228
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:537
#, c-format
msgid "Failed to change permissions of \"%s\""
msgstr "Ðе уÑпеав да ги променам пермиÑиите на \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:355
#, c-format
msgid "Failed to change file owner of \"%s\""
msgstr "Ðе уÑпеав да го променам ÑопÑтвеникот на датотеката на\"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:356
#, c-format
msgid "Failed to change file group of \"%s\""
msgstr "Ðе уÑпеав да ја променам групата на датотеката \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:444
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:190
#, c-format
msgid "The file \"%s\" already exists"
msgstr "Датотеката \"%s\" веќе поÑтои"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:462
#, c-format
msgid "Failed to create empty file \"%s\""
msgstr "Ðе уÑпеав да креирам празн датотека \"%s\""
@@ -240,11 +240,20 @@ msgstr "Ѓубре"
msgid "Cannot move or copy files within the trash"
msgstr "Ðе можам да ги премеÑтам или копирам датотеките во ѓубре"
-#: ../thunar-vfs/thunar-vfs-job.c:831
+#. no "ask-replace" handler, fallback to "ask"
+#: ../thunar-vfs/thunar-vfs-job.c:401
+#, c-format
+msgid ""
+"The file \"%s\" already exists. Would you like to replace it?\n"
+"\n"
+"If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-job.c:897
msgid "Do you want to overwrite it?"
msgstr "Дали Ñакате да го презапишете?"
-#: ../thunar-vfs/thunar-vfs-job.c:896
+#: ../thunar-vfs/thunar-vfs-job.c:1042
msgid "Do you want to skip it?"
msgstr "Дали Ñакате да го преÑкокнете?"
@@ -896,7 +905,7 @@ msgstr "Детален преглед во лиÑта на директориу
msgid "Details view"
msgstr "Преглед на детаљи"
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr ""
"Viktor Stojanovski <viktor@lugola.net> 2006\n"
@@ -904,30 +913,80 @@ msgstr ""
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:959
+#: ../thunar/thunar-dialogs.c:231 ../thunar/thunar-renamer-dialog.c:959
msgid "Failed to open the documentation browser"
msgstr "Ðе уÑпеав да ја отворам документацијата за прелиÑтувачот"
-#: ../thunar/thunar-dialogs.c:325
+#: ../thunar/thunar-dialogs.c:328
msgid "_Yes"
msgstr "_Да"
-#: ../thunar/thunar-dialogs.c:329
+#: ../thunar/thunar-dialogs.c:332
msgid "Yes to _all"
msgstr "Да за _Ñите"
-#: ../thunar/thunar-dialogs.c:333
+#: ../thunar/thunar-dialogs.c:336
msgid "_No"
msgstr "_Ðе"
-#: ../thunar/thunar-dialogs.c:337
+#: ../thunar/thunar-dialogs.c:340
msgid "N_o to all"
msgstr "Ð_е за Ñите"
-#: ../thunar/thunar-dialogs.c:342
+#: ../thunar/thunar-dialogs.c:344
+#, fuzzy
+msgid "_Retry"
+msgstr "_Врати"
+
+#: ../thunar/thunar-dialogs.c:349
msgid "_Cancel"
msgstr "_Откажи"
+#. setup the confirmation dialog
+#: ../thunar/thunar-dialogs.c:429
+msgid "Confirm to replace files"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:435
+msgid "_Skip"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:436
+#, fuzzy
+msgid "Replace _All"
+msgstr "Замени _Ñо:"
+
+#: ../thunar/thunar-dialogs.c:437
+#, fuzzy
+msgid "_Replace"
+msgstr "_Преименувај"
+
+#: ../thunar/thunar-dialogs.c:467
+#, c-format
+msgid "This folder already contains a file \"%s\"."
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:475
+msgid "ReplaceDialogPart1|Do you want to replace the existing file"
+msgstr ""
+
+#.
+#. Fourth box (size, volume, free space)
+#.
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:440
+msgid "Size:"
+msgstr "Големина:"
+
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:401
+msgid "Modified:"
+msgstr "Променето:"
+
+#: ../thunar/thunar-dialogs.c:500
+msgid "ReplaceDialogPart2|with the following file?"
+msgstr ""
+
#: ../thunar/thunar-dnd.c:70
msgid "_Copy here"
msgstr "_Копирај тука"
@@ -1786,7 +1845,7 @@ msgstr ""
msgid "Failed to display the volume management settings"
msgstr "Ðе можам да ја прикажам Ñодржината од корпата за ѓубре"
-#: ../thunar/thunar-progress-dialog.c:375
+#: ../thunar/thunar-progress-dialog.c:398
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
@@ -1794,7 +1853,7 @@ msgstr[0] "(%lu Ñ‡Ð°Ñ Ð¿Ñ€ÐµÐ¾Ñтанато)"
msgstr[1] "(%lu чаÑови преоÑтанато)"
msgstr[2] "(%lu чаÑови преоÑтанато)"
-#: ../thunar/thunar-progress-dialog.c:380
+#: ../thunar/thunar-progress-dialog.c:403
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
@@ -1802,7 +1861,7 @@ msgstr[0] "(%lu минута преоÑтанато)"
msgstr[1] "(%lu минути преоÑтанато)"
msgstr[2] "(%lu минути преоÑтанато)"
-#: ../thunar/thunar-progress-dialog.c:385
+#: ../thunar/thunar-progress-dialog.c:408
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1840,21 +1899,10 @@ msgstr "Цел на врÑката:"
msgid "Deleted:"
msgstr "Избришано:"
-#: ../thunar/thunar-properties-dialog.c:401
-msgid "Modified:"
-msgstr "Променето:"
-
#: ../thunar/thunar-properties-dialog.c:415
msgid "Accessed:"
msgstr "ПриÑтапено:"
-#.
-#. Fourth box (size, volume, free space)
-#.
-#: ../thunar/thunar-properties-dialog.c:440
-msgid "Size:"
-msgstr "Големина:"
-
#: ../thunar/thunar-properties-dialog.c:453
msgid "Volume:"
msgstr "ДиÑк:"
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 5b1f8ffb6..4c74538b1 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.8.1svn-r25675\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-22 18:30+0200\n"
+"POT-Creation-Date: 2007-05-23 23:24+0200\n"
"PO-Revision-Date: 2007-05-04 23:51+0200\n"
"Last-Translator: Terje Uriansrud <ter@operamail.com>\n"
"Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n"
@@ -56,29 +56,29 @@ msgstr "Bare lokale filer kan få nytt navn"
msgid "Preparing..."
msgstr "Forbereder ..."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:228
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:537
#, c-format
msgid "Failed to change permissions of \"%s\""
msgstr "Klarte ikke å endre tillatelser for \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:355
#, c-format
msgid "Failed to change file owner of \"%s\""
msgstr "Klarte ikke å endre fileeier for \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:356
#, c-format
msgid "Failed to change file group of \"%s\""
msgstr "Klarte ikke å endre filgruppe for \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:444
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:190
#, c-format
msgid "The file \"%s\" already exists"
msgstr "Filen \"%s\" eksisterer allerede"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:462
#, c-format
msgid "Failed to create empty file \"%s\""
msgstr "Klarte ikke lage tom fil \"%s\""
@@ -236,11 +236,20 @@ msgstr "Papirkurv"
msgid "Cannot move or copy files within the trash"
msgstr "Kan ikke flytte eller kopiere filer innenfor papirkurven"
-#: ../thunar-vfs/thunar-vfs-job.c:831
+#. no "ask-replace" handler, fallback to "ask"
+#: ../thunar-vfs/thunar-vfs-job.c:401
+#, c-format
+msgid ""
+"The file \"%s\" already exists. Would you like to replace it?\n"
+"\n"
+"If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-job.c:897
msgid "Do you want to overwrite it?"
msgstr "Ønsker du å overskrive denne?"
-#: ../thunar-vfs/thunar-vfs-job.c:896
+#: ../thunar-vfs/thunar-vfs-job.c:1042
msgid "Do you want to skip it?"
msgstr "Ønsker du å hoppe over denne?"
@@ -882,36 +891,86 @@ msgstr "Detaljert mappevisning"
msgid "Details view"
msgstr "Detaljert visning"
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr "Oversettelse bidragsytere"
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:959
+#: ../thunar/thunar-dialogs.c:231 ../thunar/thunar-renamer-dialog.c:959
msgid "Failed to open the documentation browser"
msgstr "Klarte ikke å åpne hjelpesystemet"
-#: ../thunar/thunar-dialogs.c:325
+#: ../thunar/thunar-dialogs.c:328
msgid "_Yes"
msgstr "_Ja"
-#: ../thunar/thunar-dialogs.c:329
+#: ../thunar/thunar-dialogs.c:332
msgid "Yes to _all"
msgstr "Ja til _alle"
-#: ../thunar/thunar-dialogs.c:333
+#: ../thunar/thunar-dialogs.c:336
msgid "_No"
msgstr "_Nei"
-#: ../thunar/thunar-dialogs.c:337
+#: ../thunar/thunar-dialogs.c:340
msgid "N_o to all"
msgstr "Nei til _alle"
-#: ../thunar/thunar-dialogs.c:342
+#: ../thunar/thunar-dialogs.c:344
+#, fuzzy
+msgid "_Retry"
+msgstr "Gjen_opprett"
+
+#: ../thunar/thunar-dialogs.c:349
msgid "_Cancel"
msgstr "_Avbryt"
+#. setup the confirmation dialog
+#: ../thunar/thunar-dialogs.c:429
+msgid "Confirm to replace files"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:435
+msgid "_Skip"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:436
+#, fuzzy
+msgid "Replace _All"
+msgstr "_Erstatt med:"
+
+#: ../thunar/thunar-dialogs.c:437
+#, fuzzy
+msgid "_Replace"
+msgstr "_Gi nytt navn"
+
+#: ../thunar/thunar-dialogs.c:467
+#, c-format
+msgid "This folder already contains a file \"%s\"."
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:475
+msgid "ReplaceDialogPart1|Do you want to replace the existing file"
+msgstr ""
+
+#.
+#. Fourth box (size, volume, free space)
+#.
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:440
+msgid "Size:"
+msgstr "Størrelse:"
+
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:401
+msgid "Modified:"
+msgstr "Modifisert:"
+
+#: ../thunar/thunar-dialogs.c:500
+msgid "ReplaceDialogPart2|with the following file?"
+msgstr ""
+
#: ../thunar/thunar-dnd.c:70
msgid "_Copy here"
msgstr "_Kopier hit"
@@ -1752,21 +1811,21 @@ msgstr ""
msgid "Failed to display the volume management settings"
msgstr "Klarte ikke vise enhetsbehandling innstillinger"
-#: ../thunar/thunar-progress-dialog.c:375
+#: ../thunar/thunar-progress-dialog.c:398
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
msgstr[0] "(%lu time igjen)"
msgstr[1] "(%lu timer igjen)"
-#: ../thunar/thunar-progress-dialog.c:380
+#: ../thunar/thunar-progress-dialog.c:403
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
msgstr[0] "(%lu minutt igjen)"
msgstr[1] "(%lu minutter igjen)"
-#: ../thunar/thunar-progress-dialog.c:385
+#: ../thunar/thunar-progress-dialog.c:408
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1803,21 +1862,10 @@ msgstr "Lenkemål:"
msgid "Deleted:"
msgstr "Slettet:"
-#: ../thunar/thunar-properties-dialog.c:401
-msgid "Modified:"
-msgstr "Modifisert:"
-
#: ../thunar/thunar-properties-dialog.c:415
msgid "Accessed:"
msgstr "Aksessert:"
-#.
-#. Fourth box (size, volume, free space)
-#.
-#: ../thunar/thunar-properties-dialog.c:440
-msgid "Size:"
-msgstr "Størrelse:"
-
#: ../thunar/thunar-properties-dialog.c:453
msgid "Volume:"
msgstr "Enhet:"
diff --git a/po/nl.po b/po/nl.po
index 0ae088c3b..91615041b 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-22 18:30+0200\n"
+"POT-Creation-Date: 2007-05-23 23:24+0200\n"
"PO-Revision-Date: 2006-10-27 00:51+0100\n"
"Last-Translator: Stephan Arts <stephan@xfce.org>\n"
"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -60,29 +60,29 @@ msgstr "Alleen lokale bestanden mogen worden verwijderd"
msgid "Preparing..."
msgstr "Aan het voorbereiden..."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:228
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:537
#, c-format
msgid "Failed to change permissions of \"%s\""
msgstr "Het veranderen van de rechten van \"%s\" is mislukt"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:355
#, c-format
msgid "Failed to change file owner of \"%s\""
msgstr "Het veranderen van de eigenaar van \"%s\" is mislukt"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:356
#, c-format
msgid "Failed to change file group of \"%s\""
msgstr "Het veranderen van de bestandsgroep van \"%s\" is mislukt"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:444
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:190
#, c-format
msgid "The file \"%s\" already exists"
msgstr "Het bestand \"%s\" bestaat al"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:462
#, c-format
msgid "Failed to create empty file \"%s\""
msgstr "Fout bij het maken van leeg bestand \"%s\""
@@ -242,11 +242,20 @@ msgstr "Prullenbak"
msgid "Cannot move or copy files within the trash"
msgstr "Kan geen bestanden kopiëren of verplaatsen binnen de prullenbak"
-#: ../thunar-vfs/thunar-vfs-job.c:831
+#. no "ask-replace" handler, fallback to "ask"
+#: ../thunar-vfs/thunar-vfs-job.c:401
+#, c-format
+msgid ""
+"The file \"%s\" already exists. Would you like to replace it?\n"
+"\n"
+"If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-job.c:897
msgid "Do you want to overwrite it?"
msgstr "Wilt u dit bestand overschrijven?"
-#: ../thunar-vfs/thunar-vfs-job.c:896
+#: ../thunar-vfs/thunar-vfs-job.c:1042
msgid "Do you want to skip it?"
msgstr "Wilt u dit bestand overslaan?"
@@ -893,7 +902,7 @@ msgstr "Gedetailleerde mappenweergave"
msgid "Details view"
msgstr "Gedetailleerde weergavemodus"
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr ""
"Vincent Tunru <imnotb@gmail.com>\n"
@@ -901,30 +910,80 @@ msgstr ""
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:959
+#: ../thunar/thunar-dialogs.c:231 ../thunar/thunar-renamer-dialog.c:959
msgid "Failed to open the documentation browser"
msgstr "Fout bij het openen van de documentatie browser"
-#: ../thunar/thunar-dialogs.c:325
+#: ../thunar/thunar-dialogs.c:328
msgid "_Yes"
msgstr "_Ja"
-#: ../thunar/thunar-dialogs.c:329
+#: ../thunar/thunar-dialogs.c:332
msgid "Yes to _all"
msgstr "Ja op _alles"
-#: ../thunar/thunar-dialogs.c:333
+#: ../thunar/thunar-dialogs.c:336
msgid "_No"
msgstr "_Nee"
-#: ../thunar/thunar-dialogs.c:337
+#: ../thunar/thunar-dialogs.c:340
msgid "N_o to all"
msgstr "N_ee op alles"
-#: ../thunar/thunar-dialogs.c:342
+#: ../thunar/thunar-dialogs.c:344
+#, fuzzy
+msgid "_Retry"
+msgstr "He_rstellen"
+
+#: ../thunar/thunar-dialogs.c:349
msgid "_Cancel"
msgstr "_Annuleren"
+#. setup the confirmation dialog
+#: ../thunar/thunar-dialogs.c:429
+msgid "Confirm to replace files"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:435
+msgid "_Skip"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:436
+#, fuzzy
+msgid "Replace _All"
+msgstr "Vervangen _Door:"
+
+#: ../thunar/thunar-dialogs.c:437
+#, fuzzy
+msgid "_Replace"
+msgstr "He_rnoemen"
+
+#: ../thunar/thunar-dialogs.c:467
+#, c-format
+msgid "This folder already contains a file \"%s\"."
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:475
+msgid "ReplaceDialogPart1|Do you want to replace the existing file"
+msgstr ""
+
+#.
+#. Fourth box (size, volume, free space)
+#.
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:440
+msgid "Size:"
+msgstr "Grootte:"
+
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:401
+msgid "Modified:"
+msgstr "Bewerkt:"
+
+#: ../thunar/thunar-dialogs.c:500
+msgid "ReplaceDialogPart2|with the following file?"
+msgstr ""
+
#: ../thunar/thunar-dnd.c:70
msgid "_Copy here"
msgstr "Hier _kopiëren"
@@ -1765,21 +1824,21 @@ msgstr ""
msgid "Failed to display the volume management settings"
msgstr "Het weergeven van de media beheer instellingen is mislukt"
-#: ../thunar/thunar-progress-dialog.c:375
+#: ../thunar/thunar-progress-dialog.c:398
#, 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:380
+#: ../thunar/thunar-progress-dialog.c:403
#, 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:385
+#: ../thunar/thunar-progress-dialog.c:408
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1816,21 +1875,10 @@ msgstr "Doel van de Snelkoppeling:"
msgid "Deleted:"
msgstr "Verwijderd:"
-#: ../thunar/thunar-properties-dialog.c:401
-msgid "Modified:"
-msgstr "Bewerkt:"
-
#: ../thunar/thunar-properties-dialog.c:415
msgid "Accessed:"
msgstr "Geopend:"
-#.
-#. Fourth box (size, volume, free space)
-#.
-#: ../thunar/thunar-properties-dialog.c:440
-msgid "Size:"
-msgstr "Grootte:"
-
#: ../thunar/thunar-properties-dialog.c:453
msgid "Volume:"
msgstr "Volume:"
diff --git a/po/pa.po b/po/pa.po
index 983b64839..095d123f1 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pa\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-22 18:30+0200\n"
+"POT-Creation-Date: 2007-05-23 23:24+0200\n"
"PO-Revision-Date: 2007-04-04 08:48+0530\n"
"Last-Translator: A S Alam <aalam@users.sf.net>\n"
"Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
@@ -59,29 +59,29 @@ msgstr "ਸਿਰਫ਼ ਲੋਕਲ ਫਾਇਲਾਂ ਦੇ ਨਾਂ ਹੀ
msgid "Preparing..."
msgstr "ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:228
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:537
#, c-format
msgid "Failed to change permissions of \"%s\""
msgstr "\"%s\" ਦੇ ਅਧਿਕਾਰ ਬਦਲਣ ਲਈ ਫੇਲà©à¨¹"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:355
#, c-format
msgid "Failed to change file owner of \"%s\""
msgstr "\"%s\" ਦਾ ਓਨਰ ਬਦਲਣ ਲਈ ਫੇਲà©à¨¹"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:356
#, c-format
msgid "Failed to change file group of \"%s\""
msgstr "\"%s\" ਦਾ ਗਰà©à©±à¨ª ਬਦਲਣ ਲਈ ਫੇਲà©à¨¹"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:444
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:190
#, c-format
msgid "The file \"%s\" already exists"
msgstr "ਫਾਇਲ \"%s\" ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:462
#, c-format
msgid "Failed to create empty file \"%s\""
msgstr "ਖਾਲੀ ਫਾਇਲ \"%s\" ਬਣਾਉਣ ਲਈ ਫੇਲà©à¨¹"
@@ -239,11 +239,20 @@ msgstr "ਰੱਦੀ"
msgid "Cannot move or copy files within the trash"
msgstr "ਫਾਇਲਾਂ ਨੂੰ ਰੱਦੀ à¨à©‡à¨œà¨¿à¨†à¨‚ ਜਾਂ ਨਕਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"
-#: ../thunar-vfs/thunar-vfs-job.c:831
+#. no "ask-replace" handler, fallback to "ask"
+#: ../thunar-vfs/thunar-vfs-job.c:401
+#, c-format
+msgid ""
+"The file \"%s\" already exists. Would you like to replace it?\n"
+"\n"
+"If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-job.c:897
msgid "Do you want to overwrite it?"
msgstr "ਕੀ ਤà©à¨¸à©€à¨‚ ਉੱਪਰ ਲਿਖਣਾ ਚਾਹà©à©°à¨¦à©‡ ਹੋ?"
-#: ../thunar-vfs/thunar-vfs-job.c:896
+#: ../thunar-vfs/thunar-vfs-job.c:1042
msgid "Do you want to skip it?"
msgstr "ਕੀ ਤà©à¨¸à©€à¨‚ ਛੱਡਣਾ ਚਾਹà©à©°à¨¦à©‡ ਹੋ?"
@@ -872,7 +881,7 @@ msgstr "ਡੀਟੇਲ ਡਾਇਰੈਕਟਰੀ ਲਿਸਟਿੰਗ"
msgid "Details view"
msgstr "ਡਿਟੇਲ ਵਿਊ"
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr ""
"ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮਵਾਲਾ\n"
@@ -882,30 +891,80 @@ msgstr ""
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:959
+#: ../thunar/thunar-dialogs.c:231 ../thunar/thunar-renamer-dialog.c:959
msgid "Failed to open the documentation browser"
msgstr "ਡਾਕੂਮਿੰਟ ਬਰਾਊਜ਼ਰ ਖੋਲà©à¨¹à¨£ ਲਈ ਫੇਲà©à¨¹"
-#: ../thunar/thunar-dialogs.c:325
+#: ../thunar/thunar-dialogs.c:328
msgid "_Yes"
msgstr "ਹਾਂ(_Y)"
-#: ../thunar/thunar-dialogs.c:329
+#: ../thunar/thunar-dialogs.c:332
msgid "Yes to _all"
msgstr "ਸਠਲਈ ਹਾਂ(_a)"
-#: ../thunar/thunar-dialogs.c:333
+#: ../thunar/thunar-dialogs.c:336
msgid "_No"
msgstr "ਨਹੀਂ(_N)"
-#: ../thunar/thunar-dialogs.c:337
+#: ../thunar/thunar-dialogs.c:340
msgid "N_o to all"
msgstr "ਸਠਲਈ ਨਹੀਂ(_o)"
-#: ../thunar/thunar-dialogs.c:342
+#: ../thunar/thunar-dialogs.c:344
+#, fuzzy
+msgid "_Retry"
+msgstr "ਰੀ-ਸਟੋਰ(_R)"
+
+#: ../thunar/thunar-dialogs.c:349
msgid "_Cancel"
msgstr "ਰੱਦ ਕਰੋ(_C)"
+#. setup the confirmation dialog
+#: ../thunar/thunar-dialogs.c:429
+msgid "Confirm to replace files"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:435
+msgid "_Skip"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:436
+#, fuzzy
+msgid "Replace _All"
+msgstr "ਇਸ ਨਾਲ ਬਦਲੋ(_W):"
+
+#: ../thunar/thunar-dialogs.c:437
+#, fuzzy
+msgid "_Replace"
+msgstr "ਨਾਂ ਬਦਲੋ(_R)"
+
+#: ../thunar/thunar-dialogs.c:467
+#, c-format
+msgid "This folder already contains a file \"%s\"."
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:475
+msgid "ReplaceDialogPart1|Do you want to replace the existing file"
+msgstr ""
+
+#.
+#. Fourth box (size, volume, free space)
+#.
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:440
+msgid "Size:"
+msgstr "ਆਕਾਰ:"
+
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:401
+msgid "Modified:"
+msgstr "ਸੋਧ:"
+
+#: ../thunar/thunar-dialogs.c:500
+msgid "ReplaceDialogPart2|with the following file?"
+msgstr ""
+
#: ../thunar/thunar-dnd.c:70
msgid "_Copy here"
msgstr "ਇੱਥੇ ਨਕਲ(_C)"
@@ -1718,21 +1777,21 @@ msgstr ""
msgid "Failed to display the volume management settings"
msgstr "ਵਾਲੀਅਮ ਮੈਨੇਜ਼ਮਿੰਟ ਸੈਟਿੰਗ ਵੇਖਾਉਣ ਲਈ ਫੇਲà©à¨¹"
-#: ../thunar/thunar-progress-dialog.c:375
+#: ../thunar/thunar-progress-dialog.c:398
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
msgstr[0] "(%lu ਘੰਟਾ ਬਾਕੀ)"
msgstr[1] "(%lu ਘੰਟੇ ਬਾਕੀ)"
-#: ../thunar/thunar-progress-dialog.c:380
+#: ../thunar/thunar-progress-dialog.c:403
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
msgstr[0] "(%lu ਮਿੰਟ ਬਾਕੀ)"
msgstr[1] "(%lu ਮਿੰਟ ਬਾਕੀ)"
-#: ../thunar/thunar-progress-dialog.c:385
+#: ../thunar/thunar-progress-dialog.c:408
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1769,21 +1828,10 @@ msgstr "ਲਿੰਕ ਟਾਰਗੇਟ:"
msgid "Deleted:"
msgstr "ਹਟਾਈ:"
-#: ../thunar/thunar-properties-dialog.c:401
-msgid "Modified:"
-msgstr "ਸੋਧ:"
-
#: ../thunar/thunar-properties-dialog.c:415
msgid "Accessed:"
msgstr "ਪਹà©à©°à¨š:"
-#.
-#. Fourth box (size, volume, free space)
-#.
-#: ../thunar/thunar-properties-dialog.c:440
-msgid "Size:"
-msgstr "ਆਕਾਰ:"
-
#: ../thunar/thunar-properties-dialog.c:453
msgid "Volume:"
msgstr "ਵਾਲੀਅਮ:"
diff --git a/po/pl.po b/po/pl.po
index 416bf30c8..674520b0d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-22 18:30+0200\n"
+"POT-Creation-Date: 2007-05-23 23:24+0200\n"
"PO-Revision-Date: 2007-01-20 23:10+0200\n"
"Last-Translator: Szymon Kałasz <szymon_maestro@gazeta.pl>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -59,29 +59,29 @@ msgstr "Można zmieniać nazwy tylko lokalnych plików"
msgid "Preparing..."
msgstr "PrzygotowujÄ™..."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:228
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:537
#, c-format
msgid "Failed to change permissions of \"%s\""
msgstr "Nie udało się zmienić uprawnień do \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:355
#, c-format
msgid "Failed to change file owner of \"%s\""
msgstr "Nie udało się zmienić właściciela dla \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:356
#, c-format
msgid "Failed to change file group of \"%s\""
msgstr "Nie udało się zmienić grupy dla \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:444
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:190
#, c-format
msgid "The file \"%s\" already exists"
msgstr "Plik \"%s\" już istnieje"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:462
#, c-format
msgid "Failed to create empty file \"%s\""
msgstr "Nie udało się utworzyć pustego pliku \"%s\""
@@ -241,11 +241,20 @@ msgstr "Åšmietnik"
msgid "Cannot move or copy files within the trash"
msgstr "Nie można przenosić ani kopiować plików w śmietniku"
-#: ../thunar-vfs/thunar-vfs-job.c:831
+#. no "ask-replace" handler, fallback to "ask"
+#: ../thunar-vfs/thunar-vfs-job.c:401
+#, fuzzy, c-format
+msgid ""
+"The file \"%s\" already exists. Would you like to replace it?\n"
+"\n"
+"If you replace an existing file, its contents will be overwritten."
+msgstr "Plik \"%s\" już istnieje. Czy zastąpić go przez pusty plik?"
+
+#: ../thunar-vfs/thunar-vfs-job.c:897
msgid "Do you want to overwrite it?"
msgstr "Czy chcesz go nadpisać?"
-#: ../thunar-vfs/thunar-vfs-job.c:896
+#: ../thunar-vfs/thunar-vfs-job.c:1042
msgid "Do you want to skip it?"
msgstr "Czy chcesz go pominąć?"
@@ -879,7 +888,7 @@ msgstr "Pokazuj szczegóły elementów w katalogu"
msgid "Details view"
msgstr "Widok szczegółowy"
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr ""
"Piotr Maliński <admin@rk.edu.pl> \n"
@@ -888,30 +897,80 @@ msgstr ""
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:959
+#: ../thunar/thunar-dialogs.c:231 ../thunar/thunar-renamer-dialog.c:959
msgid "Failed to open the documentation browser"
msgstr "Nie udało się uruchomić przeglądarki dokumentacji"
-#: ../thunar/thunar-dialogs.c:325
+#: ../thunar/thunar-dialogs.c:328
msgid "_Yes"
msgstr "_Tak"
-#: ../thunar/thunar-dialogs.c:329
+#: ../thunar/thunar-dialogs.c:332
msgid "Yes to _all"
msgstr "Tak dla _wszystkich"
-#: ../thunar/thunar-dialogs.c:333
+#: ../thunar/thunar-dialogs.c:336
msgid "_No"
msgstr "_Nie"
-#: ../thunar/thunar-dialogs.c:337
+#: ../thunar/thunar-dialogs.c:340
msgid "N_o to all"
msgstr "N_ie dla wszystkich"
-#: ../thunar/thunar-dialogs.c:342
+#: ../thunar/thunar-dialogs.c:344
+#, fuzzy
+msgid "_Retry"
+msgstr "_Przywróć"
+
+#: ../thunar/thunar-dialogs.c:349
msgid "_Cancel"
msgstr "_Anuluj"
+#. setup the confirmation dialog
+#: ../thunar/thunar-dialogs.c:429
+msgid "Confirm to replace files"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:435
+msgid "_Skip"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:436
+#, fuzzy
+msgid "Replace _All"
+msgstr "_Zamień na:"
+
+#: ../thunar/thunar-dialogs.c:437
+#, fuzzy
+msgid "_Replace"
+msgstr "_Zmień nazwę"
+
+#: ../thunar/thunar-dialogs.c:467
+#, c-format
+msgid "This folder already contains a file \"%s\"."
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:475
+msgid "ReplaceDialogPart1|Do you want to replace the existing file"
+msgstr ""
+
+#.
+#. Fourth box (size, volume, free space)
+#.
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:440
+msgid "Size:"
+msgstr "Rozmiar:"
+
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:401
+msgid "Modified:"
+msgstr "Ostatnio zmodyfikowany:"
+
+#: ../thunar/thunar-dialogs.c:500
+msgid "ReplaceDialogPart2|with the following file?"
+msgstr ""
+
#: ../thunar/thunar-dnd.c:70
msgid "_Copy here"
msgstr "S_kopiuj"
@@ -1764,7 +1823,7 @@ msgstr ""
msgid "Failed to display the volume management settings"
msgstr "Nie można wyświetlić ustawień menedżera woluminów"
-#: ../thunar/thunar-progress-dialog.c:375
+#: ../thunar/thunar-progress-dialog.c:398
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
@@ -1772,7 +1831,7 @@ msgstr[0] "(pozostała %lu godzina)"
msgstr[1] "(pozostały %lu godziny)"
msgstr[2] "(pozostało %lu godzin)"
-#: ../thunar/thunar-progress-dialog.c:380
+#: ../thunar/thunar-progress-dialog.c:403
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
@@ -1780,7 +1839,7 @@ msgstr[0] "(pozostała %lu minuta)"
msgstr[1] "(pozostały %lu minuty)"
msgstr[2] "(pozostało %lu minut)"
-#: ../thunar/thunar-progress-dialog.c:385
+#: ../thunar/thunar-progress-dialog.c:408
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1818,21 +1877,10 @@ msgstr "Cel dowiÄ…zania:"
msgid "Deleted:"
msgstr "Usunięto:"
-#: ../thunar/thunar-properties-dialog.c:401
-msgid "Modified:"
-msgstr "Ostatnio zmodyfikowany:"
-
#: ../thunar/thunar-properties-dialog.c:415
msgid "Accessed:"
msgstr "Ostatnio otwarty:"
-#.
-#. Fourth box (size, volume, free space)
-#.
-#: ../thunar/thunar-properties-dialog.c:440
-msgid "Size:"
-msgstr "Rozmiar:"
-
#: ../thunar/thunar-properties-dialog.c:453
msgid "Volume:"
msgstr "UrzÄ…dzenie:"
@@ -3419,11 +3467,6 @@ msgstr "Otwórz wybrane katalogi w Thunarze"
#~ msgid "Failed to determine file info of \"%s\": %s"
#~ msgstr "Nie udało się ustalić informacji o pliku \"%s\": %s"
-#~ msgid ""
-#~ "The file \"%s\" already exists. Do you want to replace it with an empty "
-#~ "file?"
-#~ msgstr "Plik \"%s\" już istnieje. Czy zastąpić go przez pusty plik?"
-
#~ msgid ""
#~ "Failed to remove \"%s\".\n"
#~ "\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d32945576..661a50ee8 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-22 18:30+0200\n"
+"POT-Creation-Date: 2007-05-23 23:24+0200\n"
"PO-Revision-Date: 2006-11-03 16:02-0200\n"
"Last-Translator: Adriano Winter Bess <awbess@gmail.com>\n"
"Language-Team: os-cillation <info@os-cillation.com>\n"
@@ -58,29 +58,29 @@ msgstr "Apenas arquivos locais podem ser renomeados"
msgid "Preparing..."
msgstr "Preparando..."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:228
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:537
#, c-format
msgid "Failed to change permissions of \"%s\""
msgstr "Falhou ao trocar permissões de \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:355
#, c-format
msgid "Failed to change file owner of \"%s\""
msgstr "Falhou ao trocar dono de \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:356
#, c-format
msgid "Failed to change file group of \"%s\""
msgstr "Falhou ao trocar grupo de \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:444
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:190
#, c-format
msgid "The file \"%s\" already exists"
msgstr "O arquivo \"%s\" já existe"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:462
#, c-format
msgid "Failed to create empty file \"%s\""
msgstr "Falhou ao criar arquivo vazio \"%s\""
@@ -238,11 +238,20 @@ msgstr "Lixeira"
msgid "Cannot move or copy files within the trash"
msgstr "Não é possÃvel mover ou copiar arquivos dentro da lixeira"
-#: ../thunar-vfs/thunar-vfs-job.c:831
+#. no "ask-replace" handler, fallback to "ask"
+#: ../thunar-vfs/thunar-vfs-job.c:401
+#, c-format
+msgid ""
+"The file \"%s\" already exists. Would you like to replace it?\n"
+"\n"
+"If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-job.c:897
msgid "Do you want to overwrite it?"
msgstr "Você quer sobrescrevê-lo?"
-#: ../thunar-vfs/thunar-vfs-job.c:896
+#: ../thunar-vfs/thunar-vfs-job.c:1042
msgid "Do you want to skip it?"
msgstr "Você quer pulá-lo?"
@@ -892,36 +901,86 @@ msgstr "Listagem de diretório detalhada"
msgid "Details view"
msgstr "Visualização de detalhes"
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr "Créditos de tradutores"
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:959
+#: ../thunar/thunar-dialogs.c:231 ../thunar/thunar-renamer-dialog.c:959
msgid "Failed to open the documentation browser"
msgstr "Falhou ao abrir o navegador da documentação"
-#: ../thunar/thunar-dialogs.c:325
+#: ../thunar/thunar-dialogs.c:328
msgid "_Yes"
msgstr "_Sim"
-#: ../thunar/thunar-dialogs.c:329
+#: ../thunar/thunar-dialogs.c:332
msgid "Yes to _all"
msgstr "Sim para _todos"
-#: ../thunar/thunar-dialogs.c:333
+#: ../thunar/thunar-dialogs.c:336
msgid "_No"
msgstr "_Não"
-#: ../thunar/thunar-dialogs.c:337
+#: ../thunar/thunar-dialogs.c:340
msgid "N_o to all"
msgstr "Nã_o para todos"
-#: ../thunar/thunar-dialogs.c:342
+#: ../thunar/thunar-dialogs.c:344
+#, fuzzy
+msgid "_Retry"
+msgstr "_Restaurar"
+
+#: ../thunar/thunar-dialogs.c:349
msgid "_Cancel"
msgstr "_Cancelar"
+#. setup the confirmation dialog
+#: ../thunar/thunar-dialogs.c:429
+msgid "Confirm to replace files"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:435
+msgid "_Skip"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:436
+#, fuzzy
+msgid "Replace _All"
+msgstr "Substituir _Por:"
+
+#: ../thunar/thunar-dialogs.c:437
+#, fuzzy
+msgid "_Replace"
+msgstr "_Renomear"
+
+#: ../thunar/thunar-dialogs.c:467
+#, c-format
+msgid "This folder already contains a file \"%s\"."
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:475
+msgid "ReplaceDialogPart1|Do you want to replace the existing file"
+msgstr ""
+
+#.
+#. Fourth box (size, volume, free space)
+#.
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:440
+msgid "Size:"
+msgstr "Tamanho:"
+
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:401
+msgid "Modified:"
+msgstr "Modificado:"
+
+#: ../thunar/thunar-dialogs.c:500
+msgid "ReplaceDialogPart2|with the following file?"
+msgstr ""
+
#: ../thunar/thunar-dnd.c:70
msgid "_Copy here"
msgstr "_Copiar aqui"
@@ -1763,21 +1822,21 @@ msgstr ""
msgid "Failed to display the volume management settings"
msgstr "Falhou ao mostrar o conteúdo da lixeira"
-#: ../thunar/thunar-progress-dialog.c:375
+#: ../thunar/thunar-progress-dialog.c:398
#, 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:380
+#: ../thunar/thunar-progress-dialog.c:403
#, 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:385
+#: ../thunar/thunar-progress-dialog.c:408
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1814,21 +1873,10 @@ msgstr "Destino da ligação:"
msgid "Deleted:"
msgstr "Apagado:"
-#: ../thunar/thunar-properties-dialog.c:401
-msgid "Modified:"
-msgstr "Modificado:"
-
#: ../thunar/thunar-properties-dialog.c:415
msgid "Accessed:"
msgstr "Acessado:"
-#.
-#. Fourth box (size, volume, free space)
-#.
-#: ../thunar/thunar-properties-dialog.c:440
-msgid "Size:"
-msgstr "Tamanho:"
-
#: ../thunar/thunar-properties-dialog.c:453
msgid "Volume:"
msgstr "Volume:"
diff --git a/po/ro.po b/po/ro.po
index baa4869db..539a866f4 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-22 18:30+0200\n"
+"POT-Creation-Date: 2007-05-23 23:24+0200\n"
"PO-Revision-Date: 2007-01-21 03:36+0200\n"
"Last-Translator: MiÅŸu Moldovan <dumol@gnome.ro>\n"
"Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
@@ -57,29 +57,29 @@ msgstr "Doar fiÅŸierele locale pot fi redenumite"
msgid "Preparing..."
msgstr "Se pregăteşte..."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:228
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:537
#, c-format
msgid "Failed to change permissions of \"%s\""
msgstr "Nu s-au putut schimba drepturile pentru „%sâ€"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:355
#, c-format
msgid "Failed to change file owner of \"%s\""
msgstr "Nu s-a putut schimba deÅ£inătorul fiÅŸierului „%sâ€"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:356
#, c-format
msgid "Failed to change file group of \"%s\""
msgstr "Nu s-a putut schimba grupul fiÅŸierului „%sâ€"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:444
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:190
#, c-format
msgid "The file \"%s\" already exists"
msgstr "Fişierul „%s†există deja"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:462
#, c-format
msgid "Failed to create empty file \"%s\""
msgstr "Nu s-a putut crea fiÅŸierul gol „%sâ€"
@@ -239,11 +239,20 @@ msgstr "CoÅŸ de gunoi"
msgid "Cannot move or copy files within the trash"
msgstr "Nu se pot muta ori copia fişiere în interiorul coşului de gunoi"
-#: ../thunar-vfs/thunar-vfs-job.c:831
+#. no "ask-replace" handler, fallback to "ask"
+#: ../thunar-vfs/thunar-vfs-job.c:401
+#, c-format
+msgid ""
+"The file \"%s\" already exists. Would you like to replace it?\n"
+"\n"
+"If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-job.c:897
msgid "Do you want to overwrite it?"
msgstr "Doriţi să-l suprascrieţi?"
-#: ../thunar-vfs/thunar-vfs-job.c:896
+#: ../thunar-vfs/thunar-vfs-job.c:1042
msgid "Do you want to skip it?"
msgstr "Doriţi să omiteţi acest fişier?"
@@ -892,36 +901,86 @@ msgstr "Afişare detaliată directoare"
msgid "Details view"
msgstr "Vizualizare detaliată"
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr "MiÅŸu Moldovan <dumol@gnome.ro>"
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:959
+#: ../thunar/thunar-dialogs.c:231 ../thunar/thunar-renamer-dialog.c:959
msgid "Failed to open the documentation browser"
msgstr "Nu s-a putut deschide navigatorul documentaţiei"
-#: ../thunar/thunar-dialogs.c:325
+#: ../thunar/thunar-dialogs.c:328
msgid "_Yes"
msgstr "_Da"
-#: ../thunar/thunar-dialogs.c:329
+#: ../thunar/thunar-dialogs.c:332
msgid "Yes to _all"
msgstr "ÃŽntotdeauna d_a"
-#: ../thunar/thunar-dialogs.c:333
+#: ../thunar/thunar-dialogs.c:336
msgid "_No"
msgstr "_Nu"
-#: ../thunar/thunar-dialogs.c:337
+#: ../thunar/thunar-dialogs.c:340
msgid "N_o to all"
msgstr "ÃŽntotdeauna n_u"
-#: ../thunar/thunar-dialogs.c:342
+#: ../thunar/thunar-dialogs.c:344
+#, fuzzy
+msgid "_Retry"
+msgstr "_Restaurează"
+
+#: ../thunar/thunar-dialogs.c:349
msgid "_Cancel"
msgstr "_Renunţă"
+#. setup the confirmation dialog
+#: ../thunar/thunar-dialogs.c:429
+msgid "Confirm to replace files"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:435
+msgid "_Skip"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:436
+#, fuzzy
+msgid "Replace _All"
+msgstr "ÃŽnlocuieÅŸte c_u:"
+
+#: ../thunar/thunar-dialogs.c:437
+#, fuzzy
+msgid "_Replace"
+msgstr "_RedenumeÅŸte"
+
+#: ../thunar/thunar-dialogs.c:467
+#, c-format
+msgid "This folder already contains a file \"%s\"."
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:475
+msgid "ReplaceDialogPart1|Do you want to replace the existing file"
+msgstr ""
+
+#.
+#. Fourth box (size, volume, free space)
+#.
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:440
+msgid "Size:"
+msgstr "Mărime:"
+
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:401
+msgid "Modified:"
+msgstr "Modificat:"
+
+#: ../thunar/thunar-dialogs.c:500
+msgid "ReplaceDialogPart2|with the following file?"
+msgstr ""
+
#: ../thunar/thunar-dnd.c:70
msgid "_Copy here"
msgstr "_Copiază aici"
@@ -1787,7 +1846,7 @@ msgstr ""
msgid "Failed to display the volume management settings"
msgstr "Nu s-au putut afişa preferinţele pentru administrarea de volume"
-#: ../thunar/thunar-progress-dialog.c:375
+#: ../thunar/thunar-progress-dialog.c:398
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
@@ -1795,7 +1854,7 @@ msgstr[0] "(durează încă o oră)"
msgstr[1] "(durează încă %lu ore)"
msgstr[2] "(durează încă %lu de ore)"
-#: ../thunar/thunar-progress-dialog.c:380
+#: ../thunar/thunar-progress-dialog.c:403
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
@@ -1803,7 +1862,7 @@ msgstr[0] "(durează încă un minut)"
msgstr[1] "(durează încă %lu minute)"
msgstr[2] "(durează încă %lu de minute)"
-#: ../thunar/thunar-progress-dialog.c:385
+#: ../thunar/thunar-progress-dialog.c:408
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1841,21 +1900,10 @@ msgstr "Ţintă legătură:"
msgid "Deleted:"
msgstr "Åžters:"
-#: ../thunar/thunar-properties-dialog.c:401
-msgid "Modified:"
-msgstr "Modificat:"
-
#: ../thunar/thunar-properties-dialog.c:415
msgid "Accessed:"
msgstr "Accesat:"
-#.
-#. Fourth box (size, volume, free space)
-#.
-#: ../thunar/thunar-properties-dialog.c:440
-msgid "Size:"
-msgstr "Mărime:"
-
#: ../thunar/thunar-properties-dialog.c:453
msgid "Volume:"
msgstr "Volum:"
diff --git a/po/ru.po b/po/ru.po
index d7cbd2e12..4bbe1d1fe 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-22 18:30+0200\n"
+"POT-Creation-Date: 2007-05-23 23:24+0200\n"
"PO-Revision-Date: 2006-10-02 22:51+0200\n"
"Last-Translator: Andrey Fedoseev <andrey.fedoseev@gmail.com>\n"
"Language-Team: Russian <ru@li.org>\n"
@@ -58,29 +58,29 @@ msgstr "Только локальные файлы могут быть пере
msgid "Preparing..."
msgstr "Подготовка..."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:228
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:537
#, c-format
msgid "Failed to change permissions of \"%s\""
msgstr "Ðе удалоÑÑŒ изменить права Ð´Ð»Ñ \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:355
#, c-format
msgid "Failed to change file owner of \"%s\""
msgstr "Ðе удалоÑÑŒ изменить владельца Ð´Ð»Ñ \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:356
#, c-format
msgid "Failed to change file group of \"%s\""
msgstr "Ðе удалоÑÑŒ изменить группу Ð´Ð»Ñ \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:444
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:190
#, c-format
msgid "The file \"%s\" already exists"
msgstr "Файл \"%s\" уже ÑущеÑтвует"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:462
#, c-format
msgid "Failed to create empty file \"%s\""
msgstr "Ðе удалоÑÑŒ Ñоздать пуÑтой файл \"%s\""
@@ -240,11 +240,20 @@ msgstr "Корзина"
msgid "Cannot move or copy files within the trash"
msgstr "Внутри корзины Ð½ÐµÐ»ÑŒÐ·Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰Ð°Ñ‚ÑŒ или копировать файлы"
-#: ../thunar-vfs/thunar-vfs-job.c:831
+#. no "ask-replace" handler, fallback to "ask"
+#: ../thunar-vfs/thunar-vfs-job.c:401
+#, c-format
+msgid ""
+"The file \"%s\" already exists. Would you like to replace it?\n"
+"\n"
+"If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-job.c:897
msgid "Do you want to overwrite it?"
msgstr "ПерезапиÑать?"
-#: ../thunar-vfs/thunar-vfs-job.c:896
+#: ../thunar-vfs/thunar-vfs-job.c:1042
msgid "Do you want to skip it?"
msgstr "ПропуÑтить?"
@@ -892,7 +901,7 @@ msgstr "Подробный ÑпиÑок"
msgid "Details view"
msgstr "ПроÑмотр в виде ÑпиÑка"
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr ""
"Ðндрей ФедоÑеев <andrey.fedoseev@gmail.com>\n"
@@ -900,30 +909,80 @@ msgstr ""
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:959
+#: ../thunar/thunar-dialogs.c:231 ../thunar/thunar-renamer-dialog.c:959
msgid "Failed to open the documentation browser"
msgstr "Ðе удалоÑÑŒ открыть программу Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñмотра документации"
-#: ../thunar/thunar-dialogs.c:325
+#: ../thunar/thunar-dialogs.c:328
msgid "_Yes"
msgstr "_Да"
-#: ../thunar/thunar-dialogs.c:329
+#: ../thunar/thunar-dialogs.c:332
msgid "Yes to _all"
msgstr "Да Ð´Ð»Ñ _вÑех"
-#: ../thunar/thunar-dialogs.c:333
+#: ../thunar/thunar-dialogs.c:336
msgid "_No"
msgstr "_Ðет"
-#: ../thunar/thunar-dialogs.c:337
+#: ../thunar/thunar-dialogs.c:340
msgid "N_o to all"
msgstr "Ð_ет Ð´Ð»Ñ Ð²Ñех"
-#: ../thunar/thunar-dialogs.c:342
+#: ../thunar/thunar-dialogs.c:344
+#, fuzzy
+msgid "_Retry"
+msgstr "_ВоÑÑтановить"
+
+#: ../thunar/thunar-dialogs.c:349
msgid "_Cancel"
msgstr "_Отменить"
+#. setup the confirmation dialog
+#: ../thunar/thunar-dialogs.c:429
+msgid "Confirm to replace files"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:435
+msgid "_Skip"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:436
+#, fuzzy
+msgid "Replace _All"
+msgstr "_Заменить на:"
+
+#: ../thunar/thunar-dialogs.c:437
+#, fuzzy
+msgid "_Replace"
+msgstr "_Переименовать"
+
+#: ../thunar/thunar-dialogs.c:467
+#, c-format
+msgid "This folder already contains a file \"%s\"."
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:475
+msgid "ReplaceDialogPart1|Do you want to replace the existing file"
+msgstr ""
+
+#.
+#. Fourth box (size, volume, free space)
+#.
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:440
+msgid "Size:"
+msgstr "Размер:"
+
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:401
+msgid "Modified:"
+msgstr "Изменён:"
+
+#: ../thunar/thunar-dialogs.c:500
+msgid "ReplaceDialogPart2|with the following file?"
+msgstr ""
+
#: ../thunar/thunar-dnd.c:70
msgid "_Copy here"
msgstr "_Копировать Ñюда"
@@ -1777,7 +1836,7 @@ msgstr ""
msgid "Failed to display the volume management settings"
msgstr "Ðе удалоÑÑŒ отобразить Ñодержимое корзины"
-#: ../thunar/thunar-progress-dialog.c:375
+#: ../thunar/thunar-progress-dialog.c:398
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
@@ -1785,7 +1844,7 @@ msgstr[0] "(оÑтаётÑÑ %lu чаÑ)"
msgstr[1] "(оÑтаётÑÑ %lu чаÑа)"
msgstr[2] "(оÑтаётÑÑ %lu чаÑов)"
-#: ../thunar/thunar-progress-dialog.c:380
+#: ../thunar/thunar-progress-dialog.c:403
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
@@ -1793,7 +1852,7 @@ msgstr[0] "(оÑтаётÑÑ %lu минута)"
msgstr[1] "(оÑтаётÑÑ %lu минуты)"
msgstr[2] "(оÑтаётÑÑ %lu минут)"
-#: ../thunar/thunar-progress-dialog.c:385
+#: ../thunar/thunar-progress-dialog.c:408
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1831,21 +1890,10 @@ msgstr "Цель ÑÑылки:"
msgid "Deleted:"
msgstr "Удалён:"
-#: ../thunar/thunar-properties-dialog.c:401
-msgid "Modified:"
-msgstr "Изменён:"
-
#: ../thunar/thunar-properties-dialog.c:415
msgid "Accessed:"
msgstr "ДоÑтуп:"
-#.
-#. Fourth box (size, volume, free space)
-#.
-#: ../thunar/thunar-properties-dialog.c:440
-msgid "Size:"
-msgstr "Размер:"
-
#: ../thunar/thunar-properties-dialog.c:453
msgid "Volume:"
msgstr "Том:"
diff --git a/po/sq.po b/po/sq.po
index 5380346da..98c061c11 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-22 18:30+0200\n"
+"POT-Creation-Date: 2007-05-23 23:24+0200\n"
"PO-Revision-Date: 2007-01-20 19:53+0200\n"
"Last-Translator: Besnik Bleta <besnik@programeshqip.org>\n"
"Language-Team: Albanian <translation-team-sq@lists.sourceforge.net>\n"
@@ -55,29 +55,29 @@ msgstr "Mund të riemërtohen vetëm kartela vendore"
msgid "Preparing..."
msgstr "Po përgatis..."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:228
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:537
#, c-format
msgid "Failed to change permissions of \"%s\""
msgstr "Dështova në ndryshim lejesh mbi \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:355
#, c-format
msgid "Failed to change file owner of \"%s\""
msgstr "Dështova në ndryshim pronari kartele për \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:356
#, c-format
msgid "Failed to change file group of \"%s\""
msgstr "Dështova në ndryshim grupi kartele për \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:444
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:190
#, c-format
msgid "The file \"%s\" already exists"
msgstr "Ka tashmë një kartelë \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:462
#, c-format
msgid "Failed to create empty file \"%s\""
msgstr "Dështova në krijimin e kartelës bosh \"%s\""
@@ -235,11 +235,20 @@ msgstr "Hedhurina"
msgid "Cannot move or copy files within the trash"
msgstr "Nuk lëviz apo kopjoj dot kartela brenda hedhurinave"
-#: ../thunar-vfs/thunar-vfs-job.c:831
+#. no "ask-replace" handler, fallback to "ask"
+#: ../thunar-vfs/thunar-vfs-job.c:401
+#, c-format
+msgid ""
+"The file \"%s\" already exists. Would you like to replace it?\n"
+"\n"
+"If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-job.c:897
msgid "Do you want to overwrite it?"
msgstr "Doni ta mbishkruani?"
-#: ../thunar-vfs/thunar-vfs-job.c:896
+#: ../thunar-vfs/thunar-vfs-job.c:1042
msgid "Do you want to skip it?"
msgstr "Doni ta anashkaloni?"
@@ -886,36 +895,86 @@ msgstr "Radhitje e hollësishme drejtorie"
msgid "Details view"
msgstr "Parje me hollësitë"
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr "kredite përkthyesish"
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:959
+#: ../thunar/thunar-dialogs.c:231 ../thunar/thunar-renamer-dialog.c:959
msgid "Failed to open the documentation browser"
msgstr "Dështova në hapjen e shfletuesit të dokumentacionit"
-#: ../thunar/thunar-dialogs.c:325
+#: ../thunar/thunar-dialogs.c:328
msgid "_Yes"
msgstr "_Po"
-#: ../thunar/thunar-dialogs.c:329
+#: ../thunar/thunar-dialogs.c:332
msgid "Yes to _all"
msgstr "Po për të _tëra"
-#: ../thunar/thunar-dialogs.c:333
+#: ../thunar/thunar-dialogs.c:336
msgid "_No"
msgstr "_Jo"
-#: ../thunar/thunar-dialogs.c:337
+#: ../thunar/thunar-dialogs.c:340
msgid "N_o to all"
msgstr "J_o të gjithave"
-#: ../thunar/thunar-dialogs.c:342
+#: ../thunar/thunar-dialogs.c:344
+#, fuzzy
+msgid "_Retry"
+msgstr "_Rikthe"
+
+#: ../thunar/thunar-dialogs.c:349
msgid "_Cancel"
msgstr "_Anulo"
+#. setup the confirmation dialog
+#: ../thunar/thunar-dialogs.c:429
+msgid "Confirm to replace files"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:435
+msgid "_Skip"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:436
+#, fuzzy
+msgid "Replace _All"
+msgstr "Zëvendëso _Me:"
+
+#: ../thunar/thunar-dialogs.c:437
+#, fuzzy
+msgid "_Replace"
+msgstr "_Riemërto"
+
+#: ../thunar/thunar-dialogs.c:467
+#, c-format
+msgid "This folder already contains a file \"%s\"."
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:475
+msgid "ReplaceDialogPart1|Do you want to replace the existing file"
+msgstr ""
+
+#.
+#. Fourth box (size, volume, free space)
+#.
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:440
+msgid "Size:"
+msgstr "Madhësi:"
+
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:401
+msgid "Modified:"
+msgstr "Ndryshuar:"
+
+#: ../thunar/thunar-dialogs.c:500
+msgid "ReplaceDialogPart2|with the following file?"
+msgstr ""
+
#: ../thunar/thunar-dnd.c:70
msgid "_Copy here"
msgstr "_Kopjoje këtu"
@@ -1757,21 +1816,21 @@ msgstr ""
msgid "Failed to display the volume management settings"
msgstr ""
-#: ../thunar/thunar-progress-dialog.c:375
+#: ../thunar/thunar-progress-dialog.c:398
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
msgstr[0] "(%lu orë e mbetur)"
msgstr[1] "(%lu orë të mbetura)"
-#: ../thunar/thunar-progress-dialog.c:380
+#: ../thunar/thunar-progress-dialog.c:403
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
msgstr[0] "(%lu minutë e mbetur)"
msgstr[1] "(%lu minuta të mbetura)"
-#: ../thunar/thunar-progress-dialog.c:385
+#: ../thunar/thunar-progress-dialog.c:408
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1808,21 +1867,10 @@ msgstr "Objektiv Lidhjeje:"
msgid "Deleted:"
msgstr "Fshirë:"
-#: ../thunar/thunar-properties-dialog.c:401
-msgid "Modified:"
-msgstr "Ndryshuar:"
-
#: ../thunar/thunar-properties-dialog.c:415
msgid "Accessed:"
msgstr "Hapur:"
-#.
-#. Fourth box (size, volume, free space)
-#.
-#: ../thunar/thunar-properties-dialog.c:440
-msgid "Size:"
-msgstr "Madhësi:"
-
#: ../thunar/thunar-properties-dialog.c:453
msgid "Volume:"
msgstr "Volum:"
diff --git a/po/sv.po b/po/sv.po
index 16e106295..4f53b8a4b 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-22 18:30+0200\n"
+"POT-Creation-Date: 2007-05-23 23:24+0200\n"
"PO-Revision-Date: 2006-02-22 16:28+0100\n"
"Last-Translator: Alexander Toresson <alexander.toresson@gmail.com>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -57,29 +57,29 @@ msgstr "Det går endast att byta namn på lokala filer"
msgid "Preparing..."
msgstr "Förbereder..."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:228
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:537
#, c-format
msgid "Failed to change permissions of \"%s\""
msgstr "Misslyckades med att ändra rättigheter på \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:355
#, c-format
msgid "Failed to change file owner of \"%s\""
msgstr "Misslyckades med att ändra filägare på \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:356
#, c-format
msgid "Failed to change file group of \"%s\""
msgstr "Misslyckades med att ändra filgrupp på \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:444
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:190
#, c-format
msgid "The file \"%s\" already exists"
msgstr "Filen \"%s\" existerar redan"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:462
#, c-format
msgid "Failed to create empty file \"%s\""
msgstr "Misslyckades med att skapa en tom fil med namnet \"%s\""
@@ -237,11 +237,20 @@ msgstr "Papperskorgen"
msgid "Cannot move or copy files within the trash"
msgstr "Kan inte flytta eller kopiera filer i papperskorgen"
-#: ../thunar-vfs/thunar-vfs-job.c:831
+#. no "ask-replace" handler, fallback to "ask"
+#: ../thunar-vfs/thunar-vfs-job.c:401
+#, c-format
+msgid ""
+"The file \"%s\" already exists. Would you like to replace it?\n"
+"\n"
+"If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-job.c:897
msgid "Do you want to overwrite it?"
msgstr "Vill du skriva över den?"
-#: ../thunar-vfs/thunar-vfs-job.c:896
+#: ../thunar-vfs/thunar-vfs-job.c:1042
msgid "Do you want to skip it?"
msgstr "Vill du hoppa över den?"
@@ -885,7 +894,7 @@ msgstr "Detaljerad kataloglistning"
msgid "Details view"
msgstr "Detaljerad vy"
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr ""
"Daniel Nylander <po@danielnylander.se>\n"
@@ -893,30 +902,80 @@ msgstr ""
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:959
+#: ../thunar/thunar-dialogs.c:231 ../thunar/thunar-renamer-dialog.c:959
msgid "Failed to open the documentation browser"
msgstr "Misslyckades med att öppna hjälpläsaren"
-#: ../thunar/thunar-dialogs.c:325
+#: ../thunar/thunar-dialogs.c:328
msgid "_Yes"
msgstr "_Ja"
-#: ../thunar/thunar-dialogs.c:329
+#: ../thunar/thunar-dialogs.c:332
msgid "Yes to _all"
msgstr "Ja till _alla"
-#: ../thunar/thunar-dialogs.c:333
+#: ../thunar/thunar-dialogs.c:336
msgid "_No"
msgstr "_Nej"
-#: ../thunar/thunar-dialogs.c:337
+#: ../thunar/thunar-dialogs.c:340
msgid "N_o to all"
msgstr "N_ej till alla"
-#: ../thunar/thunar-dialogs.c:342
+#: ../thunar/thunar-dialogs.c:344
+#, fuzzy
+msgid "_Retry"
+msgstr "Åte_rställ"
+
+#: ../thunar/thunar-dialogs.c:349
msgid "_Cancel"
msgstr "_Avbryt"
+#. setup the confirmation dialog
+#: ../thunar/thunar-dialogs.c:429
+msgid "Confirm to replace files"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:435
+msgid "_Skip"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:436
+#, fuzzy
+msgid "Replace _All"
+msgstr "Ersätt _med:"
+
+#: ../thunar/thunar-dialogs.c:437
+#, fuzzy
+msgid "_Replace"
+msgstr "_Byt namn"
+
+#: ../thunar/thunar-dialogs.c:467
+#, c-format
+msgid "This folder already contains a file \"%s\"."
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:475
+msgid "ReplaceDialogPart1|Do you want to replace the existing file"
+msgstr ""
+
+#.
+#. Fourth box (size, volume, free space)
+#.
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:440
+msgid "Size:"
+msgstr "Storlek:"
+
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:401
+msgid "Modified:"
+msgstr "Ändrad:"
+
+#: ../thunar/thunar-dialogs.c:500
+msgid "ReplaceDialogPart2|with the following file?"
+msgstr ""
+
#: ../thunar/thunar-dnd.c:70
msgid "_Copy here"
msgstr "_Kopiera hit"
@@ -1762,21 +1821,21 @@ msgstr ""
msgid "Failed to display the volume management settings"
msgstr "Kunde inte visa inställningarna för volymhanteringen"
-#: ../thunar/thunar-progress-dialog.c:375
+#: ../thunar/thunar-progress-dialog.c:398
#, 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:380
+#: ../thunar/thunar-progress-dialog.c:403
#, 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:385
+#: ../thunar/thunar-progress-dialog.c:408
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1813,21 +1872,10 @@ msgstr "Länkmål:"
msgid "Deleted:"
msgstr "Borttagen:"
-#: ../thunar/thunar-properties-dialog.c:401
-msgid "Modified:"
-msgstr "Ändrad:"
-
#: ../thunar/thunar-properties-dialog.c:415
msgid "Accessed:"
msgstr "Ã…tkommen:"
-#.
-#. Fourth box (size, volume, free space)
-#.
-#: ../thunar/thunar-properties-dialog.c:440
-msgid "Size:"
-msgstr "Storlek:"
-
#: ../thunar/thunar-properties-dialog.c:453
msgid "Volume:"
msgstr "Volym:"
diff --git a/po/tr.po b/po/tr.po
index 7ca7fd2ac..0cb6195cf 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,13 +10,14 @@ msgid ""
msgstr ""
"Project-Id-Version: tr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-22 18:30+0200\n"
-"PO-Revision-Date: 2007-05-22 20:13+0300\n"
-"Last-Translator: Eren Türkay <turkay.eren@gmail.com>\n"
-"Language-Team: Turkish <turkce@pardus.org.tr>\n"
+"POT-Creation-Date: 2007-05-23 23:24+0200\n"
+"PO-Revision-Date: 2007-04-09 00:03+0300\n"
+"Last-Translator: Türker SEZER <turkersezer@tsdesign.info>\n"
+"Language-Team: Türkçe <tr@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
#. base directory not readable
#: ../thunar-vfs/thunar-vfs-deep-count-job.c:233
@@ -58,29 +59,29 @@ msgstr "Sadece yerel dosyalar yeniden adlandırılabilir"
msgid "Preparing..."
msgstr "Yapılıyor..."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:228
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:537
#, c-format
msgid "Failed to change permissions of \"%s\""
msgstr "\"%s\" izinleri deÄŸiÅŸtirilemedi"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:355
#, c-format
msgid "Failed to change file owner of \"%s\""
msgstr "\"%s\" dosya sahibi deÄŸiÅŸtirilemedi"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:356
#, c-format
msgid "Failed to change file group of \"%s\""
msgstr "\"%s\" dosya grubu deÄŸiÅŸtirilemedi"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:444
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:190
#, c-format
msgid "The file \"%s\" already exists"
msgstr "\"%s\" zaten mevcut"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:462
#, c-format
msgid "Failed to create empty file \"%s\""
msgstr "\"%s\" boş dosyası oluşturulamadı"
@@ -150,14 +151,18 @@ msgstr "%s konumuna üçüncü bağlantı"
#. if we had no match on the NAMES, try the "%uth copy of %s" pattern
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:411
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:427
-#, c-format
+#, fuzzy, c-format
msgid "%uth copy of %s"
-msgstr "%s öğesinin %u. kopyası"
+msgid_plural "%uth copy of %s"
+msgstr[0] "%2$s %1$u. kopyası"
+msgstr[1] "%2$s %1$u. kopyası"
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:429
-#, c-format
+#, fuzzy, c-format
msgid "%uth link to %s"
-msgstr "%s konumuna %u. bağlantı"
+msgid_plural "%uth link to %s"
+msgstr[0] "%2$s konumuna %1$u. bağlantı"
+msgstr[1] "%2$s konumuna %1$u. bağlantı"
#. unable to stat source file, impossible to copy then
#. the file does not exist, don't try to create a symlink then
@@ -234,11 +239,20 @@ msgstr "Çöp"
msgid "Cannot move or copy files within the trash"
msgstr "Çöp içerisindeki dosyalar taşınamıyor veya kopyalanamıyor"
-#: ../thunar-vfs/thunar-vfs-job.c:831
+#. no "ask-replace" handler, fallback to "ask"
+#: ../thunar-vfs/thunar-vfs-job.c:401
+#, c-format
+msgid ""
+"The file \"%s\" already exists. Would you like to replace it?\n"
+"\n"
+"If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-job.c:897
msgid "Do you want to overwrite it?"
msgstr "Ãœzerine yazmak istiyor musunuz?"
-#: ../thunar-vfs/thunar-vfs-job.c:896
+#: ../thunar-vfs/thunar-vfs-job.c:1042
msgid "Do you want to skip it?"
msgstr "Es geçmek istiyor musunuz?"
@@ -508,16 +522,18 @@ msgstr ""
"kalıcı olarak silmek istediğinizden emin misiniz?"
#: ../thunar/thunar-application.c:1350
-#, c-format
+#, fuzzy, c-format
msgid ""
"Are you sure that you want to permanently\n"
"delete the selected file?"
+msgid_plural ""
"Are you sure that you want to permanently\n"
"delete the %u selected files?"
-msgstr ""
-"Seçilen dosyayı\n"
+msgstr[0] ""
+"\"%s\" öğesini\n"
"kalıcı olarak silmek istediğinizden emin misiniz?"
-"Seçilen %u dosyayı\n"
+msgstr[1] ""
+"\"%s\" öğesini\n"
"kalıcı olarak silmek istediğinizden emin misiniz?"
#: ../thunar/thunar-application.c:1370
@@ -882,36 +898,86 @@ msgstr "Detaylı dizin listeleme"
msgid "Details view"
msgstr "Detaylı görünüm"
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr "Çeviri Ekibi"
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:959
+#: ../thunar/thunar-dialogs.c:231 ../thunar/thunar-renamer-dialog.c:959
msgid "Failed to open the documentation browser"
msgstr "Döküman listeleyicisi açılamadı"
-#: ../thunar/thunar-dialogs.c:325
+#: ../thunar/thunar-dialogs.c:328
msgid "_Yes"
msgstr "_Evet"
-#: ../thunar/thunar-dialogs.c:329
+#: ../thunar/thunar-dialogs.c:332
msgid "Yes to _all"
msgstr "H_epsine hvet"
-#: ../thunar/thunar-dialogs.c:333
+#: ../thunar/thunar-dialogs.c:336
msgid "_No"
msgstr "_Hayır"
-#: ../thunar/thunar-dialogs.c:337
+#: ../thunar/thunar-dialogs.c:340
msgid "N_o to all"
msgstr "Hep_sine hayır"
-#: ../thunar/thunar-dialogs.c:342
+#: ../thunar/thunar-dialogs.c:344
+#, fuzzy
+msgid "_Retry"
+msgstr "_Geri Al"
+
+#: ../thunar/thunar-dialogs.c:349
msgid "_Cancel"
msgstr "Ä°_ptal"
+#. setup the confirmation dialog
+#: ../thunar/thunar-dialogs.c:429
+msgid "Confirm to replace files"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:435
+msgid "_Skip"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:436
+#, fuzzy
+msgid "Replace _All"
+msgstr "Yer _DeÄŸiÅŸtir:"
+
+#: ../thunar/thunar-dialogs.c:437
+#, fuzzy
+msgid "_Replace"
+msgstr "_Yeniden Adlandır"
+
+#: ../thunar/thunar-dialogs.c:467
+#, c-format
+msgid "This folder already contains a file \"%s\"."
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:475
+msgid "ReplaceDialogPart1|Do you want to replace the existing file"
+msgstr ""
+
+#.
+#. Fourth box (size, volume, free space)
+#.
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:440
+msgid "Size:"
+msgstr "Boyut:"
+
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:401
+msgid "Modified:"
+msgstr "DeÄŸiÅŸtirme:"
+
+#: ../thunar/thunar-dialogs.c:500
+msgid "ReplaceDialogPart2|with the following file?"
+msgstr ""
+
#: ../thunar/thunar-dnd.c:70
msgid "_Copy here"
msgstr "Buraya _kopyala"
@@ -1050,50 +1116,66 @@ msgstr "\"%s\" dosyası açılamadı"
#. we can just tell that n files failed to open
#: ../thunar/thunar-launcher.c:652
-#, c-format
+#, fuzzy, c-format
msgid "Failed to open %d file"
-msgstr "%d dosya açılamadı"
+msgid_plural "Failed to open %d files"
+msgstr[0] "%d dosya açılamadı"
+msgstr[1] "%d dosya açılamadı"
#: ../thunar/thunar-launcher.c:688
msgid "Are you sure you want to open all folders?"
msgstr "Tüm dizinleri açmak istediğinizden emin misiniz?"
#: ../thunar/thunar-launcher.c:690
-#, c-format
+#, fuzzy, c-format
msgid "This will open %d separate file manager window."
-msgstr "Bu %d ayrı dosya yöneticisi penceresi açacak."
+msgid_plural "This will open %d separate file manager windows."
+msgstr[0] "Bu %d ayrı dosya yöneticisi penceresi açacak."
+msgstr[1] "Bu %d ayrı dosya yöneticisi penceresi açacak."
#: ../thunar/thunar-launcher.c:694
-#, c-format
+#, fuzzy, c-format
msgid "Open %d New Window"
-msgstr "%d Yeni Pencere Aç"
+msgid_plural "Open %d New Windows"
+msgstr[0] "%d Yeni Pencere Aç"
+msgstr[1] "%d Yeni Pencere Aç"
#. turn "Open" into "Open in n New Windows"
#: ../thunar/thunar-launcher.c:786
-#, c-format
+#, fuzzy, c-format
msgid "Open in %d New Window"
-msgstr "%d Yeni Pencerede İçerisinde Aç"
+msgid_plural "Open in %d New Windows"
+msgstr[0] "%d Yeni Pencerede Aç"
+msgstr[1] "%d Yeni Pencerede Aç"
#: ../thunar/thunar-launcher.c:787
-#, c-format
+#, fuzzy, c-format
msgid "Open the selected directory in %d new window"
-msgstr "Seçilen dizini %d yeni pencerede aç"
+msgid_plural "Open the selected directories in %d new windows"
+msgstr[0] "Seçilen dizini %d yeni pencerede aç"
+msgstr[1] "Seçilen dizini %d yeni pencerede aç"
#: ../thunar/thunar-launcher.c:807
msgid "_Open in New Window"
msgstr "Y_eni Pencerede Aç"
#: ../thunar/thunar-launcher.c:810
+#, fuzzy
msgid "Open the selected file"
-msgstr "Seçilen dosyayı aç"
+msgid_plural "Open the selected files"
+msgstr[0] "Seçilen dosyayı aç"
+msgstr[1] "Seçilen dosyayı aç"
#: ../thunar/thunar-launcher.c:859
msgid "_Execute"
msgstr "Ç_alıştır"
#: ../thunar/thunar-launcher.c:860
+#, fuzzy
msgid "Execute the selected file"
-msgstr "Seçilen dosyayı çalıştır"
+msgid_plural "Execute the selected files"
+msgstr[0] "Seçilen dosyayı çalıştır"
+msgstr[1] "Seçilen dosyayı çalıştır"
#. turn the "Open" action into "Open With DEFAULT"
#: ../thunar/thunar-launcher.c:866
@@ -1102,9 +1184,11 @@ msgid "_Open With \"%s\""
msgstr "\"%s\" İ_le Aç"
#: ../thunar/thunar-launcher.c:867 ../thunar/thunar-launcher.c:956
-#, c-format
+#, fuzzy, c-format
msgid "Use \"%s\" to open the selected file"
-msgstr "Seçilen dosyayı açmak için \"%s\" kullan"
+msgid_plural "Use \"%s\" to open the selected files"
+msgstr[0] "Seçilen dosyayı açmak için \"%s\" kullan"
+msgstr[1] "Seçilen dosyayı açmak için \"%s\" kullan"
#: ../thunar/thunar-launcher.c:890
msgid "_Open With Other Application..."
@@ -1115,8 +1199,11 @@ msgid "_Open With Default Applications"
msgstr "Ö_ntanımlı Uygulamalar İle Aç"
#: ../thunar/thunar-launcher.c:900
+#, fuzzy
msgid "Open the selected file with the default application"
-msgstr "Seçilen dosyayı öntanımlı uygulama ile aç"
+msgid_plural "Open the selected files with the default applications"
+msgstr[0] "Seçilen dosyayı öntanımlı uygulama ile aç"
+msgstr[1] "Seçilen dosyayı öntanımlı uygulama ile aç"
#: ../thunar/thunar-launcher.c:955
#, c-format
@@ -1133,17 +1220,25 @@ msgid "Failed to mount \"%s\""
msgstr "\"%s\" bağlanamadı"
#: ../thunar/thunar-launcher.c:1292
+#, fuzzy
msgid "Desktop (Create Link)"
-msgstr "Masaüstü (Bağlantı Oluştur)"
+msgid_plural "Desktop (Create Links)"
+msgstr[0] "Masaüstü (Bağlantı Oluştur)"
+msgstr[1] "Masaüstü (Bağlantı Oluştur)"
#: ../thunar/thunar-launcher.c:1293
+#, fuzzy
msgid "Create a link to the selected file on the desktop"
-msgstr "Masaüstünde seçilmiş olan uygulamaya bağlantı oluştur"
+msgid_plural "Create links to the selected files on the desktop"
+msgstr[0] "Masaüstünde seçilmiş olan uygulamaya bağlantı oluştur"
+msgstr[1] "Masaüstünde seçilmiş olan uygulamaya bağlantı oluştur"
#: ../thunar/thunar-launcher.c:1330 ../thunar/thunar-launcher.c:1368
-#, c-format
+#, fuzzy, c-format
msgid "Send the selected file to \"%s\""
-msgstr "Seçilen dosyayı \"%s\" konumuna gönder"
+msgid_plural "Send the selected files to \"%s\""
+msgstr[0] "Seçilen dosyayı \"%s\" konumuna gönder"
+msgstr[1] "Seçilen dosyayı \"%s\" konumuna gönder"
#: ../thunar/thunar-list-model.c:784 ../thunar/thunar-properties-dialog.c:859
msgid "broken link"
@@ -1151,20 +1246,26 @@ msgstr "kırık bağlantı"
#. generate a text which includes the size of all items in the folder
#: ../thunar/thunar-list-model.c:2244
-#, c-format
+#, fuzzy, c-format
msgid "%d item (%s), Free space: %s"
-msgstr "%d öğe (%s), Boş alan: %s"
+msgid_plural "%d items (%s), Free space: %s"
+msgstr[0] "%d öğe (%s), Boş alan: %s"
+msgstr[1] "%d öğe (%s), Boş alan: %s"
#. just the standard text
#: ../thunar/thunar-list-model.c:2253
-#, c-format
+#, fuzzy, c-format
msgid "%d item, Free space: %s"
-msgstr "%d öğe, Boş alan: %s"
+msgid_plural "%d items, Free space: %s"
+msgstr[0] "%d öğe, Boş alan: %s"
+msgstr[1] "%d öğe, Boş alan: %s"
#: ../thunar/thunar-list-model.c:2261
-#, c-format
+#, fuzzy, c-format
msgid "%d item"
-msgstr "%d öğe"
+msgid_plural "%d items"
+msgstr[0] "%d öğe"
+msgstr[1] "%d öğe"
#: ../thunar/thunar-list-model.c:2277
#, c-format
@@ -1196,14 +1297,18 @@ msgid "Image Size:"
msgstr "Resim Boyutu:"
#: ../thunar/thunar-list-model.c:2328
-#, c-format
+#, fuzzy, c-format
msgid "%d item selected (%s)"
-msgstr "%d öğe seçildi (%s)"
+msgid_plural "%d items selected (%s)"
+msgstr[0] "%d öğe seçildi (%s)"
+msgstr[1] "%d öğe seçildi (%s)"
#: ../thunar/thunar-list-model.c:2333
-#, c-format
+#, fuzzy, c-format
msgid "%d item selected"
-msgstr "%d öğe seçildi"
+msgid_plural "%d items selected"
+msgstr[0] "%d öğe seçildi"
+msgstr[1] "%d öğe seçildi"
#. append the "Create Folder" menu action
#: ../thunar/thunar-location-buttons.c:170
@@ -1442,7 +1547,7 @@ msgstr "Dosya Yöneticisi Seçenekleri"
#.
#: ../thunar/thunar-preferences-dialog.c:245
msgid "Display"
-msgstr "Görüntü"
+msgstr ""
#: ../thunar/thunar-preferences-dialog.c:255
msgid "Default View"
@@ -1505,11 +1610,12 @@ msgstr ""
#: ../thunar/thunar-preferences-dialog.c:326
msgid "Date"
-msgstr "Tarih"
+msgstr ""
#: ../thunar/thunar-preferences-dialog.c:338
+#, fuzzy
msgid "_Format:"
-msgstr "_Biçim:"
+msgstr "_Harf Düzeni:"
#.
#. Side Pane
@@ -1717,20 +1823,26 @@ msgstr ""
msgid "Failed to display the volume management settings"
msgstr "Bölüm yönetim ayarları gösterilemedi"
-#: ../thunar/thunar-progress-dialog.c:375
-#, c-format
+#: ../thunar/thunar-progress-dialog.c:398
+#, fuzzy, c-format
msgid "(%lu hour remaining)"
-msgstr "(%lu saat kaldı)"
+msgid_plural "(%lu hours remaining)"
+msgstr[0] "(%lu saat kaldı)"
+msgstr[1] "(%lu saat kaldı)"
-#: ../thunar/thunar-progress-dialog.c:380
-#, c-format
+#: ../thunar/thunar-progress-dialog.c:403
+#, fuzzy, c-format
msgid "(%lu minute remaining)"
-msgstr "(%lu dakika kaldı)"
+msgid_plural "(%lu minutes remaining)"
+msgstr[0] "(%lu dakika kaldı)"
+msgstr[1] "(%lu dakika kaldı)"
-#: ../thunar/thunar-progress-dialog.c:385
-#, c-format
+#: ../thunar/thunar-progress-dialog.c:408
+#, fuzzy, c-format
msgid "(%lu second remaining)"
-msgstr "(%lu saniye kaldı)"
+msgid_plural "(%lu seconds remaining)"
+msgstr[0] "(%lu saniye kaldı)"
+msgstr[1] "(%lu saniye kaldı)"
#: ../thunar/thunar-properties-dialog.c:259
msgid "General"
@@ -1762,21 +1874,10 @@ msgstr "Bağlantı Hedefi:"
msgid "Deleted:"
msgstr "Silinme:"
-#: ../thunar/thunar-properties-dialog.c:401
-msgid "Modified:"
-msgstr "DeÄŸiÅŸtirme:"
-
#: ../thunar/thunar-properties-dialog.c:415
msgid "Accessed:"
msgstr "EriÅŸim:"
-#.
-#. Fourth box (size, volume, free space)
-#.
-#: ../thunar/thunar-properties-dialog.c:440
-msgid "Size:"
-msgstr "Boyut:"
-
#: ../thunar/thunar-properties-dialog.c:453
msgid "Volume:"
msgstr "Bölüm:"
@@ -1932,12 +2033,18 @@ msgstr ""
"Thunar Toplu Yeniden Adlandırma güçlü ve kullanışlı bir araçtır."
#: ../thunar/thunar-renamer-dialog.c:1527
+#, fuzzy
msgid "Remove File"
-msgstr "Dosyayı Kaldır"
+msgid_plural "Remove Files"
+msgstr[0] "Dosyaları Kaldır"
+msgstr[1] "Dosyaları Kaldır"
#: ../thunar/thunar-renamer-dialog.c:1529
+#, fuzzy
msgid "Remove the selected file from the list of files to be renamed"
-msgstr "Seçilen dosyaları yeniden adlandırılacaklar listesinden kaldır"
+msgid_plural "Remove the selected files from the list of files to be renamed"
+msgstr[0] "Seçilen dosyaları yeniden adlandırılacaklar listesinden kaldır"
+msgstr[1] "Seçilen dosyaları yeniden adlandırılacaklar listesinden kaldır"
#. change title to reflect the standalone status
#: ../thunar/thunar-renamer-dialog.c:1680
@@ -1976,12 +2083,18 @@ msgstr ""
"misiniz?"
#: ../thunar/thunar-shortcuts-pane.c:413
+#, fuzzy
msgid "Side Pane (Create Shortcut)"
-msgstr "Yan Panel (Kısa Yol Yarat)"
+msgid_plural "Side Pane (Create Shortcuts)"
+msgstr[0] "Yan Pencere Gözü (Kısa Yol Yarat)"
+msgstr[1] "Yan Pencere Gözü (Kısa Yol Yarat)"
#: ../thunar/thunar-shortcuts-pane.c:415
+#, fuzzy
msgid "Add the selected folder to the shortcuts side pane"
-msgstr "Seçilen klasörü yan panel simgelerine ekle"
+msgid_plural "Add the selected folders to the shortcuts side pane"
+msgstr[0] "Seçilen klasörü yan pencere gözü simgelerine ekle"
+msgstr[1] "Seçilen klasörü yan pencere gözü simgelerine ekle"
#. append the "Mount Volume" menu action
#: ../thunar/thunar-shortcuts-view.c:831 ../thunar/thunar-tree-view.c:1038
@@ -2053,9 +2166,11 @@ msgid "%s Bytes"
msgstr "%s Bayt"
#: ../thunar/thunar-size-label.c:507
-#, c-format
+#, fuzzy, c-format
msgid "%u item, totalling %s"
-msgstr "%u nesne, hesaplanıyor %s"
+msgid_plural "%u items, totalling %s"
+msgstr[0] "%u nesne sayısı hesaplanıyor %s"
+msgstr[1] "%u nesne sayısı hesaplanıyor %s"
#: ../thunar/thunar-standard-view.c:322
msgid "Folder Context Menu"
@@ -2119,8 +2234,11 @@ msgid "Du_plicate"
msgstr "Ä°kizle"
#: ../thunar/thunar-standard-view.c:333 ../thunar/thunar-standard-view.c:3387
+#, fuzzy
msgid "Ma_ke Link"
-msgstr "BaÄŸ O_luÅŸtur"
+msgid_plural "Ma_ke Links"
+msgstr[0] "BaÄŸ Yarat"
+msgstr[1] "BaÄŸ Yarat"
#: ../thunar/thunar-standard-view.c:334
msgid "_Rename..."
@@ -2193,32 +2311,53 @@ msgid "Failed to open directory \"%s\""
msgstr "\"%s\" klasörü açılamadı"
#: ../thunar/thunar-standard-view.c:3347
+#, fuzzy
msgid "Prepare the selected file to be moved with a Paste command"
-msgstr "Seçilen dosyaları yapıştır komutu ile taşınacak şekilde hazırla"
+msgid_plural "Prepare the selected files to be moved with a Paste command"
+msgstr[0] "Seçilen dosyaları yapıştır komutu ile taşınacak şekilde hazırla"
+msgstr[1] "Seçilen dosyaları yapıştır komutu ile taşınacak şekilde hazırla"
#: ../thunar/thunar-standard-view.c:3355
+#, fuzzy
msgid "Prepare the selected file to be copied with a Paste command"
-msgstr "Seçilen dosyaları yapıştır komutu ile kopyalanacak şekilde hazırla"
+msgid_plural "Prepare the selected files to be copied with a Paste command"
+msgstr[0] "Seçilen dosyaları yapıştır komutu ile kopyalanacak şekilde hazırla"
+msgstr[1] "Seçilen dosyaları yapıştır komutu ile kopyalanacak şekilde hazırla"
#: ../thunar/thunar-standard-view.c:3366
+#, fuzzy
msgid "Delete the selected file"
-msgstr "Seçilen dosyayı sil"
+msgid_plural "Delete the selected files"
+msgstr[0] "Seçilen dosyaları sil"
+msgstr[1] "Seçilen dosyaları sil"
#: ../thunar/thunar-standard-view.c:3380
+#, fuzzy
msgid "Duplicate the selected file"
-msgstr "Seçilen dosyayı kopyala"
+msgid_plural "Duplicate each selected file"
+msgstr[0] "Seçilen dosyaları ikizle"
+msgstr[1] "Seçilen dosyaları ikizle"
#: ../thunar/thunar-standard-view.c:3389
+#, fuzzy
msgid "Create a symbolic link for the selected file"
-msgstr "Seçilen dosya için sembolik bağ oluştur"
+msgid_plural "Create a symbolic link for each selected file"
+msgstr[0] "Seçilen dosya için sembolik bağ oluştur"
+msgstr[1] "Seçilen dosya için sembolik bağ oluştur"
#: ../thunar/thunar-standard-view.c:3397
+#, fuzzy
msgid "Rename the selected file"
-msgstr "Seçilen dosyayı yeniden adlandır"
+msgid_plural "Rename the selected files"
+msgstr[0] "Seçilen dosyayı yeniden adlandır"
+msgstr[1] "Seçilen dosyayı yeniden adlandır"
#: ../thunar/thunar-standard-view.c:3405
+#, fuzzy
msgid "Restore the selected file"
-msgstr "Seçilen dosyayı geri al"
+msgid_plural "Restore the selected files"
+msgstr[0] "Seçilen dosyayı geri al"
+msgstr[1] "Seçilen dosyayı geri al"
#. tell the user that no templates were found
#: ../thunar/thunar-templates-action.c:376
@@ -2259,7 +2398,7 @@ msgstr "Bugün"
#. TRANSLATORS: file was modified less than one day ago
#: ../thunar/thunar-util.c:124
-#, c-format
+#, fuzzy, c-format
msgid "Today at %X"
msgstr "Bugün"
@@ -2270,9 +2409,9 @@ msgstr "Dün"
#. TRANSLATORS: file was modified less than two days ago
#: ../thunar/thunar-util.c:137
-#, c-format
+#, fuzzy, c-format
msgid "Yesterday at %X"
-msgstr "Dün (%X)"
+msgstr "Dün"
#. Days from last week
#: ../thunar/thunar-util.c:145
@@ -2731,9 +2870,11 @@ msgstr "Resim Tipi:"
#. update the "Image Size" label
#: ../plugins/thunar-apr/thunar-apr-image-page.c:245
-#, c-format
+#, fuzzy, c-format
msgid "%dx%d pixel"
-msgstr "%dx%d piksel"
+msgid_plural "%dx%d pixels"
+msgstr[0] "%dx%d benek"
+msgstr[1] "%dx%d benek"
#: ../plugins/thunar-sbr/thunar-sbr-case-renamer.c:119
msgid "Con_vert to:"
@@ -2929,9 +3070,11 @@ msgstr ""
"göndermeden önce sıkıştırmanız şiddetle tavsiye edilir."
#: ../plugins/thunar-sendto-email/main.c:192
-#, c-format
+#, fuzzy, c-format
msgid "Send %d file as compressed archive?"
-msgstr "%d dosyayı sıkıştırılmış arviş olarak gönder?"
+msgid_plural "Send %d files as compressed archive?"
+msgstr[0] "%d dosyasını sıkıştırılmış gönder"
+msgstr[1] "%d dosyasını sıkıştırılmış gönder"
#: ../plugins/thunar-sendto-email/main.c:198
msgid "Send as _archive"
@@ -2973,9 +3116,11 @@ msgstr "\"%s\" öğesine sembolik bağ oluşturulamadı"
#. tell the user that we failed to compress the file(s)
#: ../plugins/thunar-sendto-email/main.c:459
-#, c-format
+#, fuzzy, c-format
msgid "Failed to compress %d file"
-msgstr " %d dosya sıkıştırılamadı"
+msgid_plural "Failed to compress %d files"
+msgstr[0] " %d dosyası sıkıştırılamadı"
+msgstr[1] " %d dosyası sıkıştırılamadı"
#. tell the user that we failed
#: ../plugins/thunar-sendto-email/main.c:600
diff --git a/po/uk.po b/po/uk.po
index 0d2acbbbf..a916e31f3 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-22 18:30+0200\n"
+"POT-Creation-Date: 2007-05-23 23:24+0200\n"
"PO-Revision-Date: 2007-03-13 17:57+0200\n"
"Last-Translator: Dmitry Nikitin <luckas_fb@mail.ru>\n"
"Language-Team: Ukrainian <xfce-i18n@xfce.org>\n"
@@ -59,29 +59,29 @@ msgstr "Лише локальні файли можуть бути перейм
msgid "Preparing..."
msgstr "Підготовка..."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:228
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:537
#, c-format
msgid "Failed to change permissions of \"%s\""
msgstr "Ðе вдаєтьÑÑ Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ права доÑтупу до \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:355
#, c-format
msgid "Failed to change file owner of \"%s\""
msgstr "Ðе вдаєтьÑÑ Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ влаÑника Ð´Ð»Ñ \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:356
#, c-format
msgid "Failed to change file group of \"%s\""
msgstr "Ðе вдаєтьÑÑ Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ групу Ð´Ð»Ñ \"%s\""
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:444
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:190
#, c-format
msgid "The file \"%s\" already exists"
msgstr "Файл \"%s\" вже Ñ–Ñнує"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:462
#, c-format
msgid "Failed to create empty file \"%s\""
msgstr "Ðе вдаєтьÑÑ Ñтворити порожній файл \"%s\""
@@ -241,11 +241,20 @@ msgstr "Смітник"
msgid "Cannot move or copy files within the trash"
msgstr "Ðеможливо переміÑтити чи Ñкопіювати файли в межах Ñмітника"
-#: ../thunar-vfs/thunar-vfs-job.c:831
+#. no "ask-replace" handler, fallback to "ask"
+#: ../thunar-vfs/thunar-vfs-job.c:401
+#, c-format
+msgid ""
+"The file \"%s\" already exists. Would you like to replace it?\n"
+"\n"
+"If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-job.c:897
msgid "Do you want to overwrite it?"
msgstr "Хочете перезапиÑати його?"
-#: ../thunar-vfs/thunar-vfs-job.c:896
+#: ../thunar-vfs/thunar-vfs-job.c:1042
msgid "Do you want to skip it?"
msgstr "Хочете пропуÑтити його?"
@@ -893,7 +902,7 @@ msgstr "Докладний ÑпиÑок тек"
msgid "Details view"
msgstr "Детальний переглÑд"
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr ""
"МакÑим Дзюманенко\n"
@@ -901,30 +910,80 @@ msgstr ""
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:959
+#: ../thunar/thunar-dialogs.c:231 ../thunar/thunar-renamer-dialog.c:959
msgid "Failed to open the documentation browser"
msgstr "Ðе вдаєтьÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ програму Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ³Ð»Ñду документації"
-#: ../thunar/thunar-dialogs.c:325
+#: ../thunar/thunar-dialogs.c:328
msgid "_Yes"
msgstr "_Так"
-#: ../thunar/thunar-dialogs.c:329
+#: ../thunar/thunar-dialogs.c:332
msgid "Yes to _all"
msgstr "Так Ð´Ð»Ñ _вÑÑ–Ñ…"
-#: ../thunar/thunar-dialogs.c:333
+#: ../thunar/thunar-dialogs.c:336
msgid "_No"
msgstr "_ÐÑ–"
-#: ../thunar/thunar-dialogs.c:337
+#: ../thunar/thunar-dialogs.c:340
msgid "N_o to all"
msgstr "Ð_Ñ– Ð´Ð»Ñ Ð²ÑÑ–Ñ…"
-#: ../thunar/thunar-dialogs.c:342
+#: ../thunar/thunar-dialogs.c:344
+#, fuzzy
+msgid "_Retry"
+msgstr "Від_новити"
+
+#: ../thunar/thunar-dialogs.c:349
msgid "_Cancel"
msgstr "_СкаÑувати"
+#. setup the confirmation dialog
+#: ../thunar/thunar-dialogs.c:429
+msgid "Confirm to replace files"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:435
+msgid "_Skip"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:436
+#, fuzzy
+msgid "Replace _All"
+msgstr "Замінити _на:"
+
+#: ../thunar/thunar-dialogs.c:437
+#, fuzzy
+msgid "_Replace"
+msgstr "Перей_менувати"
+
+#: ../thunar/thunar-dialogs.c:467
+#, c-format
+msgid "This folder already contains a file \"%s\"."
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:475
+msgid "ReplaceDialogPart1|Do you want to replace the existing file"
+msgstr ""
+
+#.
+#. Fourth box (size, volume, free space)
+#.
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:440
+msgid "Size:"
+msgstr "Розмір:"
+
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:401
+msgid "Modified:"
+msgstr "Змінено:"
+
+#: ../thunar/thunar-dialogs.c:500
+msgid "ReplaceDialogPart2|with the following file?"
+msgstr ""
+
#: ../thunar/thunar-dnd.c:70
msgid "_Copy here"
msgstr "_Копіювати Ñюди"
@@ -1784,7 +1843,7 @@ msgstr ""
msgid "Failed to display the volume management settings"
msgstr "Ðе вдалоÑÑ Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð·Ð¸Ñ‚Ð¸ влаÑтивоÑÑ‚Ñ– ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ñ€Ð¾Ð·Ð´Ñ–Ð»Ð°Ð¼Ð¸"
-#: ../thunar/thunar-progress-dialog.c:375
+#: ../thunar/thunar-progress-dialog.c:398
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
@@ -1792,7 +1851,7 @@ msgstr[0] "(залишилаÑÑŒ %lu година)"
msgstr[1] "(залишилоÑÑŒ %lu години)"
msgstr[2] "(залишилоÑÑŒ %lu годин)"
-#: ../thunar/thunar-progress-dialog.c:380
+#: ../thunar/thunar-progress-dialog.c:403
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
@@ -1800,7 +1859,7 @@ msgstr[0] "(залишилаÑÑŒ %lu хвилина)"
msgstr[1] "(залишилоÑÑŒ %lu хвилини)"
msgstr[2] "(залишилоÑÑŒ %lu хвилин)"
-#: ../thunar/thunar-progress-dialog.c:385
+#: ../thunar/thunar-progress-dialog.c:408
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1838,21 +1897,10 @@ msgstr "Ціль поÑиланнÑ:"
msgid "Deleted:"
msgstr "Видалено:"
-#: ../thunar/thunar-properties-dialog.c:401
-msgid "Modified:"
-msgstr "Змінено:"
-
#: ../thunar/thunar-properties-dialog.c:415
msgid "Accessed:"
msgstr "Ð§Ð°Ñ Ð´Ð¾Ñтупу:"
-#.
-#. Fourth box (size, volume, free space)
-#.
-#: ../thunar/thunar-properties-dialog.c:440
-msgid "Size:"
-msgstr "Розмір:"
-
#: ../thunar/thunar-properties-dialog.c:453
msgid "Volume:"
msgstr "Том:"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 13ea0febd..82f1c2943 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-22 18:30+0200\n"
+"POT-Creation-Date: 2007-05-23 23:24+0200\n"
"PO-Revision-Date: 2006-11-07 00:09+0800\n"
"Last-Translator: kang kang <kanger@gmail.com>\n"
"Language-Team: Chinese (Simplified) <postmaster@inlsd.org>\n"
@@ -56,29 +56,29 @@ msgstr "åªæœ‰æœ¬åœ°æ–‡ä»¶å¯ä»¥è¢«é‡å‘½å"
msgid "Preparing..."
msgstr "准备ä¸..."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:228
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:537
#, c-format
msgid "Failed to change permissions of \"%s\""
msgstr "æ— æ³•æ›´æ”¹ \"%s\" çš„æƒé™è®¾å®š"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:355
#, c-format
msgid "Failed to change file owner of \"%s\""
msgstr "æ— æ³•æ›´æ”¹æ–‡ä»¶ \"%s\" 的拥有者"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:356
#, c-format
msgid "Failed to change file group of \"%s\""
msgstr "æ— æ³•æ›´æ”¹æ–‡ä»¶ \"%s\" 的群组"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:444
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:190
#, c-format
msgid "The file \"%s\" already exists"
msgstr "文件 \"%s\" å·²å˜åœ¨"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:462
#, c-format
msgid "Failed to create empty file \"%s\""
msgstr "æ— æ³•åˆ›å»ºç©ºæ–‡ä»¶ \"%s\""
@@ -234,11 +234,20 @@ msgstr "垃圾箱"
msgid "Cannot move or copy files within the trash"
msgstr "æ— æ³•æŠŠæ–‡ä»¶ç§»åŠ¨æˆ–å¤åˆ¶åˆ°åžƒåœ¾ç®±"
-#: ../thunar-vfs/thunar-vfs-job.c:831
+#. no "ask-replace" handler, fallback to "ask"
+#: ../thunar-vfs/thunar-vfs-job.c:401
+#, fuzzy, c-format
+msgid ""
+"The file \"%s\" already exists. Would you like to replace it?\n"
+"\n"
+"If you replace an existing file, its contents will be overwritten."
+msgstr "文件 \"%s\" å·²ç»å˜åœ¨ã€‚您想è¦ç”¨ä¸€ä¸ªç©ºæ–‡ä»¶å–代它å—？"
+
+#: ../thunar-vfs/thunar-vfs-job.c:897
msgid "Do you want to overwrite it?"
msgstr "您想è¦è¦†ç›–它å—？"
-#: ../thunar-vfs/thunar-vfs-job.c:896
+#: ../thunar-vfs/thunar-vfs-job.c:1042
msgid "Do you want to skip it?"
msgstr "您想è¦è·³è¿‡å®ƒå—？"
@@ -864,7 +873,7 @@ msgstr "详细目录列表"
msgid "Details view"
msgstr "详细视图"
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr ""
"kangkang <kanger@gmail.com>\n"
@@ -872,30 +881,80 @@ msgstr ""
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:959
+#: ../thunar/thunar-dialogs.c:231 ../thunar/thunar-renamer-dialog.c:959
msgid "Failed to open the documentation browser"
msgstr "æ— æ³•æ‰“å¼€æ–‡æ¡£æµè§ˆå™¨"
-#: ../thunar/thunar-dialogs.c:325
+#: ../thunar/thunar-dialogs.c:328
msgid "_Yes"
msgstr "是(_Y)"
-#: ../thunar/thunar-dialogs.c:329
+#: ../thunar/thunar-dialogs.c:332
msgid "Yes to _all"
msgstr "全部是(_A)"
-#: ../thunar/thunar-dialogs.c:333
+#: ../thunar/thunar-dialogs.c:336
msgid "_No"
msgstr "å¦"
-#: ../thunar/thunar-dialogs.c:337
+#: ../thunar/thunar-dialogs.c:340
msgid "N_o to all"
msgstr "全部å¦(_O)"
-#: ../thunar/thunar-dialogs.c:342
+#: ../thunar/thunar-dialogs.c:344
+#, fuzzy
+msgid "_Retry"
+msgstr "æ¢å¤(_R)"
+
+#: ../thunar/thunar-dialogs.c:349
msgid "_Cancel"
msgstr "å–消(_C)"
+#. setup the confirmation dialog
+#: ../thunar/thunar-dialogs.c:429
+msgid "Confirm to replace files"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:435
+msgid "_Skip"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:436
+#, fuzzy
+msgid "Replace _All"
+msgstr "替æ¢ä¸º(_W)："
+
+#: ../thunar/thunar-dialogs.c:437
+#, fuzzy
+msgid "_Replace"
+msgstr "é‡å‘½å(_R)"
+
+#: ../thunar/thunar-dialogs.c:467
+#, c-format
+msgid "This folder already contains a file \"%s\"."
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:475
+msgid "ReplaceDialogPart1|Do you want to replace the existing file"
+msgstr ""
+
+#.
+#. Fourth box (size, volume, free space)
+#.
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:440
+msgid "Size:"
+msgstr "大å°ï¼š"
+
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:401
+msgid "Modified:"
+msgstr "修改："
+
+#: ../thunar/thunar-dialogs.c:500
+msgid "ReplaceDialogPart2|with the following file?"
+msgstr ""
+
#: ../thunar/thunar-dnd.c:70
msgid "_Copy here"
msgstr "å¤åˆ¶åˆ°è¿™é‡Œ(_C)"
@@ -1690,19 +1749,19 @@ msgstr ""
msgid "Failed to display the volume management settings"
msgstr "æ— æ³•è¿žæŽ¥è‡³åžƒåœ¾ç®±"
-#: ../thunar/thunar-progress-dialog.c:375
+#: ../thunar/thunar-progress-dialog.c:398
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
msgstr[0] "(%lu å°æ—¶å‰©ä½™)"
-#: ../thunar/thunar-progress-dialog.c:380
+#: ../thunar/thunar-progress-dialog.c:403
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
msgstr[0] "(%lu 分钟剩余)"
-#: ../thunar/thunar-progress-dialog.c:385
+#: ../thunar/thunar-progress-dialog.c:408
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1738,21 +1797,10 @@ msgstr "è¿žæŽ¥ç›®æ ‡ï¼š"
msgid "Deleted:"
msgstr "åˆ é™¤ï¼š"
-#: ../thunar/thunar-properties-dialog.c:401
-msgid "Modified:"
-msgstr "修改："
-
#: ../thunar/thunar-properties-dialog.c:415
msgid "Accessed:"
msgstr "访问："
-#.
-#. Fourth box (size, volume, free space)
-#.
-#: ../thunar/thunar-properties-dialog.c:440
-msgid "Size:"
-msgstr "大å°ï¼š"
-
#: ../thunar/thunar-properties-dialog.c:453
msgid "Volume:"
msgstr "å·æ ‡ï¼š"
@@ -3276,11 +3324,6 @@ msgstr "在新的 Thunar 窗å£ä¸æ‰“开指定的文件夹"
#~ msgid "Failed to determine file info of \"%s\": %s"
#~ msgstr "æ— æ³•ç¡®å®š \"%s\" 的文件信æ¯ï¼š%s"
-#~ msgid ""
-#~ "The file \"%s\" already exists. Do you want to replace it with an empty "
-#~ "file?"
-#~ msgstr "文件 \"%s\" å·²ç»å˜åœ¨ã€‚您想è¦ç”¨ä¸€ä¸ªç©ºæ–‡ä»¶å–代它å—？"
-
#~ msgid ""
#~ "Failed to remove \"%s\".\n"
#~ "\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 7e0f33aee..8134fecaa 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-22 18:30+0200\n"
+"POT-Creation-Date: 2007-05-23 23:24+0200\n"
"PO-Revision-Date: 2006-10-01 13:34+0800\n"
"Last-Translator: Hydonsingore Cia <hydonsingore@educities.edu.tw>\n"
"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -57,29 +57,29 @@ msgstr "åªèƒ½é‡æ–°å‘½å本地檔案"
msgid "Preparing..."
msgstr "準備ä¸..."
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:228
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:537
#, c-format
msgid "Failed to change permissions of \"%s\""
msgstr "無法更改 \"%s\" 的權é™è¨å®š"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:355
#, c-format
msgid "Failed to change file owner of \"%s\""
msgstr "無法更改檔案 \"%s\" çš„æ“有者"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:356
#, c-format
msgid "Failed to change file group of \"%s\""
msgstr "無法更改檔案 \"%s\" 的群組"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:444
#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:190
#, c-format
msgid "The file \"%s\" already exists"
msgstr "檔案 \"%s\" å·²å˜åœ¨"
-#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:462
#, c-format
msgid "Failed to create empty file \"%s\""
msgstr "無法建立空檔案 \"%s\""
@@ -235,11 +235,20 @@ msgstr "垃圾桶"
msgid "Cannot move or copy files within the trash"
msgstr "在垃圾桶ä¸ç„¡æ³•ç§»å‹•æˆ–複製檔案"
-#: ../thunar-vfs/thunar-vfs-job.c:831
+#. no "ask-replace" handler, fallback to "ask"
+#: ../thunar-vfs/thunar-vfs-job.c:401
+#, fuzzy, c-format
+msgid ""
+"The file \"%s\" already exists. Would you like to replace it?\n"
+"\n"
+"If you replace an existing file, its contents will be overwritten."
+msgstr "檔案 \"%s\" 已經å˜åœ¨ã€‚您想è¦ç”¨ä¸€å€‹ç©ºæª”案å–而代之嗎？"
+
+#: ../thunar-vfs/thunar-vfs-job.c:897
msgid "Do you want to overwrite it?"
msgstr "您想è¦è¦†è“‹å®ƒå—Ž?"
-#: ../thunar-vfs/thunar-vfs-job.c:896
+#: ../thunar-vfs/thunar-vfs-job.c:1042
msgid "Do you want to skip it?"
msgstr "您想è¦ç•¥éŽå—Ž?"
@@ -874,36 +883,86 @@ msgstr "詳細目錄列表"
msgid "Details view"
msgstr "詳細檢視"
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr "Cosmo Chene <cosmolax@gmail.com>"
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:959
+#: ../thunar/thunar-dialogs.c:231 ../thunar/thunar-renamer-dialog.c:959
msgid "Failed to open the documentation browser"
msgstr "無法開啟文件ç€è¦½å™¨"
-#: ../thunar/thunar-dialogs.c:325
+#: ../thunar/thunar-dialogs.c:328
msgid "_Yes"
msgstr "是(_Y)"
-#: ../thunar/thunar-dialogs.c:329
+#: ../thunar/thunar-dialogs.c:332
msgid "Yes to _all"
msgstr "全部皆是(_A)"
-#: ../thunar/thunar-dialogs.c:333
+#: ../thunar/thunar-dialogs.c:336
msgid "_No"
msgstr "å¦(_N)"
-#: ../thunar/thunar-dialogs.c:337
+#: ../thunar/thunar-dialogs.c:340
msgid "N_o to all"
msgstr "全部皆å¦(_O)"
-#: ../thunar/thunar-dialogs.c:342
+#: ../thunar/thunar-dialogs.c:344
+#, fuzzy
+msgid "_Retry"
+msgstr "æ¢å¾©(_R)"
+
+#: ../thunar/thunar-dialogs.c:349
msgid "_Cancel"
msgstr "å–消(_C)"
+#. setup the confirmation dialog
+#: ../thunar/thunar-dialogs.c:429
+msgid "Confirm to replace files"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:435
+msgid "_Skip"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:436
+#, fuzzy
+msgid "Replace _All"
+msgstr "å–代目標(_W):"
+
+#: ../thunar/thunar-dialogs.c:437
+#, fuzzy
+msgid "_Replace"
+msgstr "é‡æ–°å‘½å(_R)"
+
+#: ../thunar/thunar-dialogs.c:467
+#, c-format
+msgid "This folder already contains a file \"%s\"."
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:475
+msgid "ReplaceDialogPart1|Do you want to replace the existing file"
+msgstr ""
+
+#.
+#. Fourth box (size, volume, free space)
+#.
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:440
+msgid "Size:"
+msgstr "大å°:"
+
+#: ../thunar/thunar-dialogs.c:491 ../thunar/thunar-dialogs.c:516
+#: ../thunar/thunar-properties-dialog.c:401
+msgid "Modified:"
+msgstr "變更:"
+
+#: ../thunar/thunar-dialogs.c:500
+msgid "ReplaceDialogPart2|with the following file?"
+msgstr ""
+
#: ../thunar/thunar-dnd.c:70
msgid "_Copy here"
msgstr "複製到這裡(_C)"
@@ -1715,19 +1774,19 @@ msgstr ""
msgid "Failed to display the volume management settings"
msgstr "無法連çµè‡³åžƒåœ¾æ¡¶"
-#: ../thunar/thunar-progress-dialog.c:375
+#: ../thunar/thunar-progress-dialog.c:398
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
msgstr[0] "(剩餘%lu å°æ™‚)"
-#: ../thunar/thunar-progress-dialog.c:380
+#: ../thunar/thunar-progress-dialog.c:403
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
msgstr[0] "(剩下%lu·分é˜)"
-#: ../thunar/thunar-progress-dialog.c:385
+#: ../thunar/thunar-progress-dialog.c:408
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1763,21 +1822,10 @@ msgstr "連çµç›®æ¨™:"
msgid "Deleted:"
msgstr "刪除:"
-#: ../thunar/thunar-properties-dialog.c:401
-msgid "Modified:"
-msgstr "變更:"
-
#: ../thunar/thunar-properties-dialog.c:415
msgid "Accessed:"
msgstr "å˜å–:"
-#.
-#. Fourth box (size, volume, free space)
-#.
-#: ../thunar/thunar-properties-dialog.c:440
-msgid "Size:"
-msgstr "大å°:"
-
#: ../thunar/thunar-properties-dialog.c:453
msgid "Volume:"
msgstr "è£ç½®:"
@@ -3347,11 +3395,6 @@ msgstr "在·Thunarä¸é–‹å•ŸæŒ‡å®šçš„資料夾"
#~ msgid "Failed to determine file info of \"%s\": %s"
#~ msgstr "無法決定 \"%s\" 的檔案資訊：%s"
-#~ msgid ""
-#~ "The file \"%s\" already exists. Do you want to replace it with an empty "
-#~ "file?"
-#~ msgstr "檔案 \"%s\" 已經å˜åœ¨ã€‚您想è¦ç”¨ä¸€å€‹ç©ºæª”案å–而代之嗎？"
-
#~ msgid ""
#~ "Failed to remove \"%s\".\n"
#~ "\n"
diff --git a/thunar-vfs/thunar-vfs-io-jobs.c b/thunar-vfs/thunar-vfs-io-jobs.c
index 715cf15a4..b8490261a 100644
--- a/thunar-vfs/thunar-vfs-io-jobs.c
+++ b/thunar-vfs/thunar-vfs-io-jobs.c
@@ -1,6 +1,6 @@
/* $Id$ */
/*-
- * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+ * Copyright (c) 2005-2007 Benedikt Meurer <benny@xfce.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -148,6 +148,7 @@ _thunar_vfs_io_jobs_chmod (ThunarVfsJob *job,
ThunarVfsFileMode mode;
struct stat statb;
gboolean recursive = g_value_get_boolean (¶m_values[5]);
+ gboolean retry;
GError *err = NULL;
GList *path_list = g_value_get_boxed (¶m_values[0]);
GList *lp;
@@ -186,6 +187,7 @@ _thunar_vfs_io_jobs_chmod (ThunarVfsJob *job,
/* change the permissions of all paths */
for (lp = path_list; lp != NULL && !thunar_vfs_job_cancelled (job); lp = lp->next)
{
+retry_chmod:
/* reset the saved errno */
sverrno = 0;
@@ -227,10 +229,14 @@ sverror:
g_free (display_name);
/* ask the user whether to skip this one */
- _thunar_vfs_job_ask_skip (job, "%s", err->message);
+ retry = (_thunar_vfs_job_ask_skip (job, "%s", err->message) == THUNAR_VFS_JOB_RESPONSE_RETRY);
/* reset the error */
g_clear_error (&err);
+
+ /* check whether to retry */
+ if (G_UNLIKELY (retry))
+ goto retry_chmod;
}
}
@@ -268,6 +274,7 @@ _thunar_vfs_io_jobs_chown (ThunarVfsJob *job,
{
struct stat statb;
gboolean recursive = g_value_get_boolean (¶m_values[3]);
+ gboolean retry;
GError *err = NULL;
GList *path_list = g_value_get_boxed (¶m_values[0]);
GList *lp;
@@ -309,6 +316,7 @@ _thunar_vfs_io_jobs_chown (ThunarVfsJob *job,
/* change the ownership of all paths */
for (lp = path_list; lp != NULL && !thunar_vfs_job_cancelled (job); lp = lp->next)
{
+retry_chown:
/* reset the saved errno */
sverrno = 0;
@@ -349,11 +357,15 @@ sverror:
display_name);
g_free (display_name);
- /* ask the user whether to skip this one */
- _thunar_vfs_job_ask_skip (job, "%s", err->message);
+ /* ask the user whether to skip/retry this one */
+ retry = (_thunar_vfs_job_ask_skip (job, "%s", err->message) == THUNAR_VFS_JOB_RESPONSE_RETRY);
/* reset the error */
g_clear_error (&err);
+
+ /* check whether to retry */
+ if (G_UNLIKELY (retry))
+ goto retry_chown;
}
}
@@ -387,7 +399,7 @@ _thunar_vfs_io_jobs_create (ThunarVfsJob *job,
guint n_param_values,
GError **error)
{
- ThunarVfsJobResponse overwrite;
+ ThunarVfsJobResponse response;
GError *err = NULL;
gchar *absolute_path;
gchar *display_name;
@@ -429,11 +441,11 @@ again:
{
/* ask the user whether to override this path */
display_name = _thunar_vfs_path_dup_display_name (lp->data);
- overwrite = _thunar_vfs_job_ask_overwrite (job, _("The file \"%s\" already exists"), display_name);
+ response = _thunar_vfs_job_ask_overwrite (job, _("The file \"%s\" already exists"), display_name);
g_free (display_name);
/* check if we should overwrite */
- if (G_UNLIKELY (overwrite == THUNAR_VFS_JOB_RESPONSE_YES))
+ if (G_UNLIKELY (response == THUNAR_VFS_JOB_RESPONSE_YES))
{
/* try to remove the file (fail if not possible) */
if (_thunar_vfs_io_ops_remove (lp->data, THUNAR_VFS_IO_OPS_IGNORE_ENOENT, &err))
@@ -445,12 +457,16 @@ again:
}
else
{
- /* ask the user whether to skip this path (cancels the job if not) */
+ /* ask the user whether to skip/retry this path (cancels the job if not) */
display_name = _thunar_vfs_path_dup_display_name (lp->data);
message = g_strdup_printf (_("Failed to create empty file \"%s\""), display_name);
- _thunar_vfs_job_ask_skip (job, "%s: %s", message, g_strerror (errno));
+ response = _thunar_vfs_job_ask_skip (job, "%s: %s", message, g_strerror (errno));
g_free (display_name);
g_free (message);
+
+ /* check whether to retry the create operation */
+ if (response == THUNAR_VFS_JOB_RESPONSE_RETRY)
+ goto again;
}
}
else
@@ -722,9 +738,10 @@ _thunar_vfs_io_jobs_unlink (ThunarVfsJob *job,
guint n_param_values,
GError **error)
{
- GError *err = NULL;
- GList *path_list;
- GList *lp;
+ gboolean retry;
+ GError *err = NULL;
+ GList *path_list;
+ GList *lp;
_thunar_vfs_return_val_if_fail (G_VALUE_HOLDS (¶m_values[0], THUNAR_VFS_TYPE_PATH_LIST), FALSE);
_thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, FALSE);
@@ -752,14 +769,18 @@ _thunar_vfs_io_jobs_unlink (ThunarVfsJob *job,
/* skip the root folders, which cannot be deleted anyway */
if (G_LIKELY (!thunar_vfs_path_is_root (lp->data)))
{
- /* remove the file for the current path */
+again: /* remove the file for the current path */
if (!_thunar_vfs_io_ops_remove (lp->data, THUNAR_VFS_IO_OPS_IGNORE_ENOENT, &err))
{
/* ask the user whether to skip the file */
- _thunar_vfs_job_ask_skip (job, "%s", err->message);
+ retry = (_thunar_vfs_job_ask_skip (job, "%s", err->message) == THUNAR_VFS_JOB_RESPONSE_RETRY);
/* clear the error */
g_clear_error (&err);
+
+ /* check whether to retry */
+ if (G_UNLIKELY (retry))
+ goto again;
}
}
}
diff --git a/thunar-vfs/thunar-vfs-job-private.h b/thunar-vfs/thunar-vfs-job-private.h
index f211fc270..b5ffcf14c 100644
--- a/thunar-vfs/thunar-vfs-job-private.h
+++ b/thunar-vfs/thunar-vfs-job-private.h
@@ -1,6 +1,6 @@
/* $Id$ */
/*-
- * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+ * Copyright (c) 2005-2007 Benedikt Meurer <benny@xfce.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -59,7 +59,10 @@ ThunarVfsJobResponse _thunar_vfs_job_ask_valist (ThunarVfsJob *job,
ThunarVfsJobResponse _thunar_vfs_job_ask_overwrite (ThunarVfsJob *job,
const gchar *format,
...) G_GNUC_INTERNAL G_GNUC_PRINTF (2, 3);
-gboolean _thunar_vfs_job_ask_skip (ThunarVfsJob *job,
+ThunarVfsJobResponse _thunar_vfs_job_ask_replace (ThunarVfsJob *job,
+ ThunarVfsPath *src_path,
+ ThunarVfsPath *dst_path) G_GNUC_INTERNAL;
+ThunarVfsJobResponse _thunar_vfs_job_ask_skip (ThunarVfsJob *job,
const gchar *format,
...) G_GNUC_INTERNAL G_GNUC_PRINTF (2, 3);
void _thunar_vfs_job_error (ThunarVfsJob *job,
diff --git a/thunar-vfs/thunar-vfs-job.c b/thunar-vfs/thunar-vfs-job.c
index f19151cbd..c24beb6ba 100644
--- a/thunar-vfs/thunar-vfs-job.c
+++ b/thunar-vfs/thunar-vfs-job.c
@@ -1,6 +1,6 @@
/* $Id$ */
/*-
- * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+ * Copyright (c) 2005-2007 Benedikt Meurer <benny@xfce.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -55,6 +55,7 @@
enum
{
ASK,
+ ASK_REPLACE,
ERROR,
FINISHED,
INFO_MESSAGE,
@@ -77,6 +78,9 @@ static void thunar_vfs_job_init (ThunarVfsJob
static ThunarVfsJobResponse thunar_vfs_job_real_ask (ThunarVfsJob *job,
const gchar *message,
ThunarVfsJobResponse choices);
+static ThunarVfsJobResponse thunar_vfs_job_real_ask_replace (ThunarVfsJob *job,
+ ThunarVfsInfo *src_info,
+ ThunarVfsInfo *dst_info);
static void thunar_vfs_job_execute (gpointer data,
gpointer user_data);
static gboolean thunar_vfs_job_source_prepare (GSource *source,
@@ -190,9 +194,10 @@ thunar_vfs_job_class_init (ThunarVfsJobClass *klass)
thunar_vfs_job_parent_class = g_type_class_peek_parent (klass);
klass->ask = thunar_vfs_job_real_ask;
+ klass->ask_replace = thunar_vfs_job_real_ask_replace;
/**
- * ThunarVfsInteractiveJob::ask:
+ * ThunarVfsJob::ask:
* @job : a #ThunarVfsJob.
* @message : question to display to the user.
* @choices : a combination of #ThunarVfsInteractiveJobResponse<!---->s.
@@ -212,6 +217,31 @@ thunar_vfs_job_class_init (ThunarVfsJobClass *klass)
2, G_TYPE_STRING,
THUNAR_VFS_TYPE_VFS_JOB_RESPONSE);
+ /**
+ * ThunarVfsJob::ask-replace:
+ * @job : a #ThunarVfsJob.
+ * @src_info : the #ThunarVfsInfo of the source file.
+ * @dst_info : the #ThunarVfsInfo of the destination file, that
+ * may be replaced with the source file.
+ *
+ * Emitted to ask the user whether the destination file should
+ * be replaced by the source file.
+ *
+ * Return value: the selected choice.
+ *
+ * Since: 0.8.1
+ **/
+ job_signals[ASK_REPLACE] =
+ g_signal_new (I_("ask-replace"),
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_NO_HOOKS | G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (ThunarVfsJobClass, ask_replace),
+ _thunar_vfs_job_ask_accumulator, NULL,
+ _thunar_vfs_marshal_FLAGS__BOXED_BOXED,
+ THUNAR_VFS_TYPE_VFS_JOB_RESPONSE,
+ 2, THUNAR_VFS_TYPE_INFO,
+ THUNAR_VFS_TYPE_INFO);
+
/**
* ThunarVfsJob::error:
* @job : a #ThunarVfsJob.
@@ -353,6 +383,42 @@ thunar_vfs_job_real_ask (ThunarVfsJob *job,
+static ThunarVfsJobResponse
+thunar_vfs_job_real_ask_replace (ThunarVfsJob *job,
+ ThunarVfsInfo *src_info,
+ ThunarVfsInfo *dst_info)
+{
+ ThunarVfsJobResponse response;
+ gchar *display_name;
+ gchar *s;
+
+ /* determine a displayable variant of the dst */
+ s = _thunar_vfs_path_is_local (dst_info->path) ? thunar_vfs_path_dup_string (dst_info->path) : thunar_vfs_path_dup_uri (dst_info->path);
+ display_name = g_filename_display_name (s);
+ g_free (s);
+
+ /* no "ask-replace" handler, fallback to "ask" */
+ s = g_strdup_printf (_("The file \"%s\" already exists. Would you like to replace it?\n\n"
+ "If you replace an existing file, its contents will be overwritten."),
+ display_name);
+ g_signal_emit (G_OBJECT (job),
+ job_signals[ASK], 0, s,
+ THUNAR_VFS_JOB_RESPONSE_YES
+ | THUNAR_VFS_JOB_RESPONSE_YES_ALL
+ | THUNAR_VFS_JOB_RESPONSE_NO
+ | THUNAR_VFS_JOB_RESPONSE_NO_ALL
+ | THUNAR_VFS_JOB_RESPONSE_CANCEL,
+ &response);
+
+ /* cleanup */
+ g_free (display_name);
+ g_free (s);
+
+ return response;
+}
+
+
+
static void
thunar_vfs_job_execute (gpointer data,
gpointer user_data)
@@ -360,8 +426,8 @@ thunar_vfs_job_execute (gpointer data,
ThunarVfsJobEmitAsync *emit_async;
ThunarVfsJob *job = THUNAR_VFS_JOB (data);
- g_return_if_fail (THUNAR_VFS_IS_JOB (job));
- g_return_if_fail (job->priv->running);
+ _thunar_vfs_return_if_fail (THUNAR_VFS_IS_JOB (job));
+ _thunar_vfs_return_if_fail (job->priv->running);
/* perform the real work */
(*THUNAR_VFS_JOB_GET_CLASS (job)->execute) (job);
@@ -489,7 +555,7 @@ thunar_vfs_job_source_finalize (GSource *source)
{
ThunarVfsJob *job = THUNAR_VFS_JOB_SOURCE (source)->job;
- g_return_if_fail (THUNAR_VFS_IS_JOB (job));
+ _thunar_vfs_return_if_fail (THUNAR_VFS_IS_JOB (job));
/* decrement the number of running jobs */
jobs_running -= 1;
@@ -858,6 +924,86 @@ _thunar_vfs_job_ask_overwrite (ThunarVfsJob *job,
+/**
+ * _thunar_vfs_job_ask_replace:
+ * @job : a #ThunarVfsJob.
+ * @src_path : the #ThunarVfsPath to the source file.
+ * @dst_path : the #ThunarVfsPath to the destination file.
+ *
+ * Return value:
+ **/
+ThunarVfsJobResponse
+_thunar_vfs_job_ask_replace (ThunarVfsJob *job,
+ ThunarVfsPath *src_path,
+ ThunarVfsPath *dst_path)
+{
+ ThunarVfsJobResponse response;
+ ThunarVfsInfo *dst_info;
+ ThunarVfsInfo *src_info;
+
+ _thunar_vfs_return_val_if_fail (THUNAR_VFS_IS_JOB (job), THUNAR_VFS_JOB_RESPONSE_CANCEL);
+ _thunar_vfs_return_val_if_fail (dst_path != NULL, THUNAR_VFS_JOB_RESPONSE_CANCEL);
+ _thunar_vfs_return_val_if_fail (src_path != NULL, THUNAR_VFS_JOB_RESPONSE_CANCEL);
+
+ /* check if the user already cancelled the job */
+ if (G_UNLIKELY (job->cancelled))
+ return THUNAR_VFS_JOB_RESPONSE_CANCEL;
+
+ /* check if the user said "Overwrite All" earlier */
+ if (G_UNLIKELY (job->priv->ask_overwrite_all))
+ return THUNAR_VFS_JOB_RESPONSE_YES;
+
+ /* check if the user said "Overwrite None" earlier */
+ if (G_UNLIKELY (job->priv->ask_overwrite_none))
+ return THUNAR_VFS_JOB_RESPONSE_NO;
+
+ /* determine the info of the source file (skip if disappeared) */
+ src_info = thunar_vfs_info_new_for_path (src_path, NULL);
+ if (G_UNLIKELY (src_info == NULL))
+ return THUNAR_VFS_JOB_RESPONSE_NO;
+
+ /* determine the info of the target file (retry if disappeared) */
+ dst_info = thunar_vfs_info_new_for_path (dst_path, NULL);
+ if (G_UNLIKELY (dst_info == NULL))
+ {
+ thunar_vfs_info_unref (src_info);
+ return THUNAR_VFS_JOB_RESPONSE_RETRY;
+ }
+
+ /* ask the user whether to replace the dst file with the src file */
+ _thunar_vfs_job_emit (job, job_signals[ASK_REPLACE], 0, src_info, dst_info, &response);
+
+ /* translate the response */
+ switch (response)
+ {
+ case THUNAR_VFS_JOB_RESPONSE_YES_ALL:
+ job->priv->ask_overwrite_all = TRUE;
+ response = THUNAR_VFS_JOB_RESPONSE_YES;
+ break;
+
+ case THUNAR_VFS_JOB_RESPONSE_NO_ALL:
+ job->priv->ask_overwrite_none = TRUE;
+ response = THUNAR_VFS_JOB_RESPONSE_NO;
+ break;
+
+ case THUNAR_VFS_JOB_RESPONSE_CANCEL:
+ /* cancel the job as per users request */
+ thunar_vfs_job_cancel (job);
+ break;
+
+ default:
+ break;
+ }
+
+ /* cleanup */
+ thunar_vfs_info_unref (src_info);
+ thunar_vfs_info_unref (dst_info);
+
+ return response;
+}
+
+
+
/**
* _thunar_vfs_job_ask_skip:
* @job : a #ThunarVfsJob.
@@ -867,12 +1013,12 @@ _thunar_vfs_job_ask_overwrite (ThunarVfsJob *job,
* Asks the user whether to skip a certain file as described by
* @format.
*
- * The return value may be %TRUE to perform the skip, or %FALSE,
- * which means to cancel the @job.
- *
- * Return value: %TRUE to skip or %FALSE to cancel the @job.
+ * Return value: %THUNAR_VFS_JOB_RESPONSE_CANCEL to cancel the
+ * @job, %THUNAR_VFS_JOB_RESPONSE_YES to skip
+ * the file or %THUNAR_VFS_JOB_RESPONSE_RETRY
+ * to retry the operation.
**/
-gboolean
+ThunarVfsJobResponse
_thunar_vfs_job_ask_skip (ThunarVfsJob *job,
const gchar *format,
...)
@@ -880,15 +1026,15 @@ _thunar_vfs_job_ask_skip (ThunarVfsJob *job,
ThunarVfsJobResponse response;
va_list var_args;
- _thunar_vfs_return_val_if_fail (THUNAR_VFS_IS_JOB (job), FALSE);
+ _thunar_vfs_return_val_if_fail (THUNAR_VFS_IS_JOB (job), THUNAR_VFS_JOB_RESPONSE_CANCEL);
/* check if the user already cancelled the job */
if (G_UNLIKELY (job->cancelled))
- return FALSE;
+ return THUNAR_VFS_JOB_RESPONSE_CANCEL;
/* check if the user said "Skip All" earlier */
if (G_UNLIKELY (job->priv->ask_skip_all))
- return TRUE;
+ return THUNAR_VFS_JOB_RESPONSE_YES;
/* ask the user using the provided format string */
va_start (var_args, format);
@@ -896,7 +1042,8 @@ _thunar_vfs_job_ask_skip (ThunarVfsJob *job,
_("Do you want to skip it?"),
THUNAR_VFS_JOB_RESPONSE_YES
| THUNAR_VFS_JOB_RESPONSE_YES_ALL
- | THUNAR_VFS_JOB_RESPONSE_CANCEL);
+ | THUNAR_VFS_JOB_RESPONSE_CANCEL
+ | THUNAR_VFS_JOB_RESPONSE_RETRY);
va_end (var_args);
/* evaluate the response */
@@ -904,18 +1051,20 @@ _thunar_vfs_job_ask_skip (ThunarVfsJob *job,
{
case THUNAR_VFS_JOB_RESPONSE_YES_ALL:
job->priv->ask_skip_all = TRUE;
- /* FALL-THROUGH */
+ response = THUNAR_VFS_JOB_RESPONSE_YES;
+ break;
case THUNAR_VFS_JOB_RESPONSE_YES:
- return TRUE;
-
case THUNAR_VFS_JOB_RESPONSE_CANCEL:
- return FALSE;
+ case THUNAR_VFS_JOB_RESPONSE_RETRY:
+ break;
default:
_thunar_vfs_assert_not_reached ();
return FALSE;
}
+
+ return response;
}
diff --git a/thunar-vfs/thunar-vfs-job.h b/thunar-vfs/thunar-vfs-job.h
index 09bbe7615..8d768256a 100644
--- a/thunar-vfs/thunar-vfs-job.h
+++ b/thunar-vfs/thunar-vfs-job.h
@@ -1,6 +1,6 @@
/* $Id$ */
/*-
- * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+ * Copyright (c) 2005-2007 Benedikt Meurer <benny@xfce.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -25,7 +25,7 @@
#ifndef __THUNAR_VFS_JOB_H__
#define __THUNAR_VFS_JOB_H__
-#include <glib-object.h>
+#include <thunar-vfs/thunar-vfs-info.h>
G_BEGIN_DECLS;
@@ -47,6 +47,7 @@ typedef struct _ThunarVfsJob ThunarVfsJob;
* @THUNAR_VFS_JOB_RESPONSE_NO :
* @THUNAR_VFS_JOB_RESPONSE_NO_ALL :
* @THUNAR_VFS_JOB_RESPONSE_CANCEL :
+ * @THUNAR_VFS_JOB_RESPONSE_RETRY :
*
* Possible responses for the ThunarVfsJob::ask signal.
**/
@@ -57,6 +58,7 @@ typedef enum /*< flags >*/
THUNAR_VFS_JOB_RESPONSE_NO = 1 << 2,
THUNAR_VFS_JOB_RESPONSE_CANCEL = 1 << 3,
THUNAR_VFS_JOB_RESPONSE_NO_ALL = 1 << 4,
+ THUNAR_VFS_JOB_RESPONSE_RETRY = 1 << 5,
} ThunarVfsJobResponse;
struct _ThunarVfsJobClass
@@ -67,18 +69,20 @@ struct _ThunarVfsJobClass
/*< public >*/
/* virtual methods */
- void (*execute) (ThunarVfsJob *job);
+ void (*execute) (ThunarVfsJob *job);
/* signals */
- void (*finished) (ThunarVfsJob *job);
- ThunarVfsJobResponse (*ask) (ThunarVfsJob *job,
- const gchar *message,
- ThunarVfsJobResponse choices);
+ void (*finished) (ThunarVfsJob *job);
+ ThunarVfsJobResponse (*ask) (ThunarVfsJob *job,
+ const gchar *message,
+ ThunarVfsJobResponse choices);
+ ThunarVfsJobResponse (*ask_replace) (ThunarVfsJob *job,
+ ThunarVfsInfo *src_info,
+ ThunarVfsInfo *dst_info);
/*< private >*/
void (*reserved1) (void);
void (*reserved2) (void);
- void (*reserved3) (void);
};
struct _ThunarVfsJob
diff --git a/thunar-vfs/thunar-vfs-marshal.list b/thunar-vfs/thunar-vfs-marshal.list
index b7556e9db..2fa4d7db7 100644
--- a/thunar-vfs/thunar-vfs-marshal.list
+++ b/thunar-vfs/thunar-vfs-marshal.list
@@ -1,3 +1,4 @@
BOOLEAN:POINTER
+FLAGS:BOXED,BOXED
FLAGS:STRING,FLAGS
VOID:UINT64,UINT,UINT,UINT
diff --git a/thunar-vfs/thunar-vfs-transfer-job.c b/thunar-vfs/thunar-vfs-transfer-job.c
index 81dd75c0d..43d9b3c08 100644
--- a/thunar-vfs/thunar-vfs-transfer-job.c
+++ b/thunar-vfs/thunar-vfs-transfer-job.c
@@ -290,12 +290,16 @@ thunar_vfs_transfer_job_copy_file (ThunarVfsTransferJob *transfer_job,
/* check if we can recover from this error */
if (err->domain == G_FILE_ERROR && err->code == G_FILE_ERROR_EXIST)
{
- /* ask the user whether to overwrite */
- response = _thunar_vfs_job_ask_overwrite (THUNAR_VFS_JOB (transfer_job), "%s", err->message);
-
/* reset the error */
g_clear_error (&err);
+ /* ask the user whether to replace the target file */
+ response = _thunar_vfs_job_ask_replace (THUNAR_VFS_JOB (transfer_job), source_path, target_path);
+
+ /* check if we should retry the copy operation */
+ if (response == THUNAR_VFS_JOB_RESPONSE_RETRY)
+ continue;
+
/* try to remove the target file if we should overwrite */
if (response == THUNAR_VFS_JOB_RESPONSE_YES && !_thunar_vfs_io_ops_remove (target_path, THUNAR_VFS_IO_OPS_IGNORE_ENOENT, &err))
break;
@@ -338,6 +342,7 @@ thunar_vfs_transfer_job_node_copy (ThunarVfsTransferJob *transfer_job,
ThunarVfsPath *target_path_return;
gchar *display_name;
GError *err = NULL;
+ gboolean retry;
_thunar_vfs_return_if_fail ((target_path == NULL && target_parent_path != NULL) || (target_path != NULL && target_parent_path == NULL));
_thunar_vfs_return_if_fail (target_path == NULL || transfer_node->next == NULL);
@@ -364,6 +369,7 @@ thunar_vfs_transfer_job_node_copy (ThunarVfsTransferJob *transfer_job,
_thunar_vfs_job_info_message (THUNAR_VFS_JOB (transfer_job), display_name);
g_free (display_name);
+retry_copy:
/* copy the item specified by this node (not recursive!) */
if (thunar_vfs_transfer_job_copy_file (transfer_job, transfer_node->source_path, target_path, &target_path_return, &err))
{
@@ -396,25 +402,42 @@ thunar_vfs_transfer_job_node_copy (ThunarVfsTransferJob *transfer_job,
else
thunar_vfs_path_unref (target_path_return);
+retry_remove:
/* try to remove the source directory if we should move instead of just copy */
if (transfer_job->move && !_thunar_vfs_io_ops_remove (transfer_node->source_path, THUNAR_VFS_IO_OPS_IGNORE_ENOENT, &err))
{
/* we can ignore ENOTEMPTY (which is mapped to G_FILE_ERROR_FAILED) */
if (err->domain == G_FILE_ERROR && err->code == G_FILE_ERROR_FAILED)
- g_clear_error (&err);
+ {
+ /* no error then... */
+ g_clear_error (&err);
+ }
+ else
+ {
+ /* ask the user whether to skip/retry the removal */
+ retry = (_thunar_vfs_job_ask_skip (THUNAR_VFS_JOB (transfer_job), "%s", err->message) == THUNAR_VFS_JOB_RESPONSE_RETRY);
+
+ /* reset the error */
+ g_clear_error (&err);
+
+ /* check whether to retry */
+ if (G_UNLIKELY (retry))
+ goto retry_remove;
+ }
}
}
}
-
- /* check if we failed (ENOSPC cannot be skipped) */
- if (err != NULL && (err->domain != G_FILE_ERROR || err->code != G_FILE_ERROR_NOSPC))
+ else if (err != NULL && (err->domain != G_FILE_ERROR || err->code != G_FILE_ERROR_NOSPC)) /* ENOSPC cannot be skipped! */
{
/* ask the user whether to skip this node and all subnodes (-> cancellation) */
- if (!thunar_vfs_job_cancelled (THUNAR_VFS_JOB (transfer_job)))
- _thunar_vfs_job_ask_skip (THUNAR_VFS_JOB (transfer_job), "%s", err->message);
+ retry = (_thunar_vfs_job_ask_skip (THUNAR_VFS_JOB (transfer_job), "%s", err->message) == THUNAR_VFS_JOB_RESPONSE_RETRY);
/* reset the error */
g_clear_error (&err);
+
+ /* check whether to retry */
+ if (G_UNLIKELY (retry))
+ goto retry_copy;
}
/* release the guessed target_path */
diff --git a/thunar/thunar-dialogs.c b/thunar/thunar-dialogs.c
index 64b79317c..1b5a15cc0 100644
--- a/thunar/thunar-dialogs.c
+++ b/thunar/thunar-dialogs.c
@@ -32,6 +32,9 @@
#endif
#include <thunar/thunar-dialogs.h>
+#include <thunar/thunar-icon-factory.h>
+#include <thunar/thunar-pango-extensions.h>
+#include <thunar/thunar-preferences.h>
#include <thunar/thunar-private.h>
#include <thunar/thunar-util.h>
@@ -309,10 +312,10 @@ thunar_dialogs_show_job_ask (GtkWindow *parent,
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message), "%s", secondary->str);
/* add the buttons based on the possible choices */
- for (n = 4; n >= 0; --n)
+ for (n = 5; n >= 0; --n)
{
- /* "Cancel" should be the last button, but "No to all" was added last */
- m = (n == 4) ? 3 : (n == 3) ? 4 : n;
+ /* "Cancel" should be the last button, but "Retry" was added last */
+ m = (n == 5) ? 3 : (n == 3) ? 5 : n;
/* check if the response is set */
response = choices & (1 << m);
@@ -337,6 +340,10 @@ thunar_dialogs_show_job_ask (GtkWindow *parent,
mnemonic = _("N_o to all");
break;
+ case THUNAR_VFS_JOB_RESPONSE_RETRY:
+ mnemonic = _("_Retry");
+ break;
+
case THUNAR_VFS_JOB_RESPONSE_CANCEL:
response = GTK_RESPONSE_CANCEL;
mnemonic = _("_Cancel");
@@ -372,6 +379,167 @@ thunar_dialogs_show_job_ask (GtkWindow *parent,
+/**
+ * thunar_dialogs_show_job_ask_replace:
+ * @parent : the parent #GtkWindow or %NULL.
+ * @src_info : the #ThunarVfsInfo of the source file.
+ * @dst_info : the #ThunarVfsInfo of the destination file that
+ * may be replaced with the source file.
+ *
+ * Asks the user whether to replace the destination file with the
+ * source file identified by @src_info.
+ *
+ * Return value: the selected #ThunarVfsJobResponse.
+ **/
+ThunarVfsJobResponse
+thunar_dialogs_show_job_ask_replace (GtkWindow *parent,
+ ThunarVfsInfo *src_info,
+ ThunarVfsInfo *dst_info)
+{
+ ThunarIconFactory *icon_factory;
+ ThunarPreferences *preferences;
+ ThunarDateStyle date_style;
+ GtkIconTheme *icon_theme;
+ ThunarFile *src_file;
+ ThunarFile *dst_file;
+ GtkWidget *dialog;
+ GtkWidget *table;
+ GtkWidget *image;
+ GtkWidget *label;
+ GdkPixbuf *icon;
+ gchar *date_string;
+ gchar *size_string;
+ gchar *text;
+ gint response;
+
+ _thunar_return_val_if_fail (parent == NULL || GTK_IS_WINDOW (parent), THUNAR_VFS_JOB_RESPONSE_CANCEL);
+ _thunar_return_val_if_fail (src_info != NULL, THUNAR_VFS_JOB_RESPONSE_CANCEL);
+ _thunar_return_val_if_fail (dst_info != NULL, THUNAR_VFS_JOB_RESPONSE_CANCEL);
+
+ /* determine the style used to format dates */
+ preferences = thunar_preferences_get ();
+ g_object_get (G_OBJECT (preferences), "misc-date-style", &date_style, NULL);
+ g_object_unref (G_OBJECT (preferences));
+
+ /* determine the files for the infos */
+ src_file = thunar_file_get_for_info (src_info);
+ dst_file = thunar_file_get_for_info (dst_info);
+
+ /* setup the confirmation dialog */
+ dialog = gtk_dialog_new_with_buttons (_("Confirm to replace files"),
+ parent,
+ GTK_DIALOG_MODAL
+ | GTK_DIALOG_NO_SEPARATOR
+ | GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ _("_Skip"), THUNAR_VFS_JOB_RESPONSE_NO,
+ _("Replace _All"), THUNAR_VFS_JOB_RESPONSE_YES_ALL,
+ _("_Replace"), THUNAR_VFS_JOB_RESPONSE_YES,
+ NULL);
+ gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+ THUNAR_VFS_JOB_RESPONSE_YES,
+ THUNAR_VFS_JOB_RESPONSE_YES_ALL,
+ THUNAR_VFS_JOB_RESPONSE_NO,
+ GTK_RESPONSE_CANCEL,
+ -1);
+ gtk_dialog_set_default_response (GTK_DIALOG (dialog), THUNAR_VFS_JOB_RESPONSE_YES);
+
+ /* determine the icon factory to use */
+ icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (dialog));
+ icon_factory = thunar_icon_factory_get_for_icon_theme (icon_theme);
+
+ table = g_object_new (GTK_TYPE_TABLE,
+ "border-width", 10,
+ "n-columns", 3,
+ "n-rows", 5,
+ "row-spacing", 6,
+ "column-spacing", 5,
+ NULL);
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, TRUE, TRUE, 0);
+ gtk_widget_show (table);
+
+ image = gtk_image_new_from_icon_name ("stock_folder-copy", GTK_ICON_SIZE_BUTTON);
+ gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
+ gtk_misc_set_padding (GTK_MISC (image), 6, 6);
+ gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 1, GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+ gtk_widget_show (image);
+
+ text = g_strdup_printf (_("This folder already contains a file \"%s\"."), thunar_file_get_display_name (dst_file));
+ label = gtk_label_new (text);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_big ());
+ gtk_table_attach (GTK_TABLE (table), label, 1, 3, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+ gtk_widget_show (label);
+ g_free (text);
+
+ text = g_strdup_printf (Q_("ReplaceDialogPart1|Do you want to replace the existing file"));
+ label = gtk_label_new (text);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_table_attach (GTK_TABLE (table), label, 1, 3, 1, 2, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+ gtk_widget_show (label);
+ g_free (text);
+
+ icon = thunar_icon_factory_load_file_icon (icon_factory, dst_file, THUNAR_FILE_ICON_STATE_DEFAULT, 48);
+ image = gtk_image_new_from_pixbuf (icon);
+ gtk_misc_set_padding (GTK_MISC (image), 6, 6);
+ gtk_table_attach (GTK_TABLE (table), image, 1, 2, 2, 3, GTK_FILL, GTK_FILL, 0, 0);
+ g_object_unref (G_OBJECT (icon));
+ gtk_widget_show (image);
+
+ size_string = thunar_file_get_size_string (dst_file);
+ date_string = thunar_file_get_date_string (dst_file, THUNAR_FILE_DATE_MODIFIED, date_style);
+ text = g_strdup_printf ("%s %s\n%s %s", _("Size:"), size_string, _("Modified:"), date_string);
+ label = gtk_label_new (text);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_table_attach (GTK_TABLE (table), label, 2, 3, 2, 3, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+ gtk_widget_show (label);
+ g_free (size_string);
+ g_free (date_string);
+ g_free (text);
+
+ text = g_strdup_printf (Q_("ReplaceDialogPart2|with the following file?"));
+ label = gtk_label_new (text);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_table_attach (GTK_TABLE (table), label, 1, 3, 3, 4, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+ gtk_widget_show (label);
+ g_free (text);
+
+ icon = thunar_icon_factory_load_file_icon (icon_factory, src_file, THUNAR_FILE_ICON_STATE_DEFAULT, 48);
+ image = gtk_image_new_from_pixbuf (icon);
+ gtk_misc_set_padding (GTK_MISC (image), 6, 6);
+ gtk_table_attach (GTK_TABLE (table), image, 1, 2, 4, 5, GTK_FILL, GTK_FILL, 0, 0);
+ g_object_unref (G_OBJECT (icon));
+ gtk_widget_show (image);
+
+ size_string = thunar_file_get_size_string (src_file);
+ date_string = thunar_file_get_date_string (src_file, THUNAR_FILE_DATE_MODIFIED, date_style);
+ text = g_strdup_printf ("%s %s\n%s %s", _("Size:"), size_string, _("Modified:"), date_string);
+ label = gtk_label_new (text);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_table_attach (GTK_TABLE (table), label, 2, 3, 4, 5, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+ gtk_widget_show (label);
+ g_free (size_string);
+ g_free (date_string);
+ g_free (text);
+
+ /* run the dialog */
+ response = gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+
+ /* cleanup */
+ g_object_unref (G_OBJECT (icon_factory));
+ g_object_unref (G_OBJECT (dst_file));
+ g_object_unref (G_OBJECT (src_file));
+
+ /* translate GTK responses */
+ if (G_UNLIKELY (response < 0))
+ response = THUNAR_VFS_JOB_RESPONSE_CANCEL;
+
+ return response;
+}
+
+
+
/**
* thunar_dialogs_show_job_error:
* @parent : the parent #GtkWindow or %NULL.
diff --git a/thunar/thunar-dialogs.h b/thunar/thunar-dialogs.h
index 6ddc8948f..4830fcb4e 100644
--- a/thunar/thunar-dialogs.h
+++ b/thunar/thunar-dialogs.h
@@ -1,6 +1,6 @@
/* $Id$ */
/*-
- * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+ * Copyright (c) 2005-2007 Benedikt Meurer <benny@xfce.org>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
@@ -24,25 +24,30 @@
G_BEGIN_DECLS;
-void thunar_dialogs_show_about (GtkWindow *parent,
- const gchar *title,
- const gchar *format,
- ...) G_GNUC_INTERNAL G_GNUC_PRINTF (3, 4);
-
-void thunar_dialogs_show_error (gpointer parent,
- const GError *error,
- const gchar *format,
- ...) G_GNUC_INTERNAL G_GNUC_PRINTF (3, 4);
-
-void thunar_dialogs_show_help (gpointer parent,
- const gchar *page,
- const gchar *offset) G_GNUC_INTERNAL;
-
-ThunarVfsJobResponse thunar_dialogs_show_job_ask (GtkWindow *parent,
- const gchar *question,
- ThunarVfsJobResponse choices) G_GNUC_INTERNAL;
-void thunar_dialogs_show_job_error (GtkWindow *parent,
- GError *error) G_GNUC_INTERNAL;
+void thunar_dialogs_show_about (GtkWindow *parent,
+ const gchar *title,
+ const gchar *format,
+ ...) G_GNUC_INTERNAL G_GNUC_PRINTF (3, 4);
+
+void thunar_dialogs_show_error (gpointer parent,
+ const GError *error,
+ const gchar *format,
+ ...) G_GNUC_INTERNAL G_GNUC_PRINTF (3, 4);
+
+void thunar_dialogs_show_help (gpointer parent,
+ const gchar *page,
+ const gchar *offset) G_GNUC_INTERNAL;
+
+ThunarVfsJobResponse thunar_dialogs_show_job_ask (GtkWindow *parent,
+ const gchar *question,
+ ThunarVfsJobResponse choices) G_GNUC_INTERNAL;
+
+ThunarVfsJobResponse thunar_dialogs_show_job_ask_replace (GtkWindow *parent,
+ ThunarVfsInfo *src_info,
+ ThunarVfsInfo *dst_info) G_GNUC_INTERNAL;
+
+void thunar_dialogs_show_job_error (GtkWindow *parent,
+ GError *error) G_GNUC_INTERNAL;
G_END_DECLS;
diff --git a/thunar/thunar-progress-dialog.c b/thunar/thunar-progress-dialog.c
index 0a621a28e..b6cc02205 100644
--- a/thunar/thunar-progress-dialog.c
+++ b/thunar/thunar-progress-dialog.c
@@ -1,6 +1,6 @@
/* $Id$ */
/*-
- * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+ * Copyright (c) 2005-2007 Benedikt Meurer <benny@xfce.org>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
@@ -54,6 +54,10 @@ static ThunarVfsJobResponse thunar_progress_dialog_ask (ThunarProgressD
const gchar *message,
ThunarVfsJobResponse choices,
ThunarVfsJob *job);
+static ThunarVfsJobResponse thunar_progress_dialog_ask_replace (ThunarProgressDialog *dialog,
+ ThunarVfsInfo *src_info,
+ ThunarVfsInfo *dst_info,
+ ThunarVfsJob *job);
static void thunar_progress_dialog_error (ThunarProgressDialog *dialog,
GError *error,
ThunarVfsJob *job);
@@ -283,6 +287,25 @@ thunar_progress_dialog_ask (ThunarProgressDialog *dialog,
+static ThunarVfsJobResponse
+thunar_progress_dialog_ask_replace (ThunarProgressDialog *dialog,
+ ThunarVfsInfo *src_info,
+ ThunarVfsInfo *dst_info,
+ ThunarVfsJob *job)
+{
+ _thunar_return_val_if_fail (THUNAR_IS_PROGRESS_DIALOG (dialog), THUNAR_VFS_JOB_RESPONSE_CANCEL);
+ _thunar_return_val_if_fail (THUNAR_VFS_IS_JOB (job), THUNAR_VFS_JOB_RESPONSE_CANCEL);
+ _thunar_return_val_if_fail (dialog->job == job, THUNAR_VFS_JOB_RESPONSE_CANCEL);
+
+ /* be sure to display the progress dialog prior to opening the question dialog */
+ gtk_widget_show_now (GTK_WIDGET (dialog));
+
+ /* display the question dialog */
+ return thunar_dialogs_show_job_ask_replace (GTK_WINDOW (dialog), src_info, dst_info);
+}
+
+
+
static void
thunar_progress_dialog_error (ThunarProgressDialog *dialog,
GError *error,
@@ -510,6 +533,7 @@ thunar_progress_dialog_set_job (ThunarProgressDialog *dialog,
g_object_ref (G_OBJECT (job));
g_signal_connect_swapped (job, "ask", G_CALLBACK (thunar_progress_dialog_ask), dialog);
+ g_signal_connect_swapped (job, "ask-replace", G_CALLBACK (thunar_progress_dialog_ask_replace), dialog);
g_signal_connect_swapped (job, "error", G_CALLBACK (thunar_progress_dialog_error), dialog);
g_signal_connect_swapped (job, "finished", G_CALLBACK (thunar_progress_dialog_finished), dialog);
g_signal_connect_swapped (job, "info-message", G_CALLBACK (thunar_progress_dialog_info_message), dialog);
--
GitLab