summaryrefslogtreecommitdiff
path: root/plugins/Languages
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/Languages')
-rw-r--r--plugins/Languages/ar/informations.xml2
-rwxr-xr-xplugins/Languages/ar/translation.qmbin28304 -> 28314 bytes
-rw-r--r--plugins/Languages/ar/translation.ts337
-rw-r--r--plugins/Languages/de/informations.xml2
-rwxr-xr-xplugins/Languages/de/translation.qmbin30450 -> 30457 bytes
-rw-r--r--plugins/Languages/de/translation.ts335
-rwxr-xr-xplugins/Languages/el/informations.xml2
-rwxr-xr-xplugins/Languages/el/translation.ts333
-rwxr-xr-xplugins/Languages/es/informations.xml2
-rwxr-xr-xplugins/Languages/es/translation.qmbin32056 -> 32063 bytes
-rwxr-xr-xplugins/Languages/es/translation.ts337
-rwxr-xr-xplugins/Languages/fr/informations.xml2
-rwxr-xr-xplugins/Languages/fr/translation.qmbin32658 -> 32665 bytes
-rwxr-xr-xplugins/Languages/fr/translation.ts337
-rwxr-xr-xplugins/Languages/hi/informations.xml2
-rwxr-xr-xplugins/Languages/hi/translation.qmbin334 -> 341 bytes
-rwxr-xr-xplugins/Languages/hi/translation.ts333
-rwxr-xr-xplugins/Languages/hu/informations.xml2
-rwxr-xr-xplugins/Languages/hu/translation.qmbin23275 -> 23282 bytes
-rwxr-xr-xplugins/Languages/hu/translation.ts337
-rwxr-xr-xplugins/Languages/id/informations.xml2
-rwxr-xr-xplugins/Languages/id/translation.ts333
-rw-r--r--plugins/Languages/it/informations.xml2
-rwxr-xr-xplugins/Languages/it/translation.qmbin32212 -> 32797 bytes
-rw-r--r--plugins/Languages/it/translation.ts562
-rwxr-xr-xplugins/Languages/ja/informations.xml2
-rwxr-xr-xplugins/Languages/ja/translation.ts333
-rw-r--r--plugins/Languages/ko/informations.xml2
-rwxr-xr-xplugins/Languages/ko/translation.qmbin9284 -> 9294 bytes
-rw-r--r--plugins/Languages/ko/translation.ts337
-rwxr-xr-xplugins/Languages/nl/informations.xml2
-rwxr-xr-xplugins/Languages/nl/translation.ts333
-rwxr-xr-xplugins/Languages/no/informations.xml2
-rwxr-xr-xplugins/Languages/no/translation.ts333
-rwxr-xr-xplugins/Languages/pl/informations.xml2
-rwxr-xr-xplugins/Languages/pl/translation.ts333
-rwxr-xr-xplugins/Languages/pt/informations.xml2
-rwxr-xr-xplugins/Languages/pt/translation.ts333
-rwxr-xr-xplugins/Languages/ru/informations.xml2
-rwxr-xr-xplugins/Languages/ru/translation.qmbin15723 -> 15730 bytes
-rwxr-xr-xplugins/Languages/ru/translation.ts337
-rwxr-xr-xplugins/Languages/th/informations.xml2
-rwxr-xr-xplugins/Languages/th/translation.ts333
-rwxr-xr-xplugins/Languages/tr/informations.xml2
-rwxr-xr-xplugins/Languages/tr/translation.ts333
-rwxr-xr-xplugins/Languages/zh/informations.xml2
-rwxr-xr-xplugins/Languages/zh_TW/informations.xml2
-rwxr-xr-xplugins/Languages/zh_TW/translation.qmbin2444 -> 2454 bytes
-rwxr-xr-xplugins/Languages/zh_TW/translation.ts333
49 files changed, 3625 insertions, 2997 deletions
diff --git a/plugins/Languages/ar/informations.xml b/plugins/Languages/ar/informations.xml
index 275ae58..f35b778 100644
--- a/plugins/Languages/ar/informations.xml
+++ b/plugins/Languages/ar/informations.xml
@@ -12,7 +12,7 @@
<!-- Detailed description -->
<description xml:lang="en"><![CDATA[Translation of Ultracopier to arabic. For more details see the web site.]]></description>
<!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number -->
- <version>2.2.4.7</version>
+ <version>2.2.6.0</version>
<!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. -->
<name>ar</name>
<!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. -->
diff --git a/plugins/Languages/ar/translation.qm b/plugins/Languages/ar/translation.qm
index 988a96e..b7c25e2 100755
--- a/plugins/Languages/ar/translation.qm
+++ b/plugins/Languages/ar/translation.qm
Binary files differ
diff --git a/plugins/Languages/ar/translation.ts b/plugins/Languages/ar/translation.ts
index 301d0c2..10d5562 100644
--- a/plugins/Languages/ar/translation.ts
+++ b/plugins/Languages/ar/translation.ts
@@ -93,91 +93,96 @@
<context>
<name>CopyEngine</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="438"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="461"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="465"/>
<source>The engine is forced to move, you can&apos;t copy with it</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="473"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="496"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="519"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="542"/>
<source>The engine is forced to copy, you can&apos;t move with it</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/>
<source>Destination</source>
<translation type="unfinished">الوجهه</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/>
<source>Use the actual destination &quot;%1&quot;?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="685"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/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/Ultracopier-Spec/CopyEngine.cpp" line="976"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="979"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="984"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="988"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="886"/>
+ <source>Supported only on Windows</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1035"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1038"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1043"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1047"/>
<source>Ask</source>
<translation type="unfinished">اسال</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="977"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="981"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="985"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="989"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1036"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1040"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1044"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1048"/>
<source>Skip</source>
<translation type="unfinished">تخطي</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="980"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1039"/>
<source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="982"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="994"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1041"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1053"/>
<source>Rename</source>
<translation type="unfinished">اعاده تسميه</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="986"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1045"/>
<source>Put at the end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="990"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1049"/>
<source>Overwrite</source>
<translation type="unfinished">الكتابة فوق</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="991"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1050"/>
<source>Overwrite if different</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="992"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1051"/>
<source>Overwrite if newer</source>
<translation type="unfinished">الكتابة فوق إذا كان أحدث</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="993"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1052"/>
<source>Overwrite if older</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/>
<source>Options error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/>
<source>Options engine is not loaded. Unable to access the filters</source>
<translation type="unfinished"></translation>
</message>
@@ -185,75 +190,76 @@
<context>
<name>CopyEngineFactory</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="303"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="60"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="309"/>
<source>Supported only on Windows</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="430"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="433"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="438"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/>
<source>Ask</source>
<translation type="unfinished">اسال</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="431"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="435"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="443"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="437"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="441"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="449"/>
<source>Skip</source>
<translation type="unfinished">تخطي</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="434"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/>
<source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="454"/>
<source>Rename</source>
<translation type="unfinished">اعاده تسميه</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/>
<source>Put at the end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="450"/>
<source>Overwrite</source>
<translation type="unfinished">الكتابة فوق</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="451"/>
<source>Overwrite if different</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="452"/>
<source>Overwrite if newer</source>
<translation type="unfinished">الكتابة فوق إذا كان أحدث</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="447"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="453"/>
<source>Overwrite if older</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/>
<source>Options error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/>
<source>Options engine is not loaded. Unable to access the filters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/>
<source>Options engine is not loaded, can&apos;t access to the filters</source>
<translation type="unfinished"></translation>
</message>
@@ -670,12 +676,12 @@
<context>
<name>FileErrorDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="87"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="92"/>
<source>Error on folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="90"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="95"/>
<source>Folder name</source>
<translation type="unfinished"></translation>
</message>
@@ -683,22 +689,22 @@
<context>
<name>FileExistsDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="191"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="201"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="198"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="208"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/>
<source>Error</source>
<translation type="unfinished">الخطا</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -706,22 +712,22 @@
<context>
<name>FileIsSameDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="140"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="145"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="147"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="152"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/>
<source>Error</source>
<translation type="unfinished">الخطا</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -868,27 +874,27 @@
<context>
<name>FolderExistsDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="84"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="91"/>
<source>Folder already exists</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="164"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="172"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="173"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="181"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/>
<source>Error</source>
<translation type="unfinished">الخطا</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -1096,13 +1102,15 @@ This version is compiled as version: %1.</source>
<name>MkPath</name>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="124"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="394"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="464"/>
<source>Unable to remove</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="187"/>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="210"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="363"/>
<source>Unable to create the folder</source>
<translation type="unfinished"></translation>
</message>
@@ -1112,22 +1120,27 @@ This version is compiled as version: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="255"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="304"/>
<source>Unable to temporary rename the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="278"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="339"/>
+ <source>Unable to reverse temporary rename for real move</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="348"/>
<source>Unable to do the final real move the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="309"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="379"/>
<source>Unable to move the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="385"/>
<source>Unable to move the folder: errno: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1206,7 +1219,7 @@ This version is compiled as version: %1.</source>
<message>
<location filename="../../../OptionDialog.ui" line="75"/>
<location filename="../../../OptionDialog.ui" line="366"/>
- <location filename="../../../OptionDialog.cpp" line="290"/>
+ <location filename="../../../OptionDialog.cpp" line="297"/>
<source>Copy engine</source>
<translation>محرك النسخ</translation>
</message>
@@ -1255,21 +1268,21 @@ This version is compiled as version: %1.</source>
<message>
<location filename="../../../OptionDialog.ui" line="80"/>
<location filename="../../../OptionDialog.ui" line="379"/>
- <location filename="../../../OptionDialog.cpp" line="291"/>
+ <location filename="../../../OptionDialog.cpp" line="298"/>
<source>Listener</source>
<translation>مستمع</translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="85"/>
<location filename="../../../OptionDialog.ui" line="384"/>
- <location filename="../../../OptionDialog.cpp" line="292"/>
+ <location filename="../../../OptionDialog.cpp" line="299"/>
<source>Plugin loader</source>
<translation>محمل المساعد</translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="93"/>
<location filename="../../../OptionDialog.ui" line="389"/>
- <location filename="../../../OptionDialog.cpp" line="293"/>
+ <location filename="../../../OptionDialog.cpp" line="300"/>
<source>Session loader</source>
<translation>محمل الجلسة</translation>
</message>
@@ -1415,78 +1428,78 @@ This version is compiled as version: %1.</source>
<translation>الكتابة مباشرة إلى الملف عند تلقي إدخال جديد (يمكن أن تنتج 50٪ من فقدان الأداء)</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="197"/>
- <location filename="../../../OptionDialog.cpp" line="211"/>
+ <location filename="../../../OptionDialog.cpp" line="204"/>
+ <location filename="../../../OptionDialog.cpp" line="218"/>
<source>Load</source>
<translation>حمل</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="197"/>
+ <location filename="../../../OptionDialog.cpp" line="204"/>
<source>Load the theme?</source>
<translation>تحميل الموضوع؟</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="211"/>
+ <location filename="../../../OptionDialog.cpp" line="218"/>
<source>Load the language?</source>
<translation>تحميل اللغة؟</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="298"/>
+ <location filename="../../../OptionDialog.cpp" line="305"/>
<source>Do nothing</source>
<translation>لا تفعل شيئا</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="299"/>
+ <location filename="../../../OptionDialog.cpp" line="306"/>
<source>Ask source as folder</source>
<translation>اسأل المصدر كمجلد</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="300"/>
+ <location filename="../../../OptionDialog.cpp" line="307"/>
<source>Ask sources as files</source>
<translation>اسأل المصادر كملفات</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="301"/>
+ <location filename="../../../OptionDialog.cpp" line="308"/>
<source>Never</source>
<translation>أبدا</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="302"/>
+ <location filename="../../../OptionDialog.cpp" line="309"/>
<source>When source is same</source>
<translatorcomment>عندما يكون المصدر هو نفسه</translatorcomment>
<translation>عندما يكون المصدر هو نفسه</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="303"/>
+ <location filename="../../../OptionDialog.cpp" line="310"/>
<source>When destination is same</source>
<translatorcomment>عندما الوجهة هي نفسها</translatorcomment>
<translation>عندما تكون الوجهة نفسها</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="304"/>
+ <location filename="../../../OptionDialog.cpp" line="311"/>
<source>When source and destination are same</source>
<translatorcomment>عندما المصدر والوجهة هي نفسها</translatorcomment>
<translation>عندما تكون المصدر والوجهة هي نفسها</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="305"/>
+ <location filename="../../../OptionDialog.cpp" line="312"/>
<source>When source or destination are same</source>
<translation>عندما المصدر أو الوجهة هي نفسها</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="306"/>
+ <location filename="../../../OptionDialog.cpp" line="313"/>
<source>Always</source>
<translation>دائما</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="320"/>
- <location filename="../../../OptionDialog.cpp" line="321"/>
- <location filename="../../../OptionDialog.cpp" line="322"/>
+ <location filename="../../../OptionDialog.cpp" line="327"/>
+ <location filename="../../../OptionDialog.cpp" line="328"/>
+ <location filename="../../../OptionDialog.cpp" line="329"/>
<source>The variables are %1</source>
<translation>%1 المتغيرات هي</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="962"/>
+ <location filename="../../../OptionDialog.cpp" line="969"/>
<source>Save logs as: </source>
<translation>حفظ السجلات باسم:</translation>
</message>
@@ -1779,12 +1792,12 @@ Error:%2</source>
<translation>مفتاح المنتج</translation>
</message>
<message>
- <location filename="../../../ProductKey.cpp" line="56"/>
+ <location filename="../../../ProductKey.cpp" line="60"/>
<source>Error</source>
<translation>الخطا</translation>
</message>
<message>
- <location filename="../../../ProductKey.cpp" line="56"/>
+ <location filename="../../../ProductKey.cpp" line="60"/>
<source>Your product key was rejected.&lt;br /&gt;If you buy key, unmark check your spam and unmark the mail as spam&lt;br /&gt;If you have not buy your key, go to &lt;a href=&quot;https://shop.first-world.info/&quot;&gt;https://shop.first-world.info/&lt;/a&gt;</source>
<translation>&lt;a href=&quot;https://shop.first-world.info/&quot;&gt;https://shop.first-world.info/&lt;/a&gt;إذا لم تشتري مفتاحك ، انتقل إلى &lt;br /&gt;إذا قمت بشراء المفتاح ، قم بإلغاء تحديد بريدك المزعج وإلغاء وضع علامة للبريد على انه غير مرغوب &lt;br /&gt;تم رفض مفتاح منتجك</translation>
</message>
@@ -1842,12 +1855,12 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="541"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="543"/>
<source>Unable to read the source file: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="595"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="599"/>
<source>File truncated during the read, possible data change</source>
<translation type="unfinished"></translation>
</message>
@@ -1903,32 +1916,38 @@ Error:%2</source>
<context>
<name>ScanFileOrFolder</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="452"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="454"/>
- <source>%1 - copy</source>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="331"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="681"/>
+ <source>Blacklisted folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="463"/>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="465"/>
- <source>%1 - copy (%2)</source>
+ <source>%1 - copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="576"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="578"/>
- <source>%name% - copy</source>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="474"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="476"/>
+ <source>%1 - copy (%2)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="587"/>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="589"/>
+ <source>%name% - copy</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="598"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="600"/>
<source>%name% - copy (%number%)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="673"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="677"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="691"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="695"/>
<source>Problem with folder read</source>
<translation type="unfinished"></translation>
</message>
@@ -2039,61 +2058,61 @@ Error:%2</source>
<context>
<name>Themes</name>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="328"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="341"/>
<source>Buy the Ultimate version to fund development</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="328"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="341"/>
<source>Register your key</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="427"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="440"/>
<source>File %1/%2, size: %3/%4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="661"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="674"/>
<source>Copy list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="663"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="676"/>
<source>Move list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1091"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1117"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1092"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1118"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1093"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1119"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1095"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1121"/>
<source>File Name, 0KB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1289"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1301"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1313"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1395"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1407"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1419"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1388"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1392"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1394"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1494"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1498"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1500"/>
<source>%1 %2% of %3</source>
<translation type="unfinished"></translation>
</message>
@@ -2101,24 +2120,24 @@ Error:%2</source>
<context>
<name>ThemesFactory</name>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="284"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="294"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="285"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="295"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="286"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="296"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="482"/>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="497"/>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="512"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="510"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="525"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="540"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
@@ -2126,29 +2145,29 @@ Error:%2</source>
<context>
<name>TransferThread</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="179"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="188"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="613"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="628"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="620"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="635"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="648"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="663"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/>
<source>File not found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="925"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="940"/>
<source>Unable to change the date</source>
<translation type="unfinished"></translation>
</message>
@@ -2156,19 +2175,19 @@ Error:%2</source>
<context>
<name>TransferThreadAsync</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="340"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/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="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="428"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="446"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="436"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="454"/>
<source>Unable to create the destination folder: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="431"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="448"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="439"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="456"/>
<source>Unable to create the destination folder, errno: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -2176,24 +2195,24 @@ Error:%2</source>
<context>
<name>WriteThread</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="135"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="138"/>
<source>Path resolution error (Empty path)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="164"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="197"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="167"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="200"/>
<source>Unable to create the destination folder: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="175"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="199"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="178"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="202"/>
<source>Unable to create the destination folder, errno: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="456"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="464"/>
<source>Internal error, please report it!</source>
<translation type="unfinished"></translation>
</message>
@@ -2508,8 +2527,8 @@ Error:%2</source>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="341"/>
- <source>Overwrite if newer</source>
- <translation type="unfinished">الكتابة فوق إذا كان أحدث</translation>
+ <source>Overwrite if source newer than destination</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="346"/>
@@ -2519,8 +2538,12 @@ Error:%2</source>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="354"/>
+ <source>Overwrite if source older than destination</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="357"/>
- <source>Overwrite if older</source>
+ <source>Overwrite if destination older</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2908,8 +2931,8 @@ Error:%2</source>
</message>
<message>
<location filename="../../Themes/Oxygen/themesOptions.ui" line="213"/>
- <source>Informations</source>
- <translation type="unfinished"></translation>
+ <source>Information</source>
+ <translation type="unfinished">المعلومات</translation>
</message>
<message>
<location filename="../../Themes/Oxygen/themesOptions.ui" line="219"/>
@@ -2922,28 +2945,38 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="257"/>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="269"/>
+ <source>Click to edit the color</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="368"/>
<source>Speed with progress bar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="267"/>
- <source>Show dual progression</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="378"/>
+ <source>Progression color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="277"/>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="388"/>
<source>Show progression in the title</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="287"/>
- <source>Progression color</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="395"/>
+ <source>General margin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="306"/>
- <source>Click to edit the color</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="402"/>
+ <source>Show dual progression</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="425"/>
+ <source>General spacing</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/plugins/Languages/de/informations.xml b/plugins/Languages/de/informations.xml
index 86964a5..f50f225 100644
--- a/plugins/Languages/de/informations.xml
+++ b/plugins/Languages/de/informations.xml
@@ -12,7 +12,7 @@
<!-- Detailed description -->
<description xml:lang="en"><![CDATA[Translation of Ultracopier to german. For more details see the web site.]]></description>
<!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number -->
- <version>2.2.4.7</version>
+ <version>2.2.6.0</version>
<!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. -->
<name>de</name>
<!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. -->
diff --git a/plugins/Languages/de/translation.qm b/plugins/Languages/de/translation.qm
index 9cc5174..143550a 100755
--- a/plugins/Languages/de/translation.qm
+++ b/plugins/Languages/de/translation.qm
Binary files differ
diff --git a/plugins/Languages/de/translation.ts b/plugins/Languages/de/translation.ts
index 96f6145..12db0eb 100644
--- a/plugins/Languages/de/translation.ts
+++ b/plugins/Languages/de/translation.ts
@@ -94,91 +94,96 @@
<context>
<name>CopyEngine</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="438"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="461"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="465"/>
<source>The engine is forced to move, you can&apos;t copy with it</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="473"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="496"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="519"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="542"/>
<source>The engine is forced to copy, you can&apos;t move with it</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/>
<source>Destination</source>
<translation type="unfinished">Ziel</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/>
<source>Use the actual destination &quot;%1&quot;?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="685"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/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/Ultracopier-Spec/CopyEngine.cpp" line="976"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="979"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="984"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="988"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="886"/>
+ <source>Supported only on Windows</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1035"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1038"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1043"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1047"/>
<source>Ask</source>
<translation type="unfinished">Fragen</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="977"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="981"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="985"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="989"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1036"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1040"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1044"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1048"/>
<source>Skip</source>
<translation type="unfinished">Überspringen</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="980"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1039"/>
<source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="982"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="994"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1041"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1053"/>
<source>Rename</source>
<translation type="unfinished">Umbenennen</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="986"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1045"/>
<source>Put at the end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="990"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1049"/>
<source>Overwrite</source>
<translation type="unfinished">Überschreiben</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="991"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1050"/>
<source>Overwrite if different</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="992"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1051"/>
<source>Overwrite if newer</source>
<translation type="unfinished">Überschreiben, falls neuer</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="993"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1052"/>
<source>Overwrite if older</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/>
<source>Options error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/>
<source>Options engine is not loaded. Unable to access the filters</source>
<translation type="unfinished"></translation>
</message>
@@ -186,75 +191,76 @@
<context>
<name>CopyEngineFactory</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="303"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="60"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="309"/>
<source>Supported only on Windows</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="430"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="433"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="438"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/>
<source>Ask</source>
<translation type="unfinished">Fragen</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="431"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="435"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="443"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="437"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="441"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="449"/>
<source>Skip</source>
<translation type="unfinished">Überspringen</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="434"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/>
<source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="454"/>
<source>Rename</source>
<translation type="unfinished">Umbenennen</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/>
<source>Put at the end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="450"/>
<source>Overwrite</source>
<translation type="unfinished">Überschreiben</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="451"/>
<source>Overwrite if different</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="452"/>
<source>Overwrite if newer</source>
<translation type="unfinished">Überschreiben, falls neuer</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="447"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="453"/>
<source>Overwrite if older</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/>
<source>Options error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/>
<source>Options engine is not loaded. Unable to access the filters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/>
<source>Options engine is not loaded, can&apos;t access to the filters</source>
<translation type="unfinished"></translation>
</message>
@@ -684,12 +690,12 @@
<context>
<name>FileErrorDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="87"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="92"/>
<source>Error on folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="90"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="95"/>
<source>Folder name</source>
<translation type="unfinished"></translation>
</message>
@@ -697,22 +703,22 @@
<context>
<name>FileExistsDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="191"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="201"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="198"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="208"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/>
<source>Error</source>
<translation type="unfinished">Fehler</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -720,22 +726,22 @@
<context>
<name>FileIsSameDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="140"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="145"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="147"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="152"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/>
<source>Error</source>
<translation type="unfinished">Fehler</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -882,27 +888,27 @@
<context>
<name>FolderExistsDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="84"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="91"/>
<source>Folder already exists</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="164"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="172"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="173"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="181"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/>
<source>Error</source>
<translation type="unfinished">Fehler</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -1112,13 +1118,15 @@ Diese Version wurde kompiliert als Version: %1.</translation>
<name>MkPath</name>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="124"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="394"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="464"/>
<source>Unable to remove</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="187"/>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="210"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="363"/>
<source>Unable to create the folder</source>
<translation type="unfinished"></translation>
</message>
@@ -1128,22 +1136,27 @@ Diese Version wurde kompiliert als Version: %1.</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="255"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="304"/>
<source>Unable to temporary rename the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="278"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="339"/>
+ <source>Unable to reverse temporary rename for real move</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="348"/>
<source>Unable to do the final real move the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="309"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="379"/>
<source>Unable to move the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="385"/>
<source>Unable to move the folder: errno: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1222,7 +1235,7 @@ Diese Version wurde kompiliert als Version: %1.</translation>
<message>
<location filename="../../../OptionDialog.ui" line="75"/>
<location filename="../../../OptionDialog.ui" line="366"/>
- <location filename="../../../OptionDialog.cpp" line="290"/>
+ <location filename="../../../OptionDialog.cpp" line="297"/>
<source>Copy engine</source>
<translation>Kopier-Engine</translation>
</message>
@@ -1270,21 +1283,21 @@ Diese Version wurde kompiliert als Version: %1.</translation>
<message>
<location filename="../../../OptionDialog.ui" line="80"/>
<location filename="../../../OptionDialog.ui" line="379"/>
- <location filename="../../../OptionDialog.cpp" line="291"/>
+ <location filename="../../../OptionDialog.cpp" line="298"/>
<source>Listener</source>
<translation>Listener</translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="85"/>
<location filename="../../../OptionDialog.ui" line="384"/>
- <location filename="../../../OptionDialog.cpp" line="292"/>
+ <location filename="../../../OptionDialog.cpp" line="299"/>
<source>Plugin loader</source>
<translation>Plugin loader</translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="93"/>
<location filename="../../../OptionDialog.ui" line="389"/>
- <location filename="../../../OptionDialog.cpp" line="293"/>
+ <location filename="../../../OptionDialog.cpp" line="300"/>
<source>Session loader</source>
<translation>Session loader</translation>
</message>
@@ -1416,75 +1429,75 @@ Diese Version wurde kompiliert als Version: %1.</translation>
<translation>Schreibe direkt in die Datei, wenn ein neuer Eintrag erreicht wird (50% Leistungsverlust möglich)</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="197"/>
- <location filename="../../../OptionDialog.cpp" line="211"/>
+ <location filename="../../../OptionDialog.cpp" line="204"/>
+ <location filename="../../../OptionDialog.cpp" line="218"/>
<source>Load</source>
<translation>Laden</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="197"/>
+ <location filename="../../../OptionDialog.cpp" line="204"/>
<source>Load the theme?</source>
<translation>Dieses Theme laden?</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="211"/>
+ <location filename="../../../OptionDialog.cpp" line="218"/>
<source>Load the language?</source>
<translation>Diese Sprache laden?</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="298"/>
+ <location filename="../../../OptionDialog.cpp" line="305"/>
<source>Do nothing</source>
<translation>Nichts unternehmen</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="299"/>
+ <location filename="../../../OptionDialog.cpp" line="306"/>
<source>Ask source as folder</source>
<translation>Nach Quell-Ordner fragen</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="300"/>
+ <location filename="../../../OptionDialog.cpp" line="307"/>
<source>Ask sources as files</source>
<translation>Nach Quell-Datei fragen</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="301"/>
+ <location filename="../../../OptionDialog.cpp" line="308"/>
<source>Never</source>
<translation>Nie</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="302"/>
+ <location filename="../../../OptionDialog.cpp" line="309"/>
<source>When source is same</source>
<translation>Falls Quelle gleich ist</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="303"/>
+ <location filename="../../../OptionDialog.cpp" line="310"/>
<source>When destination is same</source>
<translation>Falls Ziel gleich ist</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="304"/>
+ <location filename="../../../OptionDialog.cpp" line="311"/>
<source>When source and destination are same</source>
<translation>Falls Quelle und Ziel gleich sind</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="305"/>
+ <location filename="../../../OptionDialog.cpp" line="312"/>
<source>When source or destination are same</source>
<translation>Falls Quelle oder Ziel gleich sind</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="306"/>
+ <location filename="../../../OptionDialog.cpp" line="313"/>
<source>Always</source>
<translation>Immer</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="320"/>
- <location filename="../../../OptionDialog.cpp" line="321"/>
- <location filename="../../../OptionDialog.cpp" line="322"/>
+ <location filename="../../../OptionDialog.cpp" line="327"/>
+ <location filename="../../../OptionDialog.cpp" line="328"/>
+ <location filename="../../../OptionDialog.cpp" line="329"/>
<source>The variables are %1</source>
<translation>Die Variablen sind %1</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="962"/>
+ <location filename="../../../OptionDialog.cpp" line="969"/>
<source>Save logs as: </source>
<translation>Protokolle speichern als: </translation>
</message>
@@ -1791,12 +1804,12 @@ Error:%2</source>
<translation>Produktschlüssel</translation>
</message>
<message>
- <location filename="../../../ProductKey.cpp" line="56"/>
+ <location filename="../../../ProductKey.cpp" line="60"/>
<source>Error</source>
<translation>Fehler</translation>
</message>
<message>
- <location filename="../../../ProductKey.cpp" line="56"/>
+ <location filename="../../../ProductKey.cpp" line="60"/>
<source>Your product key was rejected.&lt;br /&gt;If you buy key, unmark check your spam and unmark the mail as spam&lt;br /&gt;If you have not buy your key, go to &lt;a href=&quot;https://shop.first-world.info/&quot;&gt;https://shop.first-world.info/&lt;/a&gt;</source>
<translation>Ihr Produktschlüssel wurde verweigert. &lt;br /&gt; Wenn Sie einen Schlüssel gekauft haben, überprüfen Sie auch Ihren Spam-Ordner. &lt;br /&gt;Wenn Sie noch keinen Schlüssel erworben haben gehen Sie bitte auf &lt;a href=&quot;https://shop.first-world.info/&quot;&gt;https://shop.first-world.info/&lt;/a&gt;</translation>
</message>
@@ -1854,12 +1867,12 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="541"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="543"/>
<source>Unable to read the source file: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="595"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="599"/>
<source>File truncated during the read, possible data change</source>
<translation type="unfinished"></translation>
</message>
@@ -1915,32 +1928,38 @@ Error:%2</source>
<context>
<name>ScanFileOrFolder</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="452"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="454"/>
- <source>%1 - copy</source>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="331"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="681"/>
+ <source>Blacklisted folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="463"/>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="465"/>
- <source>%1 - copy (%2)</source>
+ <source>%1 - copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="576"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="578"/>
- <source>%name% - copy</source>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="474"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="476"/>
+ <source>%1 - copy (%2)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="587"/>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="589"/>
+ <source>%name% - copy</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="598"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="600"/>
<source>%name% - copy (%number%)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="673"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="677"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="691"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="695"/>
<source>Problem with folder read</source>
<translation type="unfinished"></translation>
</message>
@@ -2051,61 +2070,61 @@ Error:%2</source>
<context>
<name>Themes</name>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="328"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="341"/>
<source>Buy the Ultimate version to fund development</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="328"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="341"/>
<source>Register your key</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="427"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="440"/>
<source>File %1/%2, size: %3/%4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="661"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="674"/>
<source>Copy list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="663"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="676"/>
<source>Move list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1091"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1117"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1092"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1118"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1093"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1119"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1095"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1121"/>
<source>File Name, 0KB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1289"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1301"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1313"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1395"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1407"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1419"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1388"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1392"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1394"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1494"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1498"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1500"/>
<source>%1 %2% of %3</source>
<translation type="unfinished"></translation>
</message>
@@ -2113,24 +2132,24 @@ Error:%2</source>
<context>
<name>ThemesFactory</name>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="284"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="294"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="285"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="295"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="286"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="296"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="482"/>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="497"/>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="512"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="510"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="525"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="540"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
@@ -2138,29 +2157,29 @@ Error:%2</source>
<context>
<name>TransferThread</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="179"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="188"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="613"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="628"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="620"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="635"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="648"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="663"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/>
<source>File not found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="925"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="940"/>
<source>Unable to change the date</source>
<translation type="unfinished"></translation>
</message>
@@ -2168,19 +2187,19 @@ Error:%2</source>
<context>
<name>TransferThreadAsync</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="340"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/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="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="428"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="446"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="436"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="454"/>
<source>Unable to create the destination folder: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="431"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="448"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="439"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="456"/>
<source>Unable to create the destination folder, errno: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -2188,24 +2207,24 @@ Error:%2</source>
<context>
<name>WriteThread</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="135"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="138"/>
<source>Path resolution error (Empty path)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="164"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="197"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="167"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="200"/>
<source>Unable to create the destination folder: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="175"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="199"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="178"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="202"/>
<source>Unable to create the destination folder, errno: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="456"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="464"/>
<source>Internal error, please report it!</source>
<translation type="unfinished"></translation>
</message>
@@ -2520,8 +2539,8 @@ Error:%2</source>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="341"/>
- <source>Overwrite if newer</source>
- <translation type="unfinished">Überschreiben, falls neuer</translation>
+ <source>Overwrite if source newer than destination</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="346"/>
@@ -2531,8 +2550,12 @@ Error:%2</source>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="354"/>
+ <source>Overwrite if source older than destination</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="357"/>
- <source>Overwrite if older</source>
+ <source>Overwrite if destination older</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2920,7 +2943,7 @@ Error:%2</source>
</message>
<message>
<location filename="../../Themes/Oxygen/themesOptions.ui" line="213"/>
- <source>Informations</source>
+ <source>Information</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2934,28 +2957,38 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="257"/>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="269"/>
+ <source>Click to edit the color</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="368"/>
<source>Speed with progress bar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="267"/>
- <source>Show dual progression</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="378"/>
+ <source>Progression color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="277"/>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="388"/>
<source>Show progression in the title</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="287"/>
- <source>Progression color</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="395"/>
+ <source>General margin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="306"/>
- <source>Click to edit the color</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="402"/>
+ <source>Show dual progression</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="425"/>
+ <source>General spacing</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/plugins/Languages/el/informations.xml b/plugins/Languages/el/informations.xml
index 860e9a0..faf1b79 100755
--- a/plugins/Languages/el/informations.xml
+++ b/plugins/Languages/el/informations.xml
@@ -12,7 +12,7 @@
<!-- Detailed description -->
<description xml:lang="en"><![CDATA[Translation of Ultracopier to greek. For more details see the web site.]]></description>
<!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number -->
- <version>2.2.4.7</version>
+ <version>2.2.6.0</version>
<!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. -->
<name>el</name>
<!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. -->
diff --git a/plugins/Languages/el/translation.ts b/plugins/Languages/el/translation.ts
index 2066182..b1cbcc0 100755
--- a/plugins/Languages/el/translation.ts
+++ b/plugins/Languages/el/translation.ts
@@ -93,91 +93,96 @@
<context>
<name>CopyEngine</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="438"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="461"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="465"/>
<source>The engine is forced to move, you can&apos;t copy with it</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="473"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="496"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="519"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="542"/>
<source>The engine is forced to copy, you can&apos;t move with it</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/>
<source>Destination</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/>
<source>Use the actual destination &quot;%1&quot;?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="685"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/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/Ultracopier-Spec/CopyEngine.cpp" line="976"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="979"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="984"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="988"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="886"/>
+ <source>Supported only on Windows</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1035"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1038"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1043"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1047"/>
<source>Ask</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="977"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="981"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="985"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="989"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1036"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1040"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1044"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1048"/>
<source>Skip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="980"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1039"/>
<source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="982"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="994"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1041"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1053"/>
<source>Rename</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="986"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1045"/>
<source>Put at the end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="990"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1049"/>
<source>Overwrite</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="991"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1050"/>
<source>Overwrite if different</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="992"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1051"/>
<source>Overwrite if newer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="993"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1052"/>
<source>Overwrite if older</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/>
<source>Options error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/>
<source>Options engine is not loaded. Unable to access the filters</source>
<translation type="unfinished"></translation>
</message>
@@ -185,75 +190,76 @@
<context>
<name>CopyEngineFactory</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="303"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="60"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="309"/>
<source>Supported only on Windows</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="430"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="433"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="438"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/>
<source>Ask</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="431"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="435"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="443"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="437"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="441"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="449"/>
<source>Skip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="434"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/>
<source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="454"/>
<source>Rename</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/>
<source>Put at the end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="450"/>
<source>Overwrite</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="451"/>
<source>Overwrite if different</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="452"/>
<source>Overwrite if newer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="447"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="453"/>
<source>Overwrite if older</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/>
<source>Options error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/>
<source>Options engine is not loaded. Unable to access the filters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/>
<source>Options engine is not loaded, can&apos;t access to the filters</source>
<translation type="unfinished"></translation>
</message>
@@ -670,12 +676,12 @@
<context>
<name>FileErrorDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="87"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="92"/>
<source>Error on folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="90"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="95"/>
<source>Folder name</source>
<translation type="unfinished"></translation>
</message>
@@ -683,22 +689,22 @@
<context>
<name>FileExistsDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="191"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="201"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="198"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="208"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -706,22 +712,22 @@
<context>
<name>FileIsSameDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="140"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="145"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="147"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="152"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -868,27 +874,27 @@
<context>
<name>FolderExistsDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="84"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="91"/>
<source>Folder already exists</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="164"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="172"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="173"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="181"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -1096,13 +1102,15 @@ This version is compiled as version: %1.</source>
<name>MkPath</name>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="124"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="394"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="464"/>
<source>Unable to remove</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="187"/>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="210"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="363"/>
<source>Unable to create the folder</source>
<translation type="unfinished"></translation>
</message>
@@ -1112,22 +1120,27 @@ This version is compiled as version: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="255"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="304"/>
<source>Unable to temporary rename the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="278"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="339"/>
+ <source>Unable to reverse temporary rename for real move</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="348"/>
<source>Unable to do the final real move the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="309"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="379"/>
<source>Unable to move the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="385"/>
<source>Unable to move the folder: errno: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1206,7 +1219,7 @@ This version is compiled as version: %1.</source>
<message>
<location filename="../../../OptionDialog.ui" line="75"/>
<location filename="../../../OptionDialog.ui" line="366"/>
- <location filename="../../../OptionDialog.cpp" line="290"/>
+ <location filename="../../../OptionDialog.cpp" line="297"/>
<source>Copy engine</source>
<translation type="unfinished"></translation>
</message>
@@ -1254,21 +1267,21 @@ This version is compiled as version: %1.</source>
<message>
<location filename="../../../OptionDialog.ui" line="80"/>
<location filename="../../../OptionDialog.ui" line="379"/>
- <location filename="../../../OptionDialog.cpp" line="291"/>
+ <location filename="../../../OptionDialog.cpp" line="298"/>
<source>Listener</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="85"/>
<location filename="../../../OptionDialog.ui" line="384"/>
- <location filename="../../../OptionDialog.cpp" line="292"/>
+ <location filename="../../../OptionDialog.cpp" line="299"/>
<source>Plugin loader</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="93"/>
<location filename="../../../OptionDialog.ui" line="389"/>
- <location filename="../../../OptionDialog.cpp" line="293"/>
+ <location filename="../../../OptionDialog.cpp" line="300"/>
<source>Session loader</source>
<translation type="unfinished"></translation>
</message>
@@ -1410,75 +1423,75 @@ This version is compiled as version: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="197"/>
- <location filename="../../../OptionDialog.cpp" line="211"/>
+ <location filename="../../../OptionDialog.cpp" line="204"/>
+ <location filename="../../../OptionDialog.cpp" line="218"/>
<source>Load</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="197"/>
+ <location filename="../../../OptionDialog.cpp" line="204"/>
<source>Load the theme?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="211"/>
+ <location filename="../../../OptionDialog.cpp" line="218"/>
<source>Load the language?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="298"/>
+ <location filename="../../../OptionDialog.cpp" line="305"/>
<source>Do nothing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="299"/>
+ <location filename="../../../OptionDialog.cpp" line="306"/>
<source>Ask source as folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="300"/>
+ <location filename="../../../OptionDialog.cpp" line="307"/>
<source>Ask sources as files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="301"/>
+ <location filename="../../../OptionDialog.cpp" line="308"/>
<source>Never</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="302"/>
+ <location filename="../../../OptionDialog.cpp" line="309"/>
<source>When source is same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="303"/>
+ <location filename="../../../OptionDialog.cpp" line="310"/>
<source>When destination is same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="304"/>
+ <location filename="../../../OptionDialog.cpp" line="311"/>
<source>When source and destination are same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="305"/>
+ <location filename="../../../OptionDialog.cpp" line="312"/>
<source>When source or destination are same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="306"/>
+ <location filename="../../../OptionDialog.cpp" line="313"/>
<source>Always</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="320"/>
- <location filename="../../../OptionDialog.cpp" line="321"/>
- <location filename="../../../OptionDialog.cpp" line="322"/>
+ <location filename="../../../OptionDialog.cpp" line="327"/>
+ <location filename="../../../OptionDialog.cpp" line="328"/>
+ <location filename="../../../OptionDialog.cpp" line="329"/>
<source>The variables are %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="962"/>
+ <location filename="../../../OptionDialog.cpp" line="969"/>
<source>Save logs as: </source>
<translation type="unfinished"></translation>
</message>
@@ -1771,12 +1784,12 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../ProductKey.cpp" line="56"/>
+ <location filename="../../../ProductKey.cpp" line="60"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../ProductKey.cpp" line="56"/>
+ <location filename="../../../ProductKey.cpp" line="60"/>
<source>Your product key was rejected.&lt;br /&gt;If you buy key, unmark check your spam and unmark the mail as spam&lt;br /&gt;If you have not buy your key, go to &lt;a href=&quot;https://shop.first-world.info/&quot;&gt;https://shop.first-world.info/&lt;/a&gt;</source>
<translation type="unfinished"></translation>
</message>
@@ -1834,12 +1847,12 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="541"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="543"/>
<source>Unable to read the source file: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="595"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="599"/>
<source>File truncated during the read, possible data change</source>
<translation type="unfinished"></translation>
</message>
@@ -1895,32 +1908,38 @@ Error:%2</source>
<context>
<name>ScanFileOrFolder</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="452"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="454"/>
- <source>%1 - copy</source>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="331"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="681"/>
+ <source>Blacklisted folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="463"/>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="465"/>
- <source>%1 - copy (%2)</source>
+ <source>%1 - copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="576"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="578"/>
- <source>%name% - copy</source>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="474"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="476"/>
+ <source>%1 - copy (%2)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="587"/>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="589"/>
+ <source>%name% - copy</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="598"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="600"/>
<source>%name% - copy (%number%)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="673"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="677"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="691"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="695"/>
<source>Problem with folder read</source>
<translation type="unfinished"></translation>
</message>
@@ -2031,61 +2050,61 @@ Error:%2</source>
<context>
<name>Themes</name>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="328"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="341"/>
<source>Buy the Ultimate version to fund development</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="328"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="341"/>
<source>Register your key</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="427"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="440"/>
<source>File %1/%2, size: %3/%4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="661"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="674"/>
<source>Copy list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="663"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="676"/>
<source>Move list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1091"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1117"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1092"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1118"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1093"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1119"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1095"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1121"/>
<source>File Name, 0KB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1289"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1301"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1313"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1395"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1407"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1419"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1388"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1392"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1394"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1494"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1498"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1500"/>
<source>%1 %2% of %3</source>
<translation type="unfinished"></translation>
</message>
@@ -2093,24 +2112,24 @@ Error:%2</source>
<context>
<name>ThemesFactory</name>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="284"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="294"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="285"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="295"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="286"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="296"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="482"/>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="497"/>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="512"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="510"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="525"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="540"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
@@ -2118,29 +2137,29 @@ Error:%2</source>
<context>
<name>TransferThread</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="179"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="188"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="613"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="628"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="620"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="635"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="648"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="663"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/>
<source>File not found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="925"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="940"/>
<source>Unable to change the date</source>
<translation type="unfinished"></translation>
</message>
@@ -2148,19 +2167,19 @@ Error:%2</source>
<context>
<name>TransferThreadAsync</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="340"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/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="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="428"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="446"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="436"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="454"/>
<source>Unable to create the destination folder: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="431"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="448"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="439"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="456"/>
<source>Unable to create the destination folder, errno: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -2168,24 +2187,24 @@ Error:%2</source>
<context>
<name>WriteThread</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="135"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="138"/>
<source>Path resolution error (Empty path)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="164"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="197"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="167"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="200"/>
<source>Unable to create the destination folder: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="175"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="199"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="178"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="202"/>
<source>Unable to create the destination folder, errno: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="456"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="464"/>
<source>Internal error, please report it!</source>
<translation type="unfinished"></translation>
</message>
@@ -2500,7 +2519,7 @@ Error:%2</source>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="341"/>
- <source>Overwrite if newer</source>
+ <source>Overwrite if source newer than destination</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2511,8 +2530,12 @@ Error:%2</source>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="354"/>
+ <source>Overwrite if source older than destination</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="357"/>
- <source>Overwrite if older</source>
+ <source>Overwrite if destination older</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2900,7 +2923,7 @@ Error:%2</source>
</message>
<message>
<location filename="../../Themes/Oxygen/themesOptions.ui" line="213"/>
- <source>Informations</source>
+ <source>Information</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2914,28 +2937,38 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="257"/>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="269"/>
+ <source>Click to edit the color</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="368"/>
<source>Speed with progress bar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="267"/>
- <source>Show dual progression</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="378"/>
+ <source>Progression color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="277"/>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="388"/>
<source>Show progression in the title</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="287"/>
- <source>Progression color</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="395"/>
+ <source>General margin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="306"/>
- <source>Click to edit the color</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="402"/>
+ <source>Show dual progression</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="425"/>
+ <source>General spacing</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/plugins/Languages/es/informations.xml b/plugins/Languages/es/informations.xml
index 9a11458..5c9a0c5 100755
--- a/plugins/Languages/es/informations.xml
+++ b/plugins/Languages/es/informations.xml
@@ -12,7 +12,7 @@
<!-- Detailed description -->
<description xml:lang="en"><![CDATA[Translation of Ultracopier to spanish. For more details see the web site.]]></description>
<!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number -->
- <version>2.2.4.7</version>
+ <version>2.2.6.0</version>
<!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. -->
<name>es</name>
<!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. -->
diff --git a/plugins/Languages/es/translation.qm b/plugins/Languages/es/translation.qm
index ef1c26c..38c59cb 100755
--- a/plugins/Languages/es/translation.qm
+++ b/plugins/Languages/es/translation.qm
Binary files differ
diff --git a/plugins/Languages/es/translation.ts b/plugins/Languages/es/translation.ts
index c93f06c..5627778 100755
--- a/plugins/Languages/es/translation.ts
+++ b/plugins/Languages/es/translation.ts
@@ -93,91 +93,96 @@
<context>
<name>CopyEngine</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="438"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="461"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="465"/>
<source>The engine is forced to move, you can&apos;t copy with it</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="473"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="496"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="519"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="542"/>
<source>The engine is forced to copy, you can&apos;t move with it</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/>
<source>Destination</source>
<translation type="unfinished">Destino</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/>
<source>Use the actual destination &quot;%1&quot;?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="685"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/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/Ultracopier-Spec/CopyEngine.cpp" line="976"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="979"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="984"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="988"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="886"/>
+ <source>Supported only on Windows</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1035"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1038"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1043"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1047"/>
<source>Ask</source>
<translation type="unfinished">Pedir</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="977"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="981"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="985"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="989"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1036"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1040"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1044"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1048"/>
<source>Skip</source>
<translation type="unfinished">Salto</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="980"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1039"/>
<source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="982"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="994"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1041"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1053"/>
<source>Rename</source>
<translation type="unfinished">Cambiar el nombre</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="986"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1045"/>
<source>Put at the end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="990"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1049"/>
<source>Overwrite</source>
<translation type="unfinished">Sobrescribir</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="991"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1050"/>
<source>Overwrite if different</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="992"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1051"/>
<source>Overwrite if newer</source>
<translation type="unfinished">Sobrescribir si nuevo</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="993"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1052"/>
<source>Overwrite if older</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/>
<source>Options error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/>
<source>Options engine is not loaded. Unable to access the filters</source>
<translation type="unfinished"></translation>
</message>
@@ -185,75 +190,76 @@
<context>
<name>CopyEngineFactory</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="303"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="60"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="309"/>
<source>Supported only on Windows</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="430"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="433"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="438"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/>
<source>Ask</source>
<translation type="unfinished">Pedir</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="431"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="435"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="443"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="437"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="441"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="449"/>
<source>Skip</source>
<translation type="unfinished">Salto</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="434"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/>
<source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="454"/>
<source>Rename</source>
<translation type="unfinished">Cambiar el nombre</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/>
<source>Put at the end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="450"/>
<source>Overwrite</source>
<translation type="unfinished">Sobrescribir</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="451"/>
<source>Overwrite if different</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="452"/>
<source>Overwrite if newer</source>
<translation type="unfinished">Sobrescribir si nuevo</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="447"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="453"/>
<source>Overwrite if older</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/>
<source>Options error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/>
<source>Options engine is not loaded. Unable to access the filters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/>
<source>Options engine is not loaded, can&apos;t access to the filters</source>
<translation type="unfinished"></translation>
</message>
@@ -672,12 +678,12 @@ Este motor de copia no soporta mover</translation>
<context>
<name>FileErrorDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="87"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="92"/>
<source>Error on folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="90"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="95"/>
<source>Folder name</source>
<translation type="unfinished"></translation>
</message>
@@ -685,22 +691,22 @@ Este motor de copia no soporta mover</translation>
<context>
<name>FileExistsDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="191"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="201"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="198"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="208"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/>
<source>Error</source>
<translation type="unfinished">Error</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -708,22 +714,22 @@ Este motor de copia no soporta mover</translation>
<context>
<name>FileIsSameDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="140"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="145"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="147"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="152"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/>
<source>Error</source>
<translation type="unfinished">Error</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -870,27 +876,27 @@ Este motor de copia no soporta mover</translation>
<context>
<name>FolderExistsDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="84"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="91"/>
<source>Folder already exists</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="164"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="172"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="173"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="181"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/>
<source>Error</source>
<translation type="unfinished">Error</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -1099,13 +1105,15 @@ Esta versión está compilada en versión:%1.</translation>
<name>MkPath</name>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="124"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="394"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="464"/>
<source>Unable to remove</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="187"/>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="210"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="363"/>
<source>Unable to create the folder</source>
<translation type="unfinished"></translation>
</message>
@@ -1115,22 +1123,27 @@ Esta versión está compilada en versión:%1.</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="255"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="304"/>
<source>Unable to temporary rename the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="278"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="339"/>
+ <source>Unable to reverse temporary rename for real move</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="348"/>
<source>Unable to do the final real move the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="309"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="379"/>
<source>Unable to move the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="385"/>
<source>Unable to move the folder: errno: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1209,7 +1222,7 @@ Esta versión está compilada en versión:%1.</translation>
<message>
<location filename="../../../OptionDialog.ui" line="75"/>
<location filename="../../../OptionDialog.ui" line="366"/>
- <location filename="../../../OptionDialog.cpp" line="290"/>
+ <location filename="../../../OptionDialog.cpp" line="297"/>
<source>Copy engine</source>
<translation>Motor de copia</translation>
</message>
@@ -1257,21 +1270,21 @@ Esta versión está compilada en versión:%1.</translation>
<message>
<location filename="../../../OptionDialog.ui" line="80"/>
<location filename="../../../OptionDialog.ui" line="379"/>
- <location filename="../../../OptionDialog.cpp" line="291"/>
+ <location filename="../../../OptionDialog.cpp" line="298"/>
<source>Listener</source>
<translation>Oyente</translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="85"/>
<location filename="../../../OptionDialog.ui" line="384"/>
- <location filename="../../../OptionDialog.cpp" line="292"/>
+ <location filename="../../../OptionDialog.cpp" line="299"/>
<source>Plugin loader</source>
<translation>Plugin cargador</translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="93"/>
<location filename="../../../OptionDialog.ui" line="389"/>
- <location filename="../../../OptionDialog.cpp" line="293"/>
+ <location filename="../../../OptionDialog.cpp" line="300"/>
<source>Session loader</source>
<translation>Sesión cargador</translation>
</message>
@@ -1423,75 +1436,75 @@ Esta versión está compilada en versión:%1.</translation>
<translation>Escriba directamente el archivo cuando se recibe una nueva entrada (se puede producir un 50% de pérdida de rendimiento)</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="197"/>
- <location filename="../../../OptionDialog.cpp" line="211"/>
+ <location filename="../../../OptionDialog.cpp" line="204"/>
+ <location filename="../../../OptionDialog.cpp" line="218"/>
<source>Load</source>
<translation>Cargar</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="197"/>
+ <location filename="../../../OptionDialog.cpp" line="204"/>
<source>Load the theme?</source>
<translation>Cargue el tema?</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="211"/>
+ <location filename="../../../OptionDialog.cpp" line="218"/>
<source>Load the language?</source>
<translation>Cargue el idioma?</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="298"/>
+ <location filename="../../../OptionDialog.cpp" line="305"/>
<source>Do nothing</source>
<translation>No hacer nada</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="299"/>
+ <location filename="../../../OptionDialog.cpp" line="306"/>
<source>Ask source as folder</source>
<translation>Pregunte a la fuente que la carpeta</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="300"/>
+ <location filename="../../../OptionDialog.cpp" line="307"/>
<source>Ask sources as files</source>
<translation>Pregunte a las fuentes como archivos</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="301"/>
+ <location filename="../../../OptionDialog.cpp" line="308"/>
<source>Never</source>
<translation>Nunca</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="302"/>
+ <location filename="../../../OptionDialog.cpp" line="309"/>
<source>When source is same</source>
<translation>Cuando la fuente es la misma</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="303"/>
+ <location filename="../../../OptionDialog.cpp" line="310"/>
<source>When destination is same</source>
<translation>Cuando destino es el mismo</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="304"/>
+ <location filename="../../../OptionDialog.cpp" line="311"/>
<source>When source and destination are same</source>
<translation>Cuando la fuente y el destino son los mismos</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="305"/>
+ <location filename="../../../OptionDialog.cpp" line="312"/>
<source>When source or destination are same</source>
<translation>Cuando la fuente o el destino son los mismos</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="306"/>
+ <location filename="../../../OptionDialog.cpp" line="313"/>
<source>Always</source>
<translation>Siempre</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="320"/>
- <location filename="../../../OptionDialog.cpp" line="321"/>
- <location filename="../../../OptionDialog.cpp" line="322"/>
+ <location filename="../../../OptionDialog.cpp" line="327"/>
+ <location filename="../../../OptionDialog.cpp" line="328"/>
+ <location filename="../../../OptionDialog.cpp" line="329"/>
<source>The variables are %1</source>
<translation>Las variables son %1</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="962"/>
+ <location filename="../../../OptionDialog.cpp" line="969"/>
<source>Save logs as: </source>
<translation>Guardar registros como: </translation>
</message>
@@ -1779,12 +1792,12 @@ Error:%2</translation>
<translation>Clave de producto</translation>
</message>
<message>
- <location filename="../../../ProductKey.cpp" line="56"/>
+ <location filename="../../../ProductKey.cpp" line="60"/>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
- <location filename="../../../ProductKey.cpp" line="56"/>
+ <location filename="../../../ProductKey.cpp" line="60"/>
<source>Your product key was rejected.&lt;br /&gt;If you buy key, unmark check your spam and unmark the mail as spam&lt;br /&gt;If you have not buy your key, go to &lt;a href=&quot;https://shop.first-world.info/&quot;&gt;https://shop.first-world.info/&lt;/a&gt;</source>
<translation>Su clave de producto fue rechazada. &lt;br /&gt; Si compra la clave, desmarque, verifique su correo no deseado y desmarque el correo como spam &lt;br /&gt; Si no ha comprado su clave, vaya a &lt;a href=&quot;https://shop.first-world.info/&quot;&gt;https://shop.first-world.info/&lt;/a&gt;</translation>
</message>
@@ -1842,12 +1855,12 @@ Error:%2</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="541"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="543"/>
<source>Unable to read the source file: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="595"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="599"/>
<source>File truncated during the read, possible data change</source>
<translation type="unfinished"></translation>
</message>
@@ -1903,32 +1916,38 @@ Error:%2</translation>
<context>
<name>ScanFileOrFolder</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="452"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="454"/>
- <source>%1 - copy</source>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="331"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="681"/>
+ <source>Blacklisted folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="463"/>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="465"/>
- <source>%1 - copy (%2)</source>
+ <source>%1 - copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="576"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="578"/>
- <source>%name% - copy</source>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="474"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="476"/>
+ <source>%1 - copy (%2)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="587"/>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="589"/>
+ <source>%name% - copy</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="598"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="600"/>
<source>%name% - copy (%number%)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="673"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="677"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="691"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="695"/>
<source>Problem with folder read</source>
<translation type="unfinished"></translation>
</message>
@@ -2039,61 +2058,61 @@ Error:%2</translation>
<context>
<name>Themes</name>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="328"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="341"/>
<source>Buy the Ultimate version to fund development</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="328"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="341"/>
<source>Register your key</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="427"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="440"/>
<source>File %1/%2, size: %3/%4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="661"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="674"/>
<source>Copy list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="663"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="676"/>
<source>Move list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1091"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1117"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1092"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1118"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1093"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1119"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1095"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1121"/>
<source>File Name, 0KB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1289"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1301"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1313"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1395"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1407"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1419"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1388"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1392"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1394"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1494"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1498"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1500"/>
<source>%1 %2% of %3</source>
<translation type="unfinished"></translation>
</message>
@@ -2101,24 +2120,24 @@ Error:%2</translation>
<context>
<name>ThemesFactory</name>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="284"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="294"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="285"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="295"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="286"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="296"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="482"/>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="497"/>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="512"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="510"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="525"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="540"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
@@ -2126,29 +2145,29 @@ Error:%2</translation>
<context>
<name>TransferThread</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="179"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="188"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="613"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="628"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="620"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="635"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="648"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="663"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/>
<source>File not found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="925"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="940"/>
<source>Unable to change the date</source>
<translation type="unfinished"></translation>
</message>
@@ -2156,19 +2175,19 @@ Error:%2</translation>
<context>
<name>TransferThreadAsync</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="340"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/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="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="428"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="446"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="436"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="454"/>
<source>Unable to create the destination folder: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="431"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="448"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="439"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="456"/>
<source>Unable to create the destination folder, errno: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -2176,24 +2195,24 @@ Error:%2</translation>
<context>
<name>WriteThread</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="135"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="138"/>
<source>Path resolution error (Empty path)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="164"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="197"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="167"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="200"/>
<source>Unable to create the destination folder: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="175"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="199"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="178"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="202"/>
<source>Unable to create the destination folder, errno: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="456"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="464"/>
<source>Internal error, please report it!</source>
<translation type="unfinished"></translation>
</message>
@@ -2508,8 +2527,8 @@ Error:%2</translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="341"/>
- <source>Overwrite if newer</source>
- <translation type="unfinished">Sobrescribir si nuevo</translation>
+ <source>Overwrite if source newer than destination</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="346"/>
@@ -2519,8 +2538,12 @@ Error:%2</translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="354"/>
+ <source>Overwrite if source older than destination</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="357"/>
- <source>Overwrite if older</source>
+ <source>Overwrite if destination older</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2908,8 +2931,8 @@ Error:%2</translation>
</message>
<message>
<location filename="../../Themes/Oxygen/themesOptions.ui" line="213"/>
- <source>Informations</source>
- <translation type="unfinished"></translation>
+ <source>Information</source>
+ <translation type="unfinished">Información</translation>
</message>
<message>
<location filename="../../Themes/Oxygen/themesOptions.ui" line="219"/>
@@ -2922,28 +2945,38 @@ Error:%2</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="257"/>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="269"/>
+ <source>Click to edit the color</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="368"/>
<source>Speed with progress bar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="267"/>
- <source>Show dual progression</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="378"/>
+ <source>Progression color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="277"/>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="388"/>
<source>Show progression in the title</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="287"/>
- <source>Progression color</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="395"/>
+ <source>General margin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="306"/>
- <source>Click to edit the color</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="402"/>
+ <source>Show dual progression</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="425"/>
+ <source>General spacing</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/plugins/Languages/fr/informations.xml b/plugins/Languages/fr/informations.xml
index 4b614d0..e994c3c 100755
--- a/plugins/Languages/fr/informations.xml
+++ b/plugins/Languages/fr/informations.xml
@@ -15,7 +15,7 @@
<description xml:lang="en"><![CDATA[Translation of Ultracopier to French. For more details see the web site.]]></description>
<description xml:lang="fr"><![CDATA[Traduction d'ultracopier en Français. Pour plus de détails regardez le site web]]></description>
<!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number -->
- <version>2.2.4.7</version>
+ <version>2.2.6.0</version>
<!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. -->
<name>fr</name>
<!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. -->
diff --git a/plugins/Languages/fr/translation.qm b/plugins/Languages/fr/translation.qm
index 7ca3f05..64c79a2 100755
--- a/plugins/Languages/fr/translation.qm
+++ b/plugins/Languages/fr/translation.qm
Binary files differ
diff --git a/plugins/Languages/fr/translation.ts b/plugins/Languages/fr/translation.ts
index 3d2ed5c..e1a3a87 100755
--- a/plugins/Languages/fr/translation.ts
+++ b/plugins/Languages/fr/translation.ts
@@ -93,91 +93,96 @@
<context>
<name>CopyEngine</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="438"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="461"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="465"/>
<source>The engine is forced to move, you can&apos;t copy with it</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="473"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="496"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="519"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="542"/>
<source>The engine is forced to copy, you can&apos;t move with it</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/>
<source>Destination</source>
<translation type="unfinished">Destination</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/>
<source>Use the actual destination &quot;%1&quot;?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="685"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/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/Ultracopier-Spec/CopyEngine.cpp" line="976"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="979"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="984"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="988"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="886"/>
+ <source>Supported only on Windows</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1035"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1038"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1043"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1047"/>
<source>Ask</source>
<translation type="unfinished">Demander</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="977"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="981"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="985"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="989"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1036"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1040"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1044"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1048"/>
<source>Skip</source>
<translation type="unfinished">Passer</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="980"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1039"/>
<source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="982"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="994"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1041"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1053"/>
<source>Rename</source>
<translation type="unfinished">Renommer</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="986"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1045"/>
<source>Put at the end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="990"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1049"/>
<source>Overwrite</source>
<translation type="unfinished">Écraser</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="991"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1050"/>
<source>Overwrite if different</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="992"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1051"/>
<source>Overwrite if newer</source>
<translation type="unfinished">Écraser si plus récent</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="993"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1052"/>
<source>Overwrite if older</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/>
<source>Options error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/>
<source>Options engine is not loaded. Unable to access the filters</source>
<translation type="unfinished"></translation>
</message>
@@ -185,75 +190,76 @@
<context>
<name>CopyEngineFactory</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="303"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="60"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="309"/>
<source>Supported only on Windows</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="430"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="433"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="438"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/>
<source>Ask</source>
<translation type="unfinished">Demander</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="431"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="435"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="443"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="437"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="441"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="449"/>
<source>Skip</source>
<translation type="unfinished">Passer</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="434"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/>
<source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="454"/>
<source>Rename</source>
<translation type="unfinished">Renommer</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/>
<source>Put at the end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="450"/>
<source>Overwrite</source>
<translation type="unfinished">Écraser</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="451"/>
<source>Overwrite if different</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="452"/>
<source>Overwrite if newer</source>
<translation type="unfinished">Écraser si plus récent</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="447"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="453"/>
<source>Overwrite if older</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/>
<source>Options error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/>
<source>Options engine is not loaded. Unable to access the filters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/>
<source>Options engine is not loaded, can&apos;t access to the filters</source>
<translation type="unfinished"></translation>
</message>
@@ -673,12 +679,12 @@
<context>
<name>FileErrorDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="87"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="92"/>
<source>Error on folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="90"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="95"/>
<source>Folder name</source>
<translation type="unfinished"></translation>
</message>
@@ -686,22 +692,22 @@
<context>
<name>FileExistsDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="191"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="201"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="198"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="208"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/>
<source>Error</source>
<translation type="unfinished">Erreur</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -709,22 +715,22 @@
<context>
<name>FileIsSameDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="140"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="145"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="147"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="152"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/>
<source>Error</source>
<translation type="unfinished">Erreur</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -871,27 +877,27 @@
<context>
<name>FolderExistsDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="84"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="91"/>
<source>Folder already exists</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="164"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="172"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="173"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="181"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/>
<source>Error</source>
<translation type="unfinished">Erreur</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -1100,13 +1106,15 @@ Cette version est compilée comme version : %1.</translation>
<name>MkPath</name>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="124"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="394"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="464"/>
<source>Unable to remove</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="187"/>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="210"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="363"/>
<source>Unable to create the folder</source>
<translation type="unfinished"></translation>
</message>
@@ -1116,22 +1124,27 @@ Cette version est compilée comme version : %1.</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="255"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="304"/>
<source>Unable to temporary rename the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="278"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="339"/>
+ <source>Unable to reverse temporary rename for real move</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="348"/>
<source>Unable to do the final real move the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="309"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="379"/>
<source>Unable to move the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="385"/>
<source>Unable to move the folder: errno: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1210,7 +1223,7 @@ Cette version est compilée comme version : %1.</translation>
<message>
<location filename="../../../OptionDialog.ui" line="75"/>
<location filename="../../../OptionDialog.ui" line="366"/>
- <location filename="../../../OptionDialog.cpp" line="290"/>
+ <location filename="../../../OptionDialog.cpp" line="297"/>
<source>Copy engine</source>
<translation>Moteurs de copie</translation>
</message>
@@ -1258,21 +1271,21 @@ Cette version est compilée comme version : %1.</translation>
<message>
<location filename="../../../OptionDialog.ui" line="80"/>
<location filename="../../../OptionDialog.ui" line="379"/>
- <location filename="../../../OptionDialog.cpp" line="291"/>
+ <location filename="../../../OptionDialog.cpp" line="298"/>
<source>Listener</source>
<translation>Écouteur</translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="85"/>
<location filename="../../../OptionDialog.ui" line="384"/>
- <location filename="../../../OptionDialog.cpp" line="292"/>
+ <location filename="../../../OptionDialog.cpp" line="299"/>
<source>Plugin loader</source>
<translation>Chargeur de plugin</translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="93"/>
<location filename="../../../OptionDialog.ui" line="389"/>
- <location filename="../../../OptionDialog.cpp" line="293"/>
+ <location filename="../../../OptionDialog.cpp" line="300"/>
<source>Session loader</source>
<translation>Chargeur de session</translation>
</message>
@@ -1424,75 +1437,75 @@ Cette version est compilée comme version : %1.</translation>
<translation>Écrire directement le fichier quand il reçoit une nouvelle entrée (peut entrainer 50% de perte de performances)</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="197"/>
- <location filename="../../../OptionDialog.cpp" line="211"/>
+ <location filename="../../../OptionDialog.cpp" line="204"/>
+ <location filename="../../../OptionDialog.cpp" line="218"/>
<source>Load</source>
<translation>Charger</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="197"/>
+ <location filename="../../../OptionDialog.cpp" line="204"/>
<source>Load the theme?</source>
<translation>Charger le thème?</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="211"/>
+ <location filename="../../../OptionDialog.cpp" line="218"/>
<source>Load the language?</source>
<translation>Charger la langue?</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="298"/>
+ <location filename="../../../OptionDialog.cpp" line="305"/>
<source>Do nothing</source>
<translation>Ne rien faire</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="299"/>
+ <location filename="../../../OptionDialog.cpp" line="306"/>
<source>Ask source as folder</source>
<translation>Demander la source comme un dossier</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="300"/>
+ <location filename="../../../OptionDialog.cpp" line="307"/>
<source>Ask sources as files</source>
<translation>Demander la sources comme des fichiers</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="301"/>
+ <location filename="../../../OptionDialog.cpp" line="308"/>
<source>Never</source>
<translation>Jamais</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="302"/>
+ <location filename="../../../OptionDialog.cpp" line="309"/>
<source>When source is same</source>
<translation>Quand la source est la même</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="303"/>
+ <location filename="../../../OptionDialog.cpp" line="310"/>
<source>When destination is same</source>
<translation>Quand la destination est la même</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="304"/>
+ <location filename="../../../OptionDialog.cpp" line="311"/>
<source>When source and destination are same</source>
<translation>Quand la destination et la source sont les mêmes</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="305"/>
+ <location filename="../../../OptionDialog.cpp" line="312"/>
<source>When source or destination are same</source>
<translation>Quand la destination ou la source sont les mêmes</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="306"/>
+ <location filename="../../../OptionDialog.cpp" line="313"/>
<source>Always</source>
<translation>Toujours</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="320"/>
- <location filename="../../../OptionDialog.cpp" line="321"/>
- <location filename="../../../OptionDialog.cpp" line="322"/>
+ <location filename="../../../OptionDialog.cpp" line="327"/>
+ <location filename="../../../OptionDialog.cpp" line="328"/>
+ <location filename="../../../OptionDialog.cpp" line="329"/>
<source>The variables are %1</source>
<translation>Les variables sont %1</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="962"/>
+ <location filename="../../../OptionDialog.cpp" line="969"/>
<source>Save logs as: </source>
<translation>Sauvegarder les logs sous: </translation>
</message>
@@ -1781,12 +1794,12 @@ Erreur:%2</translation>
<translation>Clef de produit</translation>
</message>
<message>
- <location filename="../../../ProductKey.cpp" line="56"/>
+ <location filename="../../../ProductKey.cpp" line="60"/>
<source>Error</source>
<translation>Erreur</translation>
</message>
<message>
- <location filename="../../../ProductKey.cpp" line="56"/>
+ <location filename="../../../ProductKey.cpp" line="60"/>
<source>Your product key was rejected.&lt;br /&gt;If you buy key, unmark check your spam and unmark the mail as spam&lt;br /&gt;If you have not buy your key, go to &lt;a href=&quot;https://shop.first-world.info/&quot;&gt;https://shop.first-world.info/&lt;/a&gt;</source>
<translation>Votre clé de produit a été rejetée. &lt;br /&gt;Si vous achetez une clé, décochez cette case et décochez le courrier en tant que spam &lt;br /&gt;Si vous n’avez pas acheté votre clé, accédez à &lt;a href=&quot;https: // shop. first-world.info/&quot;&gt;https://shop.first-world.info/&lt;/a&gt;</translation>
</message>
@@ -1844,12 +1857,12 @@ Erreur:%2</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="541"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="543"/>
<source>Unable to read the source file: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="595"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="599"/>
<source>File truncated during the read, possible data change</source>
<translation type="unfinished"></translation>
</message>
@@ -1905,32 +1918,38 @@ Erreur:%2</translation>
<context>
<name>ScanFileOrFolder</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="452"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="454"/>
- <source>%1 - copy</source>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="331"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="681"/>
+ <source>Blacklisted folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="463"/>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="465"/>
- <source>%1 - copy (%2)</source>
+ <source>%1 - copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="576"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="578"/>
- <source>%name% - copy</source>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="474"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="476"/>
+ <source>%1 - copy (%2)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="587"/>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="589"/>
+ <source>%name% - copy</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="598"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="600"/>
<source>%name% - copy (%number%)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="673"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="677"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="691"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="695"/>
<source>Problem with folder read</source>
<translation type="unfinished"></translation>
</message>
@@ -2041,61 +2060,61 @@ Erreur:%2</translation>
<context>
<name>Themes</name>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="328"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="341"/>
<source>Buy the Ultimate version to fund development</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="328"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="341"/>
<source>Register your key</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="427"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="440"/>
<source>File %1/%2, size: %3/%4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="661"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="674"/>
<source>Copy list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="663"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="676"/>
<source>Move list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1091"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1117"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1092"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1118"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1093"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1119"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1095"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1121"/>
<source>File Name, 0KB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1289"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1301"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1313"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1395"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1407"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1419"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1388"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1392"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1394"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1494"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1498"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1500"/>
<source>%1 %2% of %3</source>
<translation type="unfinished"></translation>
</message>
@@ -2103,24 +2122,24 @@ Erreur:%2</translation>
<context>
<name>ThemesFactory</name>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="284"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="294"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="285"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="295"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="286"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="296"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="482"/>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="497"/>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="512"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="510"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="525"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="540"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
@@ -2128,29 +2147,29 @@ Erreur:%2</translation>
<context>
<name>TransferThread</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="179"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="188"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="613"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="628"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="620"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="635"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="648"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="663"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/>
<source>File not found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="925"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="940"/>
<source>Unable to change the date</source>
<translation type="unfinished"></translation>
</message>
@@ -2158,19 +2177,19 @@ Erreur:%2</translation>
<context>
<name>TransferThreadAsync</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="340"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/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="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="428"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="446"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="436"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="454"/>
<source>Unable to create the destination folder: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="431"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="448"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="439"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="456"/>
<source>Unable to create the destination folder, errno: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -2178,24 +2197,24 @@ Erreur:%2</translation>
<context>
<name>WriteThread</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="135"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="138"/>
<source>Path resolution error (Empty path)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="164"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="197"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="167"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="200"/>
<source>Unable to create the destination folder: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="175"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="199"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="178"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="202"/>
<source>Unable to create the destination folder, errno: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="456"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="464"/>
<source>Internal error, please report it!</source>
<translation type="unfinished"></translation>
</message>
@@ -2510,8 +2529,8 @@ Erreur:%2</translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="341"/>
- <source>Overwrite if newer</source>
- <translation type="unfinished">Écraser si plus récent</translation>
+ <source>Overwrite if source newer than destination</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="346"/>
@@ -2521,8 +2540,12 @@ Erreur:%2</translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="354"/>
+ <source>Overwrite if source older than destination</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="357"/>
- <source>Overwrite if older</source>
+ <source>Overwrite if destination older</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2910,8 +2933,8 @@ Erreur:%2</translation>
</message>
<message>
<location filename="../../Themes/Oxygen/themesOptions.ui" line="213"/>
- <source>Informations</source>
- <translation type="unfinished"></translation>
+ <source>Information</source>
+ <translation type="unfinished">Informations</translation>
</message>
<message>
<location filename="../../Themes/Oxygen/themesOptions.ui" line="219"/>
@@ -2924,28 +2947,38 @@ Erreur:%2</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="257"/>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="269"/>
+ <source>Click to edit the color</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="368"/>
<source>Speed with progress bar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="267"/>
- <source>Show dual progression</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="378"/>
+ <source>Progression color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="277"/>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="388"/>
<source>Show progression in the title</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="287"/>
- <source>Progression color</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="395"/>
+ <source>General margin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="306"/>
- <source>Click to edit the color</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="402"/>
+ <source>Show dual progression</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="425"/>
+ <source>General spacing</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/plugins/Languages/hi/informations.xml b/plugins/Languages/hi/informations.xml
index 14fcf4b..42bee05 100755
--- a/plugins/Languages/hi/informations.xml
+++ b/plugins/Languages/hi/informations.xml
@@ -12,7 +12,7 @@
<!-- Detailed description -->
<description xml:lang="en"><![CDATA[Translation of Ultracopier to hindi. For more details see the web site.]]></description>
<!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number -->
- <version>2.2.4.7</version>
+ <version>2.2.6.0</version>
<!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. -->
<name>hi</name>
<!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. -->
diff --git a/plugins/Languages/hi/translation.qm b/plugins/Languages/hi/translation.qm
index d925dd6..0e38009 100755
--- a/plugins/Languages/hi/translation.qm
+++ b/plugins/Languages/hi/translation.qm
Binary files differ
diff --git a/plugins/Languages/hi/translation.ts b/plugins/Languages/hi/translation.ts
index 7c569a5..8618aed 100755
--- a/plugins/Languages/hi/translation.ts
+++ b/plugins/Languages/hi/translation.ts
@@ -93,91 +93,96 @@
<context>
<name>CopyEngine</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="438"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="461"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="465"/>
<source>The engine is forced to move, you can&apos;t copy with it</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="473"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="496"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="519"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="542"/>
<source>The engine is forced to copy, you can&apos;t move with it</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/>
<source>Destination</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/>
<source>Use the actual destination &quot;%1&quot;?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="685"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/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/Ultracopier-Spec/CopyEngine.cpp" line="976"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="979"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="984"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="988"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="886"/>
+ <source>Supported only on Windows</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1035"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1038"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1043"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1047"/>
<source>Ask</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="977"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="981"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="985"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="989"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1036"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1040"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1044"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1048"/>
<source>Skip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="980"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1039"/>
<source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="982"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="994"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1041"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1053"/>
<source>Rename</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="986"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1045"/>
<source>Put at the end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="990"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1049"/>
<source>Overwrite</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="991"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1050"/>
<source>Overwrite if different</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="992"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1051"/>
<source>Overwrite if newer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="993"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1052"/>
<source>Overwrite if older</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/>
<source>Options error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/>
<source>Options engine is not loaded. Unable to access the filters</source>
<translation type="unfinished"></translation>
</message>
@@ -185,75 +190,76 @@
<context>
<name>CopyEngineFactory</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="303"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="60"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="309"/>
<source>Supported only on Windows</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="430"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="433"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="438"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/>
<source>Ask</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="431"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="435"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="443"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="437"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="441"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="449"/>
<source>Skip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="434"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/>
<source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="454"/>
<source>Rename</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/>
<source>Put at the end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="450"/>
<source>Overwrite</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="451"/>
<source>Overwrite if different</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="452"/>
<source>Overwrite if newer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="447"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="453"/>
<source>Overwrite if older</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/>
<source>Options error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/>
<source>Options engine is not loaded. Unable to access the filters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/>
<source>Options engine is not loaded, can&apos;t access to the filters</source>
<translation type="unfinished"></translation>
</message>
@@ -670,12 +676,12 @@
<context>
<name>FileErrorDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="87"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="92"/>
<source>Error on folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="90"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="95"/>
<source>Folder name</source>
<translation type="unfinished"></translation>
</message>
@@ -683,22 +689,22 @@
<context>
<name>FileExistsDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="191"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="201"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="198"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="208"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -706,22 +712,22 @@
<context>
<name>FileIsSameDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="140"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="145"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="147"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="152"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -868,27 +874,27 @@
<context>
<name>FolderExistsDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="84"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="91"/>
<source>Folder already exists</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="164"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="172"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="173"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="181"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -1096,13 +1102,15 @@ This version is compiled as version: %1.</source>
<name>MkPath</name>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="124"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="394"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="464"/>
<source>Unable to remove</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="187"/>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="210"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="363"/>
<source>Unable to create the folder</source>
<translation type="unfinished"></translation>
</message>
@@ -1112,22 +1120,27 @@ This version is compiled as version: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="255"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="304"/>
<source>Unable to temporary rename the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="278"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="339"/>
+ <source>Unable to reverse temporary rename for real move</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="348"/>
<source>Unable to do the final real move the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="309"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="379"/>
<source>Unable to move the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="385"/>
<source>Unable to move the folder: errno: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1206,7 +1219,7 @@ This version is compiled as version: %1.</source>
<message>
<location filename="../../../OptionDialog.ui" line="75"/>
<location filename="../../../OptionDialog.ui" line="366"/>
- <location filename="../../../OptionDialog.cpp" line="290"/>
+ <location filename="../../../OptionDialog.cpp" line="297"/>
<source>Copy engine</source>
<translation type="unfinished"></translation>
</message>
@@ -1254,21 +1267,21 @@ This version is compiled as version: %1.</source>
<message>
<location filename="../../../OptionDialog.ui" line="80"/>
<location filename="../../../OptionDialog.ui" line="379"/>
- <location filename="../../../OptionDialog.cpp" line="291"/>
+ <location filename="../../../OptionDialog.cpp" line="298"/>
<source>Listener</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="85"/>
<location filename="../../../OptionDialog.ui" line="384"/>
- <location filename="../../../OptionDialog.cpp" line="292"/>
+ <location filename="../../../OptionDialog.cpp" line="299"/>
<source>Plugin loader</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="93"/>
<location filename="../../../OptionDialog.ui" line="389"/>
- <location filename="../../../OptionDialog.cpp" line="293"/>
+ <location filename="../../../OptionDialog.cpp" line="300"/>
<source>Session loader</source>
<translation type="unfinished"></translation>
</message>
@@ -1410,75 +1423,75 @@ This version is compiled as version: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="197"/>
- <location filename="../../../OptionDialog.cpp" line="211"/>
+ <location filename="../../../OptionDialog.cpp" line="204"/>
+ <location filename="../../../OptionDialog.cpp" line="218"/>
<source>Load</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="197"/>
+ <location filename="../../../OptionDialog.cpp" line="204"/>
<source>Load the theme?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="211"/>
+ <location filename="../../../OptionDialog.cpp" line="218"/>
<source>Load the language?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="298"/>
+ <location filename="../../../OptionDialog.cpp" line="305"/>
<source>Do nothing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="299"/>
+ <location filename="../../../OptionDialog.cpp" line="306"/>
<source>Ask source as folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="300"/>
+ <location filename="../../../OptionDialog.cpp" line="307"/>
<source>Ask sources as files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="301"/>
+ <location filename="../../../OptionDialog.cpp" line="308"/>
<source>Never</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="302"/>
+ <location filename="../../../OptionDialog.cpp" line="309"/>
<source>When source is same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="303"/>
+ <location filename="../../../OptionDialog.cpp" line="310"/>
<source>When destination is same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="304"/>
+ <location filename="../../../OptionDialog.cpp" line="311"/>
<source>When source and destination are same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="305"/>
+ <location filename="../../../OptionDialog.cpp" line="312"/>
<source>When source or destination are same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="306"/>
+ <location filename="../../../OptionDialog.cpp" line="313"/>
<source>Always</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="320"/>
- <location filename="../../../OptionDialog.cpp" line="321"/>
- <location filename="../../../OptionDialog.cpp" line="322"/>
+ <location filename="../../../OptionDialog.cpp" line="327"/>
+ <location filename="../../../OptionDialog.cpp" line="328"/>
+ <location filename="../../../OptionDialog.cpp" line="329"/>
<source>The variables are %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="962"/>
+ <location filename="../../../OptionDialog.cpp" line="969"/>
<source>Save logs as: </source>
<translation type="unfinished"></translation>
</message>
@@ -1771,12 +1784,12 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../ProductKey.cpp" line="56"/>
+ <location filename="../../../ProductKey.cpp" line="60"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../ProductKey.cpp" line="56"/>
+ <location filename="../../../ProductKey.cpp" line="60"/>
<source>Your product key was rejected.&lt;br /&gt;If you buy key, unmark check your spam and unmark the mail as spam&lt;br /&gt;If you have not buy your key, go to &lt;a href=&quot;https://shop.first-world.info/&quot;&gt;https://shop.first-world.info/&lt;/a&gt;</source>
<translation type="unfinished"></translation>
</message>
@@ -1834,12 +1847,12 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="541"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="543"/>
<source>Unable to read the source file: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="595"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="599"/>
<source>File truncated during the read, possible data change</source>
<translation type="unfinished"></translation>
</message>
@@ -1895,32 +1908,38 @@ Error:%2</source>
<context>
<name>ScanFileOrFolder</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="452"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="454"/>
- <source>%1 - copy</source>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="331"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="681"/>
+ <source>Blacklisted folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="463"/>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="465"/>
- <source>%1 - copy (%2)</source>
+ <source>%1 - copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="576"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="578"/>
- <source>%name% - copy</source>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="474"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="476"/>
+ <source>%1 - copy (%2)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="587"/>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="589"/>
+ <source>%name% - copy</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="598"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="600"/>
<source>%name% - copy (%number%)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="673"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="677"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="691"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="695"/>
<source>Problem with folder read</source>
<translation type="unfinished"></translation>
</message>
@@ -2031,61 +2050,61 @@ Error:%2</source>
<context>
<name>Themes</name>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="328"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="341"/>
<source>Buy the Ultimate version to fund development</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="328"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="341"/>
<source>Register your key</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="427"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="440"/>
<source>File %1/%2, size: %3/%4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="661"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="674"/>
<source>Copy list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="663"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="676"/>
<source>Move list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1091"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1117"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1092"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1118"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1093"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1119"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1095"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1121"/>
<source>File Name, 0KB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1289"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1301"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1313"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1395"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1407"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1419"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1388"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1392"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1394"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1494"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1498"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1500"/>
<source>%1 %2% of %3</source>
<translation type="unfinished"></translation>
</message>
@@ -2093,24 +2112,24 @@ Error:%2</source>
<context>
<name>ThemesFactory</name>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="284"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="294"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="285"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="295"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="286"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="296"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="482"/>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="497"/>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="512"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="510"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="525"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="540"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
@@ -2118,29 +2137,29 @@ Error:%2</source>
<context>
<name>TransferThread</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="179"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="188"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="613"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="628"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="620"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="635"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="648"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="663"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/>
<source>File not found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="925"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="940"/>
<source>Unable to change the date</source>
<translation type="unfinished"></translation>
</message>
@@ -2148,19 +2167,19 @@ Error:%2</source>
<context>
<name>TransferThreadAsync</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="340"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/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="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="428"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="446"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="436"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="454"/>
<source>Unable to create the destination folder: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="431"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="448"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="439"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="456"/>
<source>Unable to create the destination folder, errno: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -2168,24 +2187,24 @@ Error:%2</source>
<context>
<name>WriteThread</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="135"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="138"/>
<source>Path resolution error (Empty path)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="164"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="197"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="167"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="200"/>
<source>Unable to create the destination folder: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="175"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="199"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="178"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="202"/>
<source>Unable to create the destination folder, errno: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="456"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="464"/>
<source>Internal error, please report it!</source>
<translation type="unfinished"></translation>
</message>
@@ -2500,7 +2519,7 @@ Error:%2</source>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="341"/>
- <source>Overwrite if newer</source>
+ <source>Overwrite if source newer than destination</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2511,8 +2530,12 @@ Error:%2</source>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="354"/>
+ <source>Overwrite if source older than destination</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="357"/>
- <source>Overwrite if older</source>
+ <source>Overwrite if destination older</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2900,7 +2923,7 @@ Error:%2</source>
</message>
<message>
<location filename="../../Themes/Oxygen/themesOptions.ui" line="213"/>
- <source>Informations</source>
+ <source>Information</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2914,28 +2937,38 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="257"/>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="269"/>
+ <source>Click to edit the color</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="368"/>
<source>Speed with progress bar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="267"/>
- <source>Show dual progression</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="378"/>
+ <source>Progression color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="277"/>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="388"/>
<source>Show progression in the title</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="287"/>
- <source>Progression color</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="395"/>
+ <source>General margin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="306"/>
- <source>Click to edit the color</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="402"/>
+ <source>Show dual progression</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="425"/>
+ <source>General spacing</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/plugins/Languages/hu/informations.xml b/plugins/Languages/hu/informations.xml
index f6f0383..dbd1247 100755
--- a/plugins/Languages/hu/informations.xml
+++ b/plugins/Languages/hu/informations.xml
@@ -12,7 +12,7 @@
<!-- Detailed description -->
<description xml:lang="en"><![CDATA[Hungarian translation of Ultracopier]]></description>
<!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number -->
- <version>2.2.4.7</version>
+ <version>2.2.6.0</version>
<!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. -->
<name>hu</name>
<!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. -->
diff --git a/plugins/Languages/hu/translation.qm b/plugins/Languages/hu/translation.qm
index fd1e794..fd2c66b 100755
--- a/plugins/Languages/hu/translation.qm
+++ b/plugins/Languages/hu/translation.qm
Binary files differ
diff --git a/plugins/Languages/hu/translation.ts b/plugins/Languages/hu/translation.ts
index 721f3fa..9333fe5 100755
--- a/plugins/Languages/hu/translation.ts
+++ b/plugins/Languages/hu/translation.ts
@@ -93,91 +93,96 @@
<context>
<name>CopyEngine</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="438"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="461"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="465"/>
<source>The engine is forced to move, you can&apos;t copy with it</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="473"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="496"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="519"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="542"/>
<source>The engine is forced to copy, you can&apos;t move with it</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/>
<source>Destination</source>
<translation type="unfinished">Cél</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/>
<source>Use the actual destination &quot;%1&quot;?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="685"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/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/Ultracopier-Spec/CopyEngine.cpp" line="976"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="979"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="984"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="988"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="886"/>
+ <source>Supported only on Windows</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1035"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1038"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1043"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1047"/>
<source>Ask</source>
<translation type="unfinished">Rákérdez</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="977"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="981"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="985"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="989"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1036"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1040"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1044"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1048"/>
<source>Skip</source>
<translation type="unfinished">Kihagyás</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="980"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1039"/>
<source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="982"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="994"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1041"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1053"/>
<source>Rename</source>
<translation type="unfinished">Átnevezés</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="986"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1045"/>
<source>Put at the end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="990"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1049"/>
<source>Overwrite</source>
<translation type="unfinished">Felülírás</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="991"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1050"/>
<source>Overwrite if different</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="992"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1051"/>
<source>Overwrite if newer</source>
<translation type="unfinished">Felülírás, ha újabb</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="993"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1052"/>
<source>Overwrite if older</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/>
<source>Options error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/>
<source>Options engine is not loaded. Unable to access the filters</source>
<translation type="unfinished"></translation>
</message>
@@ -185,75 +190,76 @@
<context>
<name>CopyEngineFactory</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="303"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="60"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="309"/>
<source>Supported only on Windows</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="430"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="433"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="438"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/>
<source>Ask</source>
<translation type="unfinished">Rákérdez</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="431"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="435"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="443"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="437"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="441"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="449"/>
<source>Skip</source>
<translation type="unfinished">Kihagyás</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="434"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/>
<source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="454"/>
<source>Rename</source>
<translation type="unfinished">Átnevezés</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/>
<source>Put at the end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="450"/>
<source>Overwrite</source>
<translation type="unfinished">Felülírás</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="451"/>
<source>Overwrite if different</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="452"/>
<source>Overwrite if newer</source>
<translation type="unfinished">Felülírás, ha újabb</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="447"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="453"/>
<source>Overwrite if older</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/>
<source>Options error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/>
<source>Options engine is not loaded. Unable to access the filters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/>
<source>Options engine is not loaded, can&apos;t access to the filters</source>
<translation type="unfinished"></translation>
</message>
@@ -671,12 +677,12 @@
<context>
<name>FileErrorDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="87"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="92"/>
<source>Error on folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="90"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="95"/>
<source>Folder name</source>
<translation type="unfinished"></translation>
</message>
@@ -684,22 +690,22 @@
<context>
<name>FileExistsDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="191"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="201"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="198"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="208"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/>
<source>Error</source>
<translation type="unfinished">Hiba</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -707,22 +713,22 @@
<context>
<name>FileIsSameDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="140"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="145"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="147"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="152"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/>
<source>Error</source>
<translation type="unfinished">Hiba</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -869,27 +875,27 @@
<context>
<name>FolderExistsDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="84"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="91"/>
<source>Folder already exists</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="164"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="172"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="173"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="181"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/>
<source>Error</source>
<translation type="unfinished">Hiba</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -1098,13 +1104,15 @@ Ez a verzió a következő verzióként került lefordításra: %1.</translation
<name>MkPath</name>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="124"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="394"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="464"/>
<source>Unable to remove</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="187"/>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="210"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="363"/>
<source>Unable to create the folder</source>
<translation type="unfinished"></translation>
</message>
@@ -1114,22 +1122,27 @@ Ez a verzió a következő verzióként került lefordításra: %1.</translation
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="255"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="304"/>
<source>Unable to temporary rename the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="278"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="339"/>
+ <source>Unable to reverse temporary rename for real move</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="348"/>
<source>Unable to do the final real move the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="309"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="379"/>
<source>Unable to move the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="385"/>
<source>Unable to move the folder: errno: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1208,28 +1221,28 @@ Ez a verzió a következő verzióként került lefordításra: %1.</translation
<message>
<location filename="../../../OptionDialog.ui" line="75"/>
<location filename="../../../OptionDialog.ui" line="366"/>
- <location filename="../../../OptionDialog.cpp" line="290"/>
+ <location filename="../../../OptionDialog.cpp" line="297"/>
<source>Copy engine</source>
<translation>Másoló motor</translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="80"/>
<location filename="../../../OptionDialog.ui" line="379"/>
- <location filename="../../../OptionDialog.cpp" line="291"/>
+ <location filename="../../../OptionDialog.cpp" line="298"/>
<source>Listener</source>
<translation>Figyelő</translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="85"/>
<location filename="../../../OptionDialog.ui" line="384"/>
- <location filename="../../../OptionDialog.cpp" line="292"/>
+ <location filename="../../../OptionDialog.cpp" line="299"/>
<source>Plugin loader</source>
<translation>Beépüő betöltő</translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="93"/>
<location filename="../../../OptionDialog.ui" line="389"/>
- <location filename="../../../OptionDialog.cpp" line="293"/>
+ <location filename="../../../OptionDialog.cpp" line="300"/>
<source>Session loader</source>
<translation>Folyamat betöltő</translation>
</message>
@@ -1433,75 +1446,75 @@ Ez a verzió a következő verzióként került lefordításra: %1.</translation
<translation>A változók: %path%, %operation%</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="197"/>
- <location filename="../../../OptionDialog.cpp" line="211"/>
+ <location filename="../../../OptionDialog.cpp" line="204"/>
+ <location filename="../../../OptionDialog.cpp" line="218"/>
<source>Load</source>
<translation>Betöltés</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="197"/>
+ <location filename="../../../OptionDialog.cpp" line="204"/>
<source>Load the theme?</source>
<translation>Téma betöltése?</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="211"/>
+ <location filename="../../../OptionDialog.cpp" line="218"/>
<source>Load the language?</source>
<translation>Nyelv betöltése?</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="298"/>
+ <location filename="../../../OptionDialog.cpp" line="305"/>
<source>Do nothing</source>
<translation>Ne tegyen semmit</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="299"/>
+ <location filename="../../../OptionDialog.cpp" line="306"/>
<source>Ask source as folder</source>
<translation>Rákérdezés a forrás mint mappa</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="300"/>
+ <location filename="../../../OptionDialog.cpp" line="307"/>
<source>Ask sources as files</source>
<translation>Rákérdezés a forrásokra mint fájlok</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="301"/>
+ <location filename="../../../OptionDialog.cpp" line="308"/>
<source>Never</source>
<translation>Soha</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="302"/>
+ <location filename="../../../OptionDialog.cpp" line="309"/>
<source>When source is same</source>
<translation>Amikor a forrás ugyanaz</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="303"/>
+ <location filename="../../../OptionDialog.cpp" line="310"/>
<source>When destination is same</source>
<translation>Amikor a cél ugyanaz</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="304"/>
+ <location filename="../../../OptionDialog.cpp" line="311"/>
<source>When source and destination are same</source>
<translation>Amikor a forrás és a cél ugyanaz</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="305"/>
+ <location filename="../../../OptionDialog.cpp" line="312"/>
<source>When source or destination are same</source>
<translation>Amikor a forrás vagy cél ugyanaz</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="306"/>
+ <location filename="../../../OptionDialog.cpp" line="313"/>
<source>Always</source>
<translation>Mindig</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="320"/>
- <location filename="../../../OptionDialog.cpp" line="321"/>
- <location filename="../../../OptionDialog.cpp" line="322"/>
+ <location filename="../../../OptionDialog.cpp" line="327"/>
+ <location filename="../../../OptionDialog.cpp" line="328"/>
+ <location filename="../../../OptionDialog.cpp" line="329"/>
<source>The variables are %1</source>
<translation>A változók: %1</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="962"/>
+ <location filename="../../../OptionDialog.cpp" line="969"/>
<source>Save logs as: </source>
<translation>Napló mentése mint:</translation>
</message>
@@ -1775,12 +1788,12 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../ProductKey.cpp" line="56"/>
+ <location filename="../../../ProductKey.cpp" line="60"/>
<source>Error</source>
<translation type="unfinished">Hiba</translation>
</message>
<message>
- <location filename="../../../ProductKey.cpp" line="56"/>
+ <location filename="../../../ProductKey.cpp" line="60"/>
<source>Your product key was rejected.&lt;br /&gt;If you buy key, unmark check your spam and unmark the mail as spam&lt;br /&gt;If you have not buy your key, go to &lt;a href=&quot;https://shop.first-world.info/&quot;&gt;https://shop.first-world.info/&lt;/a&gt;</source>
<translation type="unfinished"></translation>
</message>
@@ -1838,12 +1851,12 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="541"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="543"/>
<source>Unable to read the source file: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="595"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="599"/>
<source>File truncated during the read, possible data change</source>
<translation type="unfinished"></translation>
</message>
@@ -1899,32 +1912,38 @@ Error:%2</source>
<context>
<name>ScanFileOrFolder</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="452"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="454"/>
- <source>%1 - copy</source>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="331"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="681"/>
+ <source>Blacklisted folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="463"/>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="465"/>
- <source>%1 - copy (%2)</source>
+ <source>%1 - copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="576"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="578"/>
- <source>%name% - copy</source>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="474"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="476"/>
+ <source>%1 - copy (%2)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="587"/>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="589"/>
+ <source>%name% - copy</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="598"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="600"/>
<source>%name% - copy (%number%)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="673"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="677"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="691"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="695"/>
<source>Problem with folder read</source>
<translation type="unfinished"></translation>
</message>
@@ -2035,61 +2054,61 @@ Error:%2</source>
<context>
<name>Themes</name>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="328"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="341"/>
<source>Buy the Ultimate version to fund development</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="328"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="341"/>
<source>Register your key</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="427"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="440"/>
<source>File %1/%2, size: %3/%4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="661"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="674"/>
<source>Copy list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="663"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="676"/>
<source>Move list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1091"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1117"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1092"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1118"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1093"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1119"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1095"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1121"/>
<source>File Name, 0KB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1289"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1301"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1313"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1395"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1407"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1419"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1388"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1392"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1394"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1494"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1498"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1500"/>
<source>%1 %2% of %3</source>
<translation type="unfinished"></translation>
</message>
@@ -2097,24 +2116,24 @@ Error:%2</source>
<context>
<name>ThemesFactory</name>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="284"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="294"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="285"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="295"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="286"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="296"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="482"/>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="497"/>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="512"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="510"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="525"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="540"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
@@ -2122,29 +2141,29 @@ Error:%2</source>
<context>
<name>TransferThread</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="179"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="188"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="613"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="628"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="620"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="635"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="648"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="663"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/>
<source>File not found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="925"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="940"/>
<source>Unable to change the date</source>
<translation type="unfinished"></translation>
</message>
@@ -2152,19 +2171,19 @@ Error:%2</source>
<context>
<name>TransferThreadAsync</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="340"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/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="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="428"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="446"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="436"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="454"/>
<source>Unable to create the destination folder: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="431"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="448"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="439"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="456"/>
<source>Unable to create the destination folder, errno: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -2172,24 +2191,24 @@ Error:%2</source>
<context>
<name>WriteThread</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="135"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="138"/>
<source>Path resolution error (Empty path)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="164"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="197"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="167"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="200"/>
<source>Unable to create the destination folder: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="175"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="199"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="178"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="202"/>
<source>Unable to create the destination folder, errno: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="456"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="464"/>
<source>Internal error, please report it!</source>
<translation type="unfinished"></translation>
</message>
@@ -2504,8 +2523,8 @@ Error:%2</source>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="341"/>
- <source>Overwrite if newer</source>
- <translation type="unfinished">Felülírás, ha újabb</translation>
+ <source>Overwrite if source newer than destination</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="346"/>
@@ -2515,8 +2534,12 @@ Error:%2</source>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="354"/>
+ <source>Overwrite if source older than destination</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="357"/>
- <source>Overwrite if older</source>
+ <source>Overwrite if destination older</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2904,8 +2927,8 @@ Error:%2</source>
</message>
<message>
<location filename="../../Themes/Oxygen/themesOptions.ui" line="213"/>
- <source>Informations</source>
- <translation type="unfinished"></translation>
+ <source>Information</source>
+ <translation type="unfinished">Információ</translation>
</message>
<message>
<location filename="../../Themes/Oxygen/themesOptions.ui" line="219"/>
@@ -2918,28 +2941,38 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="257"/>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="269"/>
+ <source>Click to edit the color</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="368"/>
<source>Speed with progress bar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="267"/>
- <source>Show dual progression</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="378"/>
+ <source>Progression color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="277"/>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="388"/>
<source>Show progression in the title</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="287"/>
- <source>Progression color</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="395"/>
+ <source>General margin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="306"/>
- <source>Click to edit the color</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="402"/>
+ <source>Show dual progression</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="425"/>
+ <source>General spacing</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/plugins/Languages/id/informations.xml b/plugins/Languages/id/informations.xml
index f6a4d71..2ec69da 100755
--- a/plugins/Languages/id/informations.xml
+++ b/plugins/Languages/id/informations.xml
@@ -12,7 +12,7 @@
<!-- Detailed description -->
<description xml:lang="en"><![CDATA[Translation of Ultracopier to indonesian. For more details see the web site.]]></description>
<!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number -->
- <version>2.2.4.7</version>
+ <version>2.2.6.0</version>
<!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. -->
<name>id</name>
<!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. -->
diff --git a/plugins/Languages/id/translation.ts b/plugins/Languages/id/translation.ts
index 2066182..b1cbcc0 100755
--- a/plugins/Languages/id/translation.ts
+++ b/plugins/Languages/id/translation.ts
@@ -93,91 +93,96 @@
<context>
<name>CopyEngine</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="438"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="461"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="465"/>
<source>The engine is forced to move, you can&apos;t copy with it</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="473"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="496"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="519"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="542"/>
<source>The engine is forced to copy, you can&apos;t move with it</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/>
<source>Destination</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/>
<source>Use the actual destination &quot;%1&quot;?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="685"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/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/Ultracopier-Spec/CopyEngine.cpp" line="976"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="979"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="984"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="988"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="886"/>
+ <source>Supported only on Windows</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1035"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1038"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1043"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1047"/>
<source>Ask</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="977"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="981"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="985"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="989"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1036"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1040"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1044"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1048"/>
<source>Skip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="980"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1039"/>
<source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="982"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="994"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1041"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1053"/>
<source>Rename</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="986"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1045"/>
<source>Put at the end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="990"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1049"/>
<source>Overwrite</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="991"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1050"/>
<source>Overwrite if different</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="992"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1051"/>
<source>Overwrite if newer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="993"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1052"/>
<source>Overwrite if older</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/>
<source>Options error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/>
<source>Options engine is not loaded. Unable to access the filters</source>
<translation type="unfinished"></translation>
</message>
@@ -185,75 +190,76 @@
<context>
<name>CopyEngineFactory</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="303"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="60"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="309"/>
<source>Supported only on Windows</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="430"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="433"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="438"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/>
<source>Ask</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="431"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="435"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="443"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="437"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="441"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="449"/>
<source>Skip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="434"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/>
<source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="454"/>
<source>Rename</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/>
<source>Put at the end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="450"/>
<source>Overwrite</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="451"/>
<source>Overwrite if different</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="452"/>
<source>Overwrite if newer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="447"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="453"/>
<source>Overwrite if older</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/>
<source>Options error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/>
<source>Options engine is not loaded. Unable to access the filters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/>
<source>Options engine is not loaded, can&apos;t access to the filters</source>
<translation type="unfinished"></translation>
</message>
@@ -670,12 +676,12 @@
<context>
<name>FileErrorDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="87"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="92"/>
<source>Error on folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="90"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="95"/>
<source>Folder name</source>
<translation type="unfinished"></translation>
</message>
@@ -683,22 +689,22 @@
<context>
<name>FileExistsDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="191"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="201"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="198"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="208"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -706,22 +712,22 @@
<context>
<name>FileIsSameDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="140"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="145"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="147"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="152"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -868,27 +874,27 @@
<context>
<name>FolderExistsDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="84"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="91"/>
<source>Folder already exists</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="164"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="172"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="173"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="181"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -1096,13 +1102,15 @@ This version is compiled as version: %1.</source>
<name>MkPath</name>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="124"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="394"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="464"/>
<source>Unable to remove</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="187"/>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="210"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="363"/>
<source>Unable to create the folder</source>
<translation type="unfinished"></translation>
</message>
@@ -1112,22 +1120,27 @@ This version is compiled as version: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="255"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="304"/>
<source>Unable to temporary rename the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="278"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="339"/>
+ <source>Unable to reverse temporary rename for real move</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="348"/>
<source>Unable to do the final real move the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="309"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="379"/>
<source>Unable to move the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="385"/>
<source>Unable to move the folder: errno: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1206,7 +1219,7 @@ This version is compiled as version: %1.</source>
<message>
<location filename="../../../OptionDialog.ui" line="75"/>
<location filename="../../../OptionDialog.ui" line="366"/>
- <location filename="../../../OptionDialog.cpp" line="290"/>
+ <location filename="../../../OptionDialog.cpp" line="297"/>
<source>Copy engine</source>
<translation type="unfinished"></translation>
</message>
@@ -1254,21 +1267,21 @@ This version is compiled as version: %1.</source>
<message>
<location filename="../../../OptionDialog.ui" line="80"/>
<location filename="../../../OptionDialog.ui" line="379"/>
- <location filename="../../../OptionDialog.cpp" line="291"/>
+ <location filename="../../../OptionDialog.cpp" line="298"/>
<source>Listener</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="85"/>
<location filename="../../../OptionDialog.ui" line="384"/>
- <location filename="../../../OptionDialog.cpp" line="292"/>
+ <location filename="../../../OptionDialog.cpp" line="299"/>
<source>Plugin loader</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="93"/>
<location filename="../../../OptionDialog.ui" line="389"/>
- <location filename="../../../OptionDialog.cpp" line="293"/>
+ <location filename="../../../OptionDialog.cpp" line="300"/>
<source>Session loader</source>
<translation type="unfinished"></translation>
</message>
@@ -1410,75 +1423,75 @@ This version is compiled as version: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="197"/>
- <location filename="../../../OptionDialog.cpp" line="211"/>
+ <location filename="../../../OptionDialog.cpp" line="204"/>
+ <location filename="../../../OptionDialog.cpp" line="218"/>
<source>Load</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="197"/>
+ <location filename="../../../OptionDialog.cpp" line="204"/>
<source>Load the theme?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="211"/>
+ <location filename="../../../OptionDialog.cpp" line="218"/>
<source>Load the language?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="298"/>
+ <location filename="../../../OptionDialog.cpp" line="305"/>
<source>Do nothing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="299"/>
+ <location filename="../../../OptionDialog.cpp" line="306"/>
<source>Ask source as folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="300"/>
+ <location filename="../../../OptionDialog.cpp" line="307"/>
<source>Ask sources as files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="301"/>
+ <location filename="../../../OptionDialog.cpp" line="308"/>
<source>Never</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="302"/>
+ <location filename="../../../OptionDialog.cpp" line="309"/>
<source>When source is same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="303"/>
+ <location filename="../../../OptionDialog.cpp" line="310"/>
<source>When destination is same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="304"/>
+ <location filename="../../../OptionDialog.cpp" line="311"/>
<source>When source and destination are same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="305"/>
+ <location filename="../../../OptionDialog.cpp" line="312"/>
<source>When source or destination are same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="306"/>
+ <location filename="../../../OptionDialog.cpp" line="313"/>
<source>Always</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="320"/>
- <location filename="../../../OptionDialog.cpp" line="321"/>
- <location filename="../../../OptionDialog.cpp" line="322"/>
+ <location filename="../../../OptionDialog.cpp" line="327"/>
+ <location filename="../../../OptionDialog.cpp" line="328"/>
+ <location filename="../../../OptionDialog.cpp" line="329"/>
<source>The variables are %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="962"/>
+ <location filename="../../../OptionDialog.cpp" line="969"/>
<source>Save logs as: </source>
<translation type="unfinished"></translation>
</message>
@@ -1771,12 +1784,12 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../ProductKey.cpp" line="56"/>
+ <location filename="../../../ProductKey.cpp" line="60"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../ProductKey.cpp" line="56"/>
+ <location filename="../../../ProductKey.cpp" line="60"/>
<source>Your product key was rejected.&lt;br /&gt;If you buy key, unmark check your spam and unmark the mail as spam&lt;br /&gt;If you have not buy your key, go to &lt;a href=&quot;https://shop.first-world.info/&quot;&gt;https://shop.first-world.info/&lt;/a&gt;</source>
<translation type="unfinished"></translation>
</message>
@@ -1834,12 +1847,12 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="541"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="543"/>
<source>Unable to read the source file: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="595"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="599"/>
<source>File truncated during the read, possible data change</source>
<translation type="unfinished"></translation>
</message>
@@ -1895,32 +1908,38 @@ Error:%2</source>
<context>
<name>ScanFileOrFolder</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="452"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="454"/>
- <source>%1 - copy</source>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="331"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="681"/>
+ <source>Blacklisted folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="463"/>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="465"/>
- <source>%1 - copy (%2)</source>
+ <source>%1 - copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="576"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="578"/>
- <source>%name% - copy</source>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="474"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="476"/>
+ <source>%1 - copy (%2)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="587"/>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="589"/>
+ <source>%name% - copy</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="598"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="600"/>
<source>%name% - copy (%number%)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="673"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="677"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="691"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="695"/>
<source>Problem with folder read</source>
<translation type="unfinished"></translation>
</message>
@@ -2031,61 +2050,61 @@ Error:%2</source>
<context>
<name>Themes</name>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="328"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="341"/>
<source>Buy the Ultimate version to fund development</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="328"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="341"/>
<source>Register your key</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="427"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="440"/>
<source>File %1/%2, size: %3/%4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="661"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="674"/>
<source>Copy list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="663"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="676"/>
<source>Move list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1091"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1117"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1092"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1118"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1093"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1119"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1095"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1121"/>
<source>File Name, 0KB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1289"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1301"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1313"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1395"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1407"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1419"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1388"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1392"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1394"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1494"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1498"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1500"/>
<source>%1 %2% of %3</source>
<translation type="unfinished"></translation>
</message>
@@ -2093,24 +2112,24 @@ Error:%2</source>
<context>
<name>ThemesFactory</name>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="284"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="294"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="285"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="295"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="286"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="296"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="482"/>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="497"/>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="512"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="510"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="525"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="540"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
@@ -2118,29 +2137,29 @@ Error:%2</source>
<context>
<name>TransferThread</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="179"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="188"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="613"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="628"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="620"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="635"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="648"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="663"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/>
<source>File not found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="925"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="940"/>
<source>Unable to change the date</source>
<translation type="unfinished"></translation>
</message>
@@ -2148,19 +2167,19 @@ Error:%2</source>
<context>
<name>TransferThreadAsync</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="340"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/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="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="428"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="446"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="436"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="454"/>
<source>Unable to create the destination folder: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="431"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="448"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="439"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="456"/>
<source>Unable to create the destination folder, errno: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -2168,24 +2187,24 @@ Error:%2</source>
<context>
<name>WriteThread</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="135"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="138"/>
<source>Path resolution error (Empty path)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="164"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="197"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="167"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="200"/>
<source>Unable to create the destination folder: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="175"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="199"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="178"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="202"/>
<source>Unable to create the destination folder, errno: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="456"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="464"/>
<source>Internal error, please report it!</source>
<translation type="unfinished"></translation>
</message>
@@ -2500,7 +2519,7 @@ Error:%2</source>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="341"/>
- <source>Overwrite if newer</source>
+ <source>Overwrite if source newer than destination</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2511,8 +2530,12 @@ Error:%2</source>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="354"/>
+ <source>Overwrite if source older than destination</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="357"/>
- <source>Overwrite if older</source>
+ <source>Overwrite if destination older</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2900,7 +2923,7 @@ Error:%2</source>
</message>
<message>
<location filename="../../Themes/Oxygen/themesOptions.ui" line="213"/>
- <source>Informations</source>
+ <source>Information</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2914,28 +2937,38 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="257"/>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="269"/>
+ <source>Click to edit the color</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="368"/>
<source>Speed with progress bar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="267"/>
- <source>Show dual progression</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="378"/>
+ <source>Progression color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="277"/>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="388"/>
<source>Show progression in the title</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="287"/>
- <source>Progression color</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="395"/>
+ <source>General margin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="306"/>
- <source>Click to edit the color</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="402"/>
+ <source>Show dual progression</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="425"/>
+ <source>General spacing</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/plugins/Languages/it/informations.xml b/plugins/Languages/it/informations.xml
index e3efa99..4c40170 100644
--- a/plugins/Languages/it/informations.xml
+++ b/plugins/Languages/it/informations.xml
@@ -12,7 +12,7 @@
<!-- Detailed description -->
<description xml:lang="en"><![CDATA[Translation of Ultracopier to italian. For more details see the web site.]]></description>
<!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number -->
- <version>2.2.4.7</version>
+ <version>2.2.6.0</version>
<!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. -->
<name>it</name>
<!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. -->
diff --git a/plugins/Languages/it/translation.qm b/plugins/Languages/it/translation.qm
index 6b2c9cb..5efb69a 100755
--- a/plugins/Languages/it/translation.qm
+++ b/plugins/Languages/it/translation.qm
Binary files differ
diff --git a/plugins/Languages/it/translation.ts b/plugins/Languages/it/translation.ts
index db61cd0..2eb27ce 100644
--- a/plugins/Languages/it/translation.ts
+++ b/plugins/Languages/it/translation.ts
@@ -15,7 +15,7 @@
<message>
<location filename="../../../CliParser.cpp" line="86"/>
<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="../../../CliParser.cpp" line="174"/>
@@ -27,19 +27,19 @@
<location filename="../../../CliParser.cpp" line="176"/>
<location filename="../../../CliParser.cpp" line="187"/>
<source>To display the options</source>
- <translation>Mostrare le opzioni</translation>
+ <translation>Visualizzare opzioni</translation>
</message>
<message>
<location filename="../../../CliParser.cpp" line="179"/>
<location filename="../../../CliParser.cpp" line="190"/>
<source>To copy sources to destination, separated by space. If destination is &quot;?&quot;, ultracopier will ask the user</source>
- <translation>Copiare file di origine nella destinazione separati da uno spazio. Se la destinazione è &quot;?&quot; Ultracopier chiederà all&apos;utente</translation>
+ <translation>Copiare file di origine nella destinazione separato/i da uno spazio. Se la destinazione è &quot;?&quot; Ultracopier chiederà all&apos;utente</translation>
</message>
<message>
<location filename="../../../CliParser.cpp" line="180"/>
<location filename="../../../CliParser.cpp" line="191"/>
<source>To move sources to destination, separated by space. If destination is &quot;?&quot;, ultracopier will ask the user</source>
- <translation>Spostare file di origine nella destinazione separati da uno spazio. Se la destinazione è &quot;?&quot; Ultracopier chiederà all&apos;utente</translation>
+ <translation>Spostare file di origine nella destinazione separato/i da uno spazio. Se la destinazione è &quot;?&quot; Ultracopier chiederà all&apos;utente</translation>
</message>
<message>
<location filename="../../../CliParser.cpp" line="184"/>
@@ -49,17 +49,17 @@
<message>
<location filename="../../../CliParser.cpp" line="99"/>
<source>This file is not supported transfer list</source>
- <translation>Questo file non è supportato dalla lista trasferimenti</translation>
+ <translation>Questo file non è supportato dalla lista di trasferimento</translation>
</message>
<message>
<location filename="../../../CliParser.cpp" line="32"/>
<source>Ultracopier is already running, right click on its system tray icon (near the clock) to use it or just copy and paste</source>
- <translation>Ultracopier è già avviato, click destro su icona nell&apos;area di notifica per usarlo oppure copia e incolla semplicemente</translation>
+ <translation>Ultracopier è già avviato, cliccare col destro sull&apos;icona nell&apos;area di notifica per utilizzarlo, oppure copiare e incollare semplicemente</translation>
</message>
<message>
<location filename="../../../CliParser.cpp" line="34"/>
<source>Ultracopier is already running, view all notification area icons (near the clock), right click on its system tray icon to use it or just copy and paste</source>
- <translation>Ultracopier è già avviato, controlla tra le icone nell&apos;area di notifica. Click destro sull&apos;icona della barra applicazioni di sistema per usarlo oppure copia e incolla semplicemente</translation>
+ <translation>Ultracopier è già avviato, controlla tra le icone nell&apos;area di notifica. Cliccare col destro sull&apos;icona nell&apos;area di notifica per utilizzarlo, oppure copiare e incollare semplicemente</translation>
</message>
<message>
<location filename="../../../CliParser.cpp" line="109"/>
@@ -70,7 +70,7 @@
<location filename="../../../CliParser.cpp" line="175"/>
<location filename="../../../CliParser.cpp" line="186"/>
<source>To display this help</source>
- <translation>Mostrare questa guida</translation>
+ <translation>Visualizzare questa guida</translation>
</message>
<message>
<location filename="../../../CliParser.cpp" line="177"/>
@@ -93,91 +93,96 @@
<context>
<name>CopyEngine</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="438"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="461"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="465"/>
<source>The engine is forced to move, you can&apos;t copy with it</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="473"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="496"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="519"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="542"/>
<source>The engine is forced to copy, you can&apos;t move with it</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/>
<source>Destination</source>
<translation type="unfinished">Destinazione</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/>
<source>Use the actual destination &quot;%1&quot;?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="685"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/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/Ultracopier-Spec/CopyEngine.cpp" line="976"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="979"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="984"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="988"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="886"/>
+ <source>Supported only on Windows</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1035"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1038"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1043"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1047"/>
<source>Ask</source>
<translation type="unfinished">Chiedi</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="977"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="981"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="985"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="989"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1036"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1040"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1044"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1048"/>
<source>Skip</source>
<translation type="unfinished">Salta</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="980"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1039"/>
<source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="982"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="994"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1041"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1053"/>
<source>Rename</source>
<translation type="unfinished">Rinomina</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="986"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1045"/>
<source>Put at the end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="990"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1049"/>
<source>Overwrite</source>
<translation type="unfinished">Sovrascrivi</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="991"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1050"/>
<source>Overwrite if different</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="992"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1051"/>
<source>Overwrite if newer</source>
- <translation type="unfinished">Sovrascrivere se più recente</translation>
+ <translation type="unfinished">Sovrascrivi se più recente</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="993"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1052"/>
<source>Overwrite if older</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/>
<source>Options error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/>
<source>Options engine is not loaded. Unable to access the filters</source>
<translation type="unfinished"></translation>
</message>
@@ -185,75 +190,76 @@
<context>
<name>CopyEngineFactory</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="303"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="60"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="309"/>
<source>Supported only on Windows</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="430"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="433"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="438"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/>
<source>Ask</source>
<translation type="unfinished">Chiedi</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="431"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="435"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="443"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="437"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="441"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="449"/>
<source>Skip</source>
<translation type="unfinished">Salta</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="434"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/>
<source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="454"/>
<source>Rename</source>
<translation type="unfinished">Rinomina</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/>
<source>Put at the end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="450"/>
<source>Overwrite</source>
<translation type="unfinished">Sovrascrivi</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="451"/>
<source>Overwrite if different</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="452"/>
<source>Overwrite if newer</source>
- <translation type="unfinished">Sovrascrivere se più recente</translation>
+ <translation type="unfinished">Sovrascrivi se più recente</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="447"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="453"/>
<source>Overwrite if older</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/>
<source>Options error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/>
<source>Options engine is not loaded. Unable to access the filters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/>
<source>Options engine is not loaded, can&apos;t access to the filters</source>
<translation type="unfinished"></translation>
</message>
@@ -338,12 +344,12 @@
<message>
<location filename="../../../Core.cpp" line="104"/>
<source>Group window</source>
- <translation>Raggruppare finestre</translation>
+ <translation>Raggruppa finestre</translation>
</message>
<message>
<location filename="../../../Core.cpp" line="104"/>
<source>Do you want group the transfer with another actual running transfer?</source>
- <translation>Vuoi raggruppare il trasferimento con un altro attualmente avviato?</translation>
+ <translation>Si vuole raggruppare il trasferimento con un altro attualmente avviato?</translation>
</message>
<message>
<location filename="../../../Core.cpp" line="127"/>
@@ -358,7 +364,7 @@
<message>
<location filename="../../../Core.cpp" line="1200"/>
<source>Do you want to copy? If no, it will be moved.</source>
- <translation>Vuoi copiare? Altrimenti verrà spostato</translation>
+ <translation>Si vuole procedere alla copia? Altrimenti verrà spostato.</translation>
</message>
<message>
<location filename="../../../Core.cpp" line="275"/>
@@ -422,7 +428,7 @@
<location filename="../../../FacilityEngine.cpp" line="65"/>
<source>Move</source>
<extracomment>a move</extracomment>
- <translation>Sposta</translation>
+ <translation>Spostamento</translation>
</message>
<message>
<location filename="../../../FacilityEngine.cpp" line="67"/>
@@ -524,12 +530,12 @@
<location filename="../../../FacilityEngine.cpp" line="63"/>
<source>Transfer</source>
<extracomment>a transfer</extracomment>
- <translation>Trasferisci</translation>
+ <translation>Trasferimento</translation>
</message>
<message>
<location filename="../../../FacilityEngine.cpp" line="66"/>
<source>Start</source>
- <translation>Avvia</translation>
+ <translation>Avvio</translation>
</message>
<message>
<location filename="../../../FacilityEngine.cpp" line="71"/>
@@ -560,22 +566,22 @@
<location filename="../../../FacilityEngine.cpp" line="76"/>
<location filename="../../../FacilityEngine.cpp" line="80"/>
<source>Time remaining:</source>
- <translation>Tempo residuo:</translation>
+ <translation>Tempo rimanente:</translation>
</message>
<message>
<location filename="../../../FacilityEngine.cpp" line="77"/>
<source>Listing</source>
- <translation>Elencando</translation>
+ <translation>Elenco in corso</translation>
</message>
<message>
<location filename="../../../FacilityEngine.cpp" line="78"/>
<source>Copying</source>
- <translation>Copia</translation>
+ <translation>Copia in corso</translation>
</message>
<message>
<location filename="../../../FacilityEngine.cpp" line="79"/>
<source>Listing and copying</source>
- <translation>Elencando e copiando</translation>
+ <translation>Elenco e copia in corso</translation>
</message>
<message>
<location filename="../../../FacilityEngine.cpp" line="81"/>
@@ -595,12 +601,12 @@
<message>
<location filename="../../../FacilityEngine.cpp" line="86"/>
<source>Overwrite if newer</source>
- <translation>Sovrascrivere se più recente</translation>
+ <translation>Sovrascrivi se più recente</translation>
</message>
<message>
<location filename="../../../FacilityEngine.cpp" line="87"/>
<source>Overwrite if the last modification dates are different</source>
- <translation>Sovrascrivere se le date di ultima modifica sono differenti</translation>
+ <translation>Sovrascrivi se le ultime date di modifica differiscono</translation>
</message>
<message>
<location filename="../../../FacilityEngine.cpp" line="88"/>
@@ -620,12 +626,12 @@
<message>
<location filename="../../../FacilityEngine.cpp" line="90"/>
<source>Select source directory</source>
- <translation>Selezionare cartella di origine</translation>
+ <translation>Seleziona directory di origine</translation>
</message>
<message>
<location filename="../../../FacilityEngine.cpp" line="91"/>
<source>Select destination directory</source>
- <translation>Selezionare cartella di destinazione</translation>
+ <translation>Seleziona directory di destinazione</translation>
</message>
<message>
<location filename="../../../FacilityEngine.cpp" line="92"/>
@@ -645,12 +651,12 @@
<message>
<location filename="../../../FacilityEngine.cpp" line="95"/>
<source>Save transfer list</source>
- <translation>Salvare lista di trasferimento</translation>
+ <translation>Salva lista di trasferimento</translation>
</message>
<message>
<location filename="../../../FacilityEngine.cpp" line="96"/>
<source>Open transfer list</source>
- <translation>Aprire lista di trasferimento</translation>
+ <translation>Apri lista di trasferimento</translation>
</message>
<message>
<location filename="../../../FacilityEngine.cpp" line="97"/>
@@ -665,18 +671,18 @@
<message>
<location filename="../../../FacilityEngine.cpp" line="99"/>
<source>Not supported on this platform</source>
- <translation>Non supportato su questa piattaforma</translation>
+ <translation>Non supportato per questa piattaforma</translation>
</message>
</context>
<context>
<name>FileErrorDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="87"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="92"/>
<source>Error on folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="90"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="95"/>
<source>Folder name</source>
<translation type="unfinished"></translation>
</message>
@@ -684,22 +690,22 @@
<context>
<name>FileExistsDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="191"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="201"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="198"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="208"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/>
<source>Error</source>
<translation type="unfinished">Errore</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -707,22 +713,22 @@
<context>
<name>FileIsSameDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="140"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="145"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="147"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="152"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/>
<source>Error</source>
<translation type="unfinished">Errore</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -869,27 +875,27 @@
<context>
<name>FolderExistsDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="84"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="91"/>
<source>Folder already exists</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="164"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="172"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="173"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="181"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/>
<source>Error</source>
<translation type="unfinished">Errore</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -899,7 +905,7 @@
<message>
<location filename="../../../HelpDialog.cpp" line="36"/>
<source>About Ultracopier</source>
- <translation>Informazioni su Ultracopier</translation>
+ <translation>Riguardo a Ultrpier</translation>
</message>
<message>
<location filename="../../../HelpDialog.ui" line="67"/>
@@ -907,8 +913,8 @@
This version is compiled as version: %1.</source>
<extracomment>%1 will be replaced by a variable content (normal, debug, ...)</extracomment>
<translatorcomment>%1 sarà rimpiazzato da un contenuto variabile (normale, debug, ...)</translatorcomment>
- <translation>Utility avanzata sotto licenza GPL3 per la copia dei file basata su Qt.
-Compilata come versione: %1.</translation>
+ <translation>Utility avanzata per la copia dei file basata su Qt sotto licenza GPL3.
+Versione compilata come: %1.</translation>
</message>
<message>
<location filename="../../../HelpDialog.ui" line="85"/>
@@ -925,12 +931,12 @@ Compilata come versione: %1.</translation>
<message>
<location filename="../../../HelpDialog.ui" line="131"/>
<source>About Qt</source>
- <translation>Informazioni su Qt</translation>
+ <translation>Riguardo a Qt</translation>
</message>
<message>
<location filename="../../../HelpDialog.ui" line="154"/>
<source>Check update</source>
- <translation>Controllare aggiornamenti</translation>
+ <translation>Controlla aggiornamenti</translation>
</message>
<message>
<location filename="../../../HelpDialog.ui" line="161"/>
@@ -1003,7 +1009,7 @@ Compilata come versione: %1.</translation>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;For more information see the website &lt;a href=&quot;%1&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;%1&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<extracomment>%1 will be remplaced by the website into the corresponding languages</extracomment>
<translatorcomment>%1 sarà rimpiazzato dal sito in lingua corrispondente</translatorcomment>
- <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Per ulteriori informazioni consultare il sito &lt;a href=&quot;%1&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;%1&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Per ulteriori informazioni consultare il sito web &lt;a href=&quot;%1&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;%1&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
</context>
<context>
@@ -1074,7 +1080,7 @@ Compilata come versione: %1.</translation>
<message>
<location filename="../../../LocalListener.cpp" line="168"/>
<source>Timeout while recomposing data from connected clients</source>
- <translation>Tempo scaduto durante la ricomposizione dei dati dai client collegati</translation>
+ <translation>Timeout durante la ricomposizione dei dati dai client collegati</translation>
</message>
</context>
<context>
@@ -1089,26 +1095,28 @@ Compilata come versione: %1.</translation>
<message>
<location filename="../../../LogThread.cpp" line="107"/>
<source>Log file already open, error: %1</source>
- <translation>File log già aperto, errore %1</translation>
+ <translation>File di registro già aperto, errore %1</translation>
</message>
<message>
<location filename="../../../LogThread.cpp" line="116"/>
<location filename="../../../LogThread.cpp" line="126"/>
<source>Unable to open the log file, error: %1</source>
- <translation>Impossibile aprire il file di log, errore %1</translation>
+ <translation>Impossibile aprire file di registro, errore %1</translation>
</message>
</context>
<context>
<name>MkPath</name>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="124"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="394"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="464"/>
<source>Unable to remove</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="187"/>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="210"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="363"/>
<source>Unable to create the folder</source>
<translation type="unfinished"></translation>
</message>
@@ -1118,22 +1126,27 @@ Compilata come versione: %1.</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="255"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="304"/>
<source>Unable to temporary rename the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="278"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="339"/>
+ <source>Unable to reverse temporary rename for real move</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="348"/>
<source>Unable to do the final real move the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="309"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="379"/>
<source>Unable to move the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="385"/>
<source>Unable to move the folder: errno: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1148,12 +1161,12 @@ Compilata come versione: %1.</translation>
<message>
<location filename="../../../OSSpecific.ui" line="119"/>
<source>Classic</source>
- <translation>Classic</translation>
+ <translation>Classica</translation>
</message>
<message>
<location filename="../../../OSSpecific.ui" line="124"/>
<source>Modern</source>
- <translation>Modern</translation>
+ <translation>Moderna</translation>
</message>
<message>
<location filename="../../../OSSpecific.ui" line="177"/>
@@ -1168,27 +1181,27 @@ Compilata come versione: %1.</translation>
<message>
<location filename="../../../OSSpecific.cpp" line="29"/>
<source>The replacement of default copy/move system is not supported by the file manager (Dolphin, Nautilus, ...).&lt;br /&gt;Ask the developer of your file manager to support it.&lt;br /&gt;You need do the copy/move manually.</source>
- <translation>Il rimpiazzo del sistema di copia e spostamento predefinito non è supportato dal file manager (Dolphin, Nautilus, ...)&lt;br /&gt;Chiedere allo sviluppatore del vostro file manager di supportarlo.&lt;br /&gt;Dovete copiare/spostare manualmente.</translation>
+ <translation>Il rimpiazzo del sistema di copia e spostamento predefinito non è supportato dal gestore file (Dolphin, Nautilus, ...)&lt;br /&gt;Chiedere allo sviluppatore dello stesso di supportarlo.&lt;br /&gt;Dovete copiare/spostare manualmente.</translation>
</message>
<message>
<location filename="../../../OSSpecific.cpp" line="31"/>
<source>Reboot the system if previously had similar software installed (like Teracopy, Supercopier or an earlier version of Ultracopier).</source>
- <translation>Riavviare il sistema, se in precedenza avevate installato un software simile a questo (Teracopy, Supercopier o una versione precedente di Ultracopier)</translation>
+ <translation>Riavviare il sistema, se in precedenza avevate installato un software simile a questo (Teracopy, Supercopier o una versione precedente di Ultracopier, ecc.).</translation>
</message>
<message>
<location filename="../../../OSSpecific.cpp" line="33"/>
<source>The replacement of default copy/move system is not supported and blocked by finder of Mac OS X.&lt;br /&gt;You need do the copy/move manually by right clicking on the system tray icon near the clock (not the dock icon).</source>
- <translation>Il rimpiazzo del sistema di copia e spostamento predefinito non è supportato, quindi viene bloccato dal finder di Mac OS X.&lt;br /&gt;Chiedere supporto allo sviluppatore.&lt;br /&gt;Sarà possibile copiare/spostare manualmente cliccando col tasto destro del mouse sull&apos;icona della barra applicazioni di sistema</translation>
+ <translation>Il rimpiazzo del sistema di copia e spostamento predefinito non è supportato, quindi viene bloccato dal finder di Mac OS X.&lt;br /&gt;Chiedere supporto allo sviluppatore.&lt;br /&gt;Sarà possibile copiare/spostare manualmente cliccando col tasto destro del mouse sull&apos;icona della barra applicazioni di sistema.</translation>
</message>
<message>
<location filename="../../../OSSpecific.cpp" line="35"/>
<source>The replacement of default copy/move system should be not supported by the file manager.&lt;br /&gt;Ask to the developer to support it.&lt;br /&gt;You need do the copy/move manually.</source>
- <translation>Il rimpiazzo del sistema di copia e spostamento predefinito potrebbe non essere supportato dal file manager.&lt;br /&gt;Chiedere supporto allo sviluppatore.&lt;br /&gt;Necessario usare copia/spostamento manuale</translation>
+ <translation>Il rimpiazzo del sistema di copia e spostamento predefinito potrebbe non essere supportato dal gestore file.&lt;br /&gt;Chiedere supporto allo sviluppatore.&lt;br /&gt;Necessario usare copia/spostamento manuale.</translation>
</message>
<message>
<location filename="../../../OSSpecific.cpp" line="38"/>
<source>Consider Supercopier as deprecated, prefer Ultracopier</source>
- <translation>Considerate Supercopier deprecato, favorite Ultracopier</translation>
+ <translation>Considerate Supercopier deprecato, preferite Ultracopier</translation>
</message>
</context>
<context>
@@ -1207,12 +1220,12 @@ Compilata come versione: %1.</translation>
<message>
<location filename="../../../OptionDialog.ui" line="70"/>
<source>Plugins</source>
- <translation>Plug-in</translation>
+ <translation>Plug-ins</translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="75"/>
<location filename="../../../OptionDialog.ui" line="366"/>
- <location filename="../../../OptionDialog.cpp" line="290"/>
+ <location filename="../../../OptionDialog.cpp" line="297"/>
<source>Copy engine</source>
<translation>Motore di copia</translation>
</message>
@@ -1225,12 +1238,12 @@ Compilata come versione: %1.</translation>
<message>
<location filename="../../../OptionDialog.ui" line="106"/>
<source>Log</source>
- <translation>Log</translation>
+ <translation>Registro</translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="251"/>
<source>Check for updates</source>
- <translation>Controlla aggiornamenti automaticamente</translation>
+ <translation>Controlla aggiornamenti</translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="289"/>
@@ -1255,58 +1268,58 @@ Compilata come versione: %1.</translation>
<message>
<location filename="../../../OptionDialog.ui" line="80"/>
<location filename="../../../OptionDialog.ui" line="379"/>
- <location filename="../../../OptionDialog.cpp" line="291"/>
+ <location filename="../../../OptionDialog.cpp" line="298"/>
<source>Listener</source>
<translation>Rilevatore</translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="85"/>
<location filename="../../../OptionDialog.ui" line="384"/>
- <location filename="../../../OptionDialog.cpp" line="292"/>
+ <location filename="../../../OptionDialog.cpp" line="299"/>
<source>Plugin loader</source>
- <translation>Caricatore dei plug-in</translation>
+ <translation>Caricatore di plug-ins</translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="93"/>
<location filename="../../../OptionDialog.ui" line="389"/>
- <location filename="../../../OptionDialog.cpp" line="293"/>
+ <location filename="../../../OptionDialog.cpp" line="300"/>
<source>Session loader</source>
- <translation>Caricatore di sessione</translation>
+ <translation>Caricatore di sessioni</translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="126"/>
<source>Force the language</source>
- <translation>Forzare lingua</translation>
+ <translation>Forza lingua</translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="136"/>
<source>Replace the default copy and move system</source>
- <translation>Rimpiazzare sistema di copia e spostamento predefinito</translation>
+ <translation>Rimpiazza il sistema di copia e spostamento predefinito</translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="150"/>
<source>Load at the session loading</source>
- <translation>Caricare il programma all&apos;avvio di sistema</translation>
+ <translation>Carica al caricamento della sessione</translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="164"/>
<source>When manual open</source>
- <translation>Con avvio manuale</translation>
+ <translation>Quando l&apos;avvio è manuale</translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="190"/>
<source>Group the windows when</source>
- <translation>Raggruppare finestre quando</translation>
+ <translation>Raggruppa finestre quando</translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="231"/>
<source>Confirm to group the windows</source>
- <translation>Conferma raggruppamento finestre</translation>
+ <translation>Conferma per raggruppare le finestre</translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="241"/>
<source>Display the OS warning</source>
- <translation>Mostrare avviso del Sistema Operativo</translation>
+ <translation>Visualizza avviso del Sistema Operativo</translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="261"/>
@@ -1326,7 +1339,7 @@ Compilata come versione: %1.</translation>
<message>
<location filename="../../../OptionDialog.ui" line="304"/>
<source>default: finish.opus</source>
- <translation>Predefinito: finish.opus</translation>
+ <translation>predefinito: finish.opus</translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="311"/>
@@ -1341,7 +1354,7 @@ Compilata come versione: %1.</translation>
<message>
<location filename="../../../OptionDialog.ui" line="402"/>
<source>Plugin</source>
- <translation>Plug-in</translation>
+ <translation>Plug-ins</translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="421"/>
@@ -1351,7 +1364,7 @@ Compilata come versione: %1.</translation>
<message>
<location filename="../../../OptionDialog.ui" line="434"/>
<source>Remove</source>
- <translation>Elimina</translation>
+ <translation>Rimuovi</translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="444"/>
@@ -1361,12 +1374,12 @@ Compilata come versione: %1.</translation>
<message>
<location filename="../../../OptionDialog.ui" line="471"/>
<source>Copy engine by order of preference:</source>
- <translation>Motore di copia in ordine di preferenza:</translation>
+ <translation>Motori di copia in ordine di preferenza:</translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="542"/>
<source>Client connected</source>
- <translation>Client connessi</translation>
+ <translation>Client connesso</translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="598"/>
@@ -1391,12 +1404,12 @@ Compilata come versione: %1.</translation>
<message>
<location filename="../../../OptionDialog.ui" line="785"/>
<source>Write the transfers</source>
- <translation>Scrivere i trasferimenti</translation>
+ <translation>Scrivi i trasferimenti</translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="845"/>
<source>Write the folder operations</source>
- <translation>Scrivere le operazioni di cartella</translation>
+ <translation>Scrivi le operazioni cartella</translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="792"/>
@@ -1408,7 +1421,7 @@ Compilata come versione: %1.</translation>
<message>
<location filename="../../../OptionDialog.ui" line="815"/>
<source>Write the errors</source>
- <translation>Scrivere gli errori</translation>
+ <translation>Scrivi gli errori</translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="822"/>
@@ -1420,90 +1433,90 @@ Compilata come versione: %1.</translation>
<message>
<location filename="../../../OptionDialog.ui" line="741"/>
<source>Write the log file into:</source>
- <translation>Scrivere il file di log in:</translation>
+ <translation>Scrivi il file di registro in:</translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="772"/>
<source>Write directly to the file when it receive a new entry (can produce 50% of lost of performance)</source>
- <translation>Scrivere direttamente nel file quando si riceve una nuova voce (può causare il 50% di perdita di prestazioni)</translation>
+ <translation>Scrivere direttamente nel file quando riceve una nuova voce (può causare il 50% di perdita di prestazioni)</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="197"/>
- <location filename="../../../OptionDialog.cpp" line="211"/>
+ <location filename="../../../OptionDialog.cpp" line="204"/>
+ <location filename="../../../OptionDialog.cpp" line="218"/>
<source>Load</source>
<translation>Carica</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="197"/>
+ <location filename="../../../OptionDialog.cpp" line="204"/>
<source>Load the theme?</source>
<translation>Caricare il tema?</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="211"/>
+ <location filename="../../../OptionDialog.cpp" line="218"/>
<source>Load the language?</source>
- <translation>Caricare questa lingua?</translation>
+ <translation>Caricare la lingua?</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="298"/>
+ <location filename="../../../OptionDialog.cpp" line="305"/>
<source>Do nothing</source>
<translation>Non fare nulla</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="299"/>
+ <location filename="../../../OptionDialog.cpp" line="306"/>
<source>Ask source as folder</source>
- <translation>Chiedi cartella come origine</translation>
+ <translation>Chiedi origine come cartella</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="300"/>
+ <location filename="../../../OptionDialog.cpp" line="307"/>
<source>Ask sources as files</source>
- <translation>Chiedi file come origine</translation>
+ <translation>Chiedi origini come file</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="301"/>
+ <location filename="../../../OptionDialog.cpp" line="308"/>
<source>Never</source>
<translation>Mai</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="302"/>
+ <location filename="../../../OptionDialog.cpp" line="309"/>
<source>When source is same</source>
<translation>Quando l&apos;origine è identica</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="303"/>
+ <location filename="../../../OptionDialog.cpp" line="310"/>
<source>When destination is same</source>
<translation>Quando la destinazione è identica</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="304"/>
+ <location filename="../../../OptionDialog.cpp" line="311"/>
<source>When source and destination are same</source>
- <translation>Quando sia lorigine che la destinazione sono identiche</translation>
+ <translation>Quando origine e destinazione sono identiche</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="305"/>
+ <location filename="../../../OptionDialog.cpp" line="312"/>
<source>When source or destination are same</source>
- <translation>Quando l&apos;origine o la destinazione sono identiche</translation>
+ <translation>Quando origine o destinazione sono identiche</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="306"/>
+ <location filename="../../../OptionDialog.cpp" line="313"/>
<source>Always</source>
<translation>Sempre</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="320"/>
- <location filename="../../../OptionDialog.cpp" line="321"/>
- <location filename="../../../OptionDialog.cpp" line="322"/>
+ <location filename="../../../OptionDialog.cpp" line="327"/>
+ <location filename="../../../OptionDialog.cpp" line="328"/>
+ <location filename="../../../OptionDialog.cpp" line="329"/>
<source>The variables are %1</source>
<translation>Le variabili sono: %1</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="962"/>
+ <location filename="../../../OptionDialog.cpp" line="969"/>
<source>Save logs as: </source>
- <translation>Salva i log come: </translation>
+ <translation>Salva i registri come: </translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="775"/>
<source>Synchronized log</source>
- <translation>Log sincronizzato</translation>
+ <translation>Registro sincronizzato</translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="855"/>
@@ -1547,7 +1560,7 @@ Compilata come versione: %1.</translation>
<message>
<location filename="../../../PluginInformation.ui" line="14"/>
<source>About this plugin</source>
- <translation>Informazioni su questo plug-in</translation>
+ <translation>Riguardo a questo plug-in</translation>
</message>
<message>
<location filename="../../../PluginInformation.ui" line="23"/>
@@ -1597,12 +1610,12 @@ Compilata come versione: %1.</translation>
<message>
<location filename="../../../PluginInformation.cpp" line="45"/>
<source>Plugin loader</source>
- <translation>Caricatore di plug-in</translation>
+ <translation>Caricatore di plug-ins</translation>
</message>
<message>
<location filename="../../../PluginInformation.cpp" line="47"/>
<source>Session loader</source>
- <translation>Caricatore di sessione</translation>
+ <translation>Caricatore di sessioni</translation>
</message>
<message>
<location filename="../../../PluginInformation.cpp" line="49"/>
@@ -1640,17 +1653,17 @@ Compilata come versione: %1.</translation>
<message>
<location filename="../../../PluginsManager.cpp" line="489"/>
<source>Dependencies part is wrong</source>
- <translation>Alcune dipendenze non sono idonee</translation>
+ <translation>Sezione dipendenze sbagliata</translation>
</message>
<message>
<location filename="../../../PluginsManager.cpp" line="510"/>
<source>Dependencies %1 are not satisfied, for plugin: %2</source>
- <translation>Le dipendenze %1 per il plug-in %2 non sono soddisfatte</translation>
+ <translation>Le dipendenze &quot;%1&quot; per il plug-in &quot;%2&quot; non sono soddisfatte</translation>
</message>
<message>
<location filename="../../../PluginsManager.cpp" line="673"/>
<source>Remove %1</source>
- <translation>Eliminare %1</translation>
+ <translation>Elimina &quot;%1&quot;</translation>
</message>
<message>
<location filename="../../../PluginsManager.cpp" line="684"/>
@@ -1691,17 +1704,17 @@ Compilata come versione: %1.</translation>
<message>
<location filename="../../../PluginsManager.cpp" line="400"/>
<source>English text missing in the informations.xml for the tag: %1</source>
- <translation>Testo inglese mancante in informations.xml per il tag %1</translation>
+ <translation>Testo inglese mancante in informations.xml per il tag &quot;%1&quot;</translation>
</message>
<message>
<location filename="../../../PluginsManager.cpp" line="408"/>
<source>Tag not found: %1</source>
- <translation>Tag non trovato: %1</translation>
+ <translation>Tag &quot;%1&quot; non trovato</translation>
</message>
<message>
<location filename="../../../PluginsManager.cpp" line="673"/>
<source>Are you sure about removing &quot;%1&quot; in version %2?</source>
- <translation>Si desidera eliminare &quot;%1&quot; nella versione %2?</translation>
+ <translation>Sicuri di voler eliminare &quot;%1&quot; nella versione %2?</translation>
</message>
<message>
<location filename="../../../PluginsManager.cpp" line="708"/>
@@ -1716,7 +1729,7 @@ Compilata come versione: %1.</translation>
<message>
<location filename="../../../PluginsManager.cpp" line="711"/>
<source>Ultracopier plugin (*.urc)</source>
- <translation>Plug-in di Ultracopier (*.urc)</translation>
+ <translation>Plug-in Ultracopier (*.urc)</translation>
</message>
<message>
<location filename="../../../PluginsManager.cpp" line="728"/>
@@ -1730,7 +1743,7 @@ Compilata come versione: %1.</translation>
<location filename="../../../PluginsManager.cpp" line="877"/>
<location filename="../../../PluginsManager.cpp" line="884"/>
<source>Plugin loader</source>
- <translation>Caricatore di plug-in</translation>
+ <translation>Caricatore di plug-ins</translation>
</message>
<message>
<location filename="../../../PluginsManager.cpp" line="728"/>
@@ -1742,33 +1755,34 @@ Compilata come versione: %1.</translation>
<location filename="../../../PluginsManager.cpp" line="871"/>
<location filename="../../../PluginsManager.cpp" line="884"/>
<source>Unable to load the plugin content, please check it: %1</source>
- <translation>Impossibile caricare il contenuto del plug-in, si prega di controllare: &quot;%1&quot;</translation>
+ <translation>Impossibile caricare il contenuto del plug-in, si prega di controllarlo: %1</translation>
</message>
<message>
<location filename="../../../PluginsManager.cpp" line="821"/>
<source>Unable to create a folder to install the plugin:
%1</source>
- <translation>Impossibile creare una cartella per installare il plug-in %1</translation>
+ <translation>Impossibile creare una cartella per installare il plug-in &quot;%1&quot;</translation>
</message>
<message>
<location filename="../../../PluginsManager.cpp" line="834"/>
<source>Unable to create a file to install the plugin:
%1
Error:%2</source>
- <translation type="unfinished"></translation>
+ <translation>Impossibile creare un file per installare il plug-in &quot;%1&quot;
+Errore: %2</translation>
</message>
<message>
<location filename="../../../PluginsManager.cpp" line="853"/>
<source>Folder with same name is present, skip the plugin installation:
%1</source>
- <translation>Presente cartella con identico nome, non sarà installato il plug-in &quot;%1&quot;</translation>
+ <translation>Cartella con nome identico già presente, salta l&apos;installazione del plug-in &quot;%1&quot;</translation>
</message>
<message>
<location filename="../../../PluginsManager.cpp" line="859"/>
<location filename="../../../PluginsManager.cpp" line="865"/>
<location filename="../../../PluginsManager.cpp" line="877"/>
<source>Unable to load the plugin content, please check it</source>
- <translation>Impossibile caricare il contenuto del plug-in, si prega di controllare</translation>
+ <translation>Impossibile caricare il contenuto del plug-in, si prega di controllarlo</translation>
</message>
</context>
<context>
@@ -1777,17 +1791,17 @@ Error:%2</source>
<location filename="../../../ProductKey.ui" line="14"/>
<location filename="../../../ProductKey.ui" line="24"/>
<source>Product key</source>
- <translation>Chiave prodotto</translation>
+ <translation>Chiave del prodotto</translation>
</message>
<message>
- <location filename="../../../ProductKey.cpp" line="56"/>
+ <location filename="../../../ProductKey.cpp" line="60"/>
<source>Error</source>
<translation>Errore</translation>
</message>
<message>
- <location filename="../../../ProductKey.cpp" line="56"/>
+ <location filename="../../../ProductKey.cpp" line="60"/>
<source>Your product key was rejected.&lt;br /&gt;If you buy key, unmark check your spam and unmark the mail as spam&lt;br /&gt;If you have not buy your key, go to &lt;a href=&quot;https://shop.first-world.info/&quot;&gt;https://shop.first-world.info/&lt;/a&gt;</source>
- <translation>La vostra chiave prodotto è stata rigettata.&lt;br /&gt;Se avete comprato la chiave controllare la cartella spam della vostra casella email.&lt;br /&gt;Se non avete comprato la chiave, andare su &lt;a href=&quot;https://shop.first-world.info/&quot;&gt;https://shop.first-world.info/&lt;/a&gt;</translation>
+ <translation>La vostra chiave del prodotto è stata rigettata.&lt;br /&gt;Se avete comprato la chiave controllare la cartella spam della vostra casella e-mail.&lt;br /&gt;Se non avete comprato la chiave, andate su &lt;a href=&quot;https://shop.first-world.info/&quot;&gt;https://shop.first-world.info/&lt;/a&gt;</translation>
</message>
</context>
<context>
@@ -1796,7 +1810,7 @@ Error:%2</source>
<location filename="../../../lib/qt-tar-xz/QXzDecode.cpp" line="38"/>
<location filename="../../../lib/qt-tar-xz/QXzDecode.cpp" line="93"/>
<source>Memory allocation failed</source>
- <translation>Allocazione di memoria fallita</translation>
+ <translation>Allocazione memoria fallita</translation>
</message>
<message>
<location filename="../../../lib/qt-tar-xz/QXzDecode.cpp" line="64"/>
@@ -1807,7 +1821,7 @@ Error:%2</source>
<message>
<location filename="../../../lib/qt-tar-xz/QXzDecode.cpp" line="97"/>
<source>Memory usage limit reached</source>
- <translation>Limite di memoria raggiunto</translation>
+ <translation>Limite utilizzo memoria raggiunto</translation>
</message>
<message>
<location filename="../../../lib/qt-tar-xz/QXzDecode.cpp" line="101"/>
@@ -1817,12 +1831,12 @@ Error:%2</source>
<message>
<location filename="../../../lib/qt-tar-xz/QXzDecode.cpp" line="105"/>
<source>Unsupported options in the .xz headers</source>
- <translation>Opzioni non supportate nelle intestazioni del file .xz</translation>
+ <translation>Opzioni non supportate nelle intestazioni di file .xz</translation>
</message>
<message>
<location filename="../../../lib/qt-tar-xz/QXzDecode.cpp" line="110"/>
<source>The file is corrupted</source>
- <translation>Il file è corrotto</translation>
+ <translation>File corrotto</translation>
</message>
<message>
<location filename="../../../lib/qt-tar-xz/QXzDecode.cpp" line="114"/>
@@ -1832,7 +1846,7 @@ Error:%2</source>
<message>
<location filename="../../../lib/qt-tar-xz/QXzDecode.cpp" line="124"/>
<source>The input data is too short</source>
- <translation>I dati inseriti sono troppo corti</translation>
+ <translation>Dati inseriti troppo corti</translation>
</message>
</context>
<context>
@@ -1843,12 +1857,12 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="541"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="543"/>
<source>Unable to read the source file: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="595"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="599"/>
<source>File truncated during the read, possible data change</source>
<translation type="unfinished"></translation>
</message>
@@ -1904,32 +1918,38 @@ Error:%2</source>
<context>
<name>ScanFileOrFolder</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="452"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="454"/>
- <source>%1 - copy</source>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="331"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="681"/>
+ <source>Blacklisted folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="463"/>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="465"/>
- <source>%1 - copy (%2)</source>
+ <source>%1 - copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="576"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="578"/>
- <source>%name% - copy</source>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="474"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="476"/>
+ <source>%1 - copy (%2)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="587"/>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="589"/>
+ <source>%name% - copy</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="598"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="600"/>
<source>%name% - copy (%number%)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="673"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="677"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="691"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="695"/>
<source>Problem with folder read</source>
<translation type="unfinished"></translation>
</message>
@@ -1939,7 +1959,7 @@ Error:%2</source>
<message>
<location filename="../../../SystrayIcon.cpp" line="169"/>
<source>No copy listener found. Do the copy manually by right click one the system tray icon.</source>
- <translation>Nessun rilevatore di copia trovato. Fare una copia manualmente cliccando col tasto destro del mouse sull&apos;icona nell&apos;area di notifica</translation>
+ <translation>Nessun rilevatore di copia trovato. Effettuare copia manualmente cliccando col tasto destro sull&apos;icona nell&apos;area di notifica.</translation>
</message>
<message>
<location filename="../../../SystrayIcon.cpp" line="175"/>
@@ -1949,22 +1969,22 @@ Error:%2</source>
<message>
<location filename="../../../SystrayIcon.cpp" line="194"/>
<source>Searching information...</source>
- <translation>Cercando informazioni...</translation>
+ <translation>Ricerca informazioni...</translation>
</message>
<message>
<location filename="../../../SystrayIcon.cpp" line="207"/>
<source>Do not replace the explorer copy/move</source>
- <translation>Non rimpiazzare il sistema di copia/spostamento di Windows Explorer</translation>
+ <translation>Non rimpiazzare il sistema di copia/spostamento di Explorer</translation>
</message>
<message>
<location filename="../../../SystrayIcon.cpp" line="212"/>
<source>Semi replace the explorer copy/move</source>
- <translation>Rimpiazza parzialmente il sistema di copia/spostamento di Windows Explorer</translation>
+ <translation>Rimpiazzare parzialmente il sistema di copia/spostamento di Explorer</translation>
</message>
<message>
<location filename="../../../SystrayIcon.cpp" line="217"/>
<source>Replace the explorer copy/move</source>
- <translation>Rimpiazza il sistema di copia/spostamento di Windows Explorer</translation>
+ <translation>Rimpiazzare il sistema di copia/spostamento di Explorer</translation>
</message>
<message>
<location filename="../../../SystrayIcon.cpp" line="396"/>
@@ -1974,37 +1994,37 @@ Error:%2</source>
<message>
<location filename="../../../SystrayIcon.cpp" line="396"/>
<source>The action on the systray icon is unknown!</source>
- <translation>Azione su icona dell&apos;area di notifica sconosciuta!</translation>
+ <translation>Azione sull&apos;icona dell&apos;area di notifica sconosciuta!</translation>
</message>
<message>
<location filename="../../../SystrayIcon.cpp" line="444"/>
<source>&amp;About/Debug report</source>
- <translation>Rapporto di debug/informazioni</translation>
+ <translation>Rapporto di debug/&amp;Informazioni</translation>
</message>
<message>
<location filename="../../../SystrayIcon.cpp" line="446"/>
<source>&amp;About</source>
- <translation>Al riguardo</translation>
+ <translation>&amp;Al riguardo</translation>
</message>
<message>
<location filename="../../../SystrayIcon.cpp" line="449"/>
<source>&amp;Save bug report</source>
- <translation>Salva rapporto bug</translation>
+ <translation>&amp;Salva rapporto bug</translation>
</message>
<message>
<location filename="../../../SystrayIcon.cpp" line="451"/>
<source>&amp;Quit</source>
- <translation>Uscire</translation>
+ <translation>&amp;Esci</translation>
</message>
<message>
<location filename="../../../SystrayIcon.cpp" line="452"/>
<source>&amp;Options</source>
- <translation>Opzioni</translation>
+ <translation>&amp;Opzioni</translation>
</message>
<message>
<location filename="../../../SystrayIcon.cpp" line="453"/>
<source>&amp;Register product key</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Registra chiave del prodotto</translation>
</message>
<message>
<location filename="../../../SystrayIcon.cpp" line="491"/>
@@ -2019,82 +2039,82 @@ Error:%2</source>
<message>
<location filename="../../../SystrayIcon.cpp" line="518"/>
<source>A&amp;dd copy/moving</source>
- <translation>Aggiungi copia/spostamento</translation>
+ <translation>A&amp;ggiungi copia/spostamento</translation>
</message>
<message>
<location filename="../../../SystrayIcon.cpp" line="544"/>
<source>Add &amp;copy</source>
- <translation>Aggiungi copia</translation>
+ <translation>Aggiungi &amp;copia</translation>
</message>
<message>
<location filename="../../../SystrayIcon.cpp" line="545"/>
<source>Add &amp;transfer</source>
- <translation>Aggiungi trasferimento</translation>
+ <translation>Aggiungi &amp;trasferimento</translation>
</message>
<message>
<location filename="../../../SystrayIcon.cpp" line="546"/>
<source>Add &amp;move</source>
- <translation>Aggiungi spostamento</translation>
+ <translation>Aggiungi &amp;spostamento</translation>
</message>
</context>
<context>
<name>Themes</name>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="328"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="341"/>
<source>Buy the Ultimate version to fund development</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="328"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="341"/>
<source>Register your key</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="427"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="440"/>
<source>File %1/%2, size: %3/%4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="661"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="674"/>
<source>Copy list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="663"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="676"/>
<source>Move list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1091"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1117"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1092"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1118"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1093"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1119"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1095"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1121"/>
<source>File Name, 0KB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1289"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1301"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1313"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1395"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1407"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1419"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1388"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1392"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1394"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1494"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1498"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1500"/>
<source>%1 %2% of %3</source>
<translation type="unfinished"></translation>
</message>
@@ -2102,24 +2122,24 @@ Error:%2</source>
<context>
<name>ThemesFactory</name>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="284"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="294"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="285"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="295"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="286"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="296"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="482"/>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="497"/>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="512"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="510"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="525"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="540"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
@@ -2127,29 +2147,29 @@ Error:%2</source>
<context>
<name>TransferThread</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="179"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="188"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="613"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="628"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="620"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="635"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="648"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="663"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/>
<source>File not found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="925"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="940"/>
<source>Unable to change the date</source>
<translation type="unfinished"></translation>
</message>
@@ -2157,19 +2177,19 @@ Error:%2</source>
<context>
<name>TransferThreadAsync</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="340"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/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="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="428"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="446"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="436"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="454"/>
<source>Unable to create the destination folder: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="431"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="448"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="439"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="456"/>
<source>Unable to create the destination folder, errno: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -2177,24 +2197,24 @@ Error:%2</source>
<context>
<name>WriteThread</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="135"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="138"/>
<source>Path resolution error (Empty path)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="164"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="197"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="167"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="200"/>
<source>Unable to create the destination folder: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="175"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="199"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="178"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="202"/>
<source>Unable to create the destination folder, errno: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="456"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="464"/>
<source>Internal error, please report it!</source>
<translation type="unfinished"></translation>
</message>
@@ -2204,7 +2224,7 @@ Error:%2</source>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/copyEngineOptions.ui" line="44"/>
<source>Transfer</source>
- <translation type="unfinished">Trasferisci</translation>
+ <translation type="unfinished">Trasferimento</translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/copyEngineOptions.ui" line="63"/>
@@ -2509,8 +2529,8 @@ Error:%2</source>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="341"/>
- <source>Overwrite if newer</source>
- <translation type="unfinished">Sovrascrivere se più recente</translation>
+ <source>Overwrite if source newer than destination</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="346"/>
@@ -2520,8 +2540,12 @@ Error:%2</source>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="354"/>
+ <source>Overwrite if source older than destination</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="357"/>
- <source>Overwrite if older</source>
+ <source>Overwrite if destination older</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2909,8 +2933,8 @@ Error:%2</source>
</message>
<message>
<location filename="../../Themes/Oxygen/themesOptions.ui" line="213"/>
- <source>Informations</source>
- <translation type="unfinished"></translation>
+ <source>Information</source>
+ <translation type="unfinished">Informazioni</translation>
</message>
<message>
<location filename="../../Themes/Oxygen/themesOptions.ui" line="219"/>
@@ -2923,28 +2947,38 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="257"/>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="269"/>
+ <source>Click to edit the color</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="368"/>
<source>Speed with progress bar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="267"/>
- <source>Show dual progression</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="378"/>
+ <source>Progression color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="277"/>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="388"/>
<source>Show progression in the title</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="287"/>
- <source>Progression color</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="395"/>
+ <source>General margin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="306"/>
- <source>Click to edit the color</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="402"/>
+ <source>Show dual progression</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="425"/>
+ <source>General spacing</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/plugins/Languages/ja/informations.xml b/plugins/Languages/ja/informations.xml
index 81a05ca..e54f81c 100755
--- a/plugins/Languages/ja/informations.xml
+++ b/plugins/Languages/ja/informations.xml
@@ -12,7 +12,7 @@
<!-- Detailed description -->
<description xml:lang="en"><![CDATA[Translation of Ultracopier to japanese. For more details see the web site.]]></description>
<!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number -->
- <version>2.2.4.7</version>
+ <version>2.2.6.0</version>
<!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. -->
<name>jp</name>
<!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. -->
diff --git a/plugins/Languages/ja/translation.ts b/plugins/Languages/ja/translation.ts
index 0ace0f4..b0a80ab 100755
--- a/plugins/Languages/ja/translation.ts
+++ b/plugins/Languages/ja/translation.ts
@@ -93,91 +93,96 @@
<context>
<name>CopyEngine</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="438"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="461"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="465"/>
<source>The engine is forced to move, you can&apos;t copy with it</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="473"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="496"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="519"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="542"/>
<source>The engine is forced to copy, you can&apos;t move with it</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/>
<source>Destination</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/>
<source>Use the actual destination &quot;%1&quot;?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="685"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/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/Ultracopier-Spec/CopyEngine.cpp" line="976"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="979"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="984"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="988"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="886"/>
+ <source>Supported only on Windows</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1035"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1038"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1043"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1047"/>
<source>Ask</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="977"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="981"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="985"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="989"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1036"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1040"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1044"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1048"/>
<source>Skip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="980"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1039"/>
<source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="982"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="994"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1041"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1053"/>
<source>Rename</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="986"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1045"/>
<source>Put at the end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="990"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1049"/>
<source>Overwrite</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="991"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1050"/>
<source>Overwrite if different</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="992"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1051"/>
<source>Overwrite if newer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="993"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1052"/>
<source>Overwrite if older</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/>
<source>Options error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/>
<source>Options engine is not loaded. Unable to access the filters</source>
<translation type="unfinished"></translation>
</message>
@@ -185,75 +190,76 @@
<context>
<name>CopyEngineFactory</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="303"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="60"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="309"/>
<source>Supported only on Windows</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="430"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="433"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="438"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/>
<source>Ask</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="431"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="435"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="443"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="437"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="441"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="449"/>
<source>Skip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="434"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/>
<source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="454"/>
<source>Rename</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/>
<source>Put at the end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="450"/>
<source>Overwrite</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="451"/>
<source>Overwrite if different</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="452"/>
<source>Overwrite if newer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="447"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="453"/>
<source>Overwrite if older</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/>
<source>Options error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/>
<source>Options engine is not loaded. Unable to access the filters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/>
<source>Options engine is not loaded, can&apos;t access to the filters</source>
<translation type="unfinished"></translation>
</message>
@@ -670,12 +676,12 @@
<context>
<name>FileErrorDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="87"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="92"/>
<source>Error on folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="90"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="95"/>
<source>Folder name</source>
<translation type="unfinished"></translation>
</message>
@@ -683,22 +689,22 @@
<context>
<name>FileExistsDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="191"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="201"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="198"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="208"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -706,22 +712,22 @@
<context>
<name>FileIsSameDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="140"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="145"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="147"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="152"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -868,27 +874,27 @@
<context>
<name>FolderExistsDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="84"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="91"/>
<source>Folder already exists</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="164"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="172"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="173"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="181"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -1096,13 +1102,15 @@ This version is compiled as version: %1.</source>
<name>MkPath</name>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="124"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="394"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="464"/>
<source>Unable to remove</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="187"/>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="210"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="363"/>
<source>Unable to create the folder</source>
<translation type="unfinished"></translation>
</message>
@@ -1112,22 +1120,27 @@ This version is compiled as version: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="255"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="304"/>
<source>Unable to temporary rename the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="278"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="339"/>
+ <source>Unable to reverse temporary rename for real move</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="348"/>
<source>Unable to do the final real move the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="309"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="379"/>
<source>Unable to move the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="385"/>
<source>Unable to move the folder: errno: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1206,7 +1219,7 @@ This version is compiled as version: %1.</source>
<message>
<location filename="../../../OptionDialog.ui" line="75"/>
<location filename="../../../OptionDialog.ui" line="366"/>
- <location filename="../../../OptionDialog.cpp" line="290"/>
+ <location filename="../../../OptionDialog.cpp" line="297"/>
<source>Copy engine</source>
<translation type="unfinished"></translation>
</message>
@@ -1260,21 +1273,21 @@ This version is compiled as version: %1.</source>
<message>
<location filename="../../../OptionDialog.ui" line="80"/>
<location filename="../../../OptionDialog.ui" line="379"/>
- <location filename="../../../OptionDialog.cpp" line="291"/>
+ <location filename="../../../OptionDialog.cpp" line="298"/>
<source>Listener</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="85"/>
<location filename="../../../OptionDialog.ui" line="384"/>
- <location filename="../../../OptionDialog.cpp" line="292"/>
+ <location filename="../../../OptionDialog.cpp" line="299"/>
<source>Plugin loader</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="93"/>
<location filename="../../../OptionDialog.ui" line="389"/>
- <location filename="../../../OptionDialog.cpp" line="293"/>
+ <location filename="../../../OptionDialog.cpp" line="300"/>
<source>Session loader</source>
<translation type="unfinished"></translation>
</message>
@@ -1426,75 +1439,75 @@ This version is compiled as version: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="197"/>
- <location filename="../../../OptionDialog.cpp" line="211"/>
+ <location filename="../../../OptionDialog.cpp" line="204"/>
+ <location filename="../../../OptionDialog.cpp" line="218"/>
<source>Load</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="197"/>
+ <location filename="../../../OptionDialog.cpp" line="204"/>
<source>Load the theme?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="211"/>
+ <location filename="../../../OptionDialog.cpp" line="218"/>
<source>Load the language?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="298"/>
+ <location filename="../../../OptionDialog.cpp" line="305"/>
<source>Do nothing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="299"/>
+ <location filename="../../../OptionDialog.cpp" line="306"/>
<source>Ask source as folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="300"/>
+ <location filename="../../../OptionDialog.cpp" line="307"/>
<source>Ask sources as files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="301"/>
+ <location filename="../../../OptionDialog.cpp" line="308"/>
<source>Never</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="302"/>
+ <location filename="../../../OptionDialog.cpp" line="309"/>
<source>When source is same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="303"/>
+ <location filename="../../../OptionDialog.cpp" line="310"/>
<source>When destination is same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="304"/>
+ <location filename="../../../OptionDialog.cpp" line="311"/>
<source>When source and destination are same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="305"/>
+ <location filename="../../../OptionDialog.cpp" line="312"/>
<source>When source or destination are same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="306"/>
+ <location filename="../../../OptionDialog.cpp" line="313"/>
<source>Always</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="320"/>
- <location filename="../../../OptionDialog.cpp" line="321"/>
- <location filename="../../../OptionDialog.cpp" line="322"/>
+ <location filename="../../../OptionDialog.cpp" line="327"/>
+ <location filename="../../../OptionDialog.cpp" line="328"/>
+ <location filename="../../../OptionDialog.cpp" line="329"/>
<source>The variables are %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="962"/>
+ <location filename="../../../OptionDialog.cpp" line="969"/>
<source>Save logs as: </source>
<translation type="unfinished"></translation>
</message>
@@ -1771,12 +1784,12 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../ProductKey.cpp" line="56"/>
+ <location filename="../../../ProductKey.cpp" line="60"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../ProductKey.cpp" line="56"/>
+ <location filename="../../../ProductKey.cpp" line="60"/>
<source>Your product key was rejected.&lt;br /&gt;If you buy key, unmark check your spam and unmark the mail as spam&lt;br /&gt;If you have not buy your key, go to &lt;a href=&quot;https://shop.first-world.info/&quot;&gt;https://shop.first-world.info/&lt;/a&gt;</source>
<translation type="unfinished"></translation>
</message>
@@ -1834,12 +1847,12 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="541"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="543"/>
<source>Unable to read the source file: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="595"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="599"/>
<source>File truncated during the read, possible data change</source>
<translation type="unfinished"></translation>
</message>
@@ -1895,32 +1908,38 @@ Error:%2</source>
<context>
<name>ScanFileOrFolder</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="452"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="454"/>
- <source>%1 - copy</source>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="331"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="681"/>
+ <source>Blacklisted folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="463"/>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="465"/>
- <source>%1 - copy (%2)</source>
+ <source>%1 - copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="576"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="578"/>
- <source>%name% - copy</source>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="474"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="476"/>
+ <source>%1 - copy (%2)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="587"/>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="589"/>
+ <source>%name% - copy</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="598"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="600"/>
<source>%name% - copy (%number%)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="673"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="677"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="691"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="695"/>
<source>Problem with folder read</source>
<translation type="unfinished"></translation>
</message>
@@ -2031,61 +2050,61 @@ Error:%2</source>
<context>
<name>Themes</name>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="328"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="341"/>
<source>Buy the Ultimate version to fund development</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="328"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="341"/>
<source>Register your key</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="427"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="440"/>
<source>File %1/%2, size: %3/%4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="661"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="674"/>
<source>Copy list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="663"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="676"/>
<source>Move list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1091"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1117"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1092"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1118"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1093"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1119"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1095"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1121"/>
<source>File Name, 0KB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1289"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1301"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1313"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1395"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1407"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1419"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1388"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1392"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1394"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1494"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1498"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1500"/>
<source>%1 %2% of %3</source>
<translation type="unfinished"></translation>
</message>
@@ -2093,24 +2112,24 @@ Error:%2</source>
<context>
<name>ThemesFactory</name>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="284"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="294"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="285"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="295"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="286"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="296"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="482"/>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="497"/>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="512"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="510"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="525"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="540"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
@@ -2118,29 +2137,29 @@ Error:%2</source>
<context>
<name>TransferThread</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="179"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="188"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="613"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="628"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="620"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="635"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="648"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="663"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/>
<source>File not found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="925"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="940"/>
<source>Unable to change the date</source>
<translation type="unfinished"></translation>
</message>
@@ -2148,19 +2167,19 @@ Error:%2</source>
<context>
<name>TransferThreadAsync</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="340"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/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="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="428"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="446"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="436"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="454"/>
<source>Unable to create the destination folder: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="431"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="448"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="439"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="456"/>
<source>Unable to create the destination folder, errno: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -2168,24 +2187,24 @@ Error:%2</source>
<context>
<name>WriteThread</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="135"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="138"/>
<source>Path resolution error (Empty path)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="164"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="197"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="167"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="200"/>
<source>Unable to create the destination folder: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="175"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="199"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="178"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="202"/>
<source>Unable to create the destination folder, errno: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="456"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="464"/>
<source>Internal error, please report it!</source>
<translation type="unfinished"></translation>
</message>
@@ -2500,7 +2519,7 @@ Error:%2</source>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="341"/>
- <source>Overwrite if newer</source>
+ <source>Overwrite if source newer than destination</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2511,8 +2530,12 @@ Error:%2</source>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="354"/>
+ <source>Overwrite if source older than destination</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="357"/>
- <source>Overwrite if older</source>
+ <source>Overwrite if destination older</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2900,7 +2923,7 @@ Error:%2</source>
</message>
<message>
<location filename="../../Themes/Oxygen/themesOptions.ui" line="213"/>
- <source>Informations</source>
+ <source>Information</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2914,28 +2937,38 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="257"/>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="269"/>
+ <source>Click to edit the color</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="368"/>
<source>Speed with progress bar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="267"/>
- <source>Show dual progression</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="378"/>
+ <source>Progression color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="277"/>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="388"/>
<source>Show progression in the title</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="287"/>
- <source>Progression color</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="395"/>
+ <source>General margin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="306"/>
- <source>Click to edit the color</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="402"/>
+ <source>Show dual progression</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="425"/>
+ <source>General spacing</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/plugins/Languages/ko/informations.xml b/plugins/Languages/ko/informations.xml
index a8ce2da..e7663ed 100644
--- a/plugins/Languages/ko/informations.xml
+++ b/plugins/Languages/ko/informations.xml
@@ -13,7 +13,7 @@
<description xml:lang="en"><![CDATA[File to define all English language related, Ultracopier is written in English, then not translation file needed]]></description>
<description xml:lang="ko"><![CDATA[Ultracopier의 한국어 번역입니다. 더 나은 번역이나 오타, 오역에 대한 제보는 이메일로 연락해주시면 감사하겠습니다.]]></description>
<!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number -->
- <version>2.2.4.7</version>
+ <version>2.2.6.0</version>
<!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. -->
<name>ko</name>
<!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. -->
diff --git a/plugins/Languages/ko/translation.qm b/plugins/Languages/ko/translation.qm
index 723cbb4..a24afdb 100755
--- a/plugins/Languages/ko/translation.qm
+++ b/plugins/Languages/ko/translation.qm
Binary files differ
diff --git a/plugins/Languages/ko/translation.ts b/plugins/Languages/ko/translation.ts
index 0339f1b..4279893 100644
--- a/plugins/Languages/ko/translation.ts
+++ b/plugins/Languages/ko/translation.ts
@@ -93,91 +93,96 @@
<context>
<name>CopyEngine</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="438"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="461"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="465"/>
<source>The engine is forced to move, you can&apos;t copy with it</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="473"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="496"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="519"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="542"/>
<source>The engine is forced to copy, you can&apos;t move with it</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/>
<source>Destination</source>
<translation type="unfinished">대상</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/>
<source>Use the actual destination &quot;%1&quot;?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="685"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/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/Ultracopier-Spec/CopyEngine.cpp" line="976"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="979"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="984"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="988"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="886"/>
+ <source>Supported only on Windows</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1035"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1038"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1043"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1047"/>
<source>Ask</source>
<translation type="unfinished">확인</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="977"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="981"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="985"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="989"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1036"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1040"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1044"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1048"/>
<source>Skip</source>
<translation type="unfinished">건너뛰기</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="980"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1039"/>
<source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="982"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="994"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1041"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1053"/>
<source>Rename</source>
<translation type="unfinished">이름 바꾸기</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="986"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1045"/>
<source>Put at the end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="990"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1049"/>
<source>Overwrite</source>
<translation type="unfinished">덮어쓰기</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="991"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1050"/>
<source>Overwrite if different</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="992"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1051"/>
<source>Overwrite if newer</source>
<translation type="unfinished">더 최신이면 덮어쓰기</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="993"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1052"/>
<source>Overwrite if older</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/>
<source>Options error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/>
<source>Options engine is not loaded. Unable to access the filters</source>
<translation type="unfinished"></translation>
</message>
@@ -185,75 +190,76 @@
<context>
<name>CopyEngineFactory</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="303"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="60"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="309"/>
<source>Supported only on Windows</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="430"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="433"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="438"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/>
<source>Ask</source>
<translation type="unfinished">확인</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="431"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="435"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="443"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="437"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="441"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="449"/>
<source>Skip</source>
<translation type="unfinished">건너뛰기</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="434"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/>
<source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="454"/>
<source>Rename</source>
<translation type="unfinished">이름 바꾸기</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/>
<source>Put at the end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="450"/>
<source>Overwrite</source>
<translation type="unfinished">덮어쓰기</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="451"/>
<source>Overwrite if different</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="452"/>
<source>Overwrite if newer</source>
<translation type="unfinished">더 최신이면 덮어쓰기</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="447"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="453"/>
<source>Overwrite if older</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/>
<source>Options error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/>
<source>Options engine is not loaded. Unable to access the filters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/>
<source>Options engine is not loaded, can&apos;t access to the filters</source>
<translation type="unfinished"></translation>
</message>
@@ -671,12 +677,12 @@
<context>
<name>FileErrorDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="87"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="92"/>
<source>Error on folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="90"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="95"/>
<source>Folder name</source>
<translation type="unfinished"></translation>
</message>
@@ -684,22 +690,22 @@
<context>
<name>FileExistsDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="191"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="201"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="198"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="208"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/>
<source>Error</source>
<translation type="unfinished">오류</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -707,22 +713,22 @@
<context>
<name>FileIsSameDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="140"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="145"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="147"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="152"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/>
<source>Error</source>
<translation type="unfinished">오류</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -869,27 +875,27 @@
<context>
<name>FolderExistsDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="84"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="91"/>
<source>Folder already exists</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="164"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="172"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="173"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="181"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/>
<source>Error</source>
<translation type="unfinished">오류</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -1098,13 +1104,15 @@ This version is compiled as version: %1.</source>
<name>MkPath</name>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="124"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="394"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="464"/>
<source>Unable to remove</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="187"/>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="210"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="363"/>
<source>Unable to create the folder</source>
<translation type="unfinished"></translation>
</message>
@@ -1114,22 +1122,27 @@ This version is compiled as version: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="255"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="304"/>
<source>Unable to temporary rename the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="278"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="339"/>
+ <source>Unable to reverse temporary rename for real move</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="348"/>
<source>Unable to do the final real move the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="309"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="379"/>
<source>Unable to move the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="385"/>
<source>Unable to move the folder: errno: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1208,7 +1221,7 @@ This version is compiled as version: %1.</source>
<message>
<location filename="../../../OptionDialog.ui" line="75"/>
<location filename="../../../OptionDialog.ui" line="366"/>
- <location filename="../../../OptionDialog.cpp" line="290"/>
+ <location filename="../../../OptionDialog.cpp" line="297"/>
<source>Copy engine</source>
<translation>복사 엔진</translation>
</message>
@@ -1272,21 +1285,21 @@ This version is compiled as version: %1.</source>
<message>
<location filename="../../../OptionDialog.ui" line="80"/>
<location filename="../../../OptionDialog.ui" line="379"/>
- <location filename="../../../OptionDialog.cpp" line="291"/>
+ <location filename="../../../OptionDialog.cpp" line="298"/>
<source>Listener</source>
<translation>리스너</translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="85"/>
<location filename="../../../OptionDialog.ui" line="384"/>
- <location filename="../../../OptionDialog.cpp" line="292"/>
+ <location filename="../../../OptionDialog.cpp" line="299"/>
<source>Plugin loader</source>
<translation>플러그인 로더</translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="93"/>
<location filename="../../../OptionDialog.ui" line="389"/>
- <location filename="../../../OptionDialog.cpp" line="293"/>
+ <location filename="../../../OptionDialog.cpp" line="300"/>
<source>Session loader</source>
<translation>섹션 로더</translation>
</message>
@@ -1428,75 +1441,75 @@ This version is compiled as version: %1.</source>
<translation type="unfinished">로그 파일 만들기:</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="197"/>
- <location filename="../../../OptionDialog.cpp" line="211"/>
+ <location filename="../../../OptionDialog.cpp" line="204"/>
+ <location filename="../../../OptionDialog.cpp" line="218"/>
<source>Load</source>
<translation type="unfinished">불러오기</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="197"/>
+ <location filename="../../../OptionDialog.cpp" line="204"/>
<source>Load the theme?</source>
<translation type="unfinished">테마를 불러오시겠습니까?</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="211"/>
+ <location filename="../../../OptionDialog.cpp" line="218"/>
<source>Load the language?</source>
<translation type="unfinished">언어를 불러오시겠습니까?</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="298"/>
+ <location filename="../../../OptionDialog.cpp" line="305"/>
<source>Do nothing</source>
<translation type="unfinished">동작 없음</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="299"/>
+ <location filename="../../../OptionDialog.cpp" line="306"/>
<source>Ask source as folder</source>
<translation type="unfinished">폴더 위치 확인</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="300"/>
+ <location filename="../../../OptionDialog.cpp" line="307"/>
<source>Ask sources as files</source>
<translation type="unfinished">파일 위치 확인</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="301"/>
+ <location filename="../../../OptionDialog.cpp" line="308"/>
<source>Never</source>
<translation type="unfinished">안 함</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="302"/>
+ <location filename="../../../OptionDialog.cpp" line="309"/>
<source>When source is same</source>
<translation type="unfinished">원본이 같을 때</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="303"/>
+ <location filename="../../../OptionDialog.cpp" line="310"/>
<source>When destination is same</source>
<translation type="unfinished">대상이 같을 때</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="304"/>
+ <location filename="../../../OptionDialog.cpp" line="311"/>
<source>When source and destination are same</source>
<translation type="unfinished">원본 및 대상이 같을 때</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="305"/>
+ <location filename="../../../OptionDialog.cpp" line="312"/>
<source>When source or destination are same</source>
<translation type="unfinished">원본 또는 대상이 같을 때</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="306"/>
+ <location filename="../../../OptionDialog.cpp" line="313"/>
<source>Always</source>
<translation type="unfinished">항상</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="320"/>
- <location filename="../../../OptionDialog.cpp" line="321"/>
- <location filename="../../../OptionDialog.cpp" line="322"/>
+ <location filename="../../../OptionDialog.cpp" line="327"/>
+ <location filename="../../../OptionDialog.cpp" line="328"/>
+ <location filename="../../../OptionDialog.cpp" line="329"/>
<source>The variables are %1</source>
<translation>변수는 %1입니다.</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="962"/>
+ <location filename="../../../OptionDialog.cpp" line="969"/>
<source>Save logs as: </source>
<translation>로그 따로 저장:</translation>
</message>
@@ -1776,12 +1789,12 @@ Error:%2</source>
<translation type="unfinished">제품 키</translation>
</message>
<message>
- <location filename="../../../ProductKey.cpp" line="56"/>
+ <location filename="../../../ProductKey.cpp" line="60"/>
<source>Error</source>
<translation type="unfinished">오류</translation>
</message>
<message>
- <location filename="../../../ProductKey.cpp" line="56"/>
+ <location filename="../../../ProductKey.cpp" line="60"/>
<source>Your product key was rejected.&lt;br /&gt;If you buy key, unmark check your spam and unmark the mail as spam&lt;br /&gt;If you have not buy your key, go to &lt;a href=&quot;https://shop.first-world.info/&quot;&gt;https://shop.first-world.info/&lt;/a&gt;</source>
<translation>제품 키가 거부되었습니다.&lt;br /&gt;키를 구매한 경우, 메일함에서 스팸 폴더를 확인하고 스팸 표시 마크를 해제해 주세요.&lt;br /&gt;키를 구입하지 않은 경우, &lt;a href=&quot;https://shop.first-world.info/&quot;&gt;https://shop.first-world.info/&lt;/a&gt;로 이동하세요. </translation>
</message>
@@ -1839,12 +1852,12 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="541"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="543"/>
<source>Unable to read the source file: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="595"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="599"/>
<source>File truncated during the read, possible data change</source>
<translation type="unfinished"></translation>
</message>
@@ -1900,32 +1913,38 @@ Error:%2</source>
<context>
<name>ScanFileOrFolder</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="452"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="454"/>
- <source>%1 - copy</source>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="331"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="681"/>
+ <source>Blacklisted folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="463"/>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="465"/>
- <source>%1 - copy (%2)</source>
+ <source>%1 - copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="576"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="578"/>
- <source>%name% - copy</source>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="474"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="476"/>
+ <source>%1 - copy (%2)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="587"/>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="589"/>
+ <source>%name% - copy</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="598"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="600"/>
<source>%name% - copy (%number%)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="673"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="677"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="691"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="695"/>
<source>Problem with folder read</source>
<translation type="unfinished"></translation>
</message>
@@ -2036,61 +2055,61 @@ Error:%2</source>
<context>
<name>Themes</name>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="328"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="341"/>
<source>Buy the Ultimate version to fund development</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="328"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="341"/>
<source>Register your key</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="427"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="440"/>
<source>File %1/%2, size: %3/%4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="661"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="674"/>
<source>Copy list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="663"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="676"/>
<source>Move list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1091"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1117"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1092"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1118"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1093"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1119"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1095"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1121"/>
<source>File Name, 0KB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1289"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1301"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1313"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1395"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1407"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1419"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1388"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1392"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1394"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1494"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1498"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1500"/>
<source>%1 %2% of %3</source>
<translation type="unfinished"></translation>
</message>
@@ -2098,24 +2117,24 @@ Error:%2</source>
<context>
<name>ThemesFactory</name>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="284"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="294"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="285"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="295"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="286"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="296"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="482"/>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="497"/>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="512"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="510"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="525"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="540"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
@@ -2123,29 +2142,29 @@ Error:%2</source>
<context>
<name>TransferThread</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="179"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="188"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="613"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="628"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="620"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="635"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="648"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="663"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/>
<source>File not found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="925"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="940"/>
<source>Unable to change the date</source>
<translation type="unfinished"></translation>
</message>
@@ -2153,19 +2172,19 @@ Error:%2</source>
<context>
<name>TransferThreadAsync</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="340"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/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="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="428"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="446"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="436"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="454"/>
<source>Unable to create the destination folder: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="431"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="448"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="439"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="456"/>
<source>Unable to create the destination folder, errno: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -2173,24 +2192,24 @@ Error:%2</source>
<context>
<name>WriteThread</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="135"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="138"/>
<source>Path resolution error (Empty path)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="164"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="197"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="167"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="200"/>
<source>Unable to create the destination folder: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="175"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="199"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="178"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="202"/>
<source>Unable to create the destination folder, errno: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="456"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="464"/>
<source>Internal error, please report it!</source>
<translation type="unfinished"></translation>
</message>
@@ -2505,8 +2524,8 @@ Error:%2</source>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="341"/>
- <source>Overwrite if newer</source>
- <translation type="unfinished">더 최신이면 덮어쓰기</translation>
+ <source>Overwrite if source newer than destination</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="346"/>
@@ -2516,8 +2535,12 @@ Error:%2</source>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="354"/>
+ <source>Overwrite if source older than destination</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="357"/>
- <source>Overwrite if older</source>
+ <source>Overwrite if destination older</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2905,8 +2928,8 @@ Error:%2</source>
</message>
<message>
<location filename="../../Themes/Oxygen/themesOptions.ui" line="213"/>
- <source>Informations</source>
- <translation type="unfinished"></translation>
+ <source>Information</source>
+ <translation type="unfinished">정보</translation>
</message>
<message>
<location filename="../../Themes/Oxygen/themesOptions.ui" line="219"/>
@@ -2919,28 +2942,38 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="257"/>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="269"/>
+ <source>Click to edit the color</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="368"/>
<source>Speed with progress bar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="267"/>
- <source>Show dual progression</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="378"/>
+ <source>Progression color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="277"/>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="388"/>
<source>Show progression in the title</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="287"/>
- <source>Progression color</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="395"/>
+ <source>General margin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="306"/>
- <source>Click to edit the color</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="402"/>
+ <source>Show dual progression</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="425"/>
+ <source>General spacing</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/plugins/Languages/nl/informations.xml b/plugins/Languages/nl/informations.xml
index 8eb1d3b..be8260f 100755
--- a/plugins/Languages/nl/informations.xml
+++ b/plugins/Languages/nl/informations.xml
@@ -12,7 +12,7 @@
<!-- Detailed description -->
<description xml:lang="en"><![CDATA[Translation of Ultracopier to dutch. For more details see the web site.]]></description>
<!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number -->
- <version>2.2.4.7</version>
+ <version>2.2.6.0</version>
<!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. -->
<name>nl</name>
<!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. -->
diff --git a/plugins/Languages/nl/translation.ts b/plugins/Languages/nl/translation.ts
index 2066182..b1cbcc0 100755
--- a/plugins/Languages/nl/translation.ts
+++ b/plugins/Languages/nl/translation.ts
@@ -93,91 +93,96 @@
<context>
<name>CopyEngine</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="438"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="461"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="465"/>
<source>The engine is forced to move, you can&apos;t copy with it</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="473"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="496"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="519"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="542"/>
<source>The engine is forced to copy, you can&apos;t move with it</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/>
<source>Destination</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/>
<source>Use the actual destination &quot;%1&quot;?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="685"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/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/Ultracopier-Spec/CopyEngine.cpp" line="976"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="979"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="984"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="988"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="886"/>
+ <source>Supported only on Windows</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1035"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1038"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1043"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1047"/>
<source>Ask</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="977"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="981"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="985"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="989"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1036"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1040"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1044"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1048"/>
<source>Skip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="980"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1039"/>
<source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="982"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="994"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1041"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1053"/>
<source>Rename</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="986"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1045"/>
<source>Put at the end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="990"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1049"/>
<source>Overwrite</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="991"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1050"/>
<source>Overwrite if different</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="992"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1051"/>
<source>Overwrite if newer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="993"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1052"/>
<source>Overwrite if older</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/>
<source>Options error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/>
<source>Options engine is not loaded. Unable to access the filters</source>
<translation type="unfinished"></translation>
</message>
@@ -185,75 +190,76 @@
<context>
<name>CopyEngineFactory</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="303"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="60"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="309"/>
<source>Supported only on Windows</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="430"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="433"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="438"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/>
<source>Ask</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="431"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="435"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="443"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="437"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="441"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="449"/>
<source>Skip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="434"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/>
<source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="454"/>
<source>Rename</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/>
<source>Put at the end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="450"/>
<source>Overwrite</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="451"/>
<source>Overwrite if different</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="452"/>
<source>Overwrite if newer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="447"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="453"/>
<source>Overwrite if older</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/>
<source>Options error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/>
<source>Options engine is not loaded. Unable to access the filters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/>
<source>Options engine is not loaded, can&apos;t access to the filters</source>
<translation type="unfinished"></translation>
</message>
@@ -670,12 +676,12 @@
<context>
<name>FileErrorDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="87"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="92"/>
<source>Error on folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="90"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="95"/>
<source>Folder name</source>
<translation type="unfinished"></translation>
</message>
@@ -683,22 +689,22 @@
<context>
<name>FileExistsDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="191"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="201"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="198"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="208"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -706,22 +712,22 @@
<context>
<name>FileIsSameDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="140"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="145"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="147"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="152"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -868,27 +874,27 @@
<context>
<name>FolderExistsDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="84"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="91"/>
<source>Folder already exists</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="164"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="172"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="173"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="181"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -1096,13 +1102,15 @@ This version is compiled as version: %1.</source>
<name>MkPath</name>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="124"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="394"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="464"/>
<source>Unable to remove</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="187"/>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="210"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="363"/>
<source>Unable to create the folder</source>
<translation type="unfinished"></translation>
</message>
@@ -1112,22 +1120,27 @@ This version is compiled as version: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="255"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="304"/>
<source>Unable to temporary rename the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="278"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="339"/>
+ <source>Unable to reverse temporary rename for real move</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="348"/>
<source>Unable to do the final real move the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="309"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="379"/>
<source>Unable to move the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="385"/>
<source>Unable to move the folder: errno: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1206,7 +1219,7 @@ This version is compiled as version: %1.</source>
<message>
<location filename="../../../OptionDialog.ui" line="75"/>
<location filename="../../../OptionDialog.ui" line="366"/>
- <location filename="../../../OptionDialog.cpp" line="290"/>
+ <location filename="../../../OptionDialog.cpp" line="297"/>
<source>Copy engine</source>
<translation type="unfinished"></translation>
</message>
@@ -1254,21 +1267,21 @@ This version is compiled as version: %1.</source>
<message>
<location filename="../../../OptionDialog.ui" line="80"/>
<location filename="../../../OptionDialog.ui" line="379"/>
- <location filename="../../../OptionDialog.cpp" line="291"/>
+ <location filename="../../../OptionDialog.cpp" line="298"/>
<source>Listener</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="85"/>
<location filename="../../../OptionDialog.ui" line="384"/>
- <location filename="../../../OptionDialog.cpp" line="292"/>
+ <location filename="../../../OptionDialog.cpp" line="299"/>
<source>Plugin loader</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="93"/>
<location filename="../../../OptionDialog.ui" line="389"/>
- <location filename="../../../OptionDialog.cpp" line="293"/>
+ <location filename="../../../OptionDialog.cpp" line="300"/>
<source>Session loader</source>
<translation type="unfinished"></translation>
</message>
@@ -1410,75 +1423,75 @@ This version is compiled as version: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="197"/>
- <location filename="../../../OptionDialog.cpp" line="211"/>
+ <location filename="../../../OptionDialog.cpp" line="204"/>
+ <location filename="../../../OptionDialog.cpp" line="218"/>
<source>Load</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="197"/>
+ <location filename="../../../OptionDialog.cpp" line="204"/>
<source>Load the theme?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="211"/>
+ <location filename="../../../OptionDialog.cpp" line="218"/>
<source>Load the language?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="298"/>
+ <location filename="../../../OptionDialog.cpp" line="305"/>
<source>Do nothing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="299"/>
+ <location filename="../../../OptionDialog.cpp" line="306"/>
<source>Ask source as folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="300"/>
+ <location filename="../../../OptionDialog.cpp" line="307"/>
<source>Ask sources as files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="301"/>
+ <location filename="../../../OptionDialog.cpp" line="308"/>
<source>Never</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="302"/>
+ <location filename="../../../OptionDialog.cpp" line="309"/>
<source>When source is same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="303"/>
+ <location filename="../../../OptionDialog.cpp" line="310"/>
<source>When destination is same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="304"/>
+ <location filename="../../../OptionDialog.cpp" line="311"/>
<source>When source and destination are same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="305"/>
+ <location filename="../../../OptionDialog.cpp" line="312"/>
<source>When source or destination are same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="306"/>
+ <location filename="../../../OptionDialog.cpp" line="313"/>
<source>Always</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="320"/>
- <location filename="../../../OptionDialog.cpp" line="321"/>
- <location filename="../../../OptionDialog.cpp" line="322"/>
+ <location filename="../../../OptionDialog.cpp" line="327"/>
+ <location filename="../../../OptionDialog.cpp" line="328"/>
+ <location filename="../../../OptionDialog.cpp" line="329"/>
<source>The variables are %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="962"/>
+ <location filename="../../../OptionDialog.cpp" line="969"/>
<source>Save logs as: </source>
<translation type="unfinished"></translation>
</message>
@@ -1771,12 +1784,12 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../ProductKey.cpp" line="56"/>
+ <location filename="../../../ProductKey.cpp" line="60"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../ProductKey.cpp" line="56"/>
+ <location filename="../../../ProductKey.cpp" line="60"/>
<source>Your product key was rejected.&lt;br /&gt;If you buy key, unmark check your spam and unmark the mail as spam&lt;br /&gt;If you have not buy your key, go to &lt;a href=&quot;https://shop.first-world.info/&quot;&gt;https://shop.first-world.info/&lt;/a&gt;</source>
<translation type="unfinished"></translation>
</message>
@@ -1834,12 +1847,12 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="541"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="543"/>
<source>Unable to read the source file: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="595"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="599"/>
<source>File truncated during the read, possible data change</source>
<translation type="unfinished"></translation>
</message>
@@ -1895,32 +1908,38 @@ Error:%2</source>
<context>
<name>ScanFileOrFolder</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="452"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="454"/>
- <source>%1 - copy</source>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="331"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="681"/>
+ <source>Blacklisted folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="463"/>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="465"/>
- <source>%1 - copy (%2)</source>
+ <source>%1 - copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="576"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="578"/>
- <source>%name% - copy</source>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="474"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="476"/>
+ <source>%1 - copy (%2)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="587"/>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="589"/>
+ <source>%name% - copy</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="598"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="600"/>
<source>%name% - copy (%number%)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="673"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="677"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="691"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="695"/>
<source>Problem with folder read</source>
<translation type="unfinished"></translation>
</message>
@@ -2031,61 +2050,61 @@ Error:%2</source>
<context>
<name>Themes</name>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="328"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="341"/>
<source>Buy the Ultimate version to fund development</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="328"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="341"/>
<source>Register your key</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="427"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="440"/>
<source>File %1/%2, size: %3/%4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="661"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="674"/>
<source>Copy list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="663"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="676"/>
<source>Move list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1091"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1117"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1092"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1118"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1093"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1119"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1095"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1121"/>
<source>File Name, 0KB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1289"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1301"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1313"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1395"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1407"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1419"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1388"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1392"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1394"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1494"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1498"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1500"/>
<source>%1 %2% of %3</source>
<translation type="unfinished"></translation>
</message>
@@ -2093,24 +2112,24 @@ Error:%2</source>
<context>
<name>ThemesFactory</name>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="284"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="294"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="285"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="295"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="286"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="296"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="482"/>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="497"/>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="512"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="510"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="525"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="540"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
@@ -2118,29 +2137,29 @@ Error:%2</source>
<context>
<name>TransferThread</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="179"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="188"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="613"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="628"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="620"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="635"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="648"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="663"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/>
<source>File not found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="925"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="940"/>
<source>Unable to change the date</source>
<translation type="unfinished"></translation>
</message>
@@ -2148,19 +2167,19 @@ Error:%2</source>
<context>
<name>TransferThreadAsync</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="340"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/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="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="428"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="446"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="436"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="454"/>
<source>Unable to create the destination folder: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="431"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="448"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="439"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="456"/>
<source>Unable to create the destination folder, errno: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -2168,24 +2187,24 @@ Error:%2</source>
<context>
<name>WriteThread</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="135"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="138"/>
<source>Path resolution error (Empty path)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="164"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="197"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="167"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="200"/>
<source>Unable to create the destination folder: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="175"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="199"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="178"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="202"/>
<source>Unable to create the destination folder, errno: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="456"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="464"/>
<source>Internal error, please report it!</source>
<translation type="unfinished"></translation>
</message>
@@ -2500,7 +2519,7 @@ Error:%2</source>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="341"/>
- <source>Overwrite if newer</source>
+ <source>Overwrite if source newer than destination</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2511,8 +2530,12 @@ Error:%2</source>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="354"/>
+ <source>Overwrite if source older than destination</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="357"/>
- <source>Overwrite if older</source>
+ <source>Overwrite if destination older</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2900,7 +2923,7 @@ Error:%2</source>
</message>
<message>
<location filename="../../Themes/Oxygen/themesOptions.ui" line="213"/>
- <source>Informations</source>
+ <source>Information</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2914,28 +2937,38 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="257"/>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="269"/>
+ <source>Click to edit the color</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="368"/>
<source>Speed with progress bar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="267"/>
- <source>Show dual progression</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="378"/>
+ <source>Progression color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="277"/>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="388"/>
<source>Show progression in the title</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="287"/>
- <source>Progression color</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="395"/>
+ <source>General margin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="306"/>
- <source>Click to edit the color</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="402"/>
+ <source>Show dual progression</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="425"/>
+ <source>General spacing</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/plugins/Languages/no/informations.xml b/plugins/Languages/no/informations.xml
index 451fa8a..6427bd3 100755
--- a/plugins/Languages/no/informations.xml
+++ b/plugins/Languages/no/informations.xml
@@ -12,7 +12,7 @@
<!-- Detailed description -->
<description xml:lang="en"><![CDATA[Translation of Ultracopier to norwegian. For more details see the web site.]]></description>
<!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number -->
- <version>2.2.4.7</version>
+ <version>2.2.6.0</version>
<!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. -->
<name>no</name>
<!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. -->
diff --git a/plugins/Languages/no/translation.ts b/plugins/Languages/no/translation.ts
index 2066182..b1cbcc0 100755
--- a/plugins/Languages/no/translation.ts
+++ b/plugins/Languages/no/translation.ts
@@ -93,91 +93,96 @@
<context>
<name>CopyEngine</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="438"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="461"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="465"/>
<source>The engine is forced to move, you can&apos;t copy with it</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="473"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="496"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="519"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="542"/>
<source>The engine is forced to copy, you can&apos;t move with it</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/>
<source>Destination</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/>
<source>Use the actual destination &quot;%1&quot;?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="685"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/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/Ultracopier-Spec/CopyEngine.cpp" line="976"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="979"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="984"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="988"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="886"/>
+ <source>Supported only on Windows</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1035"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1038"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1043"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1047"/>
<source>Ask</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="977"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="981"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="985"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="989"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1036"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1040"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1044"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1048"/>
<source>Skip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="980"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1039"/>
<source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="982"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="994"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1041"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1053"/>
<source>Rename</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="986"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1045"/>
<source>Put at the end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="990"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1049"/>
<source>Overwrite</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="991"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1050"/>
<source>Overwrite if different</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="992"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1051"/>
<source>Overwrite if newer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="993"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1052"/>
<source>Overwrite if older</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/>
<source>Options error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/>
<source>Options engine is not loaded. Unable to access the filters</source>
<translation type="unfinished"></translation>
</message>
@@ -185,75 +190,76 @@
<context>
<name>CopyEngineFactory</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="303"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="60"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="309"/>
<source>Supported only on Windows</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="430"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="433"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="438"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/>
<source>Ask</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="431"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="435"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="443"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="437"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="441"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="449"/>
<source>Skip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="434"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/>
<source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="454"/>
<source>Rename</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/>
<source>Put at the end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="450"/>
<source>Overwrite</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="451"/>
<source>Overwrite if different</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="452"/>
<source>Overwrite if newer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="447"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="453"/>
<source>Overwrite if older</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/>
<source>Options error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/>
<source>Options engine is not loaded. Unable to access the filters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/>
<source>Options engine is not loaded, can&apos;t access to the filters</source>
<translation type="unfinished"></translation>
</message>
@@ -670,12 +676,12 @@
<context>
<name>FileErrorDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="87"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="92"/>
<source>Error on folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="90"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="95"/>
<source>Folder name</source>
<translation type="unfinished"></translation>
</message>
@@ -683,22 +689,22 @@
<context>
<name>FileExistsDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="191"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="201"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="198"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="208"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -706,22 +712,22 @@
<context>
<name>FileIsSameDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="140"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="145"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="147"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="152"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -868,27 +874,27 @@
<context>
<name>FolderExistsDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="84"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="91"/>
<source>Folder already exists</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="164"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="172"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="173"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="181"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -1096,13 +1102,15 @@ This version is compiled as version: %1.</source>
<name>MkPath</name>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="124"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="394"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="464"/>
<source>Unable to remove</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="187"/>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="210"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="363"/>
<source>Unable to create the folder</source>
<translation type="unfinished"></translation>
</message>
@@ -1112,22 +1120,27 @@ This version is compiled as version: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="255"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="304"/>
<source>Unable to temporary rename the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="278"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="339"/>
+ <source>Unable to reverse temporary rename for real move</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="348"/>
<source>Unable to do the final real move the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="309"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="379"/>
<source>Unable to move the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="385"/>
<source>Unable to move the folder: errno: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1206,7 +1219,7 @@ This version is compiled as version: %1.</source>
<message>
<location filename="../../../OptionDialog.ui" line="75"/>
<location filename="../../../OptionDialog.ui" line="366"/>
- <location filename="../../../OptionDialog.cpp" line="290"/>
+ <location filename="../../../OptionDialog.cpp" line="297"/>
<source>Copy engine</source>
<translation type="unfinished"></translation>
</message>
@@ -1254,21 +1267,21 @@ This version is compiled as version: %1.</source>
<message>
<location filename="../../../OptionDialog.ui" line="80"/>
<location filename="../../../OptionDialog.ui" line="379"/>
- <location filename="../../../OptionDialog.cpp" line="291"/>
+ <location filename="../../../OptionDialog.cpp" line="298"/>
<source>Listener</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="85"/>
<location filename="../../../OptionDialog.ui" line="384"/>
- <location filename="../../../OptionDialog.cpp" line="292"/>
+ <location filename="../../../OptionDialog.cpp" line="299"/>
<source>Plugin loader</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="93"/>
<location filename="../../../OptionDialog.ui" line="389"/>
- <location filename="../../../OptionDialog.cpp" line="293"/>
+ <location filename="../../../OptionDialog.cpp" line="300"/>
<source>Session loader</source>
<translation type="unfinished"></translation>
</message>
@@ -1410,75 +1423,75 @@ This version is compiled as version: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="197"/>
- <location filename="../../../OptionDialog.cpp" line="211"/>
+ <location filename="../../../OptionDialog.cpp" line="204"/>
+ <location filename="../../../OptionDialog.cpp" line="218"/>
<source>Load</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="197"/>
+ <location filename="../../../OptionDialog.cpp" line="204"/>
<source>Load the theme?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="211"/>
+ <location filename="../../../OptionDialog.cpp" line="218"/>
<source>Load the language?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="298"/>
+ <location filename="../../../OptionDialog.cpp" line="305"/>
<source>Do nothing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="299"/>
+ <location filename="../../../OptionDialog.cpp" line="306"/>
<source>Ask source as folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="300"/>
+ <location filename="../../../OptionDialog.cpp" line="307"/>
<source>Ask sources as files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="301"/>
+ <location filename="../../../OptionDialog.cpp" line="308"/>
<source>Never</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="302"/>
+ <location filename="../../../OptionDialog.cpp" line="309"/>
<source>When source is same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="303"/>
+ <location filename="../../../OptionDialog.cpp" line="310"/>
<source>When destination is same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="304"/>
+ <location filename="../../../OptionDialog.cpp" line="311"/>
<source>When source and destination are same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="305"/>
+ <location filename="../../../OptionDialog.cpp" line="312"/>
<source>When source or destination are same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="306"/>
+ <location filename="../../../OptionDialog.cpp" line="313"/>
<source>Always</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="320"/>
- <location filename="../../../OptionDialog.cpp" line="321"/>
- <location filename="../../../OptionDialog.cpp" line="322"/>
+ <location filename="../../../OptionDialog.cpp" line="327"/>
+ <location filename="../../../OptionDialog.cpp" line="328"/>
+ <location filename="../../../OptionDialog.cpp" line="329"/>
<source>The variables are %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="962"/>
+ <location filename="../../../OptionDialog.cpp" line="969"/>
<source>Save logs as: </source>
<translation type="unfinished"></translation>
</message>
@@ -1771,12 +1784,12 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../ProductKey.cpp" line="56"/>
+ <location filename="../../../ProductKey.cpp" line="60"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../ProductKey.cpp" line="56"/>
+ <location filename="../../../ProductKey.cpp" line="60"/>
<source>Your product key was rejected.&lt;br /&gt;If you buy key, unmark check your spam and unmark the mail as spam&lt;br /&gt;If you have not buy your key, go to &lt;a href=&quot;https://shop.first-world.info/&quot;&gt;https://shop.first-world.info/&lt;/a&gt;</source>
<translation type="unfinished"></translation>
</message>
@@ -1834,12 +1847,12 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="541"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="543"/>
<source>Unable to read the source file: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="595"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="599"/>
<source>File truncated during the read, possible data change</source>
<translation type="unfinished"></translation>
</message>
@@ -1895,32 +1908,38 @@ Error:%2</source>
<context>
<name>ScanFileOrFolder</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="452"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="454"/>
- <source>%1 - copy</source>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="331"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="681"/>
+ <source>Blacklisted folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="463"/>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="465"/>
- <source>%1 - copy (%2)</source>
+ <source>%1 - copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="576"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="578"/>
- <source>%name% - copy</source>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="474"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="476"/>
+ <source>%1 - copy (%2)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="587"/>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="589"/>
+ <source>%name% - copy</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="598"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="600"/>
<source>%name% - copy (%number%)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="673"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="677"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="691"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="695"/>
<source>Problem with folder read</source>
<translation type="unfinished"></translation>
</message>
@@ -2031,61 +2050,61 @@ Error:%2</source>
<context>
<name>Themes</name>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="328"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="341"/>
<source>Buy the Ultimate version to fund development</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="328"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="341"/>
<source>Register your key</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="427"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="440"/>
<source>File %1/%2, size: %3/%4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="661"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="674"/>
<source>Copy list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="663"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="676"/>
<source>Move list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1091"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1117"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1092"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1118"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1093"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1119"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1095"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1121"/>
<source>File Name, 0KB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1289"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1301"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1313"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1395"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1407"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1419"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1388"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1392"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1394"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1494"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1498"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1500"/>
<source>%1 %2% of %3</source>
<translation type="unfinished"></translation>
</message>
@@ -2093,24 +2112,24 @@ Error:%2</source>
<context>
<name>ThemesFactory</name>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="284"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="294"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="285"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="295"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="286"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="296"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="482"/>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="497"/>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="512"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="510"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="525"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="540"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
@@ -2118,29 +2137,29 @@ Error:%2</source>
<context>
<name>TransferThread</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="179"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="188"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="613"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="628"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="620"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="635"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="648"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="663"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/>
<source>File not found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="925"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="940"/>
<source>Unable to change the date</source>
<translation type="unfinished"></translation>
</message>
@@ -2148,19 +2167,19 @@ Error:%2</source>
<context>
<name>TransferThreadAsync</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="340"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/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="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="428"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="446"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="436"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="454"/>
<source>Unable to create the destination folder: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="431"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="448"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="439"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="456"/>
<source>Unable to create the destination folder, errno: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -2168,24 +2187,24 @@ Error:%2</source>
<context>
<name>WriteThread</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="135"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="138"/>
<source>Path resolution error (Empty path)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="164"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="197"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="167"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="200"/>
<source>Unable to create the destination folder: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="175"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="199"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="178"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="202"/>
<source>Unable to create the destination folder, errno: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="456"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="464"/>
<source>Internal error, please report it!</source>
<translation type="unfinished"></translation>
</message>
@@ -2500,7 +2519,7 @@ Error:%2</source>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="341"/>
- <source>Overwrite if newer</source>
+ <source>Overwrite if source newer than destination</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2511,8 +2530,12 @@ Error:%2</source>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="354"/>
+ <source>Overwrite if source older than destination</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="357"/>
- <source>Overwrite if older</source>
+ <source>Overwrite if destination older</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2900,7 +2923,7 @@ Error:%2</source>
</message>
<message>
<location filename="../../Themes/Oxygen/themesOptions.ui" line="213"/>
- <source>Informations</source>
+ <source>Information</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2914,28 +2937,38 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="257"/>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="269"/>
+ <source>Click to edit the color</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="368"/>
<source>Speed with progress bar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="267"/>
- <source>Show dual progression</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="378"/>
+ <source>Progression color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="277"/>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="388"/>
<source>Show progression in the title</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="287"/>
- <source>Progression color</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="395"/>
+ <source>General margin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="306"/>
- <source>Click to edit the color</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="402"/>
+ <source>Show dual progression</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="425"/>
+ <source>General spacing</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/plugins/Languages/pl/informations.xml b/plugins/Languages/pl/informations.xml
index b6f0f61..03a8747 100755
--- a/plugins/Languages/pl/informations.xml
+++ b/plugins/Languages/pl/informations.xml
@@ -12,7 +12,7 @@
<!-- Detailed description -->
<description xml:lang="en"><![CDATA[Translation of Ultracopier to polish. For more details see the web site.]]></description>
<!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number -->
- <version>2.2.4.7</version>
+ <version>2.2.6.0</version>
<!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. -->
<name>pl</name>
<!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. -->
diff --git a/plugins/Languages/pl/translation.ts b/plugins/Languages/pl/translation.ts
index 2066182..b1cbcc0 100755
--- a/plugins/Languages/pl/translation.ts
+++ b/plugins/Languages/pl/translation.ts
@@ -93,91 +93,96 @@
<context>
<name>CopyEngine</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="438"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="461"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="465"/>
<source>The engine is forced to move, you can&apos;t copy with it</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="473"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="496"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="519"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="542"/>
<source>The engine is forced to copy, you can&apos;t move with it</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/>
<source>Destination</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/>
<source>Use the actual destination &quot;%1&quot;?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="685"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/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/Ultracopier-Spec/CopyEngine.cpp" line="976"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="979"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="984"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="988"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="886"/>
+ <source>Supported only on Windows</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1035"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1038"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1043"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1047"/>
<source>Ask</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="977"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="981"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="985"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="989"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1036"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1040"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1044"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1048"/>
<source>Skip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="980"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1039"/>
<source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="982"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="994"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1041"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1053"/>
<source>Rename</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="986"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1045"/>
<source>Put at the end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="990"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1049"/>
<source>Overwrite</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="991"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1050"/>
<source>Overwrite if different</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="992"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1051"/>
<source>Overwrite if newer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="993"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1052"/>
<source>Overwrite if older</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/>
<source>Options error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/>
<source>Options engine is not loaded. Unable to access the filters</source>
<translation type="unfinished"></translation>
</message>
@@ -185,75 +190,76 @@
<context>
<name>CopyEngineFactory</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="303"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="60"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="309"/>
<source>Supported only on Windows</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="430"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="433"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="438"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/>
<source>Ask</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="431"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="435"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="443"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="437"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="441"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="449"/>
<source>Skip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="434"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/>
<source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="454"/>
<source>Rename</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/>
<source>Put at the end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="450"/>
<source>Overwrite</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="451"/>
<source>Overwrite if different</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="452"/>
<source>Overwrite if newer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="447"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="453"/>
<source>Overwrite if older</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/>
<source>Options error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/>
<source>Options engine is not loaded. Unable to access the filters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/>
<source>Options engine is not loaded, can&apos;t access to the filters</source>
<translation type="unfinished"></translation>
</message>
@@ -670,12 +676,12 @@
<context>
<name>FileErrorDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="87"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="92"/>
<source>Error on folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="90"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="95"/>
<source>Folder name</source>
<translation type="unfinished"></translation>
</message>
@@ -683,22 +689,22 @@
<context>
<name>FileExistsDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="191"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="201"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="198"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="208"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -706,22 +712,22 @@
<context>
<name>FileIsSameDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="140"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="145"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="147"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="152"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -868,27 +874,27 @@
<context>
<name>FolderExistsDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="84"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="91"/>
<source>Folder already exists</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="164"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="172"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="173"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="181"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -1096,13 +1102,15 @@ This version is compiled as version: %1.</source>
<name>MkPath</name>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="124"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="394"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="464"/>
<source>Unable to remove</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="187"/>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="210"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="363"/>
<source>Unable to create the folder</source>
<translation type="unfinished"></translation>
</message>
@@ -1112,22 +1120,27 @@ This version is compiled as version: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="255"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="304"/>
<source>Unable to temporary rename the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="278"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="339"/>
+ <source>Unable to reverse temporary rename for real move</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="348"/>
<source>Unable to do the final real move the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="309"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="379"/>
<source>Unable to move the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="385"/>
<source>Unable to move the folder: errno: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1206,7 +1219,7 @@ This version is compiled as version: %1.</source>
<message>
<location filename="../../../OptionDialog.ui" line="75"/>
<location filename="../../../OptionDialog.ui" line="366"/>
- <location filename="../../../OptionDialog.cpp" line="290"/>
+ <location filename="../../../OptionDialog.cpp" line="297"/>
<source>Copy engine</source>
<translation type="unfinished"></translation>
</message>
@@ -1254,21 +1267,21 @@ This version is compiled as version: %1.</source>
<message>
<location filename="../../../OptionDialog.ui" line="80"/>
<location filename="../../../OptionDialog.ui" line="379"/>
- <location filename="../../../OptionDialog.cpp" line="291"/>
+ <location filename="../../../OptionDialog.cpp" line="298"/>
<source>Listener</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="85"/>
<location filename="../../../OptionDialog.ui" line="384"/>
- <location filename="../../../OptionDialog.cpp" line="292"/>
+ <location filename="../../../OptionDialog.cpp" line="299"/>
<source>Plugin loader</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="93"/>
<location filename="../../../OptionDialog.ui" line="389"/>
- <location filename="../../../OptionDialog.cpp" line="293"/>
+ <location filename="../../../OptionDialog.cpp" line="300"/>
<source>Session loader</source>
<translation type="unfinished"></translation>
</message>
@@ -1410,75 +1423,75 @@ This version is compiled as version: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="197"/>
- <location filename="../../../OptionDialog.cpp" line="211"/>
+ <location filename="../../../OptionDialog.cpp" line="204"/>
+ <location filename="../../../OptionDialog.cpp" line="218"/>
<source>Load</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="197"/>
+ <location filename="../../../OptionDialog.cpp" line="204"/>
<source>Load the theme?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="211"/>
+ <location filename="../../../OptionDialog.cpp" line="218"/>
<source>Load the language?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="298"/>
+ <location filename="../../../OptionDialog.cpp" line="305"/>
<source>Do nothing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="299"/>
+ <location filename="../../../OptionDialog.cpp" line="306"/>
<source>Ask source as folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="300"/>
+ <location filename="../../../OptionDialog.cpp" line="307"/>
<source>Ask sources as files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="301"/>
+ <location filename="../../../OptionDialog.cpp" line="308"/>
<source>Never</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="302"/>
+ <location filename="../../../OptionDialog.cpp" line="309"/>
<source>When source is same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="303"/>
+ <location filename="../../../OptionDialog.cpp" line="310"/>
<source>When destination is same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="304"/>
+ <location filename="../../../OptionDialog.cpp" line="311"/>
<source>When source and destination are same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="305"/>
+ <location filename="../../../OptionDialog.cpp" line="312"/>
<source>When source or destination are same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="306"/>
+ <location filename="../../../OptionDialog.cpp" line="313"/>
<source>Always</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="320"/>
- <location filename="../../../OptionDialog.cpp" line="321"/>
- <location filename="../../../OptionDialog.cpp" line="322"/>
+ <location filename="../../../OptionDialog.cpp" line="327"/>
+ <location filename="../../../OptionDialog.cpp" line="328"/>
+ <location filename="../../../OptionDialog.cpp" line="329"/>
<source>The variables are %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="962"/>
+ <location filename="../../../OptionDialog.cpp" line="969"/>
<source>Save logs as: </source>
<translation type="unfinished"></translation>
</message>
@@ -1771,12 +1784,12 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../ProductKey.cpp" line="56"/>
+ <location filename="../../../ProductKey.cpp" line="60"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../ProductKey.cpp" line="56"/>
+ <location filename="../../../ProductKey.cpp" line="60"/>
<source>Your product key was rejected.&lt;br /&gt;If you buy key, unmark check your spam and unmark the mail as spam&lt;br /&gt;If you have not buy your key, go to &lt;a href=&quot;https://shop.first-world.info/&quot;&gt;https://shop.first-world.info/&lt;/a&gt;</source>
<translation type="unfinished"></translation>
</message>
@@ -1834,12 +1847,12 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="541"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="543"/>
<source>Unable to read the source file: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="595"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="599"/>
<source>File truncated during the read, possible data change</source>
<translation type="unfinished"></translation>
</message>
@@ -1895,32 +1908,38 @@ Error:%2</source>
<context>
<name>ScanFileOrFolder</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="452"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="454"/>
- <source>%1 - copy</source>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="331"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="681"/>
+ <source>Blacklisted folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="463"/>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="465"/>
- <source>%1 - copy (%2)</source>
+ <source>%1 - copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="576"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="578"/>
- <source>%name% - copy</source>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="474"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="476"/>
+ <source>%1 - copy (%2)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="587"/>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="589"/>
+ <source>%name% - copy</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="598"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="600"/>
<source>%name% - copy (%number%)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="673"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="677"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="691"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="695"/>
<source>Problem with folder read</source>
<translation type="unfinished"></translation>
</message>
@@ -2031,61 +2050,61 @@ Error:%2</source>
<context>
<name>Themes</name>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="328"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="341"/>
<source>Buy the Ultimate version to fund development</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="328"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="341"/>
<source>Register your key</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="427"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="440"/>
<source>File %1/%2, size: %3/%4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="661"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="674"/>
<source>Copy list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="663"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="676"/>
<source>Move list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1091"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1117"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1092"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1118"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1093"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1119"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1095"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1121"/>
<source>File Name, 0KB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1289"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1301"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1313"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1395"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1407"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1419"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1388"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1392"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1394"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1494"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1498"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1500"/>
<source>%1 %2% of %3</source>
<translation type="unfinished"></translation>
</message>
@@ -2093,24 +2112,24 @@ Error:%2</source>
<context>
<name>ThemesFactory</name>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="284"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="294"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="285"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="295"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="286"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="296"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="482"/>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="497"/>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="512"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="510"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="525"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="540"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
@@ -2118,29 +2137,29 @@ Error:%2</source>
<context>
<name>TransferThread</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="179"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="188"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="613"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="628"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="620"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="635"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="648"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="663"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/>
<source>File not found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="925"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="940"/>
<source>Unable to change the date</source>
<translation type="unfinished"></translation>
</message>
@@ -2148,19 +2167,19 @@ Error:%2</source>
<context>
<name>TransferThreadAsync</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="340"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/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="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="428"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="446"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="436"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="454"/>
<source>Unable to create the destination folder: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="431"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="448"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="439"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="456"/>
<source>Unable to create the destination folder, errno: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -2168,24 +2187,24 @@ Error:%2</source>
<context>
<name>WriteThread</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="135"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="138"/>
<source>Path resolution error (Empty path)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="164"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="197"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="167"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="200"/>
<source>Unable to create the destination folder: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="175"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="199"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="178"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="202"/>
<source>Unable to create the destination folder, errno: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="456"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="464"/>
<source>Internal error, please report it!</source>
<translation type="unfinished"></translation>
</message>
@@ -2500,7 +2519,7 @@ Error:%2</source>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="341"/>
- <source>Overwrite if newer</source>
+ <source>Overwrite if source newer than destination</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2511,8 +2530,12 @@ Error:%2</source>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="354"/>
+ <source>Overwrite if source older than destination</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="357"/>
- <source>Overwrite if older</source>
+ <source>Overwrite if destination older</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2900,7 +2923,7 @@ Error:%2</source>
</message>
<message>
<location filename="../../Themes/Oxygen/themesOptions.ui" line="213"/>
- <source>Informations</source>
+ <source>Information</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2914,28 +2937,38 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="257"/>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="269"/>
+ <source>Click to edit the color</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="368"/>
<source>Speed with progress bar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="267"/>
- <source>Show dual progression</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="378"/>
+ <source>Progression color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="277"/>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="388"/>
<source>Show progression in the title</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="287"/>
- <source>Progression color</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="395"/>
+ <source>General margin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="306"/>
- <source>Click to edit the color</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="402"/>
+ <source>Show dual progression</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="425"/>
+ <source>General spacing</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/plugins/Languages/pt/informations.xml b/plugins/Languages/pt/informations.xml
index 36147a7..3456e43 100755
--- a/plugins/Languages/pt/informations.xml
+++ b/plugins/Languages/pt/informations.xml
@@ -12,7 +12,7 @@
<!-- Detailed description -->
<description xml:lang="en"><![CDATA[Translation of Ultracopier to portuguese. For more details see the web site.]]></description>
<!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number -->
- <version>2.2.4.7</version>
+ <version>2.2.6.0</version>
<!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. -->
<name>pt</name>
<!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. -->
diff --git a/plugins/Languages/pt/translation.ts b/plugins/Languages/pt/translation.ts
index 2066182..b1cbcc0 100755
--- a/plugins/Languages/pt/translation.ts
+++ b/plugins/Languages/pt/translation.ts
@@ -93,91 +93,96 @@
<context>
<name>CopyEngine</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="438"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="461"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="465"/>
<source>The engine is forced to move, you can&apos;t copy with it</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="473"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="496"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="519"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="542"/>
<source>The engine is forced to copy, you can&apos;t move with it</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/>
<source>Destination</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/>
<source>Use the actual destination &quot;%1&quot;?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="685"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/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/Ultracopier-Spec/CopyEngine.cpp" line="976"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="979"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="984"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="988"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="886"/>
+ <source>Supported only on Windows</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1035"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1038"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1043"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1047"/>
<source>Ask</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="977"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="981"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="985"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="989"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1036"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1040"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1044"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1048"/>
<source>Skip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="980"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1039"/>
<source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="982"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="994"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1041"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1053"/>
<source>Rename</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="986"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1045"/>
<source>Put at the end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="990"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1049"/>
<source>Overwrite</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="991"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1050"/>
<source>Overwrite if different</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="992"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1051"/>
<source>Overwrite if newer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="993"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1052"/>
<source>Overwrite if older</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/>
<source>Options error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/>
<source>Options engine is not loaded. Unable to access the filters</source>
<translation type="unfinished"></translation>
</message>
@@ -185,75 +190,76 @@
<context>
<name>CopyEngineFactory</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="303"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="60"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="309"/>
<source>Supported only on Windows</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="430"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="433"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="438"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/>
<source>Ask</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="431"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="435"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="443"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="437"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="441"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="449"/>
<source>Skip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="434"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/>
<source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="454"/>
<source>Rename</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/>
<source>Put at the end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="450"/>
<source>Overwrite</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="451"/>
<source>Overwrite if different</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="452"/>
<source>Overwrite if newer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="447"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="453"/>
<source>Overwrite if older</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/>
<source>Options error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/>
<source>Options engine is not loaded. Unable to access the filters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/>
<source>Options engine is not loaded, can&apos;t access to the filters</source>
<translation type="unfinished"></translation>
</message>
@@ -670,12 +676,12 @@
<context>
<name>FileErrorDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="87"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="92"/>
<source>Error on folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="90"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="95"/>
<source>Folder name</source>
<translation type="unfinished"></translation>
</message>
@@ -683,22 +689,22 @@
<context>
<name>FileExistsDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="191"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="201"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="198"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="208"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -706,22 +712,22 @@
<context>
<name>FileIsSameDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="140"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="145"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="147"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="152"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -868,27 +874,27 @@
<context>
<name>FolderExistsDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="84"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="91"/>
<source>Folder already exists</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="164"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="172"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="173"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="181"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -1096,13 +1102,15 @@ This version is compiled as version: %1.</source>
<name>MkPath</name>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="124"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="394"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="464"/>
<source>Unable to remove</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="187"/>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="210"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="363"/>
<source>Unable to create the folder</source>
<translation type="unfinished"></translation>
</message>
@@ -1112,22 +1120,27 @@ This version is compiled as version: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="255"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="304"/>
<source>Unable to temporary rename the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="278"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="339"/>
+ <source>Unable to reverse temporary rename for real move</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="348"/>
<source>Unable to do the final real move the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="309"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="379"/>
<source>Unable to move the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="385"/>
<source>Unable to move the folder: errno: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1206,7 +1219,7 @@ This version is compiled as version: %1.</source>
<message>
<location filename="../../../OptionDialog.ui" line="75"/>
<location filename="../../../OptionDialog.ui" line="366"/>
- <location filename="../../../OptionDialog.cpp" line="290"/>
+ <location filename="../../../OptionDialog.cpp" line="297"/>
<source>Copy engine</source>
<translation type="unfinished"></translation>
</message>
@@ -1254,21 +1267,21 @@ This version is compiled as version: %1.</source>
<message>
<location filename="../../../OptionDialog.ui" line="80"/>
<location filename="../../../OptionDialog.ui" line="379"/>
- <location filename="../../../OptionDialog.cpp" line="291"/>
+ <location filename="../../../OptionDialog.cpp" line="298"/>
<source>Listener</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="85"/>
<location filename="../../../OptionDialog.ui" line="384"/>
- <location filename="../../../OptionDialog.cpp" line="292"/>
+ <location filename="../../../OptionDialog.cpp" line="299"/>
<source>Plugin loader</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="93"/>
<location filename="../../../OptionDialog.ui" line="389"/>
- <location filename="../../../OptionDialog.cpp" line="293"/>
+ <location filename="../../../OptionDialog.cpp" line="300"/>
<source>Session loader</source>
<translation type="unfinished"></translation>
</message>
@@ -1410,75 +1423,75 @@ This version is compiled as version: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="197"/>
- <location filename="../../../OptionDialog.cpp" line="211"/>
+ <location filename="../../../OptionDialog.cpp" line="204"/>
+ <location filename="../../../OptionDialog.cpp" line="218"/>
<source>Load</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="197"/>
+ <location filename="../../../OptionDialog.cpp" line="204"/>
<source>Load the theme?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="211"/>
+ <location filename="../../../OptionDialog.cpp" line="218"/>
<source>Load the language?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="298"/>
+ <location filename="../../../OptionDialog.cpp" line="305"/>
<source>Do nothing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="299"/>
+ <location filename="../../../OptionDialog.cpp" line="306"/>
<source>Ask source as folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="300"/>
+ <location filename="../../../OptionDialog.cpp" line="307"/>
<source>Ask sources as files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="301"/>
+ <location filename="../../../OptionDialog.cpp" line="308"/>
<source>Never</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="302"/>
+ <location filename="../../../OptionDialog.cpp" line="309"/>
<source>When source is same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="303"/>
+ <location filename="../../../OptionDialog.cpp" line="310"/>
<source>When destination is same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="304"/>
+ <location filename="../../../OptionDialog.cpp" line="311"/>
<source>When source and destination are same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="305"/>
+ <location filename="../../../OptionDialog.cpp" line="312"/>
<source>When source or destination are same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="306"/>
+ <location filename="../../../OptionDialog.cpp" line="313"/>
<source>Always</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="320"/>
- <location filename="../../../OptionDialog.cpp" line="321"/>
- <location filename="../../../OptionDialog.cpp" line="322"/>
+ <location filename="../../../OptionDialog.cpp" line="327"/>
+ <location filename="../../../OptionDialog.cpp" line="328"/>
+ <location filename="../../../OptionDialog.cpp" line="329"/>
<source>The variables are %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="962"/>
+ <location filename="../../../OptionDialog.cpp" line="969"/>
<source>Save logs as: </source>
<translation type="unfinished"></translation>
</message>
@@ -1771,12 +1784,12 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../ProductKey.cpp" line="56"/>
+ <location filename="../../../ProductKey.cpp" line="60"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../ProductKey.cpp" line="56"/>
+ <location filename="../../../ProductKey.cpp" line="60"/>
<source>Your product key was rejected.&lt;br /&gt;If you buy key, unmark check your spam and unmark the mail as spam&lt;br /&gt;If you have not buy your key, go to &lt;a href=&quot;https://shop.first-world.info/&quot;&gt;https://shop.first-world.info/&lt;/a&gt;</source>
<translation type="unfinished"></translation>
</message>
@@ -1834,12 +1847,12 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="541"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="543"/>
<source>Unable to read the source file: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="595"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="599"/>
<source>File truncated during the read, possible data change</source>
<translation type="unfinished"></translation>
</message>
@@ -1895,32 +1908,38 @@ Error:%2</source>
<context>
<name>ScanFileOrFolder</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="452"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="454"/>
- <source>%1 - copy</source>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="331"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="681"/>
+ <source>Blacklisted folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="463"/>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="465"/>
- <source>%1 - copy (%2)</source>
+ <source>%1 - copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="576"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="578"/>
- <source>%name% - copy</source>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="474"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="476"/>
+ <source>%1 - copy (%2)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="587"/>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="589"/>
+ <source>%name% - copy</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="598"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="600"/>
<source>%name% - copy (%number%)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="673"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="677"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="691"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="695"/>
<source>Problem with folder read</source>
<translation type="unfinished"></translation>
</message>
@@ -2031,61 +2050,61 @@ Error:%2</source>
<context>
<name>Themes</name>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="328"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="341"/>
<source>Buy the Ultimate version to fund development</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="328"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="341"/>
<source>Register your key</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="427"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="440"/>
<source>File %1/%2, size: %3/%4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="661"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="674"/>
<source>Copy list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="663"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="676"/>
<source>Move list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1091"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1117"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1092"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1118"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1093"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1119"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1095"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1121"/>
<source>File Name, 0KB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1289"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1301"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1313"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1395"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1407"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1419"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1388"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1392"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1394"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1494"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1498"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1500"/>
<source>%1 %2% of %3</source>
<translation type="unfinished"></translation>
</message>
@@ -2093,24 +2112,24 @@ Error:%2</source>
<context>
<name>ThemesFactory</name>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="284"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="294"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="285"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="295"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="286"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="296"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="482"/>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="497"/>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="512"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="510"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="525"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="540"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
@@ -2118,29 +2137,29 @@ Error:%2</source>
<context>
<name>TransferThread</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="179"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="188"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="613"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="628"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="620"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="635"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="648"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="663"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/>
<source>File not found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="925"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="940"/>
<source>Unable to change the date</source>
<translation type="unfinished"></translation>
</message>
@@ -2148,19 +2167,19 @@ Error:%2</source>
<context>
<name>TransferThreadAsync</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="340"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/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="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="428"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="446"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="436"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="454"/>
<source>Unable to create the destination folder: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="431"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="448"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="439"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="456"/>
<source>Unable to create the destination folder, errno: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -2168,24 +2187,24 @@ Error:%2</source>
<context>
<name>WriteThread</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="135"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="138"/>
<source>Path resolution error (Empty path)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="164"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="197"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="167"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="200"/>
<source>Unable to create the destination folder: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="175"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="199"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="178"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="202"/>
<source>Unable to create the destination folder, errno: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="456"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="464"/>
<source>Internal error, please report it!</source>
<translation type="unfinished"></translation>
</message>
@@ -2500,7 +2519,7 @@ Error:%2</source>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="341"/>
- <source>Overwrite if newer</source>
+ <source>Overwrite if source newer than destination</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2511,8 +2530,12 @@ Error:%2</source>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="354"/>
+ <source>Overwrite if source older than destination</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="357"/>
- <source>Overwrite if older</source>
+ <source>Overwrite if destination older</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2900,7 +2923,7 @@ Error:%2</source>
</message>
<message>
<location filename="../../Themes/Oxygen/themesOptions.ui" line="213"/>
- <source>Informations</source>
+ <source>Information</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2914,28 +2937,38 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="257"/>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="269"/>
+ <source>Click to edit the color</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="368"/>
<source>Speed with progress bar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="267"/>
- <source>Show dual progression</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="378"/>
+ <source>Progression color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="277"/>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="388"/>
<source>Show progression in the title</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="287"/>
- <source>Progression color</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="395"/>
+ <source>General margin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="306"/>
- <source>Click to edit the color</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="402"/>
+ <source>Show dual progression</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="425"/>
+ <source>General spacing</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/plugins/Languages/ru/informations.xml b/plugins/Languages/ru/informations.xml
index 9b3fc4d..c943116 100755
--- a/plugins/Languages/ru/informations.xml
+++ b/plugins/Languages/ru/informations.xml
@@ -12,7 +12,7 @@
<!-- Detailed description -->
<description xml:lang="en"><![CDATA[Translation of Ultracopier to russian. For more details see the web site.]]></description>
<!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number -->
- <version>2.2.4.7</version>
+ <version>2.2.6.0</version>
<!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. -->
<name>ru</name>
<!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. -->
diff --git a/plugins/Languages/ru/translation.qm b/plugins/Languages/ru/translation.qm
index 36d9bd6..47dd8e2 100755
--- a/plugins/Languages/ru/translation.qm
+++ b/plugins/Languages/ru/translation.qm
Binary files differ
diff --git a/plugins/Languages/ru/translation.ts b/plugins/Languages/ru/translation.ts
index 0996543..d422ab6 100755
--- a/plugins/Languages/ru/translation.ts
+++ b/plugins/Languages/ru/translation.ts
@@ -93,91 +93,96 @@
<context>
<name>CopyEngine</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="438"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="461"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="465"/>
<source>The engine is forced to move, you can&apos;t copy with it</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="473"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="496"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="519"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="542"/>
<source>The engine is forced to copy, you can&apos;t move with it</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/>
<source>Destination</source>
<translation type="unfinished">назначение</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/>
<source>Use the actual destination &quot;%1&quot;?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="685"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/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/Ultracopier-Spec/CopyEngine.cpp" line="976"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="979"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="984"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="988"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="886"/>
+ <source>Supported only on Windows</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1035"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1038"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1043"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1047"/>
<source>Ask</source>
<translation type="unfinished">просить</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="977"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="981"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="985"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="989"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1036"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1040"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1044"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1048"/>
<source>Skip</source>
<translation type="unfinished">пропускать</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="980"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1039"/>
<source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="982"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="994"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1041"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1053"/>
<source>Rename</source>
<translation type="unfinished">переименовать</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="986"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1045"/>
<source>Put at the end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="990"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1049"/>
<source>Overwrite</source>
<translation type="unfinished">переписывать</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="991"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1050"/>
<source>Overwrite if different</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="992"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1051"/>
<source>Overwrite if newer</source>
<translation type="unfinished">Заменить, если новее</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="993"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1052"/>
<source>Overwrite if older</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/>
<source>Options error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/>
<source>Options engine is not loaded. Unable to access the filters</source>
<translation type="unfinished"></translation>
</message>
@@ -185,75 +190,76 @@
<context>
<name>CopyEngineFactory</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="303"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="60"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="309"/>
<source>Supported only on Windows</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="430"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="433"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="438"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/>
<source>Ask</source>
<translation type="unfinished">просить</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="431"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="435"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="443"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="437"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="441"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="449"/>
<source>Skip</source>
<translation type="unfinished">пропускать</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="434"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/>
<source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="454"/>
<source>Rename</source>
<translation type="unfinished">переименовать</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/>
<source>Put at the end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="450"/>
<source>Overwrite</source>
<translation type="unfinished">переписывать</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="451"/>
<source>Overwrite if different</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="452"/>
<source>Overwrite if newer</source>
<translation type="unfinished">Заменить, если новее</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="447"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="453"/>
<source>Overwrite if older</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/>
<source>Options error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/>
<source>Options engine is not loaded. Unable to access the filters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/>
<source>Options engine is not loaded, can&apos;t access to the filters</source>
<translation type="unfinished"></translation>
</message>
@@ -670,12 +676,12 @@
<context>
<name>FileErrorDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="87"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="92"/>
<source>Error on folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="90"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="95"/>
<source>Folder name</source>
<translation type="unfinished"></translation>
</message>
@@ -683,22 +689,22 @@
<context>
<name>FileExistsDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="191"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="201"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="198"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="208"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/>
<source>Error</source>
<translation type="unfinished">ошибка</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -706,22 +712,22 @@
<context>
<name>FileIsSameDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="140"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="145"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="147"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="152"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/>
<source>Error</source>
<translation type="unfinished">ошибка</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -868,27 +874,27 @@
<context>
<name>FolderExistsDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="84"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="91"/>
<source>Folder already exists</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="164"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="172"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="173"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="181"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/>
<source>Error</source>
<translation type="unfinished">ошибка</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -1096,13 +1102,15 @@ This version is compiled as version: %1.</source>
<name>MkPath</name>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="124"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="394"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="464"/>
<source>Unable to remove</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="187"/>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="210"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="363"/>
<source>Unable to create the folder</source>
<translation type="unfinished"></translation>
</message>
@@ -1112,22 +1120,27 @@ This version is compiled as version: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="255"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="304"/>
<source>Unable to temporary rename the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="278"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="339"/>
+ <source>Unable to reverse temporary rename for real move</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="348"/>
<source>Unable to do the final real move the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="309"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="379"/>
<source>Unable to move the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="385"/>
<source>Unable to move the folder: errno: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1206,7 +1219,7 @@ This version is compiled as version: %1.</source>
<message>
<location filename="../../../OptionDialog.ui" line="75"/>
<location filename="../../../OptionDialog.ui" line="366"/>
- <location filename="../../../OptionDialog.cpp" line="290"/>
+ <location filename="../../../OptionDialog.cpp" line="297"/>
<source>Copy engine</source>
<translation>Копировать двигатель</translation>
</message>
@@ -1254,21 +1267,21 @@ This version is compiled as version: %1.</source>
<message>
<location filename="../../../OptionDialog.ui" line="80"/>
<location filename="../../../OptionDialog.ui" line="379"/>
- <location filename="../../../OptionDialog.cpp" line="291"/>
+ <location filename="../../../OptionDialog.cpp" line="298"/>
<source>Listener</source>
<translation>слушатель</translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="85"/>
<location filename="../../../OptionDialog.ui" line="384"/>
- <location filename="../../../OptionDialog.cpp" line="292"/>
+ <location filename="../../../OptionDialog.cpp" line="299"/>
<source>Plugin loader</source>
<translation>плагин погрузчика</translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="93"/>
<location filename="../../../OptionDialog.ui" line="389"/>
- <location filename="../../../OptionDialog.cpp" line="293"/>
+ <location filename="../../../OptionDialog.cpp" line="300"/>
<source>Session loader</source>
<translation>сессия погрузчика</translation>
</message>
@@ -1410,75 +1423,75 @@ This version is compiled as version: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="197"/>
- <location filename="../../../OptionDialog.cpp" line="211"/>
+ <location filename="../../../OptionDialog.cpp" line="204"/>
+ <location filename="../../../OptionDialog.cpp" line="218"/>
<source>Load</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="197"/>
+ <location filename="../../../OptionDialog.cpp" line="204"/>
<source>Load the theme?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="211"/>
+ <location filename="../../../OptionDialog.cpp" line="218"/>
<source>Load the language?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="298"/>
+ <location filename="../../../OptionDialog.cpp" line="305"/>
<source>Do nothing</source>
<translation>ничего не делать</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="299"/>
+ <location filename="../../../OptionDialog.cpp" line="306"/>
<source>Ask source as folder</source>
<translation>Спросите источника папку</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="300"/>
+ <location filename="../../../OptionDialog.cpp" line="307"/>
<source>Ask sources as files</source>
<translation>Спросите источников в виде файлов</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="301"/>
+ <location filename="../../../OptionDialog.cpp" line="308"/>
<source>Never</source>
<translation>никогда</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="302"/>
+ <location filename="../../../OptionDialog.cpp" line="309"/>
<source>When source is same</source>
<translation>Когда же источник</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="303"/>
+ <location filename="../../../OptionDialog.cpp" line="310"/>
<source>When destination is same</source>
<translation>Когда же назначения</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="304"/>
+ <location filename="../../../OptionDialog.cpp" line="311"/>
<source>When source and destination are same</source>
<translation>Когда источника и назначения те же</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="305"/>
+ <location filename="../../../OptionDialog.cpp" line="312"/>
<source>When source or destination are same</source>
<translation>Когда источника или назначения те же</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="306"/>
+ <location filename="../../../OptionDialog.cpp" line="313"/>
<source>Always</source>
<translation>всегда</translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="320"/>
- <location filename="../../../OptionDialog.cpp" line="321"/>
- <location filename="../../../OptionDialog.cpp" line="322"/>
+ <location filename="../../../OptionDialog.cpp" line="327"/>
+ <location filename="../../../OptionDialog.cpp" line="328"/>
+ <location filename="../../../OptionDialog.cpp" line="329"/>
<source>The variables are %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="962"/>
+ <location filename="../../../OptionDialog.cpp" line="969"/>
<source>Save logs as: </source>
<translation>Сохранить журналы, как: </translation>
</message>
@@ -1773,12 +1786,12 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../ProductKey.cpp" line="56"/>
+ <location filename="../../../ProductKey.cpp" line="60"/>
<source>Error</source>
<translation type="unfinished">ошибка</translation>
</message>
<message>
- <location filename="../../../ProductKey.cpp" line="56"/>
+ <location filename="../../../ProductKey.cpp" line="60"/>
<source>Your product key was rejected.&lt;br /&gt;If you buy key, unmark check your spam and unmark the mail as spam&lt;br /&gt;If you have not buy your key, go to &lt;a href=&quot;https://shop.first-world.info/&quot;&gt;https://shop.first-world.info/&lt;/a&gt;</source>
<translation type="unfinished"></translation>
</message>
@@ -1836,12 +1849,12 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="541"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="543"/>
<source>Unable to read the source file: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="595"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="599"/>
<source>File truncated during the read, possible data change</source>
<translation type="unfinished"></translation>
</message>
@@ -1897,32 +1910,38 @@ Error:%2</source>
<context>
<name>ScanFileOrFolder</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="452"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="454"/>
- <source>%1 - copy</source>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="331"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="681"/>
+ <source>Blacklisted folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="463"/>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="465"/>
- <source>%1 - copy (%2)</source>
+ <source>%1 - copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="576"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="578"/>
- <source>%name% - copy</source>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="474"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="476"/>
+ <source>%1 - copy (%2)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="587"/>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="589"/>
+ <source>%name% - copy</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="598"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="600"/>
<source>%name% - copy (%number%)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="673"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="677"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="691"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="695"/>
<source>Problem with folder read</source>
<translation type="unfinished"></translation>
</message>
@@ -2033,61 +2052,61 @@ Error:%2</source>
<context>
<name>Themes</name>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="328"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="341"/>
<source>Buy the Ultimate version to fund development</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="328"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="341"/>
<source>Register your key</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="427"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="440"/>
<source>File %1/%2, size: %3/%4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="661"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="674"/>
<source>Copy list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="663"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="676"/>
<source>Move list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1091"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1117"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1092"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1118"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1093"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1119"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1095"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1121"/>
<source>File Name, 0KB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1289"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1301"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1313"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1395"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1407"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1419"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1388"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1392"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1394"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1494"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1498"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1500"/>
<source>%1 %2% of %3</source>
<translation type="unfinished"></translation>
</message>
@@ -2095,24 +2114,24 @@ Error:%2</source>
<context>
<name>ThemesFactory</name>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="284"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="294"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="285"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="295"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="286"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="296"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="482"/>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="497"/>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="512"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="510"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="525"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="540"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
@@ -2120,29 +2139,29 @@ Error:%2</source>
<context>
<name>TransferThread</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="179"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="188"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="613"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="628"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="620"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="635"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="648"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="663"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/>
<source>File not found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="925"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="940"/>
<source>Unable to change the date</source>
<translation type="unfinished"></translation>
</message>
@@ -2150,19 +2169,19 @@ Error:%2</source>
<context>
<name>TransferThreadAsync</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="340"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/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="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="428"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="446"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="436"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="454"/>
<source>Unable to create the destination folder: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="431"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="448"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="439"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="456"/>
<source>Unable to create the destination folder, errno: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -2170,24 +2189,24 @@ Error:%2</source>
<context>
<name>WriteThread</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="135"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="138"/>
<source>Path resolution error (Empty path)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="164"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="197"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="167"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="200"/>
<source>Unable to create the destination folder: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="175"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="199"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="178"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="202"/>
<source>Unable to create the destination folder, errno: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="456"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="464"/>
<source>Internal error, please report it!</source>
<translation type="unfinished"></translation>
</message>
@@ -2502,8 +2521,8 @@ Error:%2</source>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="341"/>
- <source>Overwrite if newer</source>
- <translation type="unfinished">Заменить, если новее</translation>
+ <source>Overwrite if source newer than destination</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="346"/>
@@ -2513,8 +2532,12 @@ Error:%2</source>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="354"/>
+ <source>Overwrite if source older than destination</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="357"/>
- <source>Overwrite if older</source>
+ <source>Overwrite if destination older</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2902,8 +2925,8 @@ Error:%2</source>
</message>
<message>
<location filename="../../Themes/Oxygen/themesOptions.ui" line="213"/>
- <source>Informations</source>
- <translation type="unfinished"></translation>
+ <source>Information</source>
+ <translation type="unfinished">информация</translation>
</message>
<message>
<location filename="../../Themes/Oxygen/themesOptions.ui" line="219"/>
@@ -2916,28 +2939,38 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="257"/>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="269"/>
+ <source>Click to edit the color</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="368"/>
<source>Speed with progress bar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="267"/>
- <source>Show dual progression</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="378"/>
+ <source>Progression color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="277"/>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="388"/>
<source>Show progression in the title</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="287"/>
- <source>Progression color</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="395"/>
+ <source>General margin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="306"/>
- <source>Click to edit the color</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="402"/>
+ <source>Show dual progression</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="425"/>
+ <source>General spacing</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/plugins/Languages/th/informations.xml b/plugins/Languages/th/informations.xml
index 36ea0d5..de524b7 100755
--- a/plugins/Languages/th/informations.xml
+++ b/plugins/Languages/th/informations.xml
@@ -12,7 +12,7 @@
<!-- Detailed description -->
<description xml:lang="en"><![CDATA[Translation of Ultracopier to thai. For more details see the web site.]]></description>
<!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number -->
- <version>2.2.4.7</version>
+ <version>2.2.6.0</version>
<!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. -->
<name>th</name>
<!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. -->
diff --git a/plugins/Languages/th/translation.ts b/plugins/Languages/th/translation.ts
index 2066182..b1cbcc0 100755
--- a/plugins/Languages/th/translation.ts
+++ b/plugins/Languages/th/translation.ts
@@ -93,91 +93,96 @@
<context>
<name>CopyEngine</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="438"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="461"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="465"/>
<source>The engine is forced to move, you can&apos;t copy with it</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="473"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="496"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="519"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="542"/>
<source>The engine is forced to copy, you can&apos;t move with it</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/>
<source>Destination</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/>
<source>Use the actual destination &quot;%1&quot;?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="685"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/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/Ultracopier-Spec/CopyEngine.cpp" line="976"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="979"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="984"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="988"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="886"/>
+ <source>Supported only on Windows</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1035"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1038"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1043"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1047"/>
<source>Ask</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="977"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="981"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="985"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="989"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1036"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1040"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1044"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1048"/>
<source>Skip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="980"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1039"/>
<source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="982"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="994"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1041"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1053"/>
<source>Rename</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="986"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1045"/>
<source>Put at the end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="990"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1049"/>
<source>Overwrite</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="991"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1050"/>
<source>Overwrite if different</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="992"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1051"/>
<source>Overwrite if newer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="993"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1052"/>
<source>Overwrite if older</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/>
<source>Options error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/>
<source>Options engine is not loaded. Unable to access the filters</source>
<translation type="unfinished"></translation>
</message>
@@ -185,75 +190,76 @@
<context>
<name>CopyEngineFactory</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="303"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="60"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="309"/>
<source>Supported only on Windows</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="430"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="433"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="438"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/>
<source>Ask</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="431"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="435"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="443"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="437"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="441"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="449"/>
<source>Skip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="434"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/>
<source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="454"/>
<source>Rename</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/>
<source>Put at the end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="450"/>
<source>Overwrite</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="451"/>
<source>Overwrite if different</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="452"/>
<source>Overwrite if newer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="447"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="453"/>
<source>Overwrite if older</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/>
<source>Options error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/>
<source>Options engine is not loaded. Unable to access the filters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/>
<source>Options engine is not loaded, can&apos;t access to the filters</source>
<translation type="unfinished"></translation>
</message>
@@ -670,12 +676,12 @@
<context>
<name>FileErrorDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="87"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="92"/>
<source>Error on folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="90"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="95"/>
<source>Folder name</source>
<translation type="unfinished"></translation>
</message>
@@ -683,22 +689,22 @@
<context>
<name>FileExistsDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="191"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="201"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="198"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="208"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -706,22 +712,22 @@
<context>
<name>FileIsSameDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="140"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="145"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="147"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="152"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -868,27 +874,27 @@
<context>
<name>FolderExistsDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="84"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="91"/>
<source>Folder already exists</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="164"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="172"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="173"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="181"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -1096,13 +1102,15 @@ This version is compiled as version: %1.</source>
<name>MkPath</name>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="124"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="394"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="464"/>
<source>Unable to remove</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="187"/>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="210"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="363"/>
<source>Unable to create the folder</source>
<translation type="unfinished"></translation>
</message>
@@ -1112,22 +1120,27 @@ This version is compiled as version: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="255"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="304"/>
<source>Unable to temporary rename the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="278"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="339"/>
+ <source>Unable to reverse temporary rename for real move</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="348"/>
<source>Unable to do the final real move the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="309"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="379"/>
<source>Unable to move the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="385"/>
<source>Unable to move the folder: errno: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1206,7 +1219,7 @@ This version is compiled as version: %1.</source>
<message>
<location filename="../../../OptionDialog.ui" line="75"/>
<location filename="../../../OptionDialog.ui" line="366"/>
- <location filename="../../../OptionDialog.cpp" line="290"/>
+ <location filename="../../../OptionDialog.cpp" line="297"/>
<source>Copy engine</source>
<translation type="unfinished"></translation>
</message>
@@ -1254,21 +1267,21 @@ This version is compiled as version: %1.</source>
<message>
<location filename="../../../OptionDialog.ui" line="80"/>
<location filename="../../../OptionDialog.ui" line="379"/>
- <location filename="../../../OptionDialog.cpp" line="291"/>
+ <location filename="../../../OptionDialog.cpp" line="298"/>
<source>Listener</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="85"/>
<location filename="../../../OptionDialog.ui" line="384"/>
- <location filename="../../../OptionDialog.cpp" line="292"/>
+ <location filename="../../../OptionDialog.cpp" line="299"/>
<source>Plugin loader</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="93"/>
<location filename="../../../OptionDialog.ui" line="389"/>
- <location filename="../../../OptionDialog.cpp" line="293"/>
+ <location filename="../../../OptionDialog.cpp" line="300"/>
<source>Session loader</source>
<translation type="unfinished"></translation>
</message>
@@ -1410,75 +1423,75 @@ This version is compiled as version: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="197"/>
- <location filename="../../../OptionDialog.cpp" line="211"/>
+ <location filename="../../../OptionDialog.cpp" line="204"/>
+ <location filename="../../../OptionDialog.cpp" line="218"/>
<source>Load</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="197"/>
+ <location filename="../../../OptionDialog.cpp" line="204"/>
<source>Load the theme?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="211"/>
+ <location filename="../../../OptionDialog.cpp" line="218"/>
<source>Load the language?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="298"/>
+ <location filename="../../../OptionDialog.cpp" line="305"/>
<source>Do nothing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="299"/>
+ <location filename="../../../OptionDialog.cpp" line="306"/>
<source>Ask source as folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="300"/>
+ <location filename="../../../OptionDialog.cpp" line="307"/>
<source>Ask sources as files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="301"/>
+ <location filename="../../../OptionDialog.cpp" line="308"/>
<source>Never</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="302"/>
+ <location filename="../../../OptionDialog.cpp" line="309"/>
<source>When source is same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="303"/>
+ <location filename="../../../OptionDialog.cpp" line="310"/>
<source>When destination is same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="304"/>
+ <location filename="../../../OptionDialog.cpp" line="311"/>
<source>When source and destination are same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="305"/>
+ <location filename="../../../OptionDialog.cpp" line="312"/>
<source>When source or destination are same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="306"/>
+ <location filename="../../../OptionDialog.cpp" line="313"/>
<source>Always</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="320"/>
- <location filename="../../../OptionDialog.cpp" line="321"/>
- <location filename="../../../OptionDialog.cpp" line="322"/>
+ <location filename="../../../OptionDialog.cpp" line="327"/>
+ <location filename="../../../OptionDialog.cpp" line="328"/>
+ <location filename="../../../OptionDialog.cpp" line="329"/>
<source>The variables are %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="962"/>
+ <location filename="../../../OptionDialog.cpp" line="969"/>
<source>Save logs as: </source>
<translation type="unfinished"></translation>
</message>
@@ -1771,12 +1784,12 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../ProductKey.cpp" line="56"/>
+ <location filename="../../../ProductKey.cpp" line="60"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../ProductKey.cpp" line="56"/>
+ <location filename="../../../ProductKey.cpp" line="60"/>
<source>Your product key was rejected.&lt;br /&gt;If you buy key, unmark check your spam and unmark the mail as spam&lt;br /&gt;If you have not buy your key, go to &lt;a href=&quot;https://shop.first-world.info/&quot;&gt;https://shop.first-world.info/&lt;/a&gt;</source>
<translation type="unfinished"></translation>
</message>
@@ -1834,12 +1847,12 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="541"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="543"/>
<source>Unable to read the source file: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="595"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="599"/>
<source>File truncated during the read, possible data change</source>
<translation type="unfinished"></translation>
</message>
@@ -1895,32 +1908,38 @@ Error:%2</source>
<context>
<name>ScanFileOrFolder</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="452"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="454"/>
- <source>%1 - copy</source>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="331"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="681"/>
+ <source>Blacklisted folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="463"/>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="465"/>
- <source>%1 - copy (%2)</source>
+ <source>%1 - copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="576"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="578"/>
- <source>%name% - copy</source>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="474"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="476"/>
+ <source>%1 - copy (%2)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="587"/>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="589"/>
+ <source>%name% - copy</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="598"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="600"/>
<source>%name% - copy (%number%)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="673"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="677"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="691"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="695"/>
<source>Problem with folder read</source>
<translation type="unfinished"></translation>
</message>
@@ -2031,61 +2050,61 @@ Error:%2</source>
<context>
<name>Themes</name>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="328"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="341"/>
<source>Buy the Ultimate version to fund development</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="328"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="341"/>
<source>Register your key</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="427"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="440"/>
<source>File %1/%2, size: %3/%4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="661"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="674"/>
<source>Copy list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="663"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="676"/>
<source>Move list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1091"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1117"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1092"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1118"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1093"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1119"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1095"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1121"/>
<source>File Name, 0KB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1289"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1301"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1313"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1395"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1407"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1419"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1388"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1392"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1394"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1494"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1498"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1500"/>
<source>%1 %2% of %3</source>
<translation type="unfinished"></translation>
</message>
@@ -2093,24 +2112,24 @@ Error:%2</source>
<context>
<name>ThemesFactory</name>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="284"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="294"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="285"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="295"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="286"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="296"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="482"/>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="497"/>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="512"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="510"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="525"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="540"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
@@ -2118,29 +2137,29 @@ Error:%2</source>
<context>
<name>TransferThread</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="179"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="188"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="613"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="628"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="620"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="635"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="648"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="663"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/>
<source>File not found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="925"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="940"/>
<source>Unable to change the date</source>
<translation type="unfinished"></translation>
</message>
@@ -2148,19 +2167,19 @@ Error:%2</source>
<context>
<name>TransferThreadAsync</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="340"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/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="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="428"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="446"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="436"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="454"/>
<source>Unable to create the destination folder: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="431"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="448"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="439"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="456"/>
<source>Unable to create the destination folder, errno: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -2168,24 +2187,24 @@ Error:%2</source>
<context>
<name>WriteThread</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="135"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="138"/>
<source>Path resolution error (Empty path)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="164"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="197"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="167"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="200"/>
<source>Unable to create the destination folder: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="175"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="199"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="178"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="202"/>
<source>Unable to create the destination folder, errno: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="456"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="464"/>
<source>Internal error, please report it!</source>
<translation type="unfinished"></translation>
</message>
@@ -2500,7 +2519,7 @@ Error:%2</source>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="341"/>
- <source>Overwrite if newer</source>
+ <source>Overwrite if source newer than destination</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2511,8 +2530,12 @@ Error:%2</source>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="354"/>
+ <source>Overwrite if source older than destination</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="357"/>
- <source>Overwrite if older</source>
+ <source>Overwrite if destination older</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2900,7 +2923,7 @@ Error:%2</source>
</message>
<message>
<location filename="../../Themes/Oxygen/themesOptions.ui" line="213"/>
- <source>Informations</source>
+ <source>Information</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2914,28 +2937,38 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="257"/>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="269"/>
+ <source>Click to edit the color</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="368"/>
<source>Speed with progress bar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="267"/>
- <source>Show dual progression</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="378"/>
+ <source>Progression color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="277"/>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="388"/>
<source>Show progression in the title</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="287"/>
- <source>Progression color</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="395"/>
+ <source>General margin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="306"/>
- <source>Click to edit the color</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="402"/>
+ <source>Show dual progression</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="425"/>
+ <source>General spacing</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/plugins/Languages/tr/informations.xml b/plugins/Languages/tr/informations.xml
index 6a0be77..4d33884 100755
--- a/plugins/Languages/tr/informations.xml
+++ b/plugins/Languages/tr/informations.xml
@@ -12,7 +12,7 @@
<!-- Detailed description -->
<description xml:lang="en"><![CDATA[Translation of Ultracopier to turkish. For more details see the web site.]]></description>
<!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number -->
- <version>2.2.4.7</version>
+ <version>2.2.6.0</version>
<!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. -->
<name>tr</name>
<!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. -->
diff --git a/plugins/Languages/tr/translation.ts b/plugins/Languages/tr/translation.ts
index 2066182..b1cbcc0 100755
--- a/plugins/Languages/tr/translation.ts
+++ b/plugins/Languages/tr/translation.ts
@@ -93,91 +93,96 @@
<context>
<name>CopyEngine</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="438"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="461"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="465"/>
<source>The engine is forced to move, you can&apos;t copy with it</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="473"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="496"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="519"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="542"/>
<source>The engine is forced to copy, you can&apos;t move with it</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/>
<source>Destination</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/>
<source>Use the actual destination &quot;%1&quot;?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="685"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/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/Ultracopier-Spec/CopyEngine.cpp" line="976"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="979"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="984"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="988"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="886"/>
+ <source>Supported only on Windows</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1035"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1038"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1043"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1047"/>
<source>Ask</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="977"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="981"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="985"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="989"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1036"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1040"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1044"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1048"/>
<source>Skip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="980"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1039"/>
<source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="982"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="994"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1041"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1053"/>
<source>Rename</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="986"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1045"/>
<source>Put at the end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="990"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1049"/>
<source>Overwrite</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="991"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1050"/>
<source>Overwrite if different</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="992"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1051"/>
<source>Overwrite if newer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="993"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1052"/>
<source>Overwrite if older</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/>
<source>Options error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/>
<source>Options engine is not loaded. Unable to access the filters</source>
<translation type="unfinished"></translation>
</message>
@@ -185,75 +190,76 @@
<context>
<name>CopyEngineFactory</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="303"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="60"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="309"/>
<source>Supported only on Windows</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="430"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="433"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="438"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/>
<source>Ask</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="431"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="435"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="443"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="437"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="441"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="449"/>
<source>Skip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="434"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/>
<source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="454"/>
<source>Rename</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/>
<source>Put at the end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="450"/>
<source>Overwrite</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="451"/>
<source>Overwrite if different</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="452"/>
<source>Overwrite if newer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="447"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="453"/>
<source>Overwrite if older</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/>
<source>Options error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/>
<source>Options engine is not loaded. Unable to access the filters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/>
<source>Options engine is not loaded, can&apos;t access to the filters</source>
<translation type="unfinished"></translation>
</message>
@@ -670,12 +676,12 @@
<context>
<name>FileErrorDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="87"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="92"/>
<source>Error on folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="90"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="95"/>
<source>Folder name</source>
<translation type="unfinished"></translation>
</message>
@@ -683,22 +689,22 @@
<context>
<name>FileExistsDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="191"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="201"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="198"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="208"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -706,22 +712,22 @@
<context>
<name>FileIsSameDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="140"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="145"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="147"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="152"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -868,27 +874,27 @@
<context>
<name>FolderExistsDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="84"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="91"/>
<source>Folder already exists</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="164"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="172"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="173"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="181"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -1096,13 +1102,15 @@ This version is compiled as version: %1.</source>
<name>MkPath</name>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="124"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="394"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="464"/>
<source>Unable to remove</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="187"/>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="210"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="363"/>
<source>Unable to create the folder</source>
<translation type="unfinished"></translation>
</message>
@@ -1112,22 +1120,27 @@ This version is compiled as version: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="255"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="304"/>
<source>Unable to temporary rename the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="278"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="339"/>
+ <source>Unable to reverse temporary rename for real move</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="348"/>
<source>Unable to do the final real move the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="309"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="379"/>
<source>Unable to move the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="385"/>
<source>Unable to move the folder: errno: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1206,7 +1219,7 @@ This version is compiled as version: %1.</source>
<message>
<location filename="../../../OptionDialog.ui" line="75"/>
<location filename="../../../OptionDialog.ui" line="366"/>
- <location filename="../../../OptionDialog.cpp" line="290"/>
+ <location filename="../../../OptionDialog.cpp" line="297"/>
<source>Copy engine</source>
<translation type="unfinished"></translation>
</message>
@@ -1254,21 +1267,21 @@ This version is compiled as version: %1.</source>
<message>
<location filename="../../../OptionDialog.ui" line="80"/>
<location filename="../../../OptionDialog.ui" line="379"/>
- <location filename="../../../OptionDialog.cpp" line="291"/>
+ <location filename="../../../OptionDialog.cpp" line="298"/>
<source>Listener</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="85"/>
<location filename="../../../OptionDialog.ui" line="384"/>
- <location filename="../../../OptionDialog.cpp" line="292"/>
+ <location filename="../../../OptionDialog.cpp" line="299"/>
<source>Plugin loader</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="93"/>
<location filename="../../../OptionDialog.ui" line="389"/>
- <location filename="../../../OptionDialog.cpp" line="293"/>
+ <location filename="../../../OptionDialog.cpp" line="300"/>
<source>Session loader</source>
<translation type="unfinished"></translation>
</message>
@@ -1410,75 +1423,75 @@ This version is compiled as version: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="197"/>
- <location filename="../../../OptionDialog.cpp" line="211"/>
+ <location filename="../../../OptionDialog.cpp" line="204"/>
+ <location filename="../../../OptionDialog.cpp" line="218"/>
<source>Load</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="197"/>
+ <location filename="../../../OptionDialog.cpp" line="204"/>
<source>Load the theme?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="211"/>
+ <location filename="../../../OptionDialog.cpp" line="218"/>
<source>Load the language?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="298"/>
+ <location filename="../../../OptionDialog.cpp" line="305"/>
<source>Do nothing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="299"/>
+ <location filename="../../../OptionDialog.cpp" line="306"/>
<source>Ask source as folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="300"/>
+ <location filename="../../../OptionDialog.cpp" line="307"/>
<source>Ask sources as files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="301"/>
+ <location filename="../../../OptionDialog.cpp" line="308"/>
<source>Never</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="302"/>
+ <location filename="../../../OptionDialog.cpp" line="309"/>
<source>When source is same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="303"/>
+ <location filename="../../../OptionDialog.cpp" line="310"/>
<source>When destination is same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="304"/>
+ <location filename="../../../OptionDialog.cpp" line="311"/>
<source>When source and destination are same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="305"/>
+ <location filename="../../../OptionDialog.cpp" line="312"/>
<source>When source or destination are same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="306"/>
+ <location filename="../../../OptionDialog.cpp" line="313"/>
<source>Always</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="320"/>
- <location filename="../../../OptionDialog.cpp" line="321"/>
- <location filename="../../../OptionDialog.cpp" line="322"/>
+ <location filename="../../../OptionDialog.cpp" line="327"/>
+ <location filename="../../../OptionDialog.cpp" line="328"/>
+ <location filename="../../../OptionDialog.cpp" line="329"/>
<source>The variables are %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="962"/>
+ <location filename="../../../OptionDialog.cpp" line="969"/>
<source>Save logs as: </source>
<translation type="unfinished"></translation>
</message>
@@ -1771,12 +1784,12 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../ProductKey.cpp" line="56"/>
+ <location filename="../../../ProductKey.cpp" line="60"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../ProductKey.cpp" line="56"/>
+ <location filename="../../../ProductKey.cpp" line="60"/>
<source>Your product key was rejected.&lt;br /&gt;If you buy key, unmark check your spam and unmark the mail as spam&lt;br /&gt;If you have not buy your key, go to &lt;a href=&quot;https://shop.first-world.info/&quot;&gt;https://shop.first-world.info/&lt;/a&gt;</source>
<translation type="unfinished"></translation>
</message>
@@ -1834,12 +1847,12 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="541"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="543"/>
<source>Unable to read the source file: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="595"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="599"/>
<source>File truncated during the read, possible data change</source>
<translation type="unfinished"></translation>
</message>
@@ -1895,32 +1908,38 @@ Error:%2</source>
<context>
<name>ScanFileOrFolder</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="452"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="454"/>
- <source>%1 - copy</source>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="331"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="681"/>
+ <source>Blacklisted folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="463"/>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="465"/>
- <source>%1 - copy (%2)</source>
+ <source>%1 - copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="576"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="578"/>
- <source>%name% - copy</source>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="474"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="476"/>
+ <source>%1 - copy (%2)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="587"/>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="589"/>
+ <source>%name% - copy</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="598"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="600"/>
<source>%name% - copy (%number%)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="673"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="677"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="691"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="695"/>
<source>Problem with folder read</source>
<translation type="unfinished"></translation>
</message>
@@ -2031,61 +2050,61 @@ Error:%2</source>
<context>
<name>Themes</name>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="328"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="341"/>
<source>Buy the Ultimate version to fund development</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="328"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="341"/>
<source>Register your key</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="427"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="440"/>
<source>File %1/%2, size: %3/%4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="661"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="674"/>
<source>Copy list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="663"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="676"/>
<source>Move list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1091"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1117"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1092"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1118"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1093"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1119"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1095"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1121"/>
<source>File Name, 0KB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1289"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1301"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1313"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1395"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1407"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1419"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1388"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1392"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1394"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1494"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1498"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1500"/>
<source>%1 %2% of %3</source>
<translation type="unfinished"></translation>
</message>
@@ -2093,24 +2112,24 @@ Error:%2</source>
<context>
<name>ThemesFactory</name>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="284"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="294"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="285"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="295"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="286"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="296"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="482"/>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="497"/>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="512"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="510"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="525"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="540"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
@@ -2118,29 +2137,29 @@ Error:%2</source>
<context>
<name>TransferThread</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="179"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="188"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="613"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="628"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="620"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="635"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="648"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="663"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/>
<source>File not found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="925"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="940"/>
<source>Unable to change the date</source>
<translation type="unfinished"></translation>
</message>
@@ -2148,19 +2167,19 @@ Error:%2</source>
<context>
<name>TransferThreadAsync</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="340"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/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="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="428"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="446"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="436"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="454"/>
<source>Unable to create the destination folder: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="431"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="448"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="439"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="456"/>
<source>Unable to create the destination folder, errno: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -2168,24 +2187,24 @@ Error:%2</source>
<context>
<name>WriteThread</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="135"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="138"/>
<source>Path resolution error (Empty path)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="164"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="197"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="167"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="200"/>
<source>Unable to create the destination folder: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="175"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="199"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="178"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="202"/>
<source>Unable to create the destination folder, errno: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="456"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="464"/>
<source>Internal error, please report it!</source>
<translation type="unfinished"></translation>
</message>
@@ -2500,7 +2519,7 @@ Error:%2</source>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="341"/>
- <source>Overwrite if newer</source>
+ <source>Overwrite if source newer than destination</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2511,8 +2530,12 @@ Error:%2</source>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="354"/>
+ <source>Overwrite if source older than destination</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="357"/>
- <source>Overwrite if older</source>
+ <source>Overwrite if destination older</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2900,7 +2923,7 @@ Error:%2</source>
</message>
<message>
<location filename="../../Themes/Oxygen/themesOptions.ui" line="213"/>
- <source>Informations</source>
+ <source>Information</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2914,28 +2937,38 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="257"/>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="269"/>
+ <source>Click to edit the color</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="368"/>
<source>Speed with progress bar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="267"/>
- <source>Show dual progression</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="378"/>
+ <source>Progression color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="277"/>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="388"/>
<source>Show progression in the title</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="287"/>
- <source>Progression color</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="395"/>
+ <source>General margin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="306"/>
- <source>Click to edit the color</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="402"/>
+ <source>Show dual progression</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="425"/>
+ <source>General spacing</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/plugins/Languages/zh/informations.xml b/plugins/Languages/zh/informations.xml
index d5462e7..7b163fb 100755
--- a/plugins/Languages/zh/informations.xml
+++ b/plugins/Languages/zh/informations.xml
@@ -12,7 +12,7 @@
<!-- Detailed description -->
<description xml:lang="en"><![CDATA[Translation of Ultracopier to chinese. For more details see the web site.]]></description>
<!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number -->
- <version>2.2.4.7</version>
+ <version>2.2.6.0</version>
<!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. -->
<name>ch</name>
<!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. -->
diff --git a/plugins/Languages/zh_TW/informations.xml b/plugins/Languages/zh_TW/informations.xml
index 16f28bb..beaac2c 100755
--- a/plugins/Languages/zh_TW/informations.xml
+++ b/plugins/Languages/zh_TW/informations.xml
@@ -12,7 +12,7 @@
<!-- Detailed description -->
<description xml:lang="en"><![CDATA[Translation of Ultracopier to chinese traditional. For more details see the web site.]]></description>
<!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number -->
- <version>2.2.4.7</version>
+ <version>2.2.6.0</version>
<!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. -->
<name>zh_tw</name>
<!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. -->
diff --git a/plugins/Languages/zh_TW/translation.qm b/plugins/Languages/zh_TW/translation.qm
index 0d07322..428093b 100755
--- a/plugins/Languages/zh_TW/translation.qm
+++ b/plugins/Languages/zh_TW/translation.qm
Binary files differ
diff --git a/plugins/Languages/zh_TW/translation.ts b/plugins/Languages/zh_TW/translation.ts
index 1f97d2c..1ff1f24 100755
--- a/plugins/Languages/zh_TW/translation.ts
+++ b/plugins/Languages/zh_TW/translation.ts
@@ -93,91 +93,96 @@
<context>
<name>CopyEngine</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="438"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="461"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="465"/>
<source>The engine is forced to move, you can&apos;t copy with it</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="473"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="496"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="519"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="542"/>
<source>The engine is forced to copy, you can&apos;t move with it</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/>
<source>Destination</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/>
<source>Use the actual destination &quot;%1&quot;?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="685"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/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/Ultracopier-Spec/CopyEngine.cpp" line="976"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="979"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="984"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="988"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="886"/>
+ <source>Supported only on Windows</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1035"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1038"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1043"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1047"/>
<source>Ask</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="977"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="981"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="985"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="989"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1036"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1040"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1044"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1048"/>
<source>Skip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="980"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1039"/>
<source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="982"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="994"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1041"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1053"/>
<source>Rename</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="986"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1045"/>
<source>Put at the end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="990"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1049"/>
<source>Overwrite</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="991"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1050"/>
<source>Overwrite if different</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="992"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1051"/>
<source>Overwrite if newer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="993"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1052"/>
<source>Overwrite if older</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/>
<source>Options error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/>
<source>Options engine is not loaded. Unable to access the filters</source>
<translation type="unfinished"></translation>
</message>
@@ -185,75 +190,76 @@
<context>
<name>CopyEngineFactory</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="303"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="60"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="309"/>
<source>Supported only on Windows</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="430"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="433"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="438"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/>
<source>Ask</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="431"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="435"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="443"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="437"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="441"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="449"/>
<source>Skip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="434"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/>
<source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="454"/>
<source>Rename</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/>
<source>Put at the end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="450"/>
<source>Overwrite</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="451"/>
<source>Overwrite if different</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="452"/>
<source>Overwrite if newer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="447"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="453"/>
<source>Overwrite if older</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/>
<source>Options error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/>
<source>Options engine is not loaded. Unable to access the filters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/>
<source>Options engine is not loaded, can&apos;t access to the filters</source>
<translation type="unfinished"></translation>
</message>
@@ -670,12 +676,12 @@
<context>
<name>FileErrorDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="87"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="92"/>
<source>Error on folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="90"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="95"/>
<source>Folder name</source>
<translation type="unfinished"></translation>
</message>
@@ -683,22 +689,22 @@
<context>
<name>FileExistsDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="191"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="201"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="198"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="208"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/>
<source>Error</source>
<translation type="unfinished">錯誤</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -706,22 +712,22 @@
<context>
<name>FileIsSameDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="140"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="145"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="147"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="152"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/>
<source>Error</source>
<translation type="unfinished">錯誤</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -868,27 +874,27 @@
<context>
<name>FolderExistsDialog</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="84"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="91"/>
<source>Folder already exists</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="164"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="172"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="173"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="181"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/>
<source>Error</source>
<translation type="unfinished">錯誤</translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
@@ -1096,13 +1102,15 @@ This version is compiled as version: %1.</source>
<name>MkPath</name>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="124"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="394"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="464"/>
<source>Unable to remove</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="187"/>
<location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="210"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="363"/>
<source>Unable to create the folder</source>
<translation type="unfinished"></translation>
</message>
@@ -1112,22 +1120,27 @@ This version is compiled as version: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="255"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="304"/>
<source>Unable to temporary rename the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="278"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="339"/>
+ <source>Unable to reverse temporary rename for real move</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="348"/>
<source>Unable to do the final real move the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="309"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="379"/>
<source>Unable to move the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="385"/>
<source>Unable to move the folder: errno: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1206,7 +1219,7 @@ This version is compiled as version: %1.</source>
<message>
<location filename="../../../OptionDialog.ui" line="75"/>
<location filename="../../../OptionDialog.ui" line="366"/>
- <location filename="../../../OptionDialog.cpp" line="290"/>
+ <location filename="../../../OptionDialog.cpp" line="297"/>
<source>Copy engine</source>
<translation type="unfinished"></translation>
</message>
@@ -1260,21 +1273,21 @@ This version is compiled as version: %1.</source>
<message>
<location filename="../../../OptionDialog.ui" line="80"/>
<location filename="../../../OptionDialog.ui" line="379"/>
- <location filename="../../../OptionDialog.cpp" line="291"/>
+ <location filename="../../../OptionDialog.cpp" line="298"/>
<source>Listener</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="85"/>
<location filename="../../../OptionDialog.ui" line="384"/>
- <location filename="../../../OptionDialog.cpp" line="292"/>
+ <location filename="../../../OptionDialog.cpp" line="299"/>
<source>Plugin loader</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../OptionDialog.ui" line="93"/>
<location filename="../../../OptionDialog.ui" line="389"/>
- <location filename="../../../OptionDialog.cpp" line="293"/>
+ <location filename="../../../OptionDialog.cpp" line="300"/>
<source>Session loader</source>
<translation type="unfinished"></translation>
</message>
@@ -1426,75 +1439,75 @@ This version is compiled as version: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="197"/>
- <location filename="../../../OptionDialog.cpp" line="211"/>
+ <location filename="../../../OptionDialog.cpp" line="204"/>
+ <location filename="../../../OptionDialog.cpp" line="218"/>
<source>Load</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="197"/>
+ <location filename="../../../OptionDialog.cpp" line="204"/>
<source>Load the theme?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="211"/>
+ <location filename="../../../OptionDialog.cpp" line="218"/>
<source>Load the language?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="298"/>
+ <location filename="../../../OptionDialog.cpp" line="305"/>
<source>Do nothing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="299"/>
+ <location filename="../../../OptionDialog.cpp" line="306"/>
<source>Ask source as folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="300"/>
+ <location filename="../../../OptionDialog.cpp" line="307"/>
<source>Ask sources as files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="301"/>
+ <location filename="../../../OptionDialog.cpp" line="308"/>
<source>Never</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="302"/>
+ <location filename="../../../OptionDialog.cpp" line="309"/>
<source>When source is same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="303"/>
+ <location filename="../../../OptionDialog.cpp" line="310"/>
<source>When destination is same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="304"/>
+ <location filename="../../../OptionDialog.cpp" line="311"/>
<source>When source and destination are same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="305"/>
+ <location filename="../../../OptionDialog.cpp" line="312"/>
<source>When source or destination are same</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="306"/>
+ <location filename="../../../OptionDialog.cpp" line="313"/>
<source>Always</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="320"/>
- <location filename="../../../OptionDialog.cpp" line="321"/>
- <location filename="../../../OptionDialog.cpp" line="322"/>
+ <location filename="../../../OptionDialog.cpp" line="327"/>
+ <location filename="../../../OptionDialog.cpp" line="328"/>
+ <location filename="../../../OptionDialog.cpp" line="329"/>
<source>The variables are %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../OptionDialog.cpp" line="962"/>
+ <location filename="../../../OptionDialog.cpp" line="969"/>
<source>Save logs as: </source>
<translation type="unfinished"></translation>
</message>
@@ -1771,12 +1784,12 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../ProductKey.cpp" line="56"/>
+ <location filename="../../../ProductKey.cpp" line="60"/>
<source>Error</source>
<translation type="unfinished">錯誤</translation>
</message>
<message>
- <location filename="../../../ProductKey.cpp" line="56"/>
+ <location filename="../../../ProductKey.cpp" line="60"/>
<source>Your product key was rejected.&lt;br /&gt;If you buy key, unmark check your spam and unmark the mail as spam&lt;br /&gt;If you have not buy your key, go to &lt;a href=&quot;https://shop.first-world.info/&quot;&gt;https://shop.first-world.info/&lt;/a&gt;</source>
<translation type="unfinished"></translation>
</message>
@@ -1834,12 +1847,12 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="541"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="543"/>
<source>Unable to read the source file: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="595"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="599"/>
<source>File truncated during the read, possible data change</source>
<translation type="unfinished"></translation>
</message>
@@ -1895,32 +1908,38 @@ Error:%2</source>
<context>
<name>ScanFileOrFolder</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="452"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="454"/>
- <source>%1 - copy</source>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="331"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="681"/>
+ <source>Blacklisted folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="463"/>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="465"/>
- <source>%1 - copy (%2)</source>
+ <source>%1 - copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="576"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="578"/>
- <source>%name% - copy</source>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="474"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="476"/>
+ <source>%1 - copy (%2)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="587"/>
<location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="589"/>
+ <source>%name% - copy</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="598"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="600"/>
<source>%name% - copy (%number%)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="673"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="677"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="691"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="695"/>
<source>Problem with folder read</source>
<translation type="unfinished"></translation>
</message>
@@ -2031,61 +2050,61 @@ Error:%2</source>
<context>
<name>Themes</name>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="328"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="341"/>
<source>Buy the Ultimate version to fund development</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="328"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="341"/>
<source>Register your key</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="427"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="440"/>
<source>File %1/%2, size: %3/%4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="661"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="674"/>
<source>Copy list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="663"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="676"/>
<source>Move list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1091"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1117"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1092"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1118"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1093"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1119"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1095"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1121"/>
<source>File Name, 0KB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1289"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1301"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1313"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1395"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1407"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1419"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1388"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1392"/>
- <location filename="../../Themes/Oxygen/interface.cpp" line="1394"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1494"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1498"/>
+ <location filename="../../Themes/Oxygen/interface.cpp" line="1500"/>
<source>%1 %2% of %3</source>
<translation type="unfinished"></translation>
</message>
@@ -2093,24 +2112,24 @@ Error:%2</source>
<context>
<name>ThemesFactory</name>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="284"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="294"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="285"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="295"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="286"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="296"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="482"/>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="497"/>
- <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="512"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="510"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="525"/>
+ <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="540"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
@@ -2118,29 +2137,29 @@ Error:%2</source>
<context>
<name>TransferThread</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="179"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="188"/>
<source>Try rename with using special characters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="613"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="628"/>
<source>%name% - copy%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="620"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="635"/>
<source>%name% - copy (%number%)%suffix%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="648"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="663"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/>
<source>File not found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="925"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="940"/>
<source>Unable to change the date</source>
<translation type="unfinished"></translation>
</message>
@@ -2148,19 +2167,19 @@ Error:%2</source>
<context>
<name>TransferThreadAsync</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="340"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/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="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="428"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="446"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="436"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="454"/>
<source>Unable to create the destination folder: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="431"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="448"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="439"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="456"/>
<source>Unable to create the destination folder, errno: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -2168,24 +2187,24 @@ Error:%2</source>
<context>
<name>WriteThread</name>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="135"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="138"/>
<source>Path resolution error (Empty path)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="164"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="197"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="167"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="200"/>
<source>Unable to create the destination folder: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="175"/>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="199"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="178"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="202"/>
<source>Unable to create the destination folder, errno: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="456"/>
+ <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="464"/>
<source>Internal error, please report it!</source>
<translation type="unfinished"></translation>
</message>
@@ -2500,7 +2519,7 @@ Error:%2</source>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="341"/>
- <source>Overwrite if newer</source>
+ <source>Overwrite if source newer than destination</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2511,8 +2530,12 @@ Error:%2</source>
</message>
<message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="354"/>
+ <source>Overwrite if source older than destination</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="357"/>
- <source>Overwrite if older</source>
+ <source>Overwrite if destination older</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2900,7 +2923,7 @@ Error:%2</source>
</message>
<message>
<location filename="../../Themes/Oxygen/themesOptions.ui" line="213"/>
- <source>Informations</source>
+ <source>Information</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2914,28 +2937,38 @@ Error:%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="257"/>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="269"/>
+ <source>Click to edit the color</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="368"/>
<source>Speed with progress bar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="267"/>
- <source>Show dual progression</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="378"/>
+ <source>Progression color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="277"/>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="388"/>
<source>Show progression in the title</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="287"/>
- <source>Progression color</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="395"/>
+ <source>General margin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../Themes/Oxygen/themesOptions.ui" line="306"/>
- <source>Click to edit the color</source>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="402"/>
+ <source>Show dual progression</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../Themes/Oxygen/themesOptions.ui" line="425"/>
+ <source>General spacing</source>
<translation type="unfinished"></translation>
</message>
</context>