diff options
Diffstat (limited to 'plugins/CopyEngine/Ultracopier-Spec/Languages')
29 files changed, 2712 insertions, 2252 deletions
diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/ar/translation.qm b/plugins/CopyEngine/Ultracopier-Spec/Languages/ar/translation.qm Binary files differindex a48b608..cadeaf2 100644 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/ar/translation.qm +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/ar/translation.qm diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/ar/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/ar/translation.ts index d2b3fda..7ff11cf 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/ar/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/ar/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation>تم إجبار المحرك على الحركة ، لا يمكنك نسخه</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation>تم إجبار المحرك على النسخ ، لا يمكنك التحرك معه</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> <translation>الوجهه</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation>استخدام الوجهة الفعلية "%1" ؟</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation>تم فرض الوضع مسبقا. هذا خطا داخلي ، الرجاء الإبلاغ عنه</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation>اسال</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation>تخطي</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation>دمج</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation>اعاده تسميه</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation>وضع في نهاية</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation>الكتابة فوق</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation>الكتابة فوق إذا كان مختلفا</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation>الكتابة فوق إذا كان أحدث</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation>الكتابة فوق إذا كان أقدم</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation>خطا في الخيارات</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation>لم يتم تحميل محرك الخيارات. غير قادر علي الوصول إلى الفلاتر</translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation>اسال</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation>تخطي</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation>دمج</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation>اعاده تسميه</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation>وضع في نهاية</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation>الكتابة فوق</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation>الكتابة فوق إذا كان مختلفا</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation>الكتابة فوق إذا كان أحدث</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation>الكتابة فوق إذا كان أقدم</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation>خطا في الخيارات</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation>لم يتم تحميل محرك الخيارات. غير قادر علي الوصول إلى الفلاتر</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation>لم يتم تحميل محرك الخيارات. غير قادر علي الوصول إلى الفلاتر</translation> </message> @@ -200,12 +206,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation>خطأ في المجلد</translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation>اسم المجلد</translation> </message> @@ -213,22 +219,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation>% اسم%-نسخ% لاحقه%</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation>(% الاسم%-النسخ (% العدد%% اللاحق +ه%</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation>الخطا</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation>حاول أعاده تسميه باستخدام أحرف خاصه</translation> </message> @@ -236,22 +242,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation>% اسم%-نسخ% لاحقه%</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation>(% الاسم%-النسخ (% العدد%% اللاحق +ه%</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation>الخطا</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation>حاول أعاده تسميه باستخدام أحرف خاصه</translation> </message> @@ -398,27 +404,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation>المجلد موجود بالفعل</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation>% اسم%-نسخ% لاحقه%</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation>(% الاسم%-النسخ (% العدد%% اللاحق +ه%</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation>الخطا</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation>حاول أعاده التسميه باستخدام أحرف خاصه</translation> </message> @@ -478,6 +484,8 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation>غير قادر على إنشاء المجلد</translation> </message> @@ -487,28 +495,33 @@ <translation>مجلد المصدر غير موجود</translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation>غير قادر على أعاده تسميه المجلد المؤقت</translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation>غير قادر على القيام بالخطوة الحقيقية النهائية المجلد</translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation>غير قادر على نقل المجلد</translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation>errno: %1 :غير قادر على نقل المجلد</translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation>غير قادر على أزاله</translation> </message> @@ -521,12 +534,12 @@ <translation>خطا داخلي ، يرجى الإبلاغ عن ذلك!</translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation>غير قادر على قراءه الملف المصدر:</translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation>تم اقتطاع الملف اثناء القراءة ، وتغيير البيانات المحتملة</translation> </message> @@ -582,32 +595,38 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> - <translation>%1-نسخ</translation> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> + <source>%1 - copy</source> + <translation>%1-نسخ</translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> <source>%1 - copy (%2)</source> <translation>%1 - نسخ (%2)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> + <location filename="../../ScanFileOrFolder.cpp" line="587"/> + <location filename="../../ScanFileOrFolder.cpp" line="589"/> <source>%name% - copy</source> <translation>%اسم% - نسخ</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="587"/> - <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation>% الاسم%-النسخة (% العدد%)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation>مشكله في قراءه المجلد</translation> </message> @@ -615,29 +634,29 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation>% اسم%-نسخ% لاحقه%</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation>(% الاسم%-النسخ (% العدد%% اللاحق +ه%</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation>الملف غير موجود</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation>غير قادر على تغيير التاريخ</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation>حاول أعاده تسميه باستخدام أحرف خاصه</translation> </message> @@ -645,19 +664,19 @@ <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation>تاريخ تعديل خاطئ أو غير قادر علي الحصول عليه ، يمكنك تعطيل نقل الوقت للقيام بذلك</translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished">غير قادر على إنشاء مجلد الوجهة:</translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished">errno: %1 غير قادر علي إنشاء المجلد الوجهة</translation> </message> @@ -665,24 +684,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation>(خطأ في دقة المسار (مسار فارغ</translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation>غير قادر على إنشاء مجلد الوجهة:</translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation>errno: %1 غير قادر علي إنشاء المجلد الوجهة</translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation>خطا داخلي ، يرجى الإبلاغ عن ذلك!</translation> </message> @@ -976,12 +995,27 @@ <translation>& تنفيذ هذا الاجراء دوما</translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> <translation>الكتابة فوق إذا اختلف تاريخ التعديل</translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="357"/> + <source>Overwrite if destination older</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="362"/> <location filename="../../fileExistsDialog.ui" line="365"/> <source>Overwrite if not same size</source> @@ -1013,17 +1047,6 @@ <source>&Cancel</source> <translation>&الغاء الامر</translation> </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation>الكتابة فوق إذا كان أحدث</translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="354"/> - <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation>الكتابة فوق إذا كان أقدم</translation> - </message> </context> <context> <name>fileIsSameDialog</name> diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/de/translation.qm b/plugins/CopyEngine/Ultracopier-Spec/Languages/de/translation.qm Binary files differindex 10475cf..6a89849 100644 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/de/translation.qm +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/de/translation.qm diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/de/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/de/translation.ts index 0a32a65..30906dd 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/de/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/de/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation>Verschiebemodus - Sie können nicht kopieren</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation>Kopiermodus - Sie können nicht verschieben</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> <translation>Ziel</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation>Aktuelles Ziel: "%1" benutzen?</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation>Der Modus wurde vorher erzwungen. Interner Fehler - Bitte bei mir melden</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation>Fragen</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation>Überspringen</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation>Fusionieren</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation>Umbenennen</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation>Ans Ende verschieben</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation>Überschreiben</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation>Überschreiben, falls verschieden</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation>Überschreiben, falls neuer</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation>Überschreiben, falls älter</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation>Fehlerhafte Optionen</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation>Optionen nicht geladen - Kein Zugriff auf Filter</translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation>Fragen</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation>Überspringen</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation>Fusionieren</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation>Umbenennen</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation>Ans Ende verschieben</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation>Überschreiben</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation>Überschreiben, falls verschieden</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation>Überschreiben, falls neuer</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation>Überschreiben, falls älter</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation>Fehlerhafte Optionen</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation>Option nicht geladen - Kein Zugriff auf Filter</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation>Option nicht geladen - Kann nicht auf Filter zugreifen</translation> </message> @@ -200,12 +206,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation>Ordnerfehler</translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation>Ordnername</translation> </message> @@ -213,22 +219,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished">%name% - Kopie%suffix%</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished">%name% - Kopie% (%number%)%suffix%</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation>Versuche Umbenennung mit Sonderzeichen</translation> </message> @@ -236,22 +242,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished">%name% - Kopie%suffix%</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished">%name% - Kopie% (%number%)%suffix%</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation>Versuche Umbenennung mit Sonderzeichen</translation> </message> @@ -398,27 +404,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation>Ordner existiert bereits</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished">%name% - Kopie%suffix%</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished">%name% - Kopie% (%number%)%suffix%</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation>Versuche Umbenennung mit Sonderzeichen</translation> </message> @@ -478,6 +484,8 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation>Der Ordner kann nicht erstellt werden</translation> </message> @@ -487,28 +495,33 @@ <translation>Quell-Ordner existiert nicht</translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation>Kann den Ordner nicht temporär umbenennen</translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation>Kann den Ordner nicht endgültig verschieben</translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation>Kann den Ordner nicht verschieben</translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation>Kann Ordner nicht verschieben: Fehler Nummer: %1</translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation>Kann nicht löschen</translation> </message> @@ -521,12 +534,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -582,32 +595,38 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> - <translation>%1 - Kopie</translation> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> + <source>%1 - copy</source> + <translation>%1 - Kopie</translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> <source>%1 - copy (%2)</source> <translation>%1 - Kopie (%2)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> + <location filename="../../ScanFileOrFolder.cpp" line="587"/> + <location filename="../../ScanFileOrFolder.cpp" line="589"/> <source>%name% - copy</source> <translation>%name% - Kopie</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="587"/> - <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation>%name% - Kopie (%number%)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation>Problem beim Lesen des Ordners</translation> </message> @@ -615,29 +634,29 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished">%name% - Kopie%suffix%</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished">%name% - Kopie% (%number%)%suffix%</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation>Datei nicht gefunden</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation>Kann Datum nicht ändern</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation>Versuche Umbenennung mit Sonderzeichen</translation> </message> @@ -645,19 +664,19 @@ <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation>Falsches Änderungsdatum oder Fehler beim Auslesen, Sie können die Übertragung des Zeitstempels deaktivieren</translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished">Zielordner konnte nicht erstellt werden: </translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished">Zielordner konnte nicht erstellt werden, Fehler Nummer: %1</translation> </message> @@ -665,24 +684,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished">Zielordner konnte nicht erstellt werden: </translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished">Zielordner konnte nicht erstellt werden, Fehler Nummer: %1</translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -976,12 +995,27 @@ <translation>&Aktion immer ausführen</translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> <translation>Überschreiben, falls Änderungsdatum verschieden</translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="357"/> + <source>Overwrite if destination older</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="362"/> <location filename="../../fileExistsDialog.ui" line="365"/> <source>Overwrite if not same size</source> @@ -1013,17 +1047,6 @@ <source>&Cancel</source> <translation>Abbrechen (&C)</translation> </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation>Überschreiben, falls neuer</translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="354"/> - <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation>Überschreiben, falls älter</translation> - </message> </context> <context> <name>fileIsSameDialog</name> diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/el/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/el/translation.ts index f608b09..f043c14 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/el/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/el/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -200,12 +206,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -213,22 +219,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -236,22 +242,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -398,27 +404,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -478,6 +484,8 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -487,28 +495,33 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> @@ -521,12 +534,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -582,32 +595,38 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="587"/> <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -615,29 +634,29 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -645,19 +664,19 @@ <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -665,24 +684,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -976,12 +995,27 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="357"/> + <source>Overwrite if destination older</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="362"/> <location filename="../../fileExistsDialog.ui" line="365"/> <source>Overwrite if not same size</source> @@ -1013,17 +1047,6 @@ <source>&Cancel</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="354"/> - <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>fileIsSameDialog</name> diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/en/translation.qm b/plugins/CopyEngine/Ultracopier-Spec/Languages/en/translation.qm Binary files differindex d925dd6..922339a 100644 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/en/translation.qm +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/en/translation.qm diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/en/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/en/translation.ts index 7bb754e..9d266b0 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/en/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/en/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -200,12 +206,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -213,22 +219,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -236,22 +242,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -398,27 +404,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -478,6 +484,8 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -487,28 +495,33 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> @@ -521,12 +534,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -582,32 +595,38 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="587"/> <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -615,29 +634,29 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -645,19 +664,19 @@ <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -665,24 +684,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -976,12 +995,27 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="357"/> + <source>Overwrite if destination older</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="362"/> <location filename="../../fileExistsDialog.ui" line="365"/> <source>Overwrite if not same size</source> @@ -1013,17 +1047,6 @@ <source>&Cancel</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="354"/> - <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>fileIsSameDialog</name> diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/es/translation.qm b/plugins/CopyEngine/Ultracopier-Spec/Languages/es/translation.qm Binary files differindex feaf1fc..f4883db 100644 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/es/translation.qm +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/es/translation.qm diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/es/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/es/translation.ts index 3565910..41a5dbb 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/es/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/es/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation>El motor se ve obligado a moverse, no se puede copiar con ella</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation>El motor se ve obligado a copiar, no te puedes mover con él</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> <translation>Destino</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation>Utilice el destino "%1" actual?</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation>El modo se ha visto obligado previamente. Este es un error interno, por favor repórtelo</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation>Compatible solo con Windows</translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation>Pedir</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation>Omitir</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation>Unir</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation>Cambiar el nombre</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation>Ponga al final</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation>Sobrescribir</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation>Sobrescribir si es diferente</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation>Sobrescribir si nuevo</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation>Sobrescribir si es mayor</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation>error Opciones</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation>Opciones del motor no está cargado. No es posible acceder a los filtros</translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> - <translation type="unfinished"></translation> + <translation>Compatible solo con Windows</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation>Pedir</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation>Omitir</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation>Unir</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation>Cambiar el nombre</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation>Ponga al final</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation>Sobrescribir</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation>Sobrescribir si es diferente</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation>Sobrescribir si nuevo</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation>Sobrescribir si es mayor</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation>error Opciones</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation>Opciones del motor no está cargado. No es posible acceder a los filtros</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation>Opciones del motor no está cargado, no se puede acceder a los filtros</translation> </message> @@ -200,12 +206,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation>Error en la carpeta</translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation>Nombre de la carpeta</translation> </message> @@ -213,22 +219,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation>%name% - copia%suffix%</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation>%name% - copia (%number%)%suffix%</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation>Trate de cambiar el nombre con el uso de caracteres especiales</translation> </message> @@ -236,22 +242,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation>%name% - copia%suffix%</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation>%name% - copia (%number%)%suffix%</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation>Trate de cambiar el nombre con el uso de caracteres especiales</translation> </message> @@ -398,27 +404,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation>Carpeta ya existe</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation>%name% - copia%suffix%</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation>%name% - copia (%number%)%suffix%</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation>Trate de cambiar el nombre con el uso de caracteres especiales</translation> </message> @@ -478,6 +484,8 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation>No se puede crear la carpeta</translation> </message> @@ -487,28 +495,33 @@ <translation>La carpeta de origen no existe</translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation>No es posible cambiar el nombre de la carpeta temporal</translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation>No se puede revertir el cambio de nombre temporal para un movimiento real</translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation>No se puede hacer el movimiento final real de la carpeta</translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation>No se puede mover la carpeta</translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation>No se puede mover la carpeta: errno: %1</translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation>No se puede eliminar</translation> </message> @@ -521,12 +534,12 @@ <translation>¡Error interno, por favor repórtelo!</translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation>No se puede leer el archivo fuente: </translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation>Archivo truncado durante la lectura, posible cambio de datos</translation> </message> @@ -582,32 +595,38 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> - <translation>%1 - copia</translation> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> + <translation>Carpeta en la lista negra</translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> + <source>%1 - copy</source> + <translation>%1 - copia</translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> <source>%1 - copy (%2)</source> <translation>%1 - copia (%2)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> + <location filename="../../ScanFileOrFolder.cpp" line="587"/> + <location filename="../../ScanFileOrFolder.cpp" line="589"/> <source>%name% - copy</source> <translation>%name% - copia</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="587"/> - <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation>%name% - copia (%number%)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation>Problema con la carpeta leída</translation> </message> @@ -615,29 +634,29 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation>%name% - copia%suffix%</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation>%name% - copia (%number%)%suffix%</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation>Archivo no encontrado</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation>No se puede cambiar la fecha</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation>Trate de cambiar el nombre con el uso de caracteres especiales</translation> </message> @@ -645,19 +664,19 @@ <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation>Fecha de modificación incorrecta o incapaz de obtenerla, puede desactivar la transferencia de tiempo para hacerlo</translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation>No se puede crear la carpeta de destino: </translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation>No se puede crear la carpeta de destino, errno: %1</translation> </message> @@ -665,24 +684,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation>Error de resolución de ruta (ruta vacía)</translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation>No se puede crear la carpeta de destino: </translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation>No se puede crear la carpeta de destino, errno: %1</translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation>¡Error interno, por favor repórtelo!</translation> </message> @@ -793,7 +812,7 @@ <location filename="../../copyEngineOptions.ui" line="397"/> <location filename="../../copyEngineOptions.ui" line="413"/> <source>MB</source> - <translation type="unfinished"></translation> + <translation>MB</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="429"/> @@ -803,32 +822,32 @@ <message> <location filename="../../copyEngineOptions.ui" line="436"/> <source>OS Buffer</source> - <translation type="unfinished"></translation> + <translation>Búfer del SO</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="456"/> <source>Disable parallel transfer when are different devices</source> - <translation type="unfinished"></translation> + <translation>Deshabilitar la transferencia paralela cuando hay diferentes dispositivos</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="463"/> <source>Buffer for different device</source> - <translation type="unfinished"></translation> + <translation>Búfer para diferentes dispositivos</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="470"/> <source>OS FLags</source> - <translation type="unfinished"></translation> + <translation>Banderas de SO</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="477"/> <source>Buffer for same device</source> - <translation type="unfinished"></translation> + <translation>Búfer para el mismo dispositivo</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="484"/> <source>OS native copy (disable speed limitation)</source> - <translation type="unfinished"></translation> + <translation>Copia nativa del sistema operativo (deshabilitar la limitación de velocidad)</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="514"/> @@ -976,12 +995,27 @@ <translation>&Siempre realice esta acción</translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation>Sobrescribir si la fuente es más nueva que el destino</translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> <translation>Sobrescribir si la fecha de modificación difiere</translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation>Sobrescribir si la fuente es más antigua que el destino</translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="357"/> + <source>Overwrite if destination older</source> + <translation>Sobrescribir si el destino es más antiguo</translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="362"/> <location filename="../../fileExistsDialog.ui" line="365"/> <source>Overwrite if not same size</source> @@ -1013,17 +1047,6 @@ <source>&Cancel</source> <translation>Ca&ncelar</translation> </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation>Sobrescribir si nuevo</translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="354"/> - <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation>Sobrescribir si es mayor</translation> - </message> </context> <context> <name>fileIsSameDialog</name> diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/fr/translation.qm b/plugins/CopyEngine/Ultracopier-Spec/Languages/fr/translation.qm Binary files differindex c538b95..a40a9f1 100644 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/fr/translation.qm +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/fr/translation.qm diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/fr/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/fr/translation.ts index 19789ff..094e612 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/fr/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/fr/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation>Le moteur est forcé en déplacement, vous ne pouvez pas copier avec</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation>Le moteur est forcé en copie, vous ne pouvez pas déplacer avec</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> <translation>Destination</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation>Utiliser la destination actuelle "%1"?</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation>Le mode a été forcé. C'est une erreur interne, merci de la repporter</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation>Pris en charge uniquement sous Windows</translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation>Demander</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation>Passer</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation>Fusionner</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation>Renommer</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation>Mettre à la fin</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation>Écraser</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation>Écraser si différent</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation>Écraser si plus récent</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation>Écraser si plus vieux</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation>Erreur d'options</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation>Le moteur d'options n'est pas chargé. Impossible d'accédé aux filtres</translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> - <translation type="unfinished"></translation> + <translation>Pris en charge uniquement sous Windows</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation>Demander</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation>Passer</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation>Fusionner</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation>Renommer</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation>Mettre à la fin</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation>Écraser</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation>Écraser si différent</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation>Écraser si plus récent</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation>Écraser si plus vieux</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation>Erreur d'options</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation>Le moteur d'options n'est pas chargé. Impossible d'accédé aux filtres</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation>Moteur d'options non chargé, impossible d'accéder aux filtres</translation> </message> @@ -200,12 +206,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation>Erreur sur un dossier</translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation>Nom de répertoire</translation> </message> @@ -213,22 +219,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation>%name% - copie%suffix%</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation>%name% - copie (%number%)%suffix%</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation>Essaie de renommage avec caratéres interdits</translation> </message> @@ -236,22 +242,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation>%name% - copie%suffix%</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation>%name% - copie (%number%)%suffix%</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation>Essaie de renommage avec caratéres interdits</translation> </message> @@ -398,27 +404,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation>Dossier déjà existant</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation>%name% - copie%suffix%</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation>%name% - copie (%number%)%suffix%</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation>Essaie de renommage avec caratéres interdits</translation> </message> @@ -478,6 +484,8 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation>Impossible de créer le répertoire</translation> </message> @@ -487,28 +495,33 @@ <translation>Le dossier source n'éxiste pas</translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation>Impossible de renommer le dossier</translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation>Impossible d'inverser le renommage temporaire pour un déplacement réel</translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation>Impossible de faire le déplacement final du dossier</translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation>Impossible de déplacer le dossier</translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation>Impossible de déplacer le dossier: errno: %1</translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation>Impossible de supprimer</translation> </message> @@ -521,12 +534,12 @@ <translation>Erreur interne, veuillez la signaler!</translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation>Impossible de lire le fichier source: </translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation>Fichier tronqué lors de la lecture, modification possible des données</translation> </message> @@ -582,32 +595,38 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> - <translation>%1 - copie</translation> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> + <translation>Dossier sur liste noire</translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> + <source>%1 - copy</source> + <translation>%1 - copie</translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> <source>%1 - copy (%2)</source> <translation>%1 - copie (%2)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> + <location filename="../../ScanFileOrFolder.cpp" line="587"/> + <location filename="../../ScanFileOrFolder.cpp" line="589"/> <source>%name% - copy</source> <translation>%name% - copie</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="587"/> - <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation>%name% - copie (%number%)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation>Probléme avec la lecture du dossier</translation> </message> @@ -615,29 +634,29 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation>%name% - copie%suffix%</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation>%name% - copie (%number%)%suffix%</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation>Fichier non trouvé</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation>Essaie de renommage avec caratéres interdits</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation>Impossible de changer la date</translation> </message> @@ -645,19 +664,19 @@ <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation>Mauvaise date de modification ou impossible de l'avoir, vous pouvez désactiver le transfert de celui-ci</translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation>Impossible de créer le dossier de destination: </translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation>Impossible de créer le dossier de destination, errno: %1</translation> </message> @@ -665,24 +684,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation>Erreur de résolution de chemin (chemin vide)</translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation>Impossible de créer le dossier de destination: </translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation>Impossible de créer le dossier de destination, errno: %1</translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation>Erreur interne, veuillez la signaler!</translation> </message> @@ -793,7 +812,7 @@ <location filename="../../copyEngineOptions.ui" line="397"/> <location filename="../../copyEngineOptions.ui" line="413"/> <source>MB</source> - <translation type="unfinished"></translation> + <translation>Mo</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="429"/> @@ -803,32 +822,32 @@ <message> <location filename="../../copyEngineOptions.ui" line="436"/> <source>OS Buffer</source> - <translation type="unfinished"></translation> + <translation>Tampon du système d'exploitation</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="456"/> <source>Disable parallel transfer when are different devices</source> - <translation type="unfinished"></translation> + <translation>Désactiver le transfert parallèle lorsque différents appareils</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="463"/> <source>Buffer for different device</source> - <translation type="unfinished"></translation> + <translation>Tampon pour différents appareils</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="470"/> <source>OS FLags</source> - <translation type="unfinished"></translation> + <translation>Drapeaux du système d'exploitation</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="477"/> <source>Buffer for same device</source> - <translation type="unfinished"></translation> + <translation>Tampon pour le même appareil</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="484"/> <source>OS native copy (disable speed limitation)</source> - <translation type="unfinished"></translation> + <translation>Copie native du système d'exploitation (désactiver la limitation de vitesse)</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="514"/> @@ -976,12 +995,27 @@ <translation>&Toujours faire cette action</translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation>Écraser si la source est plus récente que la destination</translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> <translation>Écraser si les dates différes</translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation>Écraser si la source est antérieure à la destination</translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="357"/> + <source>Overwrite if destination older</source> + <translation>Écraser si destination plus ancienne</translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="362"/> <location filename="../../fileExistsDialog.ui" line="365"/> <source>Overwrite if not same size</source> @@ -1013,17 +1047,6 @@ <source>&Cancel</source> <translation>&Annuler</translation> </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation>Écraser si plus récent</translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="354"/> - <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation>Écraser si plus vieux</translation> - </message> </context> <context> <name>fileIsSameDialog</name> diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/hi/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/hi/translation.ts index f608b09..f043c14 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/hi/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/hi/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -200,12 +206,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -213,22 +219,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -236,22 +242,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -398,27 +404,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -478,6 +484,8 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -487,28 +495,33 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> @@ -521,12 +534,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -582,32 +595,38 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="587"/> <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -615,29 +634,29 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -645,19 +664,19 @@ <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -665,24 +684,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -976,12 +995,27 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="357"/> + <source>Overwrite if destination older</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="362"/> <location filename="../../fileExistsDialog.ui" line="365"/> <source>Overwrite if not same size</source> @@ -1013,17 +1047,6 @@ <source>&Cancel</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="354"/> - <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>fileIsSameDialog</name> diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/hu/translation.qm b/plugins/CopyEngine/Ultracopier-Spec/Languages/hu/translation.qm Binary files differindex 6b6a991..37f9dac 100644 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/hu/translation.qm +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/hu/translation.qm diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/hu/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/hu/translation.ts index 5df5fab..09d41cc 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/hu/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/hu/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation>A motort mozgatásra kényszerítik, nem másolhatsz vele</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation>A motort másolásra kényszerítik, nem mozgathatsz vele</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> <translation>Cél</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation>Használja a jelenlegi célt: "%1"?</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation>Ezt a módot már korábban kényszerítették. Belső hiba történt, kérlek jelentsd be</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation>Kérdezzen rá</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation>Kihagy</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation>Összeolvaszt</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation>Nevezze át</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation>Helyezze a végére</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation>Felülír</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation>Felülír, ha különbözik</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation>Felülír, ha újabb</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation>Felülír, ha régebbi</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation>Beállítási hiba</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation>A beállítási motor nincs betöltve. A szűrők elérése nem lehetséges</translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation>Kérdezzen rá</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation>Kihagy</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation>Összeolvaszt</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation>Nevezze át</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation>Helyezze a végére</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation>Felülír</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation>Felülír, ha különbözik</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation>Felülír, ha újabb</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation>Felülír, ha régebbi</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation>Beállítási hiba</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation>A beállítási motor nincs betöltve. A szűrők elérése nem lehetséges</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation>A beállítási motor nincs betöltve, a szűrők elérése nem lehetséges</translation> </message> @@ -200,12 +206,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation>Hiba a mappával</translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation>Mappa neve</translation> </message> @@ -213,22 +219,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation>Hiba</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation>Átnevezés speciális karakterek használatával</translation> </message> @@ -236,22 +242,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation>Hiba</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation>Átnevezés speciális karakterek használatával</translation> </message> @@ -398,27 +404,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation>Mappa már létezik</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation>Hiba</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation>Átnevezés speciális karakterek használatával</translation> </message> @@ -478,6 +484,8 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation>Mappa létrehozása nem lehetséges</translation> </message> @@ -487,28 +495,33 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation>Eltávolítás nem lehetséges</translation> </message> @@ -521,12 +534,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -582,32 +595,38 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> - <translation>%1 - másolás</translation> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> + <source>%1 - copy</source> + <translation>%1 - másolás</translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> <source>%1 - copy (%2)</source> <translation>%1 - másolás (%2)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> + <location filename="../../ScanFileOrFolder.cpp" line="587"/> + <location filename="../../ScanFileOrFolder.cpp" line="589"/> <source>%name% - copy</source> <translation type="unfinished">%name% - másolás</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="587"/> - <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished">%name% - másolás (%number%)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -615,29 +634,29 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation>Fájl nem található</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation>Átnevezés speciális karakterek használatával</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -645,19 +664,19 @@ <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -665,24 +684,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -976,6 +995,11 @@ <translation>&Mindig hajtsa végre ezt a műveletet</translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> @@ -983,9 +1007,13 @@ </message> <message> <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation>Felülír, ha régebbi</translation> + <source>Overwrite if destination older</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../../fileExistsDialog.ui" line="362"/> @@ -1019,11 +1047,6 @@ <source>&Cancel</source> <translation>&Mégse</translation> </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation>Felülír, ha újabb</translation> - </message> </context> <context> <name>fileIsSameDialog</name> diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/id/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/id/translation.ts index f608b09..f043c14 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/id/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/id/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -200,12 +206,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -213,22 +219,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -236,22 +242,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -398,27 +404,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -478,6 +484,8 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -487,28 +495,33 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> @@ -521,12 +534,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -582,32 +595,38 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="587"/> <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -615,29 +634,29 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -645,19 +664,19 @@ <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -665,24 +684,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -976,12 +995,27 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="357"/> + <source>Overwrite if destination older</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="362"/> <location filename="../../fileExistsDialog.ui" line="365"/> <source>Overwrite if not same size</source> @@ -1013,17 +1047,6 @@ <source>&Cancel</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="354"/> - <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>fileIsSameDialog</name> diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/it/translation.qm b/plugins/CopyEngine/Ultracopier-Spec/Languages/it/translation.qm Binary files differindex 5090866..d9be48c 100644 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/it/translation.qm +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/it/translation.qm diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/it/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/it/translation.ts index 89d53ff..ad2cf8f 100644 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/it/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/it/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> - <translation>Impossibile copiare, il motore di copia forzerà lo spostamento</translation> + <translation>Il motore è forzato a spostare, non potete copiare con esso</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> - <translation>Impossibile effettuare lo spostamento, il motore di copia forzerà la copia</translation> + <translation>Il motore è forzato a copiare, non potete spostare con esso</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> - <translation>Percorso di destinazione</translation> + <translation>Destinazione</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> - <translation>Usare l'attuale destinazione? "%1"</translation> + <translation>Usare l'attuale destinazione "%1"?</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> - <translation>La modalità è stata forzata precedentemente. Questo è un errore interno, si prega di riportatelo</translation> + <translation>La modalità è stata precedentemente forzata. Questo è un errore interno, si prega di riportatelo</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation>Supportato solo per Windows</translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation>Chiedi</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation>Salta</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation>Unisci</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation>Rinomina</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation>Metti in coda</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation>Sovrascrivi</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> - <translation>Sovrascrivi se differente</translation> + <translation>Sovrascrivi se diverso</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation>Sovrascrivi se più recente</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation>Sovrascrivi se meno recente</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> - <translation>Errore opzioni</translation> + <translation>Errore nelle opzioni</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation>Motore delle opzioni non caricato. Impossibile accedere ai filtri</translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> - <translation type="unfinished"></translation> + <translation>Supportato solo per Windows</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation>Chiedi</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation>Salta</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation>Unisci</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation>Rinomina</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation>Metti in coda</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation>Sovrascrivi</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> - <translation>Sovrascrivi se differente</translation> + <translation>Sovrascrivi se diverso</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation>Sovrascrivi se più recente</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation>Sovrascrivi se meno recente</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> - <translation>Errore opzioni</translation> + <translation>Errore nelle opzioni</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation>Motore delle opzioni non caricato. Impossibile accedere ai filtri</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation>Le opzioni del motore di copia non sono state caricate. Impossibile accedere ai filtri</translation> </message> @@ -179,7 +185,7 @@ <message> <location filename="../../DiskSpace.ui" line="24"/> <source>You need more space on this drive to finish this transfer</source> - <translation>Hai bisogno di più spazio su questo disco per finire il trasferimento</translation> + <translation>Necessario più spazio su questa unità per finire il trasferimento</translation> </message> <message> <location filename="../../DiskSpace.ui" line="49"/> @@ -194,18 +200,18 @@ <message> <location filename="../../DiskSpace.cpp" line="23"/> <source>Drives %1 have %2 available but need %3</source> - <translation>L'unità %1 ha %2 disponibili, ma necessita di %3</translation> + <translation>Unità %1 hanno %2 disponibili, ma necessitano di %3</translation> </message> </context> <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> - <translation>Errore con la cartella</translation> + <translation>Errore sulla cartella</translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation>Nome cartella</translation> </message> @@ -213,47 +219,47 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation>Copia di %name% %suffix%</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation>Copia di %name% (%number%) %suffix%</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation>Errore</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> - <translation>Tenta ridenominazione usando caratteri speciali</translation> + <translation>Tenta rinomina usando caratteri speciali</translation> </message> </context> <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation>Copia di %name% %suffix%</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation>Copia di %name% (%number%) %suffix%</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation>Errore</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> - <translation>Tenta ridenominazione usando caratteri speciali</translation> + <translation>Tenta rinomina usando caratteri speciali</translation> </message> </context> <context> @@ -271,22 +277,22 @@ <message> <location filename="../../FilterRules.ui" line="51"/> <source>Raw text</source> - <translation>Testo nudo</translation> + <translation>Testo grezzo</translation> </message> <message> <location filename="../../FilterRules.ui" line="56"/> <source>Simplified regex</source> - <translation>Espressione regolare semplificata</translation> + <translation>Regex semplificata</translation> </message> <message> <location filename="../../FilterRules.ui" line="61"/> <source>Perl's regex</source> - <translation>Espressione regolare in Perl</translation> + <translation>Regex in Perl</translation> </message> <message> <location filename="../../FilterRules.ui" line="69"/> <source>Apply on:</source> - <translation>Applicare a:</translation> + <translation>Applica per:</translation> </message> <message> <location filename="../../FilterRules.ui" line="77"/> @@ -311,17 +317,17 @@ <message> <location filename="../../FilterRules.ui" line="102"/> <source>Checking</source> - <translation>Verifica</translation> + <translation>Verifica in corso</translation> </message> <message> <location filename="../../FilterRules.ui" line="115"/> <source>Test string:</source> - <translation>Stringa di verifica:</translation> + <translation>Stringa di prova:</translation> </message> <message> <location filename="../../FilterRules.ui" line="17"/> <source>Filters dialog</source> - <translation>Finestra dialogo dei filtri</translation> + <translation>Finestra di dialogo filtri</translation> </message> <message> <location filename="../../FilterRules.ui" line="95"/> @@ -331,7 +337,7 @@ <message> <location filename="../../FilterRules.ui" line="108"/> <source>The regex is valid</source> - <translation>L'espressione regolare è valida</translation> + <translation>Regex valida</translation> </message> </context> <context> @@ -354,25 +360,25 @@ <message> <location filename="../../Filters.ui" line="132"/> <source>None = Include all</source> - <translation>Nessuno = Includi tutti</translation> + <translation>Nessuno = Includere tutti</translation> </message> <message> <location filename="../../Filters.cpp" line="94"/> <location filename="../../Filters.cpp" line="132"/> <source>Raw text</source> - <translation>Testo nudo</translation> + <translation>Testo grezzo</translation> </message> <message> <location filename="../../Filters.cpp" line="97"/> <location filename="../../Filters.cpp" line="135"/> <source>Simplified regex</source> - <translation>Espressione regolare semplificata</translation> + <translation>Regex semplificata</translation> </message> <message> <location filename="../../Filters.cpp" line="100"/> <location filename="../../Filters.cpp" line="138"/> <source>Perl's regex</source> - <translation>Espressione regolare in Perl</translation> + <translation>Regex in Perl</translation> </message> <message> <location filename="../../Filters.cpp" line="108"/> @@ -392,35 +398,35 @@ <location filename="../../Filters.cpp" line="217"/> <location filename="../../Filters.cpp" line="256"/> <source>Full match</source> - <translation>Corrispondenza completa</translation> + <translation>Corrispondenza intera</translation> </message> </context> <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> - <translation>Cartella già presente</translation> + <translation>Cartella già eistente</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation>Copia di %name% %suffix%</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation>Copia di %name% (%number%) %suffix%</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation>Errore</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> - <translation>Tenta ridenominazione usando caratteri speciali</translation> + <translation>Tenta rinomina usando caratteri speciali</translation> </message> </context> <context> @@ -435,12 +441,12 @@ <location filename="../../ListThreadListChange.cpp" line="249"/> <location filename="../../ListThreadListChange.cpp" line="420"/> <source>Unable to save the transfer list: %1</source> - <translation>Impossibile salvare la lista di trasferimento %1</translation> + <translation>Impossibile salvare lista di trasferimento %1</translation> </message> <message> <location filename="../../ListThreadListChange.cpp" line="270"/> <source>Problem reading file, or file-size is 0</source> - <translation>Problema durante la lettura del file o dimensione file nulla</translation> + <translation>Errore durante la lettura del file o dimensione file nulla</translation> </message> <message> <location filename="../../ListThreadListChange.cpp" line="277"/> @@ -450,17 +456,17 @@ <message> <location filename="../../ListThreadListChange.cpp" line="286"/> <source>The transfer list is in mixed mode, but this instance is not in this mode</source> - <translation>La lista di trasferimento è in modalità mista ma questa istanza non lo è</translation> + <translation>La lista di trasferimento è in modalità mista ma questa istanza no</translation> </message> <message> <location filename="../../ListThreadListChange.cpp" line="295"/> <source>The transfer list is in copy mode, but this instance is not in this mode</source> - <translation>La lista di trasferimento è in modalità copia ma questa istanza non lo è</translation> + <translation>La lista di trasferimento è in modalità copia ma questa istanza no</translation> </message> <message> <location filename="../../ListThreadListChange.cpp" line="301"/> <source>The transfer list is in move mode, but this instance is not in this mode</source> - <translation>La lista di trasferimento è in modalità spostamento ma questa istanza non lo è</translation> + <translation>La lista di trasferimento è in modalità spostamento ma questa istanza no</translation> </message> <message> <location filename="../../ListThreadListChange.cpp" line="365"/> @@ -478,39 +484,46 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation>Impossibile creare la cartella</translation> </message> <message> <location filename="../../MkPath.cpp" line="227"/> <source>The source folder don't exists</source> - <translation>La cartella di origine non esiste</translation> + <translation>La cartella d'origine non esiste</translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> - <translation>Impossibile ridenominare temporaneamente la cartella</translation> + <translation>Impossibile rinominare temporaneamente la cartella</translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation>Impossibile invertire rinomina temporanea dello spostamento reale</translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> - <translation>Impossibile fare il vero spostamento finale della cartella</translation> + <translation>Impossibile effettuare il reale spostamento finale della cartella</translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation>Impossibile spostare la cartella</translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation>Impossibile spostare la cartella: errore %1</translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> - <translation>Impossibile eliminare</translation> + <translation>Impossibile rimuovere</translation> </message> </context> <context> @@ -521,14 +534,14 @@ <translation>Errore interno, si prega di riportarlo!</translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation>Impossibile leggere file di origine: </translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> - <translation>File troncato durante la lettura. Possibile cambio dati</translation> + <translation>File troncato durante la lettura. Possibile modifica dati</translation> </message> </context> <context> @@ -536,7 +549,7 @@ <message> <location filename="../../RenamingRules.ui" line="35"/> <source>First renaming</source> - <translation>Prima ridenominazione</translation> + <translation>Prima rinomina</translation> </message> <message> <location filename="../../RenamingRules.ui" line="41"/> @@ -562,55 +575,61 @@ <message> <location filename="../../RenamingRules.ui" line="51"/> <source>Second renaming</source> - <translation>Seconda ridenominazione</translation> + <translation>Seconda rinomina</translation> </message> <message> <location filename="../../RenamingRules.ui" line="14"/> <source>Renaming rules</source> - <translation>Regole di ridenominazione</translation> + <translation>Regole di rinomina</translation> </message> <message> <location filename="../../RenamingRules.cpp" line="46"/> <location filename="../../RenamingRules.cpp" line="71"/> <source>%1 - copy%2</source> - <translation>Copia di %1 %2</translation> + <translation>%1 - copia%2</translation> </message> <message> <location filename="../../RenamingRules.cpp" line="50"/> <location filename="../../RenamingRules.cpp" line="84"/> <source>%1 - copy (%2)%3</source> - <translation>Copia di %1 (%2) %3</translation> + <translation>%1 - copia (%2)%3</translation> </message> </context> <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> - <translation>Copia di %1</translation> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> + <translation>Cartella in lista nera</translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> + <source>%1 - copy</source> + <translation>%1 - copia</translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> <source>%1 - copy (%2)</source> - <translation>Copia di %1 (%2)</translation> + <translation>%1 - copia (%2)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> + <location filename="../../ScanFileOrFolder.cpp" line="587"/> + <location filename="../../ScanFileOrFolder.cpp" line="589"/> <source>%name% - copy</source> <translation>Copia di %name%</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="587"/> - <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation>Copia di %name% (%number%)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation>Problema con la lettura della cartella</translation> </message> @@ -618,49 +637,49 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation>Copia di %name% %suffix%</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation>Copia di %name% (%number%) %suffix%</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation>File non trovato</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> - <translation>Tenta ridenominazione usando caratteri speciali</translation> + <translation>Tenta rinomina usando caratteri speciali</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> - <translation>Impossibile cambiare data</translation> + <translation>Impossibile cambiare la data</translation> </message> </context> <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> - <translation>Data di modifica sbagliata o impossibile ottenerla, potete disabilitare l'orario di trasferimento per procedere</translation> + <translation>Data di modifica sbagliata o impossibile da ottenere, si può disabilitare l'orario di trasferimento per procedere</translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> - <translation>Impossibile creare cartella di destinazione: </translation> + <translation>Impossibile creare cartella di destinazione:</translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation>Impossibile creare cartella di destinazione, error %1</translation> </message> @@ -668,24 +687,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> - <translation>Errore di risoluzione percorso (vuoto)</translation> + <translation>Errore nella risoluzione percorso (vuoto)</translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> - <translation>Impossibile creare cartella di destinazione: </translation> + <translation>Impossibile creare cartella di destinazione:</translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation>Impossibile creare cartella di destinazione, errore %1</translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation>Errore interno, si prega di riportarlo!</translation> </message> @@ -695,27 +714,27 @@ <message> <location filename="../../copyEngineOptions.ui" line="44"/> <source>Transfer</source> - <translation>Trasferimento</translation> + <translation>Trasferisci</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="63"/> <source>Move the whole folder</source> - <translation>Spostare intera cartella</translation> + <translation>Sposta l'intera cartella</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="97"/> <source>Transfer the file rights</source> - <translation>Trasferire autorizzazioni dei file</translation> + <translation>Trasferisci autorizzazioni file</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="76"/> <source>Keep the file date</source> - <translation>Mantenere date dei file</translation> + <translation>Mantieni data file</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="114"/> <source>Create full path if not exists</source> - <translation>Creare percorso completo se non esistente</translation> + <translation>Crea percorso completo se non esistente</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="138"/> @@ -730,57 +749,57 @@ <message> <location filename="../../copyEngineOptions.ui" line="154"/> <source>Error and collision</source> - <translation>Errori di coincidenze</translation> + <translation>Errore di collisione</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="160"/> <source>When folder error</source> - <translation>Quando si verifica errore nelle cartelle</translation> + <translation>Quando si verifica un errore nelle cartelle</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="170"/> <source>When file error</source> - <translation>Quando si verifica errore nei file</translation> + <translation>Quando si verifica un errore nei file</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="196"/> <source>When file collision</source> - <translation>Quando i file coincidono</translation> + <translation>Quando collidono i file</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="239"/> <source>Overwrite if not same size</source> - <translation>Sovrascrivere se dimensione differisce</translation> + <translation>Sovrascrivi se la dimensione differisce</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="244"/> <source>Overwrite if modification date differs</source> - <translation>Sovrascrivere se data di modifica differisce</translation> + <translation>Sovrascrivi se la data di modifica differisce</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="266"/> <source>When folder collision</source> - <translation>Quando le cartelle coincidono</translation> + <translation>Quando collidono le cartelle</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="297"/> <source>Check if destination folder exists</source> - <translation>Controllare esistenza cartella di destinazione</translation> + <translation>Controllare esistenza della cartella di destinazione</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="304"/> <source>Renaming rules</source> - <translation>Regole di ridenominazione</translation> + <translation>Regole di rinomina</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="324"/> <source>Delete partially transferred files</source> - <translation>Eliminare i file parzialmente trasferiti</translation> + <translation>Elimina file parzialmente trasferiti</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="337"/> <source>Rename the original destination</source> - <translation>Ridenominare destinazione all'origine</translation> + <translation>Rinomina destinazione originale</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="368"/> @@ -790,48 +809,48 @@ <message> <location filename="../../copyEngineOptions.ui" line="387"/> <source>Inode threads</source> - <translation>Numero thread inode</translation> + <translation>Numero thread i-node</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="397"/> <location filename="../../copyEngineOptions.ui" line="413"/> <source>MB</source> - <translation type="unfinished"></translation> + <translation>MB</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="429"/> <source>Uncheck this under Windows create problem</source> - <translation>Deselezionare ciò su Windows causa problemi</translation> + <translation>Deselezionare ciò in Windows crea problemi</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="436"/> <source>OS Buffer</source> - <translation type="unfinished"></translation> + <translation>Buffer SO</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="456"/> <source>Disable parallel transfer when are different devices</source> - <translation type="unfinished"></translation> + <translation>Disabilita trasferimenti paralleli quando i dispositivi sono diversi</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="463"/> <source>Buffer for different device</source> - <translation type="unfinished"></translation> + <translation>Buffer per diverso dispositivo</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="470"/> <source>OS FLags</source> - <translation type="unfinished"></translation> + <translation>Flags SO</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="477"/> <source>Buffer for same device</source> - <translation type="unfinished"></translation> + <translation>Buffer per stesso dispositivo</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="484"/> <source>OS native copy (disable speed limitation)</source> - <translation type="unfinished"></translation> + <translation>Copia nativa SO (disattiva limitazione di velocità)</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="514"/> @@ -841,7 +860,7 @@ <message> <location filename="../../copyEngineOptions.ui" line="520"/> <source>Check the disk space</source> - <translation>Controllare spazio su disco</translation> + <translation>Controlla spazio su disco</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="530"/> @@ -864,7 +883,7 @@ <message> <location filename="../../fileErrorDialog.ui" line="14"/> <source>Error with file</source> - <translation>Errore con file</translation> + <translation>Errore con il file</translation> </message> <message> <location filename="../../fileErrorDialog.ui" line="20"/> @@ -879,7 +898,7 @@ <message> <location filename="../../fileErrorDialog.ui" line="76"/> <source>Modified</source> - <translation>Modificato</translation> + <translation>Modificata/o</translation> </message> <message> <location filename="../../fileErrorDialog.ui" line="93"/> @@ -894,22 +913,22 @@ <message> <location filename="../../fileErrorDialog.ui" line="127"/> <source>Folder</source> - <translation>Cartelle</translation> + <translation>Cartella</translation> </message> <message> <location filename="../../fileErrorDialog.ui" line="173"/> <source>&Always perform this action</source> - <translation>Esegui sempre questa azione</translation> + <translation>&Esegui sempre questa azione</translation> </message> <message> <location filename="../../fileErrorDialog.ui" line="193"/> <source>Try in with elevated privileges</source> - <translation>Tenta con privilegi superiori</translation> + <translation>Prova con privilegi superiori</translation> </message> <message> <location filename="../../fileErrorDialog.ui" line="200"/> <source>Put to bottom</source> - <translation>Metti in coda</translation> + <translation>Metti in fondo</translation> </message> <message> <location filename="../../fileErrorDialog.ui" line="207"/> @@ -919,12 +938,12 @@ <message> <location filename="../../fileErrorDialog.ui" line="214"/> <source>&Skip</source> - <translation>Salta</translation> + <translation>&Salta</translation> </message> <message> <location filename="../../fileErrorDialog.ui" line="221"/> <source>&Cancel</source> - <translation>Annulla</translation> + <translation>&Annulla</translation> </message> </context> <context> @@ -932,7 +951,7 @@ <message> <location filename="../../fileExistsDialog.ui" line="14"/> <source>The file exists</source> - <translation>File è già presente</translation> + <translation>File già eistente</translation> </message> <message> <location filename="../../fileExistsDialog.ui" line="34"/> @@ -966,66 +985,70 @@ <location filename="../../fileExistsDialog.ui" line="133"/> <location filename="../../fileExistsDialog.ui" line="221"/> <source>Folder</source> - <translation>Cartelle</translation> + <translation>Cartella</translation> </message> <message> <location filename="../../fileExistsDialog.ui" line="277"/> <source>Suggest new &name</source> - <translation>Suggerisci nuovo nome</translation> + <translation>Suggerisci nuovo &nome</translation> </message> <message> <location filename="../../fileExistsDialog.ui" line="288"/> <source>&Always perform this action</source> - <translation>Esegui sempre questa azione</translation> + <translation>&Esegui sempre questa azione</translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation>Sovrascrivi se l'origine è più recente della destinazione</translation> </message> <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> - <translation>Sovrascrivere se data di modifica differisce</translation> + <translation>Sovrascrivi se la data di modifica differisce</translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation>Sovrascrivi se l'origine è meno recente della destinazione</translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="357"/> + <source>Overwrite if destination older</source> + <translation>Sovrasccrivi se la destinazione è meno recente</translation> </message> <message> <location filename="../../fileExistsDialog.ui" line="362"/> <location filename="../../fileExistsDialog.ui" line="365"/> <source>Overwrite if not same size</source> - <translation>Sovrascrivere se dimensione differisce</translation> + <translation>Sovrascrivi se la dimensione differisce</translation> </message> <message> <location filename="../../fileExistsDialog.ui" line="370"/> <location filename="../../fileExistsDialog.ui" line="373"/> <source>Overwrite if not same size and date</source> - <translation>Sovrascrivere se dimensione e data differiscono</translation> + <translation>Sovrascrivi se dimensione e data differiscono</translation> </message> <message> <location filename="../../fileExistsDialog.ui" line="308"/> <source>&Rename</source> - <translation>Rinomina</translation> + <translation>&Rinomina</translation> </message> <message> <location filename="../../fileExistsDialog.ui" line="315"/> <source>&Overwrite</source> - <translation>Sovrascrivi</translation> + <translation>&Sovrascrivi</translation> </message> <message> <location filename="../../fileExistsDialog.ui" line="325"/> <source>&Skip</source> - <translation>Salta</translation> + <translation>&Salta</translation> </message> <message> <location filename="../../fileExistsDialog.ui" line="332"/> <source>&Cancel</source> - <translation>Annulla</translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation>Sovrascrivi se più recente</translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="354"/> - <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation>Sovrascrivi se meno recente</translation> + <translation>&Annulla</translation> </message> </context> <context> @@ -1038,7 +1061,7 @@ <message> <location filename="../../fileIsSameDialog.ui" line="110"/> <source>Modified</source> - <translation>Modificato</translation> + <translation>Modificata/o</translation> </message> <message> <location filename="../../fileIsSameDialog.ui" line="70"/> @@ -1048,37 +1071,37 @@ <message> <location filename="../../fileIsSameDialog.ui" line="14"/> <source>The source and destination are same</source> - <translation>Origine e destinazioni sono identiche</translation> + <translation>Origine e destinazione sono identiche</translation> </message> <message> <location filename="../../fileIsSameDialog.ui" line="90"/> <source>Folder</source> - <translation>Cartelle</translation> + <translation>Cartella</translation> </message> <message> <location filename="../../fileIsSameDialog.ui" line="159"/> <source>Suggest new &name</source> - <translation>Suggerisci nuovo nome</translation> + <translation>Suggerisci nuovo &nome</translation> </message> <message> <location filename="../../fileIsSameDialog.ui" line="170"/> <source>&Always perform this action</source> - <translation>Esegui sempre questa azione</translation> + <translation>&Esegui sempre questa azione</translation> </message> <message> <location filename="../../fileIsSameDialog.ui" line="190"/> <source>&Rename</source> - <translation>Rinomina</translation> + <translation>&Rinomina</translation> </message> <message> <location filename="../../fileIsSameDialog.ui" line="197"/> <source>&Skip</source> - <translation>Salta</translation> + <translation>&Salta</translation> </message> <message> <location filename="../../fileIsSameDialog.ui" line="204"/> <source>&Cancel</source> - <translation>Annulla</translation> + <translation>&Annulla</translation> </message> </context> <context> @@ -1096,13 +1119,13 @@ <message> <location filename="../../folderExistsDialog.ui" line="14"/> <source>The source and destination is identical</source> - <translation>Origine e destinazioni sono identiche</translation> + <translation>Origine e destinazione sono identiche</translation> </message> <message> <location filename="../../folderExistsDialog.ui" line="82"/> <location filename="../../folderExistsDialog.ui" line="150"/> <source>Modified</source> - <translation>Modificato</translation> + <translation>Modificata/o</translation> </message> <message> <location filename="../../folderExistsDialog.ui" line="99"/> @@ -1114,22 +1137,22 @@ <location filename="../../folderExistsDialog.ui" line="116"/> <location filename="../../folderExistsDialog.ui" line="184"/> <source>Folder</source> - <translation>Cartelle</translation> + <translation>Cartella</translation> </message> <message> <location filename="../../folderExistsDialog.ui" line="227"/> <source>Suggest new &name</source> - <translation>Suggerisci nuovo nome</translation> + <translation>Suggerisci nuovo &nome</translation> </message> <message> <location filename="../../folderExistsDialog.ui" line="238"/> <source>&Always perform this action</source> - <translation>Esegui sempre questa azione</translation> + <translation>&Esegui sempre questa azione</translation> </message> <message> <location filename="../../folderExistsDialog.ui" line="245"/> <source>&Rename</source> - <translation>Rinomina</translation> + <translation>&Rinomina</translation> </message> <message> <location filename="../../folderExistsDialog.ui" line="252"/> @@ -1144,7 +1167,7 @@ <message> <location filename="../../folderExistsDialog.ui" line="266"/> <source>&Cancel</source> - <translation>Annulla</translation> + <translation>&Annulla</translation> </message> </context> </TS> diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/ja/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/ja/translation.ts index ebb1c5a..5d3d997 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/ja/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/ja/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -200,12 +206,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -213,22 +219,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -236,22 +242,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -398,27 +404,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -478,6 +484,8 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -487,28 +495,33 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> @@ -521,12 +534,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -582,32 +595,38 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="587"/> <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -615,29 +634,29 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -645,19 +664,19 @@ <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -665,24 +684,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -976,12 +995,27 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="357"/> + <source>Overwrite if destination older</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="362"/> <location filename="../../fileExistsDialog.ui" line="365"/> <source>Overwrite if not same size</source> @@ -1013,17 +1047,6 @@ <source>&Cancel</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="354"/> - <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>fileIsSameDialog</name> diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/ko/translation.qm b/plugins/CopyEngine/Ultracopier-Spec/Languages/ko/translation.qm Binary files differindex 04477d6..1ffa2aa 100644 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/ko/translation.qm +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/ko/translation.qm diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/ko/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/ko/translation.ts index 74fbf13..0c57b9c 100644 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/ko/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/ko/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation>엔진이 강제로 이동합니다. 사용자가 복사할 수 없습니다.</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation>엔진이 강제로 복사합니다. 사용자가 이동할 수 없습니다.</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished">대상</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished">실제 대상 "%1"를(을) 사용하시겠습니까?</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation>모드가 이전에 강제되었습니다. 내부 오류입니다. 문제를 보고해 주세요.</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished">Windows에서만 지원</translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished">확인</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished">건너뛰기</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished">합치기</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished">이름 바꾸기</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished">끝에 놓기</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished">덮어쓰기</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished">다르면 덮어쓰기</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished">더 최신이면 덮어쓰기</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished">더 이전이면 덮어쓰기</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished">옵션 오류</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation>옵션 엔진이 호출되지 않았습니다. 필터에 액세스할 수 없습니다. </translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished">Windows에서만 지원</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished">확인</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished">건너뛰기</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished">합치기</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished">이름 바꾸기</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished">끝에 놓기</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished">덮어쓰기</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished">다르면 덮어쓰기</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished">더 최신이면 덮어씌우기</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished">더 이전이면 덮어쓰기</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished">옵션 오류</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation>옵션 엔진이 호출되지 않았습니다. 필터에 액세스할 수 없습니다.</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation>옵션 엔진이 호출되지 않았습니다. 필터에 액세스할 수 없습니다.</translation> </message> @@ -200,12 +206,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished">폴더 오류</translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished">폴더 이름</translation> </message> @@ -213,22 +219,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished">%name% - 복사%suffix%</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished">%name% - 복사 (%number%)%suffix%</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished">오류</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation>특수 문자를 사용하여 이름을 바꾸세요.</translation> </message> @@ -236,22 +242,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished">%name% - 복사%suffix%</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished">%name% - 복사 (%number%)%suffix%</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished">오류</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation>특수 문자를 사용하여 이름을 바꾸세요.</translation> </message> @@ -398,27 +404,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation>폴더가 이미 존재합니다.</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished">%name% - 복사%suffix%</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished">%name% - 복사 (%number%)%suffix%</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation>오류</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation>특수 문자를 사용하여 이름을 바꾸세요.</translation> </message> @@ -478,6 +484,8 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished">폴더를 만들 수 없습니다</translation> </message> @@ -487,28 +495,33 @@ <translation>원본 폴더가 존재하지 않습니다.</translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation>폴더 이름을 임시로 바꿀 수 없습니다.</translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation>폴더를 이동할 수 없습니다.</translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation>폴더를 이동할 수 없습니다.</translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished">폴더를 이동할 수 없습니다. Errno: %1 </translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation>제거할 수 없습니다.</translation> </message> @@ -521,12 +534,12 @@ <translation type="unfinished">내부 오류. 이 문제를 보고해 주세요!</translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished">원본 파일을 읽을 수 없습니다: </translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation>읽기 중 파일이 잘림. 데이터가 변경되었을 수 있습니다. </translation> </message> @@ -582,32 +595,38 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> - <translation type="unfinished">%1 - 복사</translation> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> + <source>%1 - copy</source> + <translation type="unfinished">%1 - 복사</translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> <source>%1 - copy (%2)</source> <translation type="unfinished">%1 - 복사 (%2)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> + <location filename="../../ScanFileOrFolder.cpp" line="587"/> + <location filename="../../ScanFileOrFolder.cpp" line="589"/> <source>%name% - copy</source> <translation type="unfinished">%name% - 복사</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="587"/> - <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished">%name% - 복사 (%number%)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished">폴더 읽기 문제</translation> </message> @@ -615,29 +634,29 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished">%name% - 복사%suffix%</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished">%name% - 복사 (%number%)%suffix%</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation>파일을 찾을 수 없습니다.</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation>날짜를 변경할 수 없습니다.</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation>특수 문자를 사용하여 이름을 바꾸세요.</translation> </message> @@ -645,19 +664,19 @@ <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation>수정 날짜가 잘못되었거나 가져올 수 없습니다. 시간 보내기를 비활성화할 수 있습니다.</translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished">대상 폴더를 만들 수 없음:</translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished">대상 폴더를 만들 수 없음. Errno: %1</translation> </message> @@ -665,24 +684,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished">경로 확인 오류 (빈 경로)</translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished">대상 폴더를 만들 수 없음:</translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished">대상 폴더를 만들 수 없음. Errno: %1</translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished">내부 오류. 문제를 보고해 주세요!</translation> </message> @@ -976,12 +995,27 @@ <translation type="unfinished">&항상 이 동작 수행</translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> <translation type="unfinished">수정한 날짜가 다르면 덮어쓰기</translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="357"/> + <source>Overwrite if destination older</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="362"/> <location filename="../../fileExistsDialog.ui" line="365"/> <source>Overwrite if not same size</source> @@ -1013,17 +1047,6 @@ <source>&Cancel</source> <translation>&취소</translation> </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation type="unfinished">더 최신이면 덮어쓰기</translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="354"/> - <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation type="unfinished">더 이전이면 덮어쓰기</translation> - </message> </context> <context> <name>fileIsSameDialog</name> diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/nl/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/nl/translation.ts index f608b09..f043c14 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/nl/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/nl/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -200,12 +206,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -213,22 +219,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -236,22 +242,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -398,27 +404,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -478,6 +484,8 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -487,28 +495,33 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> @@ -521,12 +534,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -582,32 +595,38 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="587"/> <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -615,29 +634,29 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -645,19 +664,19 @@ <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -665,24 +684,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -976,12 +995,27 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="357"/> + <source>Overwrite if destination older</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="362"/> <location filename="../../fileExistsDialog.ui" line="365"/> <source>Overwrite if not same size</source> @@ -1013,17 +1047,6 @@ <source>&Cancel</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="354"/> - <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>fileIsSameDialog</name> diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/no/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/no/translation.ts index f608b09..f043c14 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/no/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/no/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -200,12 +206,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -213,22 +219,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -236,22 +242,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -398,27 +404,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -478,6 +484,8 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -487,28 +495,33 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> @@ -521,12 +534,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -582,32 +595,38 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="587"/> <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -615,29 +634,29 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -645,19 +664,19 @@ <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -665,24 +684,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -976,12 +995,27 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="357"/> + <source>Overwrite if destination older</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="362"/> <location filename="../../fileExistsDialog.ui" line="365"/> <source>Overwrite if not same size</source> @@ -1013,17 +1047,6 @@ <source>&Cancel</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="354"/> - <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>fileIsSameDialog</name> diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/pl/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/pl/translation.ts index f608b09..f043c14 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/pl/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/pl/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -200,12 +206,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -213,22 +219,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -236,22 +242,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -398,27 +404,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -478,6 +484,8 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -487,28 +495,33 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> @@ -521,12 +534,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -582,32 +595,38 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="587"/> <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -615,29 +634,29 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -645,19 +664,19 @@ <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -665,24 +684,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -976,12 +995,27 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="357"/> + <source>Overwrite if destination older</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="362"/> <location filename="../../fileExistsDialog.ui" line="365"/> <source>Overwrite if not same size</source> @@ -1013,17 +1047,6 @@ <source>&Cancel</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="354"/> - <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>fileIsSameDialog</name> diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/pt/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/pt/translation.ts index f608b09..f043c14 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/pt/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/pt/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -200,12 +206,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -213,22 +219,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -236,22 +242,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -398,27 +404,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -478,6 +484,8 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -487,28 +495,33 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> @@ -521,12 +534,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -582,32 +595,38 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="587"/> <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -615,29 +634,29 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -645,19 +664,19 @@ <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -665,24 +684,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -976,12 +995,27 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="357"/> + <source>Overwrite if destination older</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="362"/> <location filename="../../fileExistsDialog.ui" line="365"/> <source>Overwrite if not same size</source> @@ -1013,17 +1047,6 @@ <source>&Cancel</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="354"/> - <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>fileIsSameDialog</name> diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/ru/translation.qm b/plugins/CopyEngine/Ultracopier-Spec/Languages/ru/translation.qm Binary files differindex a1f6180..427ee00 100644 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/ru/translation.qm +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/ru/translation.qm diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/ru/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/ru/translation.ts index 5ca2037..e507d1e 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/ru/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/ru/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished">Двигатель вынуждены покинуть свои дома, вы не можете скопировать с ним</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished">Двигатель вынужден копии, вы не можете двигаться вместе с ним</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished">назначение</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished">просить</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished">пропускать</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished">слияние</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished">переименовать</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished">Заменить, если новее</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished">Опции ошибке</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished">просить</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished">пропускать</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished">слияние</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished">переименовать</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished">Заменить, если новее</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished">Опции ошибке</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished">Параметры двигателя не загружается, не может получить доступ к фильтрам</translation> </message> @@ -200,12 +206,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished">Ошибка в папку</translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished">имя папки</translation> </message> @@ -213,22 +219,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished">ошибка</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -236,22 +242,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished">ошибка</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -398,27 +404,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished">Папка уже существует</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished">ошибка</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -478,6 +484,8 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation>Невозможно создать папку</translation> </message> @@ -487,28 +495,33 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> @@ -521,12 +534,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -582,32 +595,38 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> - <translation type="unfinished">%1 - копия</translation> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> + <source>%1 - copy</source> + <translation type="unfinished">%1 - копия</translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> <source>%1 - copy (%2)</source> <translation type="unfinished">%1 - копия (%2)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> + <location filename="../../ScanFileOrFolder.cpp" line="587"/> + <location filename="../../ScanFileOrFolder.cpp" line="589"/> <source>%name% - copy</source> <translation type="unfinished">%name% - копия</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="587"/> - <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished">%name% - копия (%number%)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -615,29 +634,29 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -645,19 +664,19 @@ <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -665,24 +684,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -976,12 +995,27 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="357"/> + <source>Overwrite if destination older</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="362"/> <location filename="../../fileExistsDialog.ui" line="365"/> <source>Overwrite if not same size</source> @@ -1013,17 +1047,6 @@ <source>&Cancel</source> <translation>отменить</translation> </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation>Заменить, если новее</translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="354"/> - <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>fileIsSameDialog</name> diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/th/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/th/translation.ts index f608b09..f043c14 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/th/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/th/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -200,12 +206,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -213,22 +219,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -236,22 +242,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -398,27 +404,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -478,6 +484,8 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -487,28 +495,33 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> @@ -521,12 +534,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -582,32 +595,38 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="587"/> <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -615,29 +634,29 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -645,19 +664,19 @@ <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -665,24 +684,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -976,12 +995,27 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="357"/> + <source>Overwrite if destination older</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="362"/> <location filename="../../fileExistsDialog.ui" line="365"/> <source>Overwrite if not same size</source> @@ -1013,17 +1047,6 @@ <source>&Cancel</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="354"/> - <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>fileIsSameDialog</name> diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/tr/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/tr/translation.ts index f608b09..f043c14 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/tr/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/tr/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -200,12 +206,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -213,22 +219,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -236,22 +242,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -398,27 +404,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -478,6 +484,8 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -487,28 +495,33 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> @@ -521,12 +534,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -582,32 +595,38 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="587"/> <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -615,29 +634,29 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -645,19 +664,19 @@ <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -665,24 +684,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -976,12 +995,27 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="357"/> + <source>Overwrite if destination older</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="362"/> <location filename="../../fileExistsDialog.ui" line="365"/> <source>Overwrite if not same size</source> @@ -1013,17 +1047,6 @@ <source>&Cancel</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="354"/> - <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>fileIsSameDialog</name> diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/zh/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/zh/translation.ts index ebb1c5a..5d3d997 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/zh/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/zh/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -200,12 +206,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -213,22 +219,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -236,22 +242,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -398,27 +404,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -478,6 +484,8 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -487,28 +495,33 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> @@ -521,12 +534,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -582,32 +595,38 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="587"/> <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -615,29 +634,29 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -645,19 +664,19 @@ <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -665,24 +684,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -976,12 +995,27 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="357"/> + <source>Overwrite if destination older</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="362"/> <location filename="../../fileExistsDialog.ui" line="365"/> <source>Overwrite if not same size</source> @@ -1013,17 +1047,6 @@ <source>&Cancel</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="354"/> - <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>fileIsSameDialog</name> |