[Xfce4-commits] r25750 - in thunar/trunk: . po thunar thunar-vfs
Benedikt Meurer
benny at xfce.org
Wed May 23 23:30:43 CEST 2007
Author: benny
Date: 2007-05-23 21:30:42 +0000 (Wed, 23 May 2007)
New Revision: 25750
Modified:
thunar/trunk/ChangeLog
thunar/trunk/po/ChangeLog
thunar/trunk/po/Thunar.pot
thunar/trunk/po/ar.po
thunar/trunk/po/be.po
thunar/trunk/po/ca.po
thunar/trunk/po/cs.po
thunar/trunk/po/de.po
thunar/trunk/po/dz.po
thunar/trunk/po/el.po
thunar/trunk/po/en_GB.po
thunar/trunk/po/eo.po
thunar/trunk/po/es.po
thunar/trunk/po/et.po
thunar/trunk/po/eu.po
thunar/trunk/po/fi.po
thunar/trunk/po/fr.po
thunar/trunk/po/gl.po
thunar/trunk/po/he.po
thunar/trunk/po/hu.po
thunar/trunk/po/it.po
thunar/trunk/po/ja.po
thunar/trunk/po/ka.po
thunar/trunk/po/ko.po
thunar/trunk/po/lt.po
thunar/trunk/po/mk.po
thunar/trunk/po/nb_NO.po
thunar/trunk/po/nl.po
thunar/trunk/po/pa.po
thunar/trunk/po/pl.po
thunar/trunk/po/pt_BR.po
thunar/trunk/po/ro.po
thunar/trunk/po/ru.po
thunar/trunk/po/sq.po
thunar/trunk/po/sv.po
thunar/trunk/po/tr.po
thunar/trunk/po/uk.po
thunar/trunk/po/zh_CN.po
thunar/trunk/po/zh_TW.po
thunar/trunk/thunar-vfs/thunar-vfs-io-jobs.c
thunar/trunk/thunar-vfs/thunar-vfs-job-private.h
thunar/trunk/thunar-vfs/thunar-vfs-job.c
thunar/trunk/thunar-vfs/thunar-vfs-job.h
thunar/trunk/thunar-vfs/thunar-vfs-marshal.list
thunar/trunk/thunar-vfs/thunar-vfs-transfer-job.c
thunar/trunk/thunar/thunar-dialogs.c
thunar/trunk/thunar/thunar-dialogs.h
thunar/trunk/thunar/thunar-progress-dialog.c
Log:
2007-05-23 Benedikt Meurer <benny at 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.
Modified: thunar/trunk/ChangeLog
===================================================================
--- thunar/trunk/ChangeLog 2007-05-23 07:45:19 UTC (rev 25749)
+++ thunar/trunk/ChangeLog 2007-05-23 21:30:42 UTC (rev 25750)
@@ -1,3 +1,18 @@
+2007-05-23 Benedikt Meurer <benny at 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 at xfce.org>
* configure.in.in, docs/README.thunarrc, thunar/: Add support for
Modified: thunar/trunk/po/ChangeLog
===================================================================
--- thunar/trunk/po/ChangeLog 2007-05-23 07:45:19 UTC (rev 25749)
+++ thunar/trunk/po/ChangeLog 2007-05-23 21:30:42 UTC (rev 25750)
@@ -1,6 +1,13 @@
-2007-05-22 Eren Türkay <erenturkay at xfce.org>
- * tr.po: Updated.
+2007-05-23 Benedikt Meurer <benny at xfce.org>
+ * tr.po: Revert broken file.
+ * *.po, *.pot: Merge new strings.
+ * de.po: Update german translations.
+
+2007-05-22 Eren Turkay <erenturkay at xfce.org>
+
+ * tr.po: Updated.
+
2007-05-22 Benedikt Meurer <benny at xfce.org>
* *.po, *.pot: Merge new strings.
Modified: thunar/trunk/po/Thunar.pot
===================================================================
--- thunar/trunk/po/Thunar.pot 2007-05-23 07:45:19 UTC (rev 25749)
+++ thunar/trunk/po/Thunar.pot 2007-05-23 21:30:42 UTC (rev 25750)
@@ -8,7 +8,7 @@
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 at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -57,29 +57,29 @@
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 @@
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 @@
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 @@
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 @@
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 ""
Modified: thunar/trunk/po/ar.po
===================================================================
--- thunar/trunk/po/ar.po 2007-05-23 07:45:19 UTC (rev 25749)
+++ thunar/trunk/po/ar.po 2007-05-23 21:30:42 UTC (rev 25750)
@@ -9,7 +9,7 @@
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 at yahoo.com>\n"
"Language-Team: Arabic <doc at arabeyes.org>\n"
@@ -61,29 +61,29 @@
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 @@
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 @@
"↵\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 @@
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 @@
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[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[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 @@
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 ""
Modified: thunar/trunk/po/be.po
===================================================================
--- thunar/trunk/po/be.po 2007-05-23 07:45:19 UTC (rev 25749)
+++ thunar/trunk/po/be.po 2007-05-23 21:30:42 UTC (rev 25750)
@@ -7,7 +7,7 @@
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 at gmail.com>\n"
"Language-Team: Belarusian <be at li.org>\n"
@@ -58,29 +58,29 @@
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 @@
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 @@
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 @@
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[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[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 @@
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 "Том:"
@@ -3420,11 +3468,6 @@
#~ 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"
#~ "Do you want to skip it?"
Modified: thunar/trunk/po/ca.po
===================================================================
--- thunar/trunk/po/ca.po 2007-05-23 07:45:19 UTC (rev 25749)
+++ thunar/trunk/po/ca.po 2007-05-23 21:30:42 UTC (rev 25750)
@@ -9,7 +9,7 @@
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 at bulma.net>\n"
"Language-Team: Catalan\n"
@@ -59,29 +59,29 @@
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 @@
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 @@
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 @@
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 @@
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:"
Modified: thunar/trunk/po/cs.po
===================================================================
--- thunar/trunk/po/cs.po 2007-05-23 07:45:19 UTC (rev 25749)
+++ thunar/trunk/po/cs.po 2007-05-23 21:30:42 UTC (rev 25750)
@@ -7,7 +7,7 @@
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 at gmail.com>\n"
"Language-Team: Čeština <translation-team-cs at lists.sourceforge.net>\n"
@@ -56,29 +56,29 @@
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 @@
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 @@
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 @@
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[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[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 @@
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:"
@@ -3445,11 +3493,6 @@
#~ 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"
#~ "Do you want to skip it?"
Modified: thunar/trunk/po/de.po
===================================================================
--- thunar/trunk/po/de.po 2007-05-23 07:45:19 UTC (rev 25749)
+++ thunar/trunk/po/de.po 2007-05-23 21:30:42 UTC (rev 25750)
@@ -9,8 +9,8 @@
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 at xfce.org>\n"
"Language-Team: German <de at li.org>\n"
"MIME-Version: 1.0\n"
@@ -58,29 +58,29 @@
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 @@
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 @@
msgid "Details view"
msgstr "Detailansicht"
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr ""
"Benedikt Meurer <benny at xfce.org>\n"
@@ -904,30 +916,77 @@
#. 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 @@
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 @@
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 @@
#: ../Thunar-folder-handler.desktop.in.in.h:3
msgid "Open the specified folders in Thunar"
msgstr "Angegebene Ordner mit Thunar öffnen"
-
Modified: thunar/trunk/po/dz.po
===================================================================
--- thunar/trunk/po/dz.po 2007-05-23 07:45:19 UTC (rev 25749)
+++ thunar/trunk/po/dz.po 2007-05-23 21:30:42 UTC (rev 25750)
@@ -7,7 +7,7 @@
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 at yahoo.com>\n"
"Language-Team: Dzongkha <pgeyleg at dit.gov.bt>\n"
@@ -59,29 +59,29 @@
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 @@
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 @@
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 @@
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 @@
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 "སྐད་ཤུགས།"
Modified: thunar/trunk/po/el.po
===================================================================
--- thunar/trunk/po/el.po 2007-05-23 07:45:19 UTC (rev 25749)
+++ thunar/trunk/po/el.po 2007-05-23 21:30:42 UTC (rev 25750)
@@ -8,7 +8,7 @@
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 at freemail.gr>\n"
"Language-Team: Greek <nls at tux.hellug.gr>\n"
@@ -58,29 +58,29 @@
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 @@
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 @@
msgid "Details view"
msgstr "Προβολή λεπτομερειών"
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr ""
"Σταύρος Γιαννούρης <stavrosg at hellug.gr>\n"
@@ -898,30 +907,80 @@
#. 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 @@
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 @@
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 "Τόμος:"
Modified: thunar/trunk/po/en_GB.po
===================================================================
--- thunar/trunk/po/en_GB.po 2007-05-23 07:45:19 UTC (rev 25749)
+++ thunar/trunk/po/en_GB.po 2007-05-23 21:30:42 UTC (rev 25750)
@@ -9,7 +9,7 @@
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 at gmail.com>\n"
"Language-Team: English/GB\n"
@@ -58,29 +58,29 @@
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 @@
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 @@
msgid "Details view"
msgstr "Details view"
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr "Jeff Bailes <thepizzaking at 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 @@
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 @@
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:"
Modified: thunar/trunk/po/eo.po
===================================================================
--- thunar/trunk/po/eo.po 2007-05-23 07:45:19 UTC (rev 25749)
+++ thunar/trunk/po/eo.po 2007-05-23 21:30:42 UTC (rev 25750)
@@ -9,7 +9,7 @@
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 at gmail.com>\n"
"Language-Team: Esperanto <debian-l10n-esperanto at lists.debian.org>\n"
@@ -58,29 +58,29 @@
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 @@
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 @@
msgid "Details view"
msgstr "Montru detalojn"
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr ""
"Antono Vasiljev <antono.vasiljev at gmail.com>\n"
@@ -895,30 +906,80 @@
#. 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 @@
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 @@
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:"
@@ -3394,13 +3444,6 @@
#~ 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"
#~ "Do you want to skip it?"
Modified: thunar/trunk/po/es.po
===================================================================
--- thunar/trunk/po/es.po 2007-05-23 07:45:19 UTC (rev 25749)
+++ thunar/trunk/po/es.po 2007-05-23 21:30:42 UTC (rev 25750)
@@ -9,7 +9,7 @@
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 at yahoo.es>\n"
"Language-Team: Spanish <es at li.org>\n"
@@ -59,29 +59,29 @@
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 @@
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 @@
"\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 @@
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 at 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 @@
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 @@
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:"
@@ -3441,11 +3488,6 @@
#~ 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"
#~ "Do you want to skip it?"
Modified: thunar/trunk/po/et.po
===================================================================
--- thunar/trunk/po/et.po 2007-05-23 07:45:19 UTC (rev 25749)
+++ thunar/trunk/po/et.po 2007-05-23 21:30:42 UTC (rev 25750)
@@ -7,7 +7,7 @@
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 at proekspert.ee>\n"
"Language-Team: Estonian <et at li.org>\n"
@@ -57,29 +57,29 @@
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 @@
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 @@
"\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 @@
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 @@
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 @@
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:"
@@ -3413,11 +3460,6 @@
#~ 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"
#~ "Do you want to skip it?"
Modified: thunar/trunk/po/eu.po
===================================================================
--- thunar/trunk/po/eu.po 2007-05-23 07:45:19 UTC (rev 25749)
+++ thunar/trunk/po/eu.po 2007-05-23 21:30:42 UTC (rev 25750)
@@ -8,7 +8,7 @@
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 at beobide.net>\n"
"Language-Team: librezale <librezale at librezale.org>\n"
@@ -58,29 +58,29 @@
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 @@
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 @@
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 @@
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 @@
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:"
Modified: thunar/trunk/po/fi.po
===================================================================
--- thunar/trunk/po/fi.po 2007-05-23 07:45:19 UTC (rev 25749)
+++ thunar/trunk/po/fi.po 2007-05-23 21:30:42 UTC (rev 25750)
@@ -7,7 +7,7 @@
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 at pp1.inet.fi>\n"
"Language-Team: Finnish <translation-team-fi at lists.sourceforge.net>\n"
@@ -56,29 +56,29 @@
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 @@
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 @@
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 at 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 @@
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 @@
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:"
Modified: thunar/trunk/po/fr.po
===================================================================
--- thunar/trunk/po/fr.po 2007-05-23 07:45:19 UTC (rev 25749)
+++ thunar/trunk/po/fr.po 2007-05-23 21:30:42 UTC (rev 25750)
@@ -10,7 +10,7 @@
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 at solnet.ch>\n"
"Language-Team: French <xfce-i18n at xfce.org>\n"
@@ -59,29 +59,29 @@
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 @@
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 @@
msgid "Details view"
msgstr "Vue détails"
-#: ../thunar/thunar-dialogs.c:101
+#: ../thunar/thunar-dialogs.c:104
msgid "translator-credits"
msgstr ""
"Stephane Roy <sroy at j2n.net>\n"
@@ -900,30 +909,80 @@
#. 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 @@
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 @@
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 :"
Modified: thunar/trunk/po/gl.po
===================================================================
--- thunar/trunk/po/gl.po 2007-05-23 07:45:19