diff options
Diffstat (limited to 'plugins/CopyEngine')
36 files changed, 3180 insertions, 3112 deletions
diff --git a/plugins/CopyEngine/README.md b/plugins/CopyEngine/README.md new file mode 100644 index 0000000..317a7e4 --- /dev/null +++ b/plugins/CopyEngine/README.md @@ -0,0 +1,3 @@ +# Copy Engine + +This plugin type execute the copy/move to do diff --git a/plugins/CopyEngine/Rsync/README.md b/plugins/CopyEngine/Rsync/README.md new file mode 100644 index 0000000..94452a4 --- /dev/null +++ b/plugins/CopyEngine/Rsync/README.md @@ -0,0 +1,6 @@ +# Copy Engine: Rsync + +This copy engine uses the `rsync` command. It is implemented by compile switches +in the same code as the default _Ultracopier_ copy engine. + +Not same code due to delete part, to prevent error from some user diff --git a/plugins/CopyEngine/Rsync/informations.xml b/plugins/CopyEngine/Rsync/informations.xml index 5f1f5ed..990809e 100644 --- a/plugins/CopyEngine/Rsync/informations.xml +++ b/plugins/CopyEngine/Rsync/informations.xml @@ -17,7 +17,7 @@ <description xml:lang="en"><![CDATA[Rsync copy engine, variant of the official copy engine to provide simple way to do backups]]></description> <description xml:lang="fr"><![CDATA[Moteur de copie rsync, variante du moteur de copie officiel pour fournir une maniĆ©re simple de faire des backups]]></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>1.4.0.8</version> + <version>1.6.1.3</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>Rsync</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/CopyEngine/Ultracopier/CopyEngineFactory.cpp b/plugins/CopyEngine/Ultracopier/CopyEngineFactory.cpp index 6822481..ce86c94 100644 --- a/plugins/CopyEngine/Ultracopier/CopyEngineFactory.cpp +++ b/plugins/CopyEngine/Ultracopier/CopyEngineFactory.cpp @@ -182,10 +182,12 @@ void CopyEngineFactory::setResources(OptionInterface * options,const std::string size_t max_memory=getTotalSystemMemory()/1024; if(max_memory>0) { + if(max_memory>2147483648) + max_memory=2147483648; if(sequentialBuffer>(max_memory/10)) - sequentialBuffer=max_memory/10; + sequentialBuffer=max_memory/10; if(parallelBuffer>(max_memory/100)) - parallelBuffer=max_memory/100; + parallelBuffer=max_memory/100; } ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,QStringLiteral("detected memory: %1MB").arg(max_memory/1024).toStdString()); #endif @@ -223,62 +225,11 @@ void CopyEngineFactory::setResources(OptionInterface * options,const std::string KeysList.push_back(std::pair<std::string, std::string>("inodeThreads",std::to_string(1))); KeysList.push_back(std::pair<std::string, std::string>("copyListOrder","false")); options->addOptionGroup(KeysList); - #if ! defined (Q_CC_GNU) - ui->keepDate->setEnabled(false); - ui->keepDate->setToolTip(QStringLiteral("Not supported with this compiler")); - #endif - ui->doRightTransfer->setChecked(stringtobool(options->getOptionValue("doRightTransfer"))); - ui->keepDate->setChecked(stringtobool(options->getOptionValue("keepDate"))); - ui->blockSize->setValue(stringtouint32(options->getOptionValue("blockSize")));//keep before sequentialBuffer and parallelBuffer - ui->autoStart->setChecked(stringtobool(options->getOptionValue("autoStart"))); - #ifdef ULTRACOPIER_PLUGIN_RSYNC - ui->rsync->setChecked(stringtobool(options->getOptionValue("rsync"))); - #else - ui->label_rsync->setVisible(false); - ui->rsync->setVisible(false); - #endif - ui->comboBoxFolderError->setCurrentIndex(stringtouint32(options->getOptionValue("folderError"))); - ui->comboBoxFolderCollision->setCurrentIndex(stringtouint32(options->getOptionValue("folderCollision"))); - ui->comboBoxFileError->setCurrentIndex(stringtouint32(options->getOptionValue("fileError"))); - ui->comboBoxFileCollision->setCurrentIndex(stringtouint32(options->getOptionValue("fileCollision"))); - ui->transferAlgorithm->setCurrentIndex(stringtouint32(options->getOptionValue("transferAlgorithm"))); - ui->checkBoxDestinationFolderExists->setChecked(stringtobool(options->getOptionValue("checkDestinationFolder"))); - ui->parallelizeIfSmallerThan->setValue(stringtouint32(options->getOptionValue("parallelizeIfSmallerThan"))); - ui->sequentialBuffer->setValue(stringtouint32(options->getOptionValue("sequentialBuffer"))); - ui->parallelBuffer->setValue(stringtouint32(options->getOptionValue("parallelBuffer"))); - ui->sequentialBuffer->setSingleStep(ui->blockSize->value()); - ui->parallelBuffer->setSingleStep(ui->blockSize->value()); - ui->deletePartiallyTransferredFiles->setChecked(stringtobool(options->getOptionValue("deletePartiallyTransferredFiles"))); - ui->moveTheWholeFolder->setChecked(stringtobool(options->getOptionValue("moveTheWholeFolder"))); - ui->followTheStrictOrder->setChecked(stringtobool(options->getOptionValue("followTheStrictOrder"))); - ui->inodeThreads->setValue(stringtouint32(options->getOptionValue("inodeThreads"))); - ui->renameTheOriginalDestination->setChecked(stringtobool(options->getOptionValue("renameTheOriginalDestination"))); - ui->checkDiskSpace->setChecked(stringtobool(options->getOptionValue("checkDiskSpace"))); - ui->defaultDestinationFolder->setText(QString::fromStdString(options->getOptionValue("defaultDestinationFolder"))); - - ui->doChecksum->setChecked(stringtobool(options->getOptionValue("doChecksum"))); - ui->checksumIgnoreIfImpossible->setChecked(stringtobool(options->getOptionValue("checksumIgnoreIfImpossible"))); - ui->checksumOnlyOnError->setChecked(stringtobool(options->getOptionValue("checksumOnlyOnError"))); - - ui->osBuffer->setChecked(stringtobool(options->getOptionValue("osBuffer"))); - ui->osBufferLimited->setChecked(stringtobool(options->getOptionValue("osBufferLimited"))); - ui->osBufferLimit->setValue(stringtouint32(options->getOptionValue("osBufferLimit"))); - //ui->autoStart->setChecked(options->getOptionValue("autoStart").toBool());//moved from options(), wrong previous place - includeStrings=stringtostringlist(options->getOptionValue("includeStrings")); - includeOptions=stringtostringlist(options->getOptionValue("includeOptions")); - excludeStrings=stringtostringlist(options->getOptionValue("excludeStrings")); - excludeOptions=stringtostringlist(options->getOptionValue("excludeOptions")); - filters->setFilters(includeStrings,includeOptions,excludeStrings,excludeOptions); - firstRenamingRule=options->getOptionValue("firstRenamingRule"); - otherRenamingRule=options->getOptionValue("otherRenamingRule"); - renamingRules->setRenamingRules(firstRenamingRule,otherRenamingRule); - - ui->checksumOnlyOnError->setEnabled(ui->doChecksum->isChecked()); - ui->checksumIgnoreIfImpossible->setEnabled(ui->doChecksum->isChecked()); - ui->copyListOrder->setChecked(stringtobool(options->getOptionValue("copyListOrder"))); - updateBufferCheckbox(); optionsEngine=options; + resetOptions(); + + updateBufferCheckbox(); updatedBlockSize(); } @@ -315,6 +266,63 @@ bool CopyEngineFactory::canDoOnlyCopy() const void CopyEngineFactory::resetOptions() { + auto options=optionsEngine; + optionsEngine=NULL; + #if ! defined (Q_CC_GNU) + ui->keepDate->setEnabled(false); + ui->keepDate->setToolTip(QStringLiteral("Not supported with this compiler")); + #endif + ui->doRightTransfer->setChecked(stringtobool(options->getOptionValue("doRightTransfer"))); + ui->keepDate->setChecked(stringtobool(options->getOptionValue("keepDate"))); + ui->blockSize->setValue(stringtouint32(options->getOptionValue("blockSize")));//keep before sequentialBuffer and parallelBuffer + ui->autoStart->setChecked(stringtobool(options->getOptionValue("autoStart"))); + #ifdef ULTRACOPIER_PLUGIN_RSYNC + ui->rsync->setChecked(stringtobool(options->getOptionValue("rsync"))); + #else + ui->label_rsync->setVisible(false); + ui->rsync->setVisible(false); + #endif + ui->comboBoxFolderError->setCurrentIndex(stringtouint32(options->getOptionValue("folderError"))); + ui->comboBoxFolderCollision->setCurrentIndex(stringtouint32(options->getOptionValue("folderCollision"))); + ui->comboBoxFileError->setCurrentIndex(stringtouint32(options->getOptionValue("fileError"))); + ui->comboBoxFileCollision->setCurrentIndex(stringtouint32(options->getOptionValue("fileCollision"))); + ui->transferAlgorithm->setCurrentIndex(stringtouint32(options->getOptionValue("transferAlgorithm"))); + ui->checkBoxDestinationFolderExists->setChecked(stringtobool(options->getOptionValue("checkDestinationFolder"))); + ui->parallelizeIfSmallerThan->setValue(stringtouint32(options->getOptionValue("parallelizeIfSmallerThan"))); + ui->sequentialBuffer->setValue(stringtouint32(options->getOptionValue("sequentialBuffer"))); + ui->parallelBuffer->setValue(stringtouint32(options->getOptionValue("parallelBuffer"))); + ui->sequentialBuffer->setSingleStep(ui->blockSize->value()); + ui->parallelBuffer->setSingleStep(ui->blockSize->value()); + ui->deletePartiallyTransferredFiles->setChecked(stringtobool(options->getOptionValue("deletePartiallyTransferredFiles"))); + ui->moveTheWholeFolder->setChecked(stringtobool(options->getOptionValue("moveTheWholeFolder"))); + ui->followTheStrictOrder->setChecked(stringtobool(options->getOptionValue("followTheStrictOrder"))); + ui->inodeThreads->setValue(stringtouint32(options->getOptionValue("inodeThreads"))); + ui->renameTheOriginalDestination->setChecked(stringtobool(options->getOptionValue("renameTheOriginalDestination"))); + ui->checkDiskSpace->setChecked(stringtobool(options->getOptionValue("checkDiskSpace"))); + ui->defaultDestinationFolder->setText(QString::fromStdString(options->getOptionValue("defaultDestinationFolder"))); + + ui->doChecksum->setChecked(stringtobool(options->getOptionValue("doChecksum"))); + ui->checksumIgnoreIfImpossible->setChecked(stringtobool(options->getOptionValue("checksumIgnoreIfImpossible"))); + ui->checksumOnlyOnError->setChecked(stringtobool(options->getOptionValue("checksumOnlyOnError"))); + + ui->osBuffer->setChecked(stringtobool(options->getOptionValue("osBuffer"))); + ui->osBufferLimited->setChecked(stringtobool(options->getOptionValue("osBufferLimited"))); + ui->osBufferLimit->setValue(stringtouint32(options->getOptionValue("osBufferLimit"))); + //ui->autoStart->setChecked(options->getOptionValue("autoStart").toBool());//moved from options(), wrong previous place + includeStrings=stringtostringlist(options->getOptionValue("includeStrings")); + includeOptions=stringtostringlist(options->getOptionValue("includeOptions")); + excludeStrings=stringtostringlist(options->getOptionValue("excludeStrings")); + excludeOptions=stringtostringlist(options->getOptionValue("excludeOptions")); + filters->setFilters(includeStrings,includeOptions,excludeStrings,excludeOptions); + firstRenamingRule=options->getOptionValue("firstRenamingRule"); + otherRenamingRule=options->getOptionValue("otherRenamingRule"); + renamingRules->setRenamingRules(firstRenamingRule,otherRenamingRule); + + ui->checksumOnlyOnError->setEnabled(ui->doChecksum->isChecked()); + ui->checksumIgnoreIfImpossible->setEnabled(ui->doChecksum->isChecked()); + ui->copyListOrder->setChecked(stringtobool(options->getOptionValue("copyListOrder"))); + + optionsEngine=options; } QWidget * CopyEngineFactory::options() diff --git a/plugins/CopyEngine/Ultracopier/FileExistsDialog.cpp b/plugins/CopyEngine/Ultracopier/FileExistsDialog.cpp index 91df1f8..10b8543 100644 --- a/plugins/CopyEngine/Ultracopier/FileExistsDialog.cpp +++ b/plugins/CopyEngine/Ultracopier/FileExistsDialog.cpp @@ -134,30 +134,26 @@ void FileExistsDialog::on_SuggestNewName_clicked() if(num==1) { if(firstRenamingRule.empty()) - newFileName=tr("%1 - copy").arg(fileName); + newFileName=tr("%name% - copy%suffix%"); else - { newFileName=QString::fromStdString(firstRenamingRule); - newFileName.replace("%name%",fileName); - } } else { if(otherRenamingRule.empty()) - newFileName=tr("%1 - copy (%2)").arg(fileName).arg(num); + newFileName=tr("%name% - copy (%number%)%suffix%"); else - { newFileName=QString::fromStdString(otherRenamingRule); - newFileName.replace(QStringLiteral("%name%"),fileName); - newFileName.replace(QStringLiteral("%number%"),QString::number(num)); - } + newFileName.replace(QStringLiteral("%number%"),QString::number(num)); } - destination=absolutePath+CURRENTSEPARATOR+newFileName+suffix; + newFileName.replace(QStringLiteral("%name%"),fileName); + newFileName.replace(QStringLiteral("%suffix%"),suffix); + destination=absolutePath+CURRENTSEPARATOR+newFileName; destinationInfo.setFile(destination); num++; } while(destinationInfo.exists()); - ui->lineEditNewName->setText(newFileName+suffix); + ui->lineEditNewName->setText(newFileName); } void FileExistsDialog::on_Rename_clicked() diff --git a/plugins/CopyEngine/Ultracopier/FileIsSameDialog.cpp b/plugins/CopyEngine/Ultracopier/FileIsSameDialog.cpp index 3bee3ae..7683d1d 100644 --- a/plugins/CopyEngine/Ultracopier/FileIsSameDialog.cpp +++ b/plugins/CopyEngine/Ultracopier/FileIsSameDialog.cpp @@ -108,30 +108,26 @@ void FileIsSameDialog::on_SuggestNewName_clicked() if(num==1) { if(firstRenamingRule.empty()) - newFileName=tr("%1 - copy").arg(fileName); + newFileName=tr("%name% - copy"); else - { newFileName=QString::fromStdString(firstRenamingRule); - newFileName.replace(QStringLiteral("%name%"),fileName); - } } else { if(otherRenamingRule.empty()) - newFileName=tr("%1 - copy (%2)").arg(fileName).arg(num); + newFileName=tr("%name% - copy (%number%)"); else - { newFileName=QString::fromStdString(otherRenamingRule); - newFileName.replace(QStringLiteral("%name%"),fileName); - newFileName.replace(QStringLiteral("%number%"),QString::number(num)); - } + newFileName.replace(QStringLiteral("%number%"),QString::number(num)); } + newFileName.replace(QStringLiteral("%name%"),fileName); + newFileName.replace(QStringLiteral("%suffix%"),suffix); destination=absolutePath+CURRENTSEPARATOR+newFileName+suffix; destinationInfo.setFile(destination); num++; } while(destinationInfo.exists()); - ui->lineEditNewName->setText(newFileName+suffix); + ui->lineEditNewName->setText(newFileName); } void FileIsSameDialog::on_Rename_clicked() diff --git a/plugins/CopyEngine/Ultracopier/FolderExistsDialog.cpp b/plugins/CopyEngine/Ultracopier/FolderExistsDialog.cpp index d05a715..59466ed 100644 --- a/plugins/CopyEngine/Ultracopier/FolderExistsDialog.cpp +++ b/plugins/CopyEngine/Ultracopier/FolderExistsDialog.cpp @@ -119,30 +119,27 @@ void FolderExistsDialog::on_SuggestNewName_clicked() if(num==1) { if(firstRenamingRule.empty()) - newFileName=tr("%1 - copy").arg(fileName); + newFileName=tr("%name% - copy"); else { newFileName=QString::fromStdString(firstRenamingRule); - newFileName.replace(QStringLiteral("%name%"),fileName); } } else { if(otherRenamingRule.empty()) - newFileName=tr("%1 - copy (%2)").arg(fileName).arg(num); + newFileName=tr("%name% - copy (%number%)"); else - { newFileName=QString::fromStdString(otherRenamingRule); - newFileName.replace(QStringLiteral("%name%"),fileName); - newFileName.replace(QStringLiteral("%number%"),QString::number(num)); - } + newFileName.replace(QStringLiteral("%number%"),QString::number(num)); } + newFileName.replace(QStringLiteral("%name%"),fileName); destination=absolutePath+CURRENTSEPARATOR+newFileName+suffix; destinationInfo.setFile(destination); num++; } while(destinationInfo.exists()); - ui->lineEditNewName->setText(newFileName+suffix); + ui->lineEditNewName->setText(newFileName); } void FolderExistsDialog::on_Rename_clicked() diff --git a/plugins/CopyEngine/Ultracopier/Languages/ar/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/ar/translation.ts index 4d395a0..e17b3f2 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/ar/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/ar/translation.ts @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="419"/> - <location filename="../../CopyEngineFactory.cpp" line="422"/> <location filename="../../CopyEngineFactory.cpp" line="427"/> - <location filename="../../CopyEngineFactory.cpp" line="431"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> <location filename="../../CopyEngineFactory.cpp" line="428"/> <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="425"/> - <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="443"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="447"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -274,21 +274,21 @@ <name>FileExistsDialog</name> <message> <location filename="../../FileExistsDialog.cpp" line="137"/> - <source>%1 - copy</source> + <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="147"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileExistsDialog.cpp" line="144"/> + <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -297,21 +297,21 @@ <name>FileIsSameDialog</name> <message> <location filename="../../FileIsSameDialog.cpp" line="111"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="121"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileIsSameDialog.cpp" line="118"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -464,21 +464,21 @@ </message> <message> <location filename="../../FolderExistsDialog.cpp" line="122"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="132"/> - <source>%1 - copy (%2)</source> + <location filename="../../FolderExistsDialog.cpp" line="131"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -486,49 +486,49 @@ <context> <name>ListThread</name> <message> - <location filename="../../ListThread.cpp" line="1482"/> - <location filename="../../ListThread.cpp" line="2414"/> + <location filename="../../ListThread.cpp" line="1487"/> + <location filename="../../ListThread.cpp" line="2419"/> <source>Unable do to move or copy item into wrong forced mode: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1489"/> - <location filename="../../ListThread.cpp" line="2421"/> + <location filename="../../ListThread.cpp" line="1494"/> + <location filename="../../ListThread.cpp" line="2426"/> <source>Unable to save the transfer list: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1505"/> + <location filename="../../ListThread.cpp" line="1510"/> <source>Problem reading file, or file-size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1512"/> + <location filename="../../ListThread.cpp" line="1517"/> <source>Wrong header: "%1"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1521"/> + <location filename="../../ListThread.cpp" line="1526"/> <source>The transfer list is in mixed mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1530"/> + <location filename="../../ListThread.cpp" line="1535"/> <source>The transfer list is in copy mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1536"/> + <location filename="../../ListThread.cpp" line="1541"/> <source>The transfer list is in move mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1599"/> + <location filename="../../ListThread.cpp" line="1604"/> <source>Some errors have been found during the line parsing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1607"/> + <location filename="../../ListThread.cpp" line="1612"/> <source>Unable to open the transfer list: %1</source> <translation type="unfinished"></translation> </message> @@ -570,24 +570,24 @@ <context> <name>ReadThread</name> <message> - <location filename="../../ReadThread.cpp" line="55"/> + <location filename="../../ReadThread.cpp" line="59"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="184"/> + <location filename="../../ReadThread.cpp" line="188"/> <source>Internal error reading the source file:block size out of range</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="192"/> - <location filename="../../ReadThread.cpp" line="408"/> + <location filename="../../ReadThread.cpp" line="196"/> + <location filename="../../ReadThread.cpp" line="420"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="233"/> - <location filename="../../ReadThread.cpp" line="456"/> + <location filename="../../ReadThread.cpp" line="237"/> + <location filename="../../ReadThread.cpp" line="468"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -595,37 +595,31 @@ <context> <name>RenamingRules</name> <message> - <location filename="../../RenamingRules.ui" line="26"/> + <location filename="../../RenamingRules.ui" line="35"/> <source>First renaming</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="32"/> - <source>%name% - copy</source> + <location filename="../../RenamingRules.ui" line="41"/> + <source>%name% - copy%suffix%</source> <extracomment>%name% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="39"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p></body></html></source> - <extracomment> should not be translated</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../RenamingRules.ui" line="49"/> - <source>Second renaming</source> + <location filename="../../RenamingRules.ui" line="57"/> + <source>%name% - copy (%number%)%suffix%</source> + <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="55"/> - <source>%name% - copy (%number%)</source> + <location filename="../../RenamingRules.ui" line="67"/> + <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name, <span style=" font-weight:600;">%number%</span> for the extra number, <span style=" font-weight:600;">%suffix%</span> file suffix</p></body></html></source> <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="62"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p><p><span style=" font-weight:600;">%number%</span> for the extra number</p></body></html></source> - <extracomment>%name%, %number% should not be translated</extracomment> + <location filename="../../RenamingRules.ui" line="51"/> + <source>Second renaming</source> <translation type="unfinished"></translation> </message> <message> @@ -655,33 +649,41 @@ </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="338"/> - <location filename="../../ScanFileOrFolder.cpp" line="404"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="348"/> - <location filename="../../ScanFileOrFolder.cpp" line="414"/> + <location filename="../../ScanFileOrFolder.cpp" line="345"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> + <location filename="../../ScanFileOrFolder.cpp" line="401"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="408"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="444"/> <source>This is not a folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> + <location filename="../../ScanFileOrFolder.cpp" line="446"/> <source>The folder does exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="448"/> <source>The folder is not readable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="467"/> + <location filename="../../ScanFileOrFolder.cpp" line="459"/> <source>Problem with name encoding</source> <translation type="unfinished"></translation> </message> @@ -690,9 +692,9 @@ <name>TransferThread</name> <message> <location filename="../../TransferThread.cpp" line="244"/> - <location filename="../../TransferThread.cpp" line="677"/> - <location filename="../../TransferThread.cpp" line="749"/> - <location filename="../../TransferThread.cpp" line="1319"/> + <location filename="../../TransferThread.cpp" line="673"/> + <location filename="../../TransferThread.cpp" line="745"/> + <location filename="../../TransferThread.cpp" line="1315"/> <source>File not found</source> <translation type="unfinished"></translation> </message> @@ -725,60 +727,60 @@ </message> <message> <location filename="../../TransferThread.cpp" line="645"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="655"/> - <source>%1 - copy (%2)</source> + <location filename="../../TransferThread.cpp" line="652"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="715"/> - <location filename="../../TransferThread.cpp" line="830"/> + <location filename="../../TransferThread.cpp" line="711"/> + <location filename="../../TransferThread.cpp" line="826"/> <source>The source file doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="755"/> - <location filename="../../TransferThread.cpp" line="842"/> + <location filename="../../TransferThread.cpp" line="751"/> + <location filename="../../TransferThread.cpp" line="838"/> <source>Unable to do the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="791"/> + <location filename="../../TransferThread.cpp" line="787"/> <source>The source doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="836"/> + <location filename="../../TransferThread.cpp" line="832"/> <source>Another file exists at same place</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1138"/> + <location filename="../../TransferThread.cpp" line="1134"/> <source>The checksums do not match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1228"/> + <location filename="../../TransferThread.cpp" line="1224"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1243"/> + <location filename="../../TransferThread.cpp" line="1239"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1254"/> + <location filename="../../TransferThread.cpp" line="1250"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1319"/> - <location filename="../../TransferThread.cpp" line="1337"/> - <location filename="../../TransferThread.cpp" line="1352"/> + <location filename="../../TransferThread.cpp" line="1315"/> + <location filename="../../TransferThread.cpp" line="1333"/> + <location filename="../../TransferThread.cpp" line="1348"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -791,22 +793,22 @@ <context> <name>WriteThread</name> <message> - <location filename="../../WriteThread.cpp" line="80"/> + <location filename="../../WriteThread.cpp" line="83"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="269"/> + <location filename="../../WriteThread.cpp" line="277"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="672"/> + <location filename="../../WriteThread.cpp" line="680"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="697"/> + <location filename="../../WriteThread.cpp" line="705"/> <source>File truncated during read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -814,198 +816,198 @@ <context> <name>copyEngineOptions</name> <message> - <location filename="../../copyEngineOptions.ui" line="35"/> + <location filename="../../copyEngineOptions.ui" line="44"/> <source>Transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="44"/> + <location filename="../../copyEngineOptions.ui" line="53"/> <source>Move the whole folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="51"/> + <location filename="../../copyEngineOptions.ui" line="60"/> <source>Transfer the file rights</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="61"/> + <location filename="../../copyEngineOptions.ui" line="70"/> <source>Keep the file date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="74"/> + <location filename="../../copyEngineOptions.ui" line="83"/> <source>Autostart the transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="81"/> - <location filename="../../copyEngineOptions.ui" line="101"/> + <location filename="../../copyEngineOptions.ui" line="90"/> + <location filename="../../copyEngineOptions.ui" line="110"/> <source>Less performance if checked</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="104"/> + <location filename="../../copyEngineOptions.ui" line="113"/> <source>Follow the strict order</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="130"/> + <location filename="../../copyEngineOptions.ui" line="139"/> <source>Error and collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="136"/> + <location filename="../../copyEngineOptions.ui" line="145"/> <source>When folder error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="146"/> + <location filename="../../copyEngineOptions.ui" line="155"/> <source>When file error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="172"/> + <location filename="../../copyEngineOptions.ui" line="181"/> <source>When file collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="232"/> + <location filename="../../copyEngineOptions.ui" line="241"/> <source>When folder collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="263"/> + <location filename="../../copyEngineOptions.ui" line="272"/> <source>Check if destination folder exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="270"/> + <location filename="../../copyEngineOptions.ui" line="279"/> <source>Renaming rules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="290"/> + <location filename="../../copyEngineOptions.ui" line="299"/> <source>Delete partially transferred files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="303"/> + <location filename="../../copyEngineOptions.ui" line="312"/> <source>Rename the original destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="334"/> + <location filename="../../copyEngineOptions.ui" line="343"/> <source>Control</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="340"/> + <location filename="../../copyEngineOptions.ui" line="349"/> <source>Checksum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="349"/> + <location filename="../../copyEngineOptions.ui" line="358"/> <source>Only after error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="356"/> + <location filename="../../copyEngineOptions.ui" line="365"/> <source>Ignore if impossible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="373"/> + <location filename="../../copyEngineOptions.ui" line="382"/> <source>Verify checksums</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="405"/> + <location filename="../../copyEngineOptions.ui" line="414"/> <source>Performance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="411"/> + <location filename="../../copyEngineOptions.ui" line="420"/> <source>Parallel buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="418"/> - <location filename="../../copyEngineOptions.ui" line="431"/> - <location filename="../../copyEngineOptions.ui" line="444"/> - <location filename="../../copyEngineOptions.ui" line="481"/> - <location filename="../../copyEngineOptions.ui" line="550"/> + <location filename="../../copyEngineOptions.ui" line="427"/> + <location filename="../../copyEngineOptions.ui" line="440"/> + <location filename="../../copyEngineOptions.ui" line="453"/> + <location filename="../../copyEngineOptions.ui" line="490"/> + <location filename="../../copyEngineOptions.ui" line="559"/> <source>KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="460"/> + <location filename="../../copyEngineOptions.ui" line="469"/> <source>Block size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="467"/> + <location filename="../../copyEngineOptions.ui" line="476"/> <source>Sequential buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="474"/> + <location filename="../../copyEngineOptions.ui" line="483"/> <source>Enable OS buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="497"/> + <location filename="../../copyEngineOptions.ui" line="506"/> <source>OS buffer only if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="504"/> + <location filename="../../copyEngineOptions.ui" line="513"/> <source>Transfer algorithm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="543"/> + <location filename="../../copyEngineOptions.ui" line="552"/> <source>Parallelize if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="573"/> - <source>Inode threads</source> + <location filename="../../copyEngineOptions.ui" line="582"/> + <source>Inode threads (unsafe > 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="580"/> - <location filename="../../copyEngineOptions.ui" line="590"/> + <location filename="../../copyEngineOptions.ui" line="589"/> + <location filename="../../copyEngineOptions.ui" line="599"/> <source>More cpu, but better organisation on the disk</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="593"/> + <location filename="../../copyEngineOptions.ui" line="602"/> <source>Order the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="609"/> + <location filename="../../copyEngineOptions.ui" line="618"/> <source>Misc</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="615"/> + <location filename="../../copyEngineOptions.ui" line="624"/> <source>Check the disk space</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="625"/> + <location filename="../../copyEngineOptions.ui" line="634"/> <source>Use this folder when destination is not set</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="637"/> + <location filename="../../copyEngineOptions.ui" line="646"/> <source>Browse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="659"/> + <location filename="../../copyEngineOptions.ui" line="668"/> <source>Filters</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/CopyEngine/Ultracopier/Languages/de/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/de/translation.ts index 5f57544..fb6408e 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/de/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/de/translation.ts @@ -147,85 +147,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="419"/> - <location filename="../../CopyEngineFactory.cpp" line="422"/> <location filename="../../CopyEngineFactory.cpp" line="427"/> - <location filename="../../CopyEngineFactory.cpp" line="431"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Ask</source> <translation>Fragen</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> <location filename="../../CopyEngineFactory.cpp" line="428"/> <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Skip</source> <translation>Ćberspringen</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Merge</source> <translation>Fusionieren</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="425"/> - <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> <source>Rename</source> <translation>Umbenennen</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> <source>Put at the end</source> <translation>Ans Ende verschieben</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> <source>Overwrite</source> <translation>Ćberschreiben</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> <source>Overwrite if different</source> <translation>Ćberschreiben, falls verschieden</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="443"/> <source>Overwrite if newer</source> <translation>Ćberschreiben, falls neuer</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> <source>Overwrite if older</source> <translation>Ćberschreiben, falls Ƥlter</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="447"/> <source>Automatic</source> <translation>Automatisch</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Sequential</source> <translation>Sequentiell</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Parallel</source> <translation>Parallel</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options error</source> <translation>Fehlerhafte Optionen</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation>Option nicht geladen - Kein Zugriff auf Filter</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options engine is not loaded, can't access to the filters</source> <translation>Option nicht geladen - Kann nicht auf Filter zugreifen</translation> </message> @@ -275,21 +275,21 @@ <name>FileExistsDialog</name> <message> <location filename="../../FileExistsDialog.cpp" line="137"/> - <source>%1 - copy</source> - <translation>%1 - Kopie</translation> + <source>%name% - copy%suffix%</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="147"/> - <source>%1 - copy (%2)</source> - <translation>%1 - Kopie (%2)</translation> + <location filename="../../FileExistsDialog.cpp" line="144"/> + <source>%name% - copy (%number%)%suffix%</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Try rename with using special characters</source> <translation>Versuche Umbenennung mit Sonderzeichen</translation> </message> @@ -298,21 +298,21 @@ <name>FileIsSameDialog</name> <message> <location filename="../../FileIsSameDialog.cpp" line="111"/> - <source>%1 - copy</source> - <translation>%1 - kopieren</translation> + <source>%name% - copy</source> + <translation type="unfinished">%name% - Kopie</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="121"/> - <source>%1 - copy (%2)</source> - <translation>%1 - kopieren (%2)</translation> + <location filename="../../FileIsSameDialog.cpp" line="118"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">%name% - Kopie (%number%)</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Try rename with using special characters</source> <translation>Versuche Umbenennung mit Sonderzeichen</translation> </message> @@ -465,21 +465,21 @@ </message> <message> <location filename="../../FolderExistsDialog.cpp" line="122"/> - <source>%1 - copy</source> - <translation>%1 - Kopie</translation> + <source>%name% - copy</source> + <translation type="unfinished">%name% - Kopie</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="132"/> - <source>%1 - copy (%2)</source> - <translation>%1 - Kopie (%2)</translation> + <location filename="../../FolderExistsDialog.cpp" line="131"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">%name% - Kopie (%number%)</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Try rename with using special characters</source> <translation>Versuche Umbenennung mit Sonderzeichen</translation> </message> @@ -487,49 +487,49 @@ <context> <name>ListThread</name> <message> - <location filename="../../ListThread.cpp" line="1482"/> - <location filename="../../ListThread.cpp" line="2414"/> + <location filename="../../ListThread.cpp" line="1487"/> + <location filename="../../ListThread.cpp" line="2419"/> <source>Unable do to move or copy item into wrong forced mode: %1</source> <translation>Falscher Modus: %1 - Kann Element nicht verschieben oder kopieren</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1489"/> - <location filename="../../ListThread.cpp" line="2421"/> + <location filename="../../ListThread.cpp" line="1494"/> + <location filename="../../ListThread.cpp" line="2426"/> <source>Unable to save the transfer list: %1</source> <translation>Konnte die Transferliste: %1 nicht speichern</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1505"/> + <location filename="../../ListThread.cpp" line="1510"/> <source>Problem reading file, or file-size is 0</source> <translation>Lesefehler, oder DateigrƶĆe=0</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1512"/> + <location filename="../../ListThread.cpp" line="1517"/> <source>Wrong header: "%1"</source> <translation>Falscher Header: "%1"</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1521"/> + <location filename="../../ListThread.cpp" line="1526"/> <source>The transfer list is in mixed mode, but this instance is not in this mode</source> <translation>Die Transferliste ist im gemischten Modus, aber diese Instanz ist nicht im selben Modus</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1530"/> + <location filename="../../ListThread.cpp" line="1535"/> <source>The transfer list is in copy mode, but this instance is not in this mode</source> <translation>Die Transferliste ist im Kopiermodus, aber diese Instanz ist nicht im selben Modus</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1536"/> + <location filename="../../ListThread.cpp" line="1541"/> <source>The transfer list is in move mode, but this instance is not in this mode</source> <translation>Die Transferliste ist im Verschiebe-Modus, aber diese Instanz ist nicht im selben Modus</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1599"/> + <location filename="../../ListThread.cpp" line="1604"/> <source>Some errors have been found during the line parsing</source> <translation>Bei der Zeilenanalyse sind Fehler aufgetreten</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1607"/> + <location filename="../../ListThread.cpp" line="1612"/> <source>Unable to open the transfer list: %1</source> <translation>Transferliste: %1 kann nicht geƶffnet werden</translation> </message> @@ -571,24 +571,24 @@ <context> <name>ReadThread</name> <message> - <location filename="../../ReadThread.cpp" line="55"/> + <location filename="../../ReadThread.cpp" line="59"/> <source>Internal error, please report it!</source> <translation>Interner Fehler - Bitte bei mir melden!</translation> </message> <message> - <location filename="../../ReadThread.cpp" line="184"/> + <location filename="../../ReadThread.cpp" line="188"/> <source>Internal error reading the source file:block size out of range</source> <translation>Interner Fehler beim Lesen der Quelldatei: BlockgrƶĆe auĆerhalb des zulƤssigen Bereichs</translation> </message> <message> - <location filename="../../ReadThread.cpp" line="192"/> - <location filename="../../ReadThread.cpp" line="408"/> + <location filename="../../ReadThread.cpp" line="196"/> + <location filename="../../ReadThread.cpp" line="420"/> <source>Unable to read the source file: </source> <translation>Die Quelldatei kann nicht gelesen werden: </translation> </message> <message> - <location filename="../../ReadThread.cpp" line="233"/> - <location filename="../../ReadThread.cpp" line="456"/> + <location filename="../../ReadThread.cpp" line="237"/> + <location filename="../../ReadThread.cpp" line="468"/> <source>File truncated during the read, possible data change</source> <translation>Datei wƤhrend des Lesevorgangs abgeschnitten, Daten wurden mƶglicherweise verƤndert</translation> </message> @@ -596,38 +596,32 @@ <context> <name>RenamingRules</name> <message> - <location filename="../../RenamingRules.ui" line="26"/> + <location filename="../../RenamingRules.ui" line="35"/> <source>First renaming</source> <translation>Erste Umbenennung</translation> </message> <message> - <location filename="../../RenamingRules.ui" line="32"/> - <source>%name% - copy</source> + <location filename="../../RenamingRules.ui" line="41"/> + <source>%name% - copy%suffix%</source> <extracomment>%name% should not be translated</extracomment> - <translation>%name% - Kopie</translation> - </message> - <message> - <location filename="../../RenamingRules.ui" line="39"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p></body></html></source> - <extracomment> should not be translated</extracomment> - <translation><html><head/><body><p>Variablen: <span style=" font-weight:600;">%name%</span> fĆ¼r den ursprĆ¼nglichen Dateinamen</p></body></html></translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="49"/> - <source>Second renaming</source> - <translation>Zweite Umbenennung</translation> + <location filename="../../RenamingRules.ui" line="57"/> + <source>%name% - copy (%number%)%suffix%</source> + <extracomment>%name%, %number% should not be translated</extracomment> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="55"/> - <source>%name% - copy (%number%)</source> + <location filename="../../RenamingRules.ui" line="67"/> + <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name, <span style=" font-weight:600;">%number%</span> for the extra number, <span style=" font-weight:600;">%suffix%</span> file suffix</p></body></html></source> <extracomment>%name%, %number% should not be translated</extracomment> - <translation>%name% - Kopie (%number%)</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="62"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p><p><span style=" font-weight:600;">%number%</span> for the extra number</p></body></html></source> - <extracomment>%name%, %number% should not be translated</extracomment> - <translation><html><head/><body><p>Variablen: <span style=" font-weight:600;">%name%</span> fĆ¼r den ursprĆ¼nglichen Dateinamen</p><p><span style=" font-weight:600;">%number%</span> fĆ¼r die zusƤtzliche Zahl</p></body></html></translation> + <location filename="../../RenamingRules.ui" line="51"/> + <source>Second renaming</source> + <translation>Zweite Umbenennung</translation> </message> <message> <location filename="../../RenamingRules.cpp" line="39"/> @@ -656,33 +650,41 @@ </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="338"/> - <location filename="../../ScanFileOrFolder.cpp" line="404"/> <source>%1 - copy</source> <translation>%1 - Kopie</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="348"/> - <location filename="../../ScanFileOrFolder.cpp" line="414"/> + <location filename="../../ScanFileOrFolder.cpp" line="345"/> <source>%1 - copy (%2)</source> <translation>%1 - Kopie (%2)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> + <location filename="../../ScanFileOrFolder.cpp" line="401"/> + <source>%name% - copy</source> + <translation type="unfinished">%name% - Kopie</translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="408"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">%name% - Kopie (%number%)</translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="444"/> <source>This is not a folder</source> <translation>Dies ist kein Ordner</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> + <location filename="../../ScanFileOrFolder.cpp" line="446"/> <source>The folder does exists</source> <translation>Ordner existiert bereits</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="448"/> <source>The folder is not readable</source> <translation>Der Ordner kann nicht gelesen werden</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="467"/> + <location filename="../../ScanFileOrFolder.cpp" line="459"/> <source>Problem with name encoding</source> <translation>Problem mit der Namen-Encodierung</translation> </message> @@ -691,9 +693,9 @@ <name>TransferThread</name> <message> <location filename="../../TransferThread.cpp" line="244"/> - <location filename="../../TransferThread.cpp" line="677"/> - <location filename="../../TransferThread.cpp" line="749"/> - <location filename="../../TransferThread.cpp" line="1319"/> + <location filename="../../TransferThread.cpp" line="673"/> + <location filename="../../TransferThread.cpp" line="745"/> + <location filename="../../TransferThread.cpp" line="1315"/> <source>File not found</source> <translation>Datei nicht gefunden</translation> </message> @@ -725,46 +727,36 @@ <translation type="unfinished">Stammverzeichnis</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="645"/> - <source>%1 - copy</source> - <translation type="unfinished">%1 - Kopie</translation> - </message> - <message> - <location filename="../../TransferThread.cpp" line="655"/> - <source>%1 - copy (%2)</source> - <translation type="unfinished">%1 - Kopie (%2)</translation> - </message> - <message> - <location filename="../../TransferThread.cpp" line="791"/> + <location filename="../../TransferThread.cpp" line="787"/> <source>The source doesn't exist</source> <translation type="unfinished">Quelle existiert nicht</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1319"/> - <location filename="../../TransferThread.cpp" line="1337"/> - <location filename="../../TransferThread.cpp" line="1352"/> + <location filename="../../TransferThread.cpp" line="1315"/> + <location filename="../../TransferThread.cpp" line="1333"/> + <location filename="../../TransferThread.cpp" line="1348"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="715"/> - <location filename="../../TransferThread.cpp" line="830"/> + <location filename="../../TransferThread.cpp" line="711"/> + <location filename="../../TransferThread.cpp" line="826"/> <source>The source file doesn't exist</source> <translation type="unfinished">Quelldatei existiert nicht</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1138"/> + <location filename="../../TransferThread.cpp" line="1134"/> <source>The checksums do not match</source> <translation type="unfinished">PrĆ¼fsummen sind verschieden</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1243"/> + <location filename="../../TransferThread.cpp" line="1239"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished">Interner Fehler: Ubertragene GrƶĆe ungleich</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="755"/> - <location filename="../../TransferThread.cpp" line="842"/> + <location filename="../../TransferThread.cpp" line="751"/> + <location filename="../../TransferThread.cpp" line="838"/> <source>Unable to do the folder</source> <translation type="unfinished">Ordner kann nicht erstellt werden</translation> </message> @@ -774,17 +766,27 @@ <translation>Versuche Umbenennung mit Sonderzeichen</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="836"/> + <location filename="../../TransferThread.cpp" line="645"/> + <source>%name% - copy</source> + <translation type="unfinished">%name% - Kopie</translation> + </message> + <message> + <location filename="../../TransferThread.cpp" line="652"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">%name% - Kopie (%number%)</translation> + </message> + <message> + <location filename="../../TransferThread.cpp" line="832"/> <source>Another file exists at same place</source> <translation type="unfinished">Andere Datei befindet sich am selben Ort</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1228"/> + <location filename="../../TransferThread.cpp" line="1224"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished">Interner Fehler: Ziel ist nicht geschlossen</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1254"/> + <location filename="../../TransferThread.cpp" line="1250"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished">Interner Fehler: Puffer ist nicht leer</translation> </message> @@ -792,22 +794,22 @@ <context> <name>WriteThread</name> <message> - <location filename="../../WriteThread.cpp" line="80"/> + <location filename="../../WriteThread.cpp" line="83"/> <source>Path resolution error (Empty path)</source> <translation>Pfad-Auflƶsungsfehler (leerer Pfad)</translation> </message> <message> - <location filename="../../WriteThread.cpp" line="269"/> + <location filename="../../WriteThread.cpp" line="277"/> <source>Internal error, please report it!</source> <translation>Interner Fehler - Bitte bei mir melden!</translation> </message> <message> - <location filename="../../WriteThread.cpp" line="672"/> + <location filename="../../WriteThread.cpp" line="680"/> <source>Unable to read the source file: </source> <translation>Quelldatei kann nicht gelesen werden: </translation> </message> <message> - <location filename="../../WriteThread.cpp" line="697"/> + <location filename="../../WriteThread.cpp" line="705"/> <source>File truncated during read, possible data change</source> <translation>Datenabbruch beim Lesen, Daten wurden mƶglicherweise verƤndert</translation> </message> @@ -815,198 +817,198 @@ <context> <name>copyEngineOptions</name> <message> - <location filename="../../copyEngineOptions.ui" line="35"/> + <location filename="../../copyEngineOptions.ui" line="44"/> <source>Transfer</source> <translation>Ćbertragung</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="44"/> + <location filename="../../copyEngineOptions.ui" line="53"/> <source>Move the whole folder</source> <translation>Verschiebe den ganzen Ordner</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="51"/> + <location filename="../../copyEngineOptions.ui" line="60"/> <source>Transfer the file rights</source> <translation>Ćbertrage die Dateirechte</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="61"/> + <location filename="../../copyEngineOptions.ui" line="70"/> <source>Keep the file date</source> <translation>Datum der Dateien beibehalten</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="74"/> + <location filename="../../copyEngineOptions.ui" line="83"/> <source>Autostart the transfer</source> <translation>Ćbertragung automatisch starten</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="81"/> - <location filename="../../copyEngineOptions.ui" line="101"/> + <location filename="../../copyEngineOptions.ui" line="90"/> + <location filename="../../copyEngineOptions.ui" line="110"/> <source>Less performance if checked</source> <translation>Leistung drosseln</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="104"/> + <location filename="../../copyEngineOptions.ui" line="113"/> <source>Follow the strict order</source> <translation>Genau nach Reihenfolge</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="130"/> + <location filename="../../copyEngineOptions.ui" line="139"/> <source>Error and collision</source> <translation>Fehler und Kollision</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="136"/> + <location filename="../../copyEngineOptions.ui" line="145"/> <source>When folder error</source> <translation>Bei Ordnerfehlern:</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="146"/> + <location filename="../../copyEngineOptions.ui" line="155"/> <source>When file error</source> <translation>Bei Dateifehlern:</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="172"/> + <location filename="../../copyEngineOptions.ui" line="181"/> <source>When file collision</source> <translation>Bei Dateikollisionen:</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="232"/> + <location filename="../../copyEngineOptions.ui" line="241"/> <source>When folder collision</source> <translation>Bei Ordnerkollisionen:</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="263"/> + <location filename="../../copyEngineOptions.ui" line="272"/> <source>Check if destination folder exists</source> <translation>PrĆ¼fen ob Zielordner vorhanden ist</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="270"/> + <location filename="../../copyEngineOptions.ui" line="279"/> <source>Renaming rules</source> <translation>Umbennungsregeln</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="290"/> + <location filename="../../copyEngineOptions.ui" line="299"/> <source>Delete partially transferred files</source> <translation>UnvollstƤndig Ć¼bertragene Dateien lƶschen</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="303"/> + <location filename="../../copyEngineOptions.ui" line="312"/> <source>Rename the original destination</source> <translation>Original-Ziel umbenennen</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="334"/> + <location filename="../../copyEngineOptions.ui" line="343"/> <source>Control</source> <translation>ĆberprĆ¼fung</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="340"/> + <location filename="../../copyEngineOptions.ui" line="349"/> <source>Checksum</source> <translation>PrĆ¼fsumme</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="349"/> + <location filename="../../copyEngineOptions.ui" line="358"/> <source>Only after error</source> <translation>Nur nach einem Fehler</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="356"/> + <location filename="../../copyEngineOptions.ui" line="365"/> <source>Ignore if impossible</source> <translation>Ignorieren falls unmƶglich</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="373"/> + <location filename="../../copyEngineOptions.ui" line="382"/> <source>Verify checksums</source> <translation>PrĆ¼fsummen vergleichen</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="405"/> + <location filename="../../copyEngineOptions.ui" line="414"/> <source>Performance</source> <translation>Leistung</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="411"/> + <location filename="../../copyEngineOptions.ui" line="420"/> <source>Parallel buffer</source> <translation>Paralleler Puffer</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="418"/> - <location filename="../../copyEngineOptions.ui" line="431"/> - <location filename="../../copyEngineOptions.ui" line="444"/> - <location filename="../../copyEngineOptions.ui" line="481"/> - <location filename="../../copyEngineOptions.ui" line="550"/> + <location filename="../../copyEngineOptions.ui" line="427"/> + <location filename="../../copyEngineOptions.ui" line="440"/> + <location filename="../../copyEngineOptions.ui" line="453"/> + <location filename="../../copyEngineOptions.ui" line="490"/> + <location filename="../../copyEngineOptions.ui" line="559"/> <source>KB</source> <translation>KB</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="460"/> + <location filename="../../copyEngineOptions.ui" line="469"/> <source>Block size</source> <translation>BlockgrƶĆe</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="467"/> + <location filename="../../copyEngineOptions.ui" line="476"/> <source>Sequential buffer</source> <translation>Sequentieller Puffer</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="474"/> + <location filename="../../copyEngineOptions.ui" line="483"/> <source>Enable OS buffer</source> <translation>OS-Puffer aktivieren</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="497"/> + <location filename="../../copyEngineOptions.ui" line="506"/> <source>OS buffer only if smaller than</source> <translation>OS-Puffer nur verwenden, wenn kleiner als</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="504"/> + <location filename="../../copyEngineOptions.ui" line="513"/> <source>Transfer algorithm</source> <translation>Ćbertragungs-Algorithmus</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="543"/> + <location filename="../../copyEngineOptions.ui" line="552"/> <source>Parallelize if smaller than</source> <translation>Parallelisieren wenn kleiner als</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="573"/> - <source>Inode threads</source> - <translation>Inode Threads</translation> + <location filename="../../copyEngineOptions.ui" line="582"/> + <source>Inode threads (unsafe > 1)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="580"/> - <location filename="../../copyEngineOptions.ui" line="590"/> + <location filename="../../copyEngineOptions.ui" line="589"/> + <location filename="../../copyEngineOptions.ui" line="599"/> <source>More cpu, but better organisation on the disk</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="593"/> + <location filename="../../copyEngineOptions.ui" line="602"/> <source>Order the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="609"/> + <location filename="../../copyEngineOptions.ui" line="618"/> <source>Misc</source> <translation>Verschiedenes</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="615"/> + <location filename="../../copyEngineOptions.ui" line="624"/> <source>Check the disk space</source> <translation>Auf freien Speicherplatz Ć¼berprĆ¼fen</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="625"/> + <location filename="../../copyEngineOptions.ui" line="634"/> <source>Use this folder when destination is not set</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="637"/> + <location filename="../../copyEngineOptions.ui" line="646"/> <source>Browse</source> <translation>WƤhlen</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="659"/> + <location filename="../../copyEngineOptions.ui" line="668"/> <source>Filters</source> <translation>Filter</translation> </message> diff --git a/plugins/CopyEngine/Ultracopier/Languages/el/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/el/translation.ts index 4d395a0..e17b3f2 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/el/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/el/translation.ts @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="419"/> - <location filename="../../CopyEngineFactory.cpp" line="422"/> <location filename="../../CopyEngineFactory.cpp" line="427"/> - <location filename="../../CopyEngineFactory.cpp" line="431"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> <location filename="../../CopyEngineFactory.cpp" line="428"/> <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="425"/> - <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="443"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="447"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -274,21 +274,21 @@ <name>FileExistsDialog</name> <message> <location filename="../../FileExistsDialog.cpp" line="137"/> - <source>%1 - copy</source> + <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="147"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileExistsDialog.cpp" line="144"/> + <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -297,21 +297,21 @@ <name>FileIsSameDialog</name> <message> <location filename="../../FileIsSameDialog.cpp" line="111"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="121"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileIsSameDialog.cpp" line="118"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -464,21 +464,21 @@ </message> <message> <location filename="../../FolderExistsDialog.cpp" line="122"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="132"/> - <source>%1 - copy (%2)</source> + <location filename="../../FolderExistsDialog.cpp" line="131"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -486,49 +486,49 @@ <context> <name>ListThread</name> <message> - <location filename="../../ListThread.cpp" line="1482"/> - <location filename="../../ListThread.cpp" line="2414"/> + <location filename="../../ListThread.cpp" line="1487"/> + <location filename="../../ListThread.cpp" line="2419"/> <source>Unable do to move or copy item into wrong forced mode: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1489"/> - <location filename="../../ListThread.cpp" line="2421"/> + <location filename="../../ListThread.cpp" line="1494"/> + <location filename="../../ListThread.cpp" line="2426"/> <source>Unable to save the transfer list: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1505"/> + <location filename="../../ListThread.cpp" line="1510"/> <source>Problem reading file, or file-size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1512"/> + <location filename="../../ListThread.cpp" line="1517"/> <source>Wrong header: "%1"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1521"/> + <location filename="../../ListThread.cpp" line="1526"/> <source>The transfer list is in mixed mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1530"/> + <location filename="../../ListThread.cpp" line="1535"/> <source>The transfer list is in copy mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1536"/> + <location filename="../../ListThread.cpp" line="1541"/> <source>The transfer list is in move mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1599"/> + <location filename="../../ListThread.cpp" line="1604"/> <source>Some errors have been found during the line parsing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1607"/> + <location filename="../../ListThread.cpp" line="1612"/> <source>Unable to open the transfer list: %1</source> <translation type="unfinished"></translation> </message> @@ -570,24 +570,24 @@ <context> <name>ReadThread</name> <message> - <location filename="../../ReadThread.cpp" line="55"/> + <location filename="../../ReadThread.cpp" line="59"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="184"/> + <location filename="../../ReadThread.cpp" line="188"/> <source>Internal error reading the source file:block size out of range</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="192"/> - <location filename="../../ReadThread.cpp" line="408"/> + <location filename="../../ReadThread.cpp" line="196"/> + <location filename="../../ReadThread.cpp" line="420"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="233"/> - <location filename="../../ReadThread.cpp" line="456"/> + <location filename="../../ReadThread.cpp" line="237"/> + <location filename="../../ReadThread.cpp" line="468"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -595,37 +595,31 @@ <context> <name>RenamingRules</name> <message> - <location filename="../../RenamingRules.ui" line="26"/> + <location filename="../../RenamingRules.ui" line="35"/> <source>First renaming</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="32"/> - <source>%name% - copy</source> + <location filename="../../RenamingRules.ui" line="41"/> + <source>%name% - copy%suffix%</source> <extracomment>%name% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="39"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p></body></html></source> - <extracomment> should not be translated</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../RenamingRules.ui" line="49"/> - <source>Second renaming</source> + <location filename="../../RenamingRules.ui" line="57"/> + <source>%name% - copy (%number%)%suffix%</source> + <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="55"/> - <source>%name% - copy (%number%)</source> + <location filename="../../RenamingRules.ui" line="67"/> + <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name, <span style=" font-weight:600;">%number%</span> for the extra number, <span style=" font-weight:600;">%suffix%</span> file suffix</p></body></html></source> <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="62"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p><p><span style=" font-weight:600;">%number%</span> for the extra number</p></body></html></source> - <extracomment>%name%, %number% should not be translated</extracomment> + <location filename="../../RenamingRules.ui" line="51"/> + <source>Second renaming</source> <translation type="unfinished"></translation> </message> <message> @@ -655,33 +649,41 @@ </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="338"/> - <location filename="../../ScanFileOrFolder.cpp" line="404"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="348"/> - <location filename="../../ScanFileOrFolder.cpp" line="414"/> + <location filename="../../ScanFileOrFolder.cpp" line="345"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> + <location filename="../../ScanFileOrFolder.cpp" line="401"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="408"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="444"/> <source>This is not a folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> + <location filename="../../ScanFileOrFolder.cpp" line="446"/> <source>The folder does exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="448"/> <source>The folder is not readable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="467"/> + <location filename="../../ScanFileOrFolder.cpp" line="459"/> <source>Problem with name encoding</source> <translation type="unfinished"></translation> </message> @@ -690,9 +692,9 @@ <name>TransferThread</name> <message> <location filename="../../TransferThread.cpp" line="244"/> - <location filename="../../TransferThread.cpp" line="677"/> - <location filename="../../TransferThread.cpp" line="749"/> - <location filename="../../TransferThread.cpp" line="1319"/> + <location filename="../../TransferThread.cpp" line="673"/> + <location filename="../../TransferThread.cpp" line="745"/> + <location filename="../../TransferThread.cpp" line="1315"/> <source>File not found</source> <translation type="unfinished"></translation> </message> @@ -725,60 +727,60 @@ </message> <message> <location filename="../../TransferThread.cpp" line="645"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="655"/> - <source>%1 - copy (%2)</source> + <location filename="../../TransferThread.cpp" line="652"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="715"/> - <location filename="../../TransferThread.cpp" line="830"/> + <location filename="../../TransferThread.cpp" line="711"/> + <location filename="../../TransferThread.cpp" line="826"/> <source>The source file doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="755"/> - <location filename="../../TransferThread.cpp" line="842"/> + <location filename="../../TransferThread.cpp" line="751"/> + <location filename="../../TransferThread.cpp" line="838"/> <source>Unable to do the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="791"/> + <location filename="../../TransferThread.cpp" line="787"/> <source>The source doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="836"/> + <location filename="../../TransferThread.cpp" line="832"/> <source>Another file exists at same place</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1138"/> + <location filename="../../TransferThread.cpp" line="1134"/> <source>The checksums do not match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1228"/> + <location filename="../../TransferThread.cpp" line="1224"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1243"/> + <location filename="../../TransferThread.cpp" line="1239"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1254"/> + <location filename="../../TransferThread.cpp" line="1250"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1319"/> - <location filename="../../TransferThread.cpp" line="1337"/> - <location filename="../../TransferThread.cpp" line="1352"/> + <location filename="../../TransferThread.cpp" line="1315"/> + <location filename="../../TransferThread.cpp" line="1333"/> + <location filename="../../TransferThread.cpp" line="1348"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -791,22 +793,22 @@ <context> <name>WriteThread</name> <message> - <location filename="../../WriteThread.cpp" line="80"/> + <location filename="../../WriteThread.cpp" line="83"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="269"/> + <location filename="../../WriteThread.cpp" line="277"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="672"/> + <location filename="../../WriteThread.cpp" line="680"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="697"/> + <location filename="../../WriteThread.cpp" line="705"/> <source>File truncated during read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -814,198 +816,198 @@ <context> <name>copyEngineOptions</name> <message> - <location filename="../../copyEngineOptions.ui" line="35"/> + <location filename="../../copyEngineOptions.ui" line="44"/> <source>Transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="44"/> + <location filename="../../copyEngineOptions.ui" line="53"/> <source>Move the whole folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="51"/> + <location filename="../../copyEngineOptions.ui" line="60"/> <source>Transfer the file rights</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="61"/> + <location filename="../../copyEngineOptions.ui" line="70"/> <source>Keep the file date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="74"/> + <location filename="../../copyEngineOptions.ui" line="83"/> <source>Autostart the transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="81"/> - <location filename="../../copyEngineOptions.ui" line="101"/> + <location filename="../../copyEngineOptions.ui" line="90"/> + <location filename="../../copyEngineOptions.ui" line="110"/> <source>Less performance if checked</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="104"/> + <location filename="../../copyEngineOptions.ui" line="113"/> <source>Follow the strict order</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="130"/> + <location filename="../../copyEngineOptions.ui" line="139"/> <source>Error and collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="136"/> + <location filename="../../copyEngineOptions.ui" line="145"/> <source>When folder error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="146"/> + <location filename="../../copyEngineOptions.ui" line="155"/> <source>When file error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="172"/> + <location filename="../../copyEngineOptions.ui" line="181"/> <source>When file collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="232"/> + <location filename="../../copyEngineOptions.ui" line="241"/> <source>When folder collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="263"/> + <location filename="../../copyEngineOptions.ui" line="272"/> <source>Check if destination folder exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="270"/> + <location filename="../../copyEngineOptions.ui" line="279"/> <source>Renaming rules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="290"/> + <location filename="../../copyEngineOptions.ui" line="299"/> <source>Delete partially transferred files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="303"/> + <location filename="../../copyEngineOptions.ui" line="312"/> <source>Rename the original destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="334"/> + <location filename="../../copyEngineOptions.ui" line="343"/> <source>Control</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="340"/> + <location filename="../../copyEngineOptions.ui" line="349"/> <source>Checksum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="349"/> + <location filename="../../copyEngineOptions.ui" line="358"/> <source>Only after error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="356"/> + <location filename="../../copyEngineOptions.ui" line="365"/> <source>Ignore if impossible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="373"/> + <location filename="../../copyEngineOptions.ui" line="382"/> <source>Verify checksums</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="405"/> + <location filename="../../copyEngineOptions.ui" line="414"/> <source>Performance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="411"/> + <location filename="../../copyEngineOptions.ui" line="420"/> <source>Parallel buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="418"/> - <location filename="../../copyEngineOptions.ui" line="431"/> - <location filename="../../copyEngineOptions.ui" line="444"/> - <location filename="../../copyEngineOptions.ui" line="481"/> - <location filename="../../copyEngineOptions.ui" line="550"/> + <location filename="../../copyEngineOptions.ui" line="427"/> + <location filename="../../copyEngineOptions.ui" line="440"/> + <location filename="../../copyEngineOptions.ui" line="453"/> + <location filename="../../copyEngineOptions.ui" line="490"/> + <location filename="../../copyEngineOptions.ui" line="559"/> <source>KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="460"/> + <location filename="../../copyEngineOptions.ui" line="469"/> <source>Block size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="467"/> + <location filename="../../copyEngineOptions.ui" line="476"/> <source>Sequential buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="474"/> + <location filename="../../copyEngineOptions.ui" line="483"/> <source>Enable OS buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="497"/> + <location filename="../../copyEngineOptions.ui" line="506"/> <source>OS buffer only if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="504"/> + <location filename="../../copyEngineOptions.ui" line="513"/> <source>Transfer algorithm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="543"/> + <location filename="../../copyEngineOptions.ui" line="552"/> <source>Parallelize if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="573"/> - <source>Inode threads</source> + <location filename="../../copyEngineOptions.ui" line="582"/> + <source>Inode threads (unsafe > 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="580"/> - <location filename="../../copyEngineOptions.ui" line="590"/> + <location filename="../../copyEngineOptions.ui" line="589"/> + <location filename="../../copyEngineOptions.ui" line="599"/> <source>More cpu, but better organisation on the disk</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="593"/> + <location filename="../../copyEngineOptions.ui" line="602"/> <source>Order the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="609"/> + <location filename="../../copyEngineOptions.ui" line="618"/> <source>Misc</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="615"/> + <location filename="../../copyEngineOptions.ui" line="624"/> <source>Check the disk space</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="625"/> + <location filename="../../copyEngineOptions.ui" line="634"/> <source>Use this folder when destination is not set</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="637"/> + <location filename="../../copyEngineOptions.ui" line="646"/> <source>Browse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="659"/> + <location filename="../../copyEngineOptions.ui" line="668"/> <source>Filters</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/CopyEngine/Ultracopier/Languages/en/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/en/translation.ts index fec0f28..223e40a 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/en/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/en/translation.ts @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="419"/> - <location filename="../../CopyEngineFactory.cpp" line="422"/> <location filename="../../CopyEngineFactory.cpp" line="427"/> - <location filename="../../CopyEngineFactory.cpp" line="431"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> <location filename="../../CopyEngineFactory.cpp" line="428"/> <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="425"/> - <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="443"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="447"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -274,21 +274,21 @@ <name>FileExistsDialog</name> <message> <location filename="../../FileExistsDialog.cpp" line="137"/> - <source>%1 - copy</source> + <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="147"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileExistsDialog.cpp" line="144"/> + <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -297,21 +297,21 @@ <name>FileIsSameDialog</name> <message> <location filename="../../FileIsSameDialog.cpp" line="111"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="121"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileIsSameDialog.cpp" line="118"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -464,21 +464,21 @@ </message> <message> <location filename="../../FolderExistsDialog.cpp" line="122"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="132"/> - <source>%1 - copy (%2)</source> + <location filename="../../FolderExistsDialog.cpp" line="131"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -486,49 +486,49 @@ <context> <name>ListThread</name> <message> - <location filename="../../ListThread.cpp" line="1482"/> - <location filename="../../ListThread.cpp" line="2414"/> + <location filename="../../ListThread.cpp" line="1487"/> + <location filename="../../ListThread.cpp" line="2419"/> <source>Unable do to move or copy item into wrong forced mode: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1489"/> - <location filename="../../ListThread.cpp" line="2421"/> + <location filename="../../ListThread.cpp" line="1494"/> + <location filename="../../ListThread.cpp" line="2426"/> <source>Unable to save the transfer list: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1505"/> + <location filename="../../ListThread.cpp" line="1510"/> <source>Problem reading file, or file-size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1512"/> + <location filename="../../ListThread.cpp" line="1517"/> <source>Wrong header: "%1"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1521"/> + <location filename="../../ListThread.cpp" line="1526"/> <source>The transfer list is in mixed mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1530"/> + <location filename="../../ListThread.cpp" line="1535"/> <source>The transfer list is in copy mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1536"/> + <location filename="../../ListThread.cpp" line="1541"/> <source>The transfer list is in move mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1599"/> + <location filename="../../ListThread.cpp" line="1604"/> <source>Some errors have been found during the line parsing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1607"/> + <location filename="../../ListThread.cpp" line="1612"/> <source>Unable to open the transfer list: %1</source> <translation type="unfinished"></translation> </message> @@ -570,24 +570,24 @@ <context> <name>ReadThread</name> <message> - <location filename="../../ReadThread.cpp" line="55"/> + <location filename="../../ReadThread.cpp" line="59"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="184"/> + <location filename="../../ReadThread.cpp" line="188"/> <source>Internal error reading the source file:block size out of range</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="192"/> - <location filename="../../ReadThread.cpp" line="408"/> + <location filename="../../ReadThread.cpp" line="196"/> + <location filename="../../ReadThread.cpp" line="420"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="233"/> - <location filename="../../ReadThread.cpp" line="456"/> + <location filename="../../ReadThread.cpp" line="237"/> + <location filename="../../ReadThread.cpp" line="468"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -600,37 +600,31 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="26"/> + <location filename="../../RenamingRules.ui" line="35"/> <source>First renaming</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="32"/> - <source>%name% - copy</source> + <location filename="../../RenamingRules.ui" line="41"/> + <source>%name% - copy%suffix%</source> <extracomment>%name% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="39"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p></body></html></source> - <extracomment> should not be translated</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../RenamingRules.ui" line="49"/> - <source>Second renaming</source> + <location filename="../../RenamingRules.ui" line="57"/> + <source>%name% - copy (%number%)%suffix%</source> + <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="55"/> - <source>%name% - copy (%number%)</source> + <location filename="../../RenamingRules.ui" line="67"/> + <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name, <span style=" font-weight:600;">%number%</span> for the extra number, <span style=" font-weight:600;">%suffix%</span> file suffix</p></body></html></source> <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="62"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p><p><span style=" font-weight:600;">%number%</span> for the extra number</p></body></html></source> - <extracomment>%name%, %number% should not be translated</extracomment> + <location filename="../../RenamingRules.ui" line="51"/> + <source>Second renaming</source> <translation type="unfinished"></translation> </message> <message> @@ -655,33 +649,41 @@ </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="338"/> - <location filename="../../ScanFileOrFolder.cpp" line="404"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="348"/> - <location filename="../../ScanFileOrFolder.cpp" line="414"/> + <location filename="../../ScanFileOrFolder.cpp" line="345"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> + <location filename="../../ScanFileOrFolder.cpp" line="401"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="408"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="444"/> <source>This is not a folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> + <location filename="../../ScanFileOrFolder.cpp" line="446"/> <source>The folder does exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="448"/> <source>The folder is not readable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="467"/> + <location filename="../../ScanFileOrFolder.cpp" line="459"/> <source>Problem with name encoding</source> <translation type="unfinished"></translation> </message> @@ -690,9 +692,9 @@ <name>TransferThread</name> <message> <location filename="../../TransferThread.cpp" line="244"/> - <location filename="../../TransferThread.cpp" line="677"/> - <location filename="../../TransferThread.cpp" line="749"/> - <location filename="../../TransferThread.cpp" line="1319"/> + <location filename="../../TransferThread.cpp" line="673"/> + <location filename="../../TransferThread.cpp" line="745"/> + <location filename="../../TransferThread.cpp" line="1315"/> <source>File not found</source> <translation type="unfinished"></translation> </message> @@ -725,60 +727,60 @@ </message> <message> <location filename="../../TransferThread.cpp" line="645"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="655"/> - <source>%1 - copy (%2)</source> + <location filename="../../TransferThread.cpp" line="652"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="715"/> - <location filename="../../TransferThread.cpp" line="830"/> + <location filename="../../TransferThread.cpp" line="711"/> + <location filename="../../TransferThread.cpp" line="826"/> <source>The source file doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="755"/> - <location filename="../../TransferThread.cpp" line="842"/> + <location filename="../../TransferThread.cpp" line="751"/> + <location filename="../../TransferThread.cpp" line="838"/> <source>Unable to do the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="791"/> + <location filename="../../TransferThread.cpp" line="787"/> <source>The source doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="836"/> + <location filename="../../TransferThread.cpp" line="832"/> <source>Another file exists at same place</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1138"/> + <location filename="../../TransferThread.cpp" line="1134"/> <source>The checksums do not match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1228"/> + <location filename="../../TransferThread.cpp" line="1224"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1243"/> + <location filename="../../TransferThread.cpp" line="1239"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1254"/> + <location filename="../../TransferThread.cpp" line="1250"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1319"/> - <location filename="../../TransferThread.cpp" line="1337"/> - <location filename="../../TransferThread.cpp" line="1352"/> + <location filename="../../TransferThread.cpp" line="1315"/> + <location filename="../../TransferThread.cpp" line="1333"/> + <location filename="../../TransferThread.cpp" line="1348"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -791,22 +793,22 @@ <context> <name>WriteThread</name> <message> - <location filename="../../WriteThread.cpp" line="80"/> + <location filename="../../WriteThread.cpp" line="83"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="269"/> + <location filename="../../WriteThread.cpp" line="277"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="672"/> + <location filename="../../WriteThread.cpp" line="680"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="697"/> + <location filename="../../WriteThread.cpp" line="705"/> <source>File truncated during read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -814,198 +816,198 @@ <context> <name>copyEngineOptions</name> <message> - <location filename="../../copyEngineOptions.ui" line="35"/> + <location filename="../../copyEngineOptions.ui" line="44"/> <source>Transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="44"/> + <location filename="../../copyEngineOptions.ui" line="53"/> <source>Move the whole folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="51"/> + <location filename="../../copyEngineOptions.ui" line="60"/> <source>Transfer the file rights</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="61"/> + <location filename="../../copyEngineOptions.ui" line="70"/> <source>Keep the file date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="74"/> + <location filename="../../copyEngineOptions.ui" line="83"/> <source>Autostart the transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="81"/> - <location filename="../../copyEngineOptions.ui" line="101"/> + <location filename="../../copyEngineOptions.ui" line="90"/> + <location filename="../../copyEngineOptions.ui" line="110"/> <source>Less performance if checked</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="104"/> + <location filename="../../copyEngineOptions.ui" line="113"/> <source>Follow the strict order</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="130"/> + <location filename="../../copyEngineOptions.ui" line="139"/> <source>Error and collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="136"/> + <location filename="../../copyEngineOptions.ui" line="145"/> <source>When folder error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="146"/> + <location filename="../../copyEngineOptions.ui" line="155"/> <source>When file error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="172"/> + <location filename="../../copyEngineOptions.ui" line="181"/> <source>When file collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="232"/> + <location filename="../../copyEngineOptions.ui" line="241"/> <source>When folder collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="263"/> + <location filename="../../copyEngineOptions.ui" line="272"/> <source>Check if destination folder exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="270"/> + <location filename="../../copyEngineOptions.ui" line="279"/> <source>Renaming rules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="290"/> + <location filename="../../copyEngineOptions.ui" line="299"/> <source>Delete partially transferred files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="303"/> + <location filename="../../copyEngineOptions.ui" line="312"/> <source>Rename the original destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="334"/> + <location filename="../../copyEngineOptions.ui" line="343"/> <source>Control</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="340"/> + <location filename="../../copyEngineOptions.ui" line="349"/> <source>Checksum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="349"/> + <location filename="../../copyEngineOptions.ui" line="358"/> <source>Only after error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="356"/> + <location filename="../../copyEngineOptions.ui" line="365"/> <source>Ignore if impossible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="373"/> + <location filename="../../copyEngineOptions.ui" line="382"/> <source>Verify checksums</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="405"/> + <location filename="../../copyEngineOptions.ui" line="414"/> <source>Performance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="411"/> + <location filename="../../copyEngineOptions.ui" line="420"/> <source>Parallel buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="418"/> - <location filename="../../copyEngineOptions.ui" line="431"/> - <location filename="../../copyEngineOptions.ui" line="444"/> - <location filename="../../copyEngineOptions.ui" line="481"/> - <location filename="../../copyEngineOptions.ui" line="550"/> + <location filename="../../copyEngineOptions.ui" line="427"/> + <location filename="../../copyEngineOptions.ui" line="440"/> + <location filename="../../copyEngineOptions.ui" line="453"/> + <location filename="../../copyEngineOptions.ui" line="490"/> + <location filename="../../copyEngineOptions.ui" line="559"/> <source>KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="460"/> + <location filename="../../copyEngineOptions.ui" line="469"/> <source>Block size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="467"/> + <location filename="../../copyEngineOptions.ui" line="476"/> <source>Sequential buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="474"/> + <location filename="../../copyEngineOptions.ui" line="483"/> <source>Enable OS buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="497"/> + <location filename="../../copyEngineOptions.ui" line="506"/> <source>OS buffer only if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="504"/> + <location filename="../../copyEngineOptions.ui" line="513"/> <source>Transfer algorithm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="543"/> + <location filename="../../copyEngineOptions.ui" line="552"/> <source>Parallelize if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="573"/> - <source>Inode threads</source> + <location filename="../../copyEngineOptions.ui" line="582"/> + <source>Inode threads (unsafe > 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="580"/> - <location filename="../../copyEngineOptions.ui" line="590"/> + <location filename="../../copyEngineOptions.ui" line="589"/> + <location filename="../../copyEngineOptions.ui" line="599"/> <source>More cpu, but better organisation on the disk</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="593"/> + <location filename="../../copyEngineOptions.ui" line="602"/> <source>Order the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="609"/> + <location filename="../../copyEngineOptions.ui" line="618"/> <source>Misc</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="615"/> + <location filename="../../copyEngineOptions.ui" line="624"/> <source>Check the disk space</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="625"/> + <location filename="../../copyEngineOptions.ui" line="634"/> <source>Use this folder when destination is not set</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="637"/> + <location filename="../../copyEngineOptions.ui" line="646"/> <source>Browse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="659"/> + <location filename="../../copyEngineOptions.ui" line="668"/> <source>Filters</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/CopyEngine/Ultracopier/Languages/es/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/es/translation.ts index 5da0c8b..d69e5eb 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/es/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/es/translation.ts @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="419"/> - <location filename="../../CopyEngineFactory.cpp" line="422"/> <location filename="../../CopyEngineFactory.cpp" line="427"/> - <location filename="../../CopyEngineFactory.cpp" line="431"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Ask</source> <translation>Pedir</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> <location filename="../../CopyEngineFactory.cpp" line="428"/> <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Skip</source> <translation>Omitir</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Merge</source> <translation>Unir</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="425"/> - <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> <source>Rename</source> <translation>Cambiar el nombre</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> <source>Put at the end</source> <translation>Ponga al final</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> <source>Overwrite</source> <translation>Sobrescribir</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> <source>Overwrite if different</source> <translation>Sobrescribir si es diferente</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="443"/> <source>Overwrite if newer</source> <translation>Sobrescribir si nuevo</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> <source>Overwrite if older</source> <translation>Sobrescribir si es mayor</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="447"/> <source>Automatic</source> <translation>AutomĆ”tico</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Sequential</source> <translation>Secuencial</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Parallel</source> <translation>Paralelo</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options error</source> <translation>error Opciones</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation>Opciones del motor no estĆ” cargado. No es posible acceder a los filtros</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options engine is not loaded, can't access to the filters</source> <translation>Opciones del motor no estĆ” cargado, no se puede acceder a los filtros</translation> </message> @@ -274,21 +274,21 @@ <name>FileExistsDialog</name> <message> <location filename="../../FileExistsDialog.cpp" line="137"/> - <source>%1 - copy</source> - <translation>%1 - copia</translation> + <source>%name% - copy%suffix%</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="147"/> - <source>%1 - copy (%2)</source> - <translation>%1 - copia (%2)</translation> + <location filename="../../FileExistsDialog.cpp" line="144"/> + <source>%name% - copy (%number%)%suffix%</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Try rename with using special characters</source> <translation>Trate de cambiar el nombre con el uso de caracteres especiales</translation> </message> @@ -297,21 +297,21 @@ <name>FileIsSameDialog</name> <message> <location filename="../../FileIsSameDialog.cpp" line="111"/> - <source>%1 - copy</source> - <translation>%1 - copia</translation> + <source>%name% - copy</source> + <translation type="unfinished">%name% - copia</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="121"/> - <source>%1 - copy (%2)</source> - <translation>%1 - copia (%2)</translation> + <location filename="../../FileIsSameDialog.cpp" line="118"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">%name% - copia (%number%)</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Try rename with using special characters</source> <translation>Trate de cambiar el nombre con el uso de caracteres especiales</translation> </message> @@ -464,21 +464,21 @@ </message> <message> <location filename="../../FolderExistsDialog.cpp" line="122"/> - <source>%1 - copy</source> - <translation>%1 - copia</translation> + <source>%name% - copy</source> + <translation type="unfinished">%name% - copia</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="132"/> - <source>%1 - copy (%2)</source> - <translation>%1 - copia (%2)</translation> + <location filename="../../FolderExistsDialog.cpp" line="131"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">%name% - copia (%number%)</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Try rename with using special characters</source> <translation>Trate de cambiar el nombre con el uso de caracteres especiales</translation> </message> @@ -486,49 +486,49 @@ <context> <name>ListThread</name> <message> - <location filename="../../ListThread.cpp" line="1482"/> - <location filename="../../ListThread.cpp" line="2414"/> + <location filename="../../ListThread.cpp" line="1487"/> + <location filename="../../ListThread.cpp" line="2419"/> <source>Unable do to move or copy item into wrong forced mode: %1</source> <translation>No se puede hacer para mover o copiar elemento en modo incorrecto obligado: %1</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1489"/> - <location filename="../../ListThread.cpp" line="2421"/> + <location filename="../../ListThread.cpp" line="1494"/> + <location filename="../../ListThread.cpp" line="2426"/> <source>Unable to save the transfer list: %1</source> <translation>No se puede guardar la lista de transferencias: %1</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1505"/> + <location filename="../../ListThread.cpp" line="1510"/> <source>Problem reading file, or file-size is 0</source> <translation>Problema al leer el archivo o archivos de tamaƱo es 0</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1512"/> + <location filename="../../ListThread.cpp" line="1517"/> <source>Wrong header: "%1"</source> <translation>Encabezado incorrecto: "%1"</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1521"/> + <location filename="../../ListThread.cpp" line="1526"/> <source>The transfer list is in mixed mode, but this instance is not in this mode</source> <translation>La lista de transferencia estĆ” en modo mixto, pero este caso no es de este modo</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1530"/> + <location filename="../../ListThread.cpp" line="1535"/> <source>The transfer list is in copy mode, but this instance is not in this mode</source> <translation>La lista de transferencia estĆ” en el modo de copia, pero esta instancia no estĆ” en este modo</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1536"/> + <location filename="../../ListThread.cpp" line="1541"/> <source>The transfer list is in move mode, but this instance is not in this mode</source> <translation>La lista de transferencia es el modo de desplazamiento, pero esta instancia no estĆ” en este modo</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1599"/> + <location filename="../../ListThread.cpp" line="1604"/> <source>Some errors have been found during the line parsing</source> <translation>Algunos errores han sido encontrados durante el anĆ”lisis de lĆnea</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1607"/> + <location filename="../../ListThread.cpp" line="1612"/> <source>Unable to open the transfer list: %1</source> <translation>No se puede abrir la lista de transferencias: %1</translation> </message> @@ -570,24 +570,24 @@ <context> <name>ReadThread</name> <message> - <location filename="../../ReadThread.cpp" line="55"/> + <location filename="../../ReadThread.cpp" line="59"/> <source>Internal error, please report it!</source> <translation>Error interno, por favor informe de ello!</translation> </message> <message> - <location filename="../../ReadThread.cpp" line="184"/> + <location filename="../../ReadThread.cpp" line="188"/> <source>Internal error reading the source file:block size out of range</source> <translation>Error interno de leer el archivo de origen: tamaƱo de bloque fuera de rango</translation> </message> <message> - <location filename="../../ReadThread.cpp" line="192"/> - <location filename="../../ReadThread.cpp" line="408"/> + <location filename="../../ReadThread.cpp" line="196"/> + <location filename="../../ReadThread.cpp" line="420"/> <source>Unable to read the source file: </source> <translation>No se puede leer el archivo de origen: </translation> </message> <message> - <location filename="../../ReadThread.cpp" line="233"/> - <location filename="../../ReadThread.cpp" line="456"/> + <location filename="../../ReadThread.cpp" line="237"/> + <location filename="../../ReadThread.cpp" line="468"/> <source>File truncated during the read, possible data change</source> <translation>Archivo truncada durante el cambio de lectura, los datos posibles</translation> </message> @@ -595,38 +595,32 @@ <context> <name>RenamingRules</name> <message> - <location filename="../../RenamingRules.ui" line="26"/> + <location filename="../../RenamingRules.ui" line="35"/> <source>First renaming</source> <translation>En primer lugar el cambio de nombre</translation> </message> <message> - <location filename="../../RenamingRules.ui" line="32"/> - <source>%name% - copy</source> + <location filename="../../RenamingRules.ui" line="41"/> + <source>%name% - copy%suffix%</source> <extracomment>%name% should not be translated</extracomment> - <translation>%name% - copia</translation> - </message> - <message> - <location filename="../../RenamingRules.ui" line="39"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p></body></html></source> - <extracomment> should not be translated</extracomment> - <translation><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> para el nombre del archivo original</p></body></html></translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="49"/> - <source>Second renaming</source> - <translation>En segundo lugar el cambio de nombre</translation> + <location filename="../../RenamingRules.ui" line="57"/> + <source>%name% - copy (%number%)%suffix%</source> + <extracomment>%name%, %number% should not be translated</extracomment> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="55"/> - <source>%name% - copy (%number%)</source> + <location filename="../../RenamingRules.ui" line="67"/> + <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name, <span style=" font-weight:600;">%number%</span> for the extra number, <span style=" font-weight:600;">%suffix%</span> file suffix</p></body></html></source> <extracomment>%name%, %number% should not be translated</extracomment> - <translation>%name% - copia (%number%)</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="62"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p><p><span style=" font-weight:600;">%number%</span> for the extra number</p></body></html></source> - <extracomment>%name%, %number% should not be translated</extracomment> - <translation><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> para el nombre del archivo original</p><p><span style=" font-weight:600;">%number%</span> para el nĆŗmero adicional</p></body></html></translation> + <location filename="../../RenamingRules.ui" line="51"/> + <source>Second renaming</source> + <translation>En segundo lugar el cambio de nombre</translation> </message> <message> <location filename="../../RenamingRules.cpp" line="39"/> @@ -655,33 +649,41 @@ </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="338"/> - <location filename="../../ScanFileOrFolder.cpp" line="404"/> <source>%1 - copy</source> <translation>%1 - copia</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="348"/> - <location filename="../../ScanFileOrFolder.cpp" line="414"/> + <location filename="../../ScanFileOrFolder.cpp" line="345"/> <source>%1 - copy (%2)</source> <translation>%1 - copia (%2)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> + <location filename="../../ScanFileOrFolder.cpp" line="401"/> + <source>%name% - copy</source> + <translation type="unfinished">%name% - copia</translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="408"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">%name% - copia (%number%)</translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="444"/> <source>This is not a folder</source> <translation>Esto no es una carpeta</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> + <location filename="../../ScanFileOrFolder.cpp" line="446"/> <source>The folder does exists</source> <translation>La carpeta no existe</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="448"/> <source>The folder is not readable</source> <translation>La carpeta no se puede leer</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="467"/> + <location filename="../../ScanFileOrFolder.cpp" line="459"/> <source>Problem with name encoding</source> <translation>Problema con codificaciĆ³n de nombres</translation> </message> @@ -690,9 +692,9 @@ <name>TransferThread</name> <message> <location filename="../../TransferThread.cpp" line="244"/> - <location filename="../../TransferThread.cpp" line="677"/> - <location filename="../../TransferThread.cpp" line="749"/> - <location filename="../../TransferThread.cpp" line="1319"/> + <location filename="../../TransferThread.cpp" line="673"/> + <location filename="../../TransferThread.cpp" line="745"/> + <location filename="../../TransferThread.cpp" line="1315"/> <source>File not found</source> <translation>Archivo no encontrado</translation> </message> @@ -724,46 +726,36 @@ <translation type="unfinished">raĆz</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="645"/> - <source>%1 - copy</source> - <translation type="unfinished">%1 - copia</translation> - </message> - <message> - <location filename="../../TransferThread.cpp" line="655"/> - <source>%1 - copy (%2)</source> - <translation type="unfinished">%1 - copia (%2)</translation> - </message> - <message> - <location filename="../../TransferThread.cpp" line="791"/> + <location filename="../../TransferThread.cpp" line="787"/> <source>The source doesn't exist</source> <translation type="unfinished">La fuente no existe</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1319"/> - <location filename="../../TransferThread.cpp" line="1337"/> - <location filename="../../TransferThread.cpp" line="1352"/> + <location filename="../../TransferThread.cpp" line="1315"/> + <location filename="../../TransferThread.cpp" line="1333"/> + <location filename="../../TransferThread.cpp" line="1348"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="715"/> - <location filename="../../TransferThread.cpp" line="830"/> + <location filename="../../TransferThread.cpp" line="711"/> + <location filename="../../TransferThread.cpp" line="826"/> <source>The source file doesn't exist</source> <translation type="unfinished">El archivo de origen no existe</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1138"/> + <location filename="../../TransferThread.cpp" line="1134"/> <source>The checksums do not match</source> <translation type="unfinished">Las sumas de comprobaciĆ³n no coinciden</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1243"/> + <location filename="../../TransferThread.cpp" line="1239"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished">Error interno: El tamaƱo transferido no coincide</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="755"/> - <location filename="../../TransferThread.cpp" line="842"/> + <location filename="../../TransferThread.cpp" line="751"/> + <location filename="../../TransferThread.cpp" line="838"/> <source>Unable to do the folder</source> <translation type="unfinished">Incapaz de hacer la carpeta</translation> </message> @@ -773,17 +765,27 @@ <translation>Trate de cambiar el nombre con el uso de caracteres especiales</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="836"/> + <location filename="../../TransferThread.cpp" line="645"/> + <source>%name% - copy</source> + <translation type="unfinished">%name% - copia</translation> + </message> + <message> + <location filename="../../TransferThread.cpp" line="652"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">%name% - copia (%number%)</translation> + </message> + <message> + <location filename="../../TransferThread.cpp" line="832"/> <source>Another file exists at same place</source> <translation type="unfinished">Otro archivo existe en el mismo lugar</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1228"/> + <location filename="../../TransferThread.cpp" line="1224"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished">Error interno: El destino no estĆ” cerrado</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1254"/> + <location filename="../../TransferThread.cpp" line="1250"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished">Error interno: El buffer no estĆ” vacĆo</translation> </message> @@ -791,22 +793,22 @@ <context> <name>WriteThread</name> <message> - <location filename="../../WriteThread.cpp" line="80"/> + <location filename="../../WriteThread.cpp" line="83"/> <source>Path resolution error (Empty path)</source> <translation>Error de resoluciĆ³n de ruta (camino vacĆo)</translation> </message> <message> - <location filename="../../WriteThread.cpp" line="269"/> + <location filename="../../WriteThread.cpp" line="277"/> <source>Internal error, please report it!</source> <translation>Error interno, por favor informe de ello!</translation> </message> <message> - <location filename="../../WriteThread.cpp" line="672"/> + <location filename="../../WriteThread.cpp" line="680"/> <source>Unable to read the source file: </source> <translation>No se puede leer el archivo de origen: </translation> </message> <message> - <location filename="../../WriteThread.cpp" line="697"/> + <location filename="../../WriteThread.cpp" line="705"/> <source>File truncated during read, possible data change</source> <translation>Archivo truncado durante lectura, posible cambio de datos</translation> </message> @@ -814,198 +816,198 @@ <context> <name>copyEngineOptions</name> <message> - <location filename="../../copyEngineOptions.ui" line="35"/> + <location filename="../../copyEngineOptions.ui" line="44"/> <source>Transfer</source> <translation>Transferencia</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="44"/> + <location filename="../../copyEngineOptions.ui" line="53"/> <source>Move the whole folder</source> <translation>Mueva la carpeta completa</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="51"/> + <location filename="../../copyEngineOptions.ui" line="60"/> <source>Transfer the file rights</source> <translation>Transferencia de los derechos de archivo</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="61"/> + <location filename="../../copyEngineOptions.ui" line="70"/> <source>Keep the file date</source> <translation>Mantener la fecha de archivo</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="74"/> + <location filename="../../copyEngineOptions.ui" line="83"/> <source>Autostart the transfer</source> <translation>Inicio automĆ”tico de la transferencia</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="81"/> - <location filename="../../copyEngineOptions.ui" line="101"/> + <location filename="../../copyEngineOptions.ui" line="90"/> + <location filename="../../copyEngineOptions.ui" line="110"/> <source>Less performance if checked</source> <translation>Si comprueba Menos rendimiento</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="104"/> + <location filename="../../copyEngineOptions.ui" line="113"/> <source>Follow the strict order</source> <translation>Siga el orden estricto</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="130"/> + <location filename="../../copyEngineOptions.ui" line="139"/> <source>Error and collision</source> <translation>Error y de la colisiĆ³n</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="136"/> + <location filename="../../copyEngineOptions.ui" line="145"/> <source>When folder error</source> <translation>Cuando el error carpeta</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="146"/> + <location filename="../../copyEngineOptions.ui" line="155"/> <source>When file error</source> <translation>Cuando archivo error</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="172"/> + <location filename="../../copyEngineOptions.ui" line="181"/> <source>When file collision</source> <translation>Cuando archivo colisiĆ³n</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="232"/> + <location filename="../../copyEngineOptions.ui" line="241"/> <source>When folder collision</source> <translation>Cuando la colisiĆ³n carpeta</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="263"/> + <location filename="../../copyEngineOptions.ui" line="272"/> <source>Check if destination folder exists</source> <translation>Compruebe si existe la carpeta de destino</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="270"/> + <location filename="../../copyEngineOptions.ui" line="279"/> <source>Renaming rules</source> <translation>Reglas de Cambio de nombre</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="290"/> + <location filename="../../copyEngineOptions.ui" line="299"/> <source>Delete partially transferred files</source> <translation>Eliminar archivos parcialmente transferidos</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="303"/> + <location filename="../../copyEngineOptions.ui" line="312"/> <source>Rename the original destination</source> <translation>Cambie el nombre del destino original</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="334"/> + <location filename="../../copyEngineOptions.ui" line="343"/> <source>Control</source> <translation>Controlar</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="340"/> + <location filename="../../copyEngineOptions.ui" line="349"/> <source>Checksum</source> <translation>Suma de comprobaciĆ³n</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="349"/> + <location filename="../../copyEngineOptions.ui" line="358"/> <source>Only after error</source> <translation>SĆ³lo despuĆ©s de un error</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="356"/> + <location filename="../../copyEngineOptions.ui" line="365"/> <source>Ignore if impossible</source> <translation>No haga caso si no es posible</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="373"/> + <location filename="../../copyEngineOptions.ui" line="382"/> <source>Verify checksums</source> <translation>Verifique checksums</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="405"/> + <location filename="../../copyEngineOptions.ui" line="414"/> <source>Performance</source> <translation>Rendimiento</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="411"/> + <location filename="../../copyEngineOptions.ui" line="420"/> <source>Parallel buffer</source> <translation>BĆŗfer paralelo</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="418"/> - <location filename="../../copyEngineOptions.ui" line="431"/> - <location filename="../../copyEngineOptions.ui" line="444"/> - <location filename="../../copyEngineOptions.ui" line="481"/> - <location filename="../../copyEngineOptions.ui" line="550"/> + <location filename="../../copyEngineOptions.ui" line="427"/> + <location filename="../../copyEngineOptions.ui" line="440"/> + <location filename="../../copyEngineOptions.ui" line="453"/> + <location filename="../../copyEngineOptions.ui" line="490"/> + <location filename="../../copyEngineOptions.ui" line="559"/> <source>KB</source> <translation>KB</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="460"/> + <location filename="../../copyEngineOptions.ui" line="469"/> <source>Block size</source> <translation>TamaƱo del bloque</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="467"/> + <location filename="../../copyEngineOptions.ui" line="476"/> <source>Sequential buffer</source> <translation>TampĆ³n secuencial</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="474"/> + <location filename="../../copyEngineOptions.ui" line="483"/> <source>Enable OS buffer</source> <translation>Habilitar el OS de amortiguaciĆ³n</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="497"/> + <location filename="../../copyEngineOptions.ui" line="506"/> <source>OS buffer only if smaller than</source> <translation>OS de amortiguaciĆ³n sĆ³lo si menor que</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="504"/> + <location filename="../../copyEngineOptions.ui" line="513"/> <source>Transfer algorithm</source> <translation>Algoritmo de transferencia</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="543"/> + <location filename="../../copyEngineOptions.ui" line="552"/> <source>Parallelize if smaller than</source> <translation>Paralelice si mĆ”s pequeƱo que</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="573"/> - <source>Inode threads</source> - <translation>Temas inodo</translation> + <location filename="../../copyEngineOptions.ui" line="582"/> + <source>Inode threads (unsafe > 1)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="580"/> - <location filename="../../copyEngineOptions.ui" line="590"/> + <location filename="../../copyEngineOptions.ui" line="589"/> + <location filename="../../copyEngineOptions.ui" line="599"/> <source>More cpu, but better organisation on the disk</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="593"/> + <location filename="../../copyEngineOptions.ui" line="602"/> <source>Order the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="609"/> + <location filename="../../copyEngineOptions.ui" line="618"/> <source>Misc</source> <translation>Misc</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="615"/> + <location filename="../../copyEngineOptions.ui" line="624"/> <source>Check the disk space</source> <translation>Compruebe el espacio en disco</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="625"/> + <location filename="../../copyEngineOptions.ui" line="634"/> <source>Use this folder when destination is not set</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="637"/> + <location filename="../../copyEngineOptions.ui" line="646"/> <source>Browse</source> <translation>Busque</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="659"/> + <location filename="../../copyEngineOptions.ui" line="668"/> <source>Filters</source> <translation>Filtros</translation> </message> diff --git a/plugins/CopyEngine/Ultracopier/Languages/fr/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/fr/translation.ts index 3cd05c0..1eeef1b 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/fr/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/fr/translation.ts @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="419"/> - <location filename="../../CopyEngineFactory.cpp" line="422"/> <location filename="../../CopyEngineFactory.cpp" line="427"/> - <location filename="../../CopyEngineFactory.cpp" line="431"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Ask</source> <translation>Demander</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> <location filename="../../CopyEngineFactory.cpp" line="428"/> <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Skip</source> <translation>Passer</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Merge</source> <translation>Fusionner</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="425"/> - <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> <source>Rename</source> <translation>Renommer</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> <source>Put at the end</source> <translation>Mettre Ć la fin</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> <source>Overwrite</source> <translation>Ćcraser</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> <source>Overwrite if different</source> <translation>Ćcraser si diffĆ©rent</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="443"/> <source>Overwrite if newer</source> <translation>Ćcraser si plus rĆ©cent</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> <source>Overwrite if older</source> <translation>Ćcraser si plus vieux</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="447"/> <source>Automatic</source> <translation>Automatique</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Sequential</source> <translation>SĆ©quentiel</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Parallel</source> <translation>ParallĆØle</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options error</source> <translation>Erreur d'options</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation>Le moteur d'options n'est pas chargĆ©. Impossible d'accĆ©dĆ© aux filtres</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options engine is not loaded, can't access to the filters</source> <translation>Moteur d'options non chargĆ©, impossible d'accĆ©der aux filtres</translation> </message> @@ -274,21 +274,21 @@ <name>FileExistsDialog</name> <message> <location filename="../../FileExistsDialog.cpp" line="137"/> - <source>%1 - copy</source> - <translation>%1 - copie</translation> + <source>%name% - copy%suffix%</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="147"/> - <source>%1 - copy (%2)</source> - <translation>%1 - copie (%2)</translation> + <location filename="../../FileExistsDialog.cpp" line="144"/> + <source>%name% - copy (%number%)%suffix%</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Try rename with using special characters</source> <translation>Essaie de renommage avec caratĆ©res interdits</translation> </message> @@ -297,21 +297,21 @@ <name>FileIsSameDialog</name> <message> <location filename="../../FileIsSameDialog.cpp" line="111"/> - <source>%1 - copy</source> - <translation>%1 - copie</translation> + <source>%name% - copy</source> + <translation type="unfinished">%name% - copie</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="121"/> - <source>%1 - copy (%2)</source> - <translation>%1 - copie (%2)</translation> + <location filename="../../FileIsSameDialog.cpp" line="118"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">%name% - copie (%number%)</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Try rename with using special characters</source> <translation>Essaie de renommage avec caratĆ©res interdits</translation> </message> @@ -464,21 +464,21 @@ </message> <message> <location filename="../../FolderExistsDialog.cpp" line="122"/> - <source>%1 - copy</source> - <translation>%1 - copie</translation> + <source>%name% - copy</source> + <translation type="unfinished">%name% - copie</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="132"/> - <source>%1 - copy (%2)</source> - <translation>%1 - copie (%2)</translation> + <location filename="../../FolderExistsDialog.cpp" line="131"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">%name% - copie (%number%)</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Try rename with using special characters</source> <translation>Essaie de renommage avec caratĆ©res interdits</translation> </message> @@ -486,49 +486,49 @@ <context> <name>ListThread</name> <message> - <location filename="../../ListThread.cpp" line="1482"/> - <location filename="../../ListThread.cpp" line="2414"/> + <location filename="../../ListThread.cpp" line="1487"/> + <location filename="../../ListThread.cpp" line="2419"/> <source>Unable do to move or copy item into wrong forced mode: %1</source> <translation>Impossible de faire un dĆ©placement ou une copie dans le mauvais mode forcĆ©: %1</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1489"/> - <location filename="../../ListThread.cpp" line="2421"/> + <location filename="../../ListThread.cpp" line="1494"/> + <location filename="../../ListThread.cpp" line="2426"/> <source>Unable to save the transfer list: %1</source> <translation>Impossible de sauvegarder la liste de transfert: %1</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1505"/> + <location filename="../../ListThread.cpp" line="1510"/> <source>Problem reading file, or file-size is 0</source> <translation>Problem durant la lecture, ou taille de fichier est 0</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1512"/> + <location filename="../../ListThread.cpp" line="1517"/> <source>Wrong header: "%1"</source> <translation>Mauvais en-tĆŖte: "%1"</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1521"/> + <location filename="../../ListThread.cpp" line="1526"/> <source>The transfer list is in mixed mode, but this instance is not in this mode</source> <translation>La liste de transfert est en mode mixte, mais l'instance n'est pas dans ce mode</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1530"/> + <location filename="../../ListThread.cpp" line="1535"/> <source>The transfer list is in copy mode, but this instance is not in this mode</source> <translation>La liste de transfert est en mode copie, mais l'instance n'est pas dans ce mode</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1536"/> + <location filename="../../ListThread.cpp" line="1541"/> <source>The transfer list is in move mode, but this instance is not in this mode</source> <translation>La liste de transfert est en mode dĆ©placement, mais l'instance n'est pas dans ce mode</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1599"/> + <location filename="../../ListThread.cpp" line="1604"/> <source>Some errors have been found during the line parsing</source> <translation>Certaine erreur ont Ć©tĆ© trouvĆ© durant l'analise de la line</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1607"/> + <location filename="../../ListThread.cpp" line="1612"/> <source>Unable to open the transfer list: %1</source> <translation>Impossible d'ouvrir la list de transfert: %1</translation> </message> @@ -570,24 +570,24 @@ <context> <name>ReadThread</name> <message> - <location filename="../../ReadThread.cpp" line="55"/> + <location filename="../../ReadThread.cpp" line="59"/> <source>Internal error, please report it!</source> <translation>Erreur interne, merci de la reporter!</translation> </message> <message> - <location filename="../../ReadThread.cpp" line="184"/> + <location filename="../../ReadThread.cpp" line="188"/> <source>Internal error reading the source file:block size out of range</source> <translation>Erreur interne lisant le fichier source: taille de block hors de la plage</translation> </message> <message> - <location filename="../../ReadThread.cpp" line="192"/> - <location filename="../../ReadThread.cpp" line="408"/> + <location filename="../../ReadThread.cpp" line="196"/> + <location filename="../../ReadThread.cpp" line="420"/> <source>Unable to read the source file: </source> <translation>Impossible de lire le fichier source: </translation> </message> <message> - <location filename="../../ReadThread.cpp" line="233"/> - <location filename="../../ReadThread.cpp" line="456"/> + <location filename="../../ReadThread.cpp" line="237"/> + <location filename="../../ReadThread.cpp" line="468"/> <source>File truncated during the read, possible data change</source> <translatorcomment>La taille du fichier a diminuĆ© durant -> changĆ© le texte original</translatorcomment> <translation>Fichier a diminuĆ© durant la lecture, possible changement de donnĆ©es</translation> @@ -596,42 +596,32 @@ <context> <name>RenamingRules</name> <message> - <location filename="../../RenamingRules.ui" line="26"/> + <location filename="../../RenamingRules.ui" line="35"/> <source>First renaming</source> <translation>Premier renommage</translation> </message> <message> - <location filename="../../RenamingRules.ui" line="32"/> - <source>%name% - copy</source> + <location filename="../../RenamingRules.ui" line="41"/> + <source>%name% - copy%suffix%</source> <extracomment>%name% should not be translated</extracomment> - <translatorcomment>variables need never be translated</translatorcomment> - <translation>%name% - copie</translation> - </message> - <message> - <location filename="../../RenamingRules.ui" line="39"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p></body></html></source> - <extracomment> should not be translated</extracomment> - <translatorcomment>variables need never be translated</translatorcomment> - <translation><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> pour le nom originel</p></body></html></translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="49"/> - <source>Second renaming</source> - <translation>Second renommage</translation> + <location filename="../../RenamingRules.ui" line="57"/> + <source>%name% - copy (%number%)%suffix%</source> + <extracomment>%name%, %number% should not be translated</extracomment> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="55"/> - <source>%name% - copy (%number%)</source> + <location filename="../../RenamingRules.ui" line="67"/> + <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name, <span style=" font-weight:600;">%number%</span> for the extra number, <span style=" font-weight:600;">%suffix%</span> file suffix</p></body></html></source> <extracomment>%name%, %number% should not be translated</extracomment> - <translatorcomment>variables need never be translated</translatorcomment> - <translation>%name% - copie (%number%)</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="62"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p><p><span style=" font-weight:600;">%number%</span> for the extra number</p></body></html></source> - <extracomment>%name%, %number% should not be translated</extracomment> - <translatorcomment>variables need never be translated</translatorcomment> - <translation><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> pour le nom originel</p><p><span style=" font-weight:600;">%number%</span> pour le nombre extra</p></body></html></translation> + <location filename="../../RenamingRules.ui" line="51"/> + <source>Second renaming</source> + <translation>Second renommage</translation> </message> <message> <location filename="../../RenamingRules.cpp" line="39"/> @@ -660,33 +650,41 @@ </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="338"/> - <location filename="../../ScanFileOrFolder.cpp" line="404"/> <source>%1 - copy</source> <translation>%1 - copie</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="348"/> - <location filename="../../ScanFileOrFolder.cpp" line="414"/> + <location filename="../../ScanFileOrFolder.cpp" line="345"/> <source>%1 - copy (%2)</source> <translation>%1 - copie (%2)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> + <location filename="../../ScanFileOrFolder.cpp" line="401"/> + <source>%name% - copy</source> + <translation type="unfinished">%name% - copie</translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="408"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">%name% - copie (%number%)</translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="444"/> <source>This is not a folder</source> <translation>N'est pas un dossier</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> + <location filename="../../ScanFileOrFolder.cpp" line="446"/> <source>The folder does exists</source> <translation>Le rĆ©pertoire n'existe pas</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="448"/> <source>The folder is not readable</source> <translation>Le rĆ©pertoire n'est pas lisible</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="467"/> + <location filename="../../ScanFileOrFolder.cpp" line="459"/> <source>Problem with name encoding</source> <translation>ProblĆ©m d'encodage</translation> </message> @@ -695,9 +693,9 @@ <name>TransferThread</name> <message> <location filename="../../TransferThread.cpp" line="244"/> - <location filename="../../TransferThread.cpp" line="677"/> - <location filename="../../TransferThread.cpp" line="749"/> - <location filename="../../TransferThread.cpp" line="1319"/> + <location filename="../../TransferThread.cpp" line="673"/> + <location filename="../../TransferThread.cpp" line="745"/> + <location filename="../../TransferThread.cpp" line="1315"/> <source>File not found</source> <translation>Fichier non trouvĆ©</translation> </message> @@ -717,39 +715,29 @@ <translation>racine</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="645"/> - <source>%1 - copy</source> - <translation>%1 - copie</translation> - </message> - <message> - <location filename="../../TransferThread.cpp" line="655"/> - <source>%1 - copy (%2)</source> - <translation>%1 - copie (%2)</translation> - </message> - <message> - <location filename="../../TransferThread.cpp" line="791"/> + <location filename="../../TransferThread.cpp" line="787"/> <source>The source doesn't exist</source> <translation>La source n'existe pas</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="715"/> - <location filename="../../TransferThread.cpp" line="830"/> + <location filename="../../TransferThread.cpp" line="711"/> + <location filename="../../TransferThread.cpp" line="826"/> <source>The source file doesn't exist</source> <translation>Le fichier source n'existe pas</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1138"/> + <location filename="../../TransferThread.cpp" line="1134"/> <source>The checksums do not match</source> <translation>Les sommes de controle ne correspondent pas</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1243"/> + <location filename="../../TransferThread.cpp" line="1239"/> <source>Internal error: The size transfered doesn't match</source> <translation>Erreur interne: La taille transfĆ©rĆ© ne corresponds pas</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="755"/> - <location filename="../../TransferThread.cpp" line="842"/> + <location filename="../../TransferThread.cpp" line="751"/> + <location filename="../../TransferThread.cpp" line="838"/> <source>Unable to do the folder</source> <translation>Impossible de crĆ©er le dossier</translation> </message> @@ -771,24 +759,34 @@ <translation>Erreur interne: DĆ©jĆ ouvert</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="836"/> + <location filename="../../TransferThread.cpp" line="645"/> + <source>%name% - copy</source> + <translation type="unfinished">%name% - copie</translation> + </message> + <message> + <location filename="../../TransferThread.cpp" line="652"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">%name% - copie (%number%)</translation> + </message> + <message> + <location filename="../../TransferThread.cpp" line="832"/> <source>Another file exists at same place</source> <translation>Un autre fichier exists Ć la mĆŖme place</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1228"/> + <location filename="../../TransferThread.cpp" line="1224"/> <source>Internal error: The destination is not closed</source> <translation>Erreur interne: La destination n'est pas fermĆ©</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1254"/> + <location filename="../../TransferThread.cpp" line="1250"/> <source>Internal error: The buffer is not empty</source> <translation>Erreur interne: Le buffer n'est pas vide</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1319"/> - <location filename="../../TransferThread.cpp" line="1337"/> - <location filename="../../TransferThread.cpp" line="1352"/> + <location filename="../../TransferThread.cpp" line="1315"/> + <location filename="../../TransferThread.cpp" line="1333"/> + <location filename="../../TransferThread.cpp" line="1348"/> <source>Unable to change the date</source> <translation>Impossible de changer la date</translation> </message> @@ -796,22 +794,22 @@ <context> <name>WriteThread</name> <message> - <location filename="../../WriteThread.cpp" line="80"/> + <location filename="../../WriteThread.cpp" line="83"/> <source>Path resolution error (Empty path)</source> <translation>Erreur de rĆ©solution de chemain (chemain vide)</translation> </message> <message> - <location filename="../../WriteThread.cpp" line="269"/> + <location filename="../../WriteThread.cpp" line="277"/> <source>Internal error, please report it!</source> <translation>Erreur interne, merci de la reporter!</translation> </message> <message> - <location filename="../../WriteThread.cpp" line="672"/> + <location filename="../../WriteThread.cpp" line="680"/> <source>Unable to read the source file: </source> <translation>Impossible de lire le fichier source: </translation> </message> <message> - <location filename="../../WriteThread.cpp" line="697"/> + <location filename="../../WriteThread.cpp" line="705"/> <source>File truncated during read, possible data change</source> <translation>Fichier rĆ©trĆ©ci pendant la lecture, possible changement de donnĆ©es</translation> </message> @@ -819,198 +817,198 @@ <context> <name>copyEngineOptions</name> <message> - <location filename="../../copyEngineOptions.ui" line="35"/> + <location filename="../../copyEngineOptions.ui" line="44"/> <source>Transfer</source> <translation>Transfert</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="44"/> + <location filename="../../copyEngineOptions.ui" line="53"/> <source>Move the whole folder</source> <translation>DĆ©placer le dossier complet</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="51"/> + <location filename="../../copyEngineOptions.ui" line="60"/> <source>Transfer the file rights</source> <translation>TransfĆ©rer les droits des fichiers</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="61"/> + <location filename="../../copyEngineOptions.ui" line="70"/> <source>Keep the file date</source> <translation>Garder la date du fichier</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="74"/> + <location filename="../../copyEngineOptions.ui" line="83"/> <source>Autostart the transfer</source> <translation>DĆ©marrer automatiquement le transfert</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="81"/> - <location filename="../../copyEngineOptions.ui" line="101"/> + <location filename="../../copyEngineOptions.ui" line="90"/> + <location filename="../../copyEngineOptions.ui" line="110"/> <source>Less performance if checked</source> <translation>Moins de performance si cochĆ©</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="104"/> + <location filename="../../copyEngineOptions.ui" line="113"/> <source>Follow the strict order</source> <translation>Suivre l'ordre strict</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="130"/> + <location filename="../../copyEngineOptions.ui" line="139"/> <source>Error and collision</source> <translation>Erreur et collision</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="136"/> + <location filename="../../copyEngineOptions.ui" line="145"/> <source>When folder error</source> <translation>En cas d'erreur de rĆ©pertoire</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="146"/> + <location filename="../../copyEngineOptions.ui" line="155"/> <source>When file error</source> <translation>En cas d'erreur de fichier</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="172"/> + <location filename="../../copyEngineOptions.ui" line="181"/> <source>When file collision</source> <translation>En cas de collision de fichier</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="232"/> + <location filename="../../copyEngineOptions.ui" line="241"/> <source>When folder collision</source> <translation>Lors d'une collision de dossier</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="263"/> + <location filename="../../copyEngineOptions.ui" line="272"/> <source>Check if destination folder exists</source> <translation>VĆ©rifier si le rĆ©pertoire de destination existe</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="270"/> + <location filename="../../copyEngineOptions.ui" line="279"/> <source>Renaming rules</source> <translation>RĆØgles de renommage</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="290"/> + <location filename="../../copyEngineOptions.ui" line="299"/> <source>Delete partially transferred files</source> <translation>Supprimer les transferts partiels</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="303"/> + <location filename="../../copyEngineOptions.ui" line="312"/> <source>Rename the original destination</source> <translation>Renommer la destination originale</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="334"/> + <location filename="../../copyEngineOptions.ui" line="343"/> <source>Control</source> <translation>Controle</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="340"/> + <location filename="../../copyEngineOptions.ui" line="349"/> <source>Checksum</source> <translation>Somme de contrĆ“le</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="349"/> + <location filename="../../copyEngineOptions.ui" line="358"/> <source>Only after error</source> <translation>Seulement aprĆØs erreur</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="356"/> + <location filename="../../copyEngineOptions.ui" line="365"/> <source>Ignore if impossible</source> <translation>Ignorer si impossible</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="373"/> + <location filename="../../copyEngineOptions.ui" line="382"/> <source>Verify checksums</source> <translation>VĆ©rifier les sommes de contrĆ“les</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="405"/> + <location filename="../../copyEngineOptions.ui" line="414"/> <source>Performance</source> <translation>Performance</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="411"/> + <location filename="../../copyEngineOptions.ui" line="420"/> <source>Parallel buffer</source> <translation>Buffer parallĆ©le</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="418"/> - <location filename="../../copyEngineOptions.ui" line="431"/> - <location filename="../../copyEngineOptions.ui" line="444"/> - <location filename="../../copyEngineOptions.ui" line="481"/> - <location filename="../../copyEngineOptions.ui" line="550"/> + <location filename="../../copyEngineOptions.ui" line="427"/> + <location filename="../../copyEngineOptions.ui" line="440"/> + <location filename="../../copyEngineOptions.ui" line="453"/> + <location filename="../../copyEngineOptions.ui" line="490"/> + <location filename="../../copyEngineOptions.ui" line="559"/> <source>KB</source> <translation>Ko</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="460"/> + <location filename="../../copyEngineOptions.ui" line="469"/> <source>Block size</source> <translation>Taille de bloc</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="467"/> + <location filename="../../copyEngineOptions.ui" line="476"/> <source>Sequential buffer</source> <translation>Buffer sĆ©quentiel</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="474"/> + <location filename="../../copyEngineOptions.ui" line="483"/> <source>Enable OS buffer</source> <translation>Activer le tampon de l'OS</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="497"/> + <location filename="../../copyEngineOptions.ui" line="506"/> <source>OS buffer only if smaller than</source> <translation>Tampon de l'OS seulement si plus petit que</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="504"/> + <location filename="../../copyEngineOptions.ui" line="513"/> <source>Transfer algorithm</source> <translation>Algorithme de transfert</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="543"/> + <location filename="../../copyEngineOptions.ui" line="552"/> <source>Parallelize if smaller than</source> <translation>ParallĆØlise si plus petit que</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="573"/> - <source>Inode threads</source> - <translation>Thread d'inode</translation> + <location filename="../../copyEngineOptions.ui" line="582"/> + <source>Inode threads (unsafe > 1)</source> + <translation>Inode threads (non sĆ©curisĆ©> 1)</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="580"/> - <location filename="../../copyEngineOptions.ui" line="590"/> + <location filename="../../copyEngineOptions.ui" line="589"/> + <location filename="../../copyEngineOptions.ui" line="599"/> <source>More cpu, but better organisation on the disk</source> <translation>Plus de cpu mais meilleur organisation sur le disque</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="593"/> + <location filename="../../copyEngineOptions.ui" line="602"/> <source>Order the list</source> <translation>Ordonner la liste</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="609"/> + <location filename="../../copyEngineOptions.ui" line="618"/> <source>Misc</source> <translation>Divers</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="615"/> + <location filename="../../copyEngineOptions.ui" line="624"/> <source>Check the disk space</source> <translation>VĆ©rifier l'espace disque</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="625"/> + <location filename="../../copyEngineOptions.ui" line="634"/> <source>Use this folder when destination is not set</source> <translation>Utiliser ce dossier quand la destination n'est pas dĆ©fini</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="637"/> + <location filename="../../copyEngineOptions.ui" line="646"/> <source>Browse</source> <translation>Parcourir</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="659"/> + <location filename="../../copyEngineOptions.ui" line="668"/> <source>Filters</source> <translation>Filtres</translation> </message> diff --git a/plugins/CopyEngine/Ultracopier/Languages/hi/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/hi/translation.ts index 4d395a0..e17b3f2 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/hi/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/hi/translation.ts @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="419"/> - <location filename="../../CopyEngineFactory.cpp" line="422"/> <location filename="../../CopyEngineFactory.cpp" line="427"/> - <location filename="../../CopyEngineFactory.cpp" line="431"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> <location filename="../../CopyEngineFactory.cpp" line="428"/> <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="425"/> - <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="443"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="447"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -274,21 +274,21 @@ <name>FileExistsDialog</name> <message> <location filename="../../FileExistsDialog.cpp" line="137"/> - <source>%1 - copy</source> + <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="147"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileExistsDialog.cpp" line="144"/> + <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -297,21 +297,21 @@ <name>FileIsSameDialog</name> <message> <location filename="../../FileIsSameDialog.cpp" line="111"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="121"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileIsSameDialog.cpp" line="118"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -464,21 +464,21 @@ </message> <message> <location filename="../../FolderExistsDialog.cpp" line="122"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="132"/> - <source>%1 - copy (%2)</source> + <location filename="../../FolderExistsDialog.cpp" line="131"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -486,49 +486,49 @@ <context> <name>ListThread</name> <message> - <location filename="../../ListThread.cpp" line="1482"/> - <location filename="../../ListThread.cpp" line="2414"/> + <location filename="../../ListThread.cpp" line="1487"/> + <location filename="../../ListThread.cpp" line="2419"/> <source>Unable do to move or copy item into wrong forced mode: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1489"/> - <location filename="../../ListThread.cpp" line="2421"/> + <location filename="../../ListThread.cpp" line="1494"/> + <location filename="../../ListThread.cpp" line="2426"/> <source>Unable to save the transfer list: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1505"/> + <location filename="../../ListThread.cpp" line="1510"/> <source>Problem reading file, or file-size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1512"/> + <location filename="../../ListThread.cpp" line="1517"/> <source>Wrong header: "%1"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1521"/> + <location filename="../../ListThread.cpp" line="1526"/> <source>The transfer list is in mixed mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1530"/> + <location filename="../../ListThread.cpp" line="1535"/> <source>The transfer list is in copy mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1536"/> + <location filename="../../ListThread.cpp" line="1541"/> <source>The transfer list is in move mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1599"/> + <location filename="../../ListThread.cpp" line="1604"/> <source>Some errors have been found during the line parsing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1607"/> + <location filename="../../ListThread.cpp" line="1612"/> <source>Unable to open the transfer list: %1</source> <translation type="unfinished"></translation> </message> @@ -570,24 +570,24 @@ <context> <name>ReadThread</name> <message> - <location filename="../../ReadThread.cpp" line="55"/> + <location filename="../../ReadThread.cpp" line="59"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="184"/> + <location filename="../../ReadThread.cpp" line="188"/> <source>Internal error reading the source file:block size out of range</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="192"/> - <location filename="../../ReadThread.cpp" line="408"/> + <location filename="../../ReadThread.cpp" line="196"/> + <location filename="../../ReadThread.cpp" line="420"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="233"/> - <location filename="../../ReadThread.cpp" line="456"/> + <location filename="../../ReadThread.cpp" line="237"/> + <location filename="../../ReadThread.cpp" line="468"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -595,37 +595,31 @@ <context> <name>RenamingRules</name> <message> - <location filename="../../RenamingRules.ui" line="26"/> + <location filename="../../RenamingRules.ui" line="35"/> <source>First renaming</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="32"/> - <source>%name% - copy</source> + <location filename="../../RenamingRules.ui" line="41"/> + <source>%name% - copy%suffix%</source> <extracomment>%name% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="39"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p></body></html></source> - <extracomment> should not be translated</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../RenamingRules.ui" line="49"/> - <source>Second renaming</source> + <location filename="../../RenamingRules.ui" line="57"/> + <source>%name% - copy (%number%)%suffix%</source> + <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="55"/> - <source>%name% - copy (%number%)</source> + <location filename="../../RenamingRules.ui" line="67"/> + <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name, <span style=" font-weight:600;">%number%</span> for the extra number, <span style=" font-weight:600;">%suffix%</span> file suffix</p></body></html></source> <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="62"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p><p><span style=" font-weight:600;">%number%</span> for the extra number</p></body></html></source> - <extracomment>%name%, %number% should not be translated</extracomment> + <location filename="../../RenamingRules.ui" line="51"/> + <source>Second renaming</source> <translation type="unfinished"></translation> </message> <message> @@ -655,33 +649,41 @@ </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="338"/> - <location filename="../../ScanFileOrFolder.cpp" line="404"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="348"/> - <location filename="../../ScanFileOrFolder.cpp" line="414"/> + <location filename="../../ScanFileOrFolder.cpp" line="345"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> + <location filename="../../ScanFileOrFolder.cpp" line="401"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="408"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="444"/> <source>This is not a folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> + <location filename="../../ScanFileOrFolder.cpp" line="446"/> <source>The folder does exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="448"/> <source>The folder is not readable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="467"/> + <location filename="../../ScanFileOrFolder.cpp" line="459"/> <source>Problem with name encoding</source> <translation type="unfinished"></translation> </message> @@ -690,9 +692,9 @@ <name>TransferThread</name> <message> <location filename="../../TransferThread.cpp" line="244"/> - <location filename="../../TransferThread.cpp" line="677"/> - <location filename="../../TransferThread.cpp" line="749"/> - <location filename="../../TransferThread.cpp" line="1319"/> + <location filename="../../TransferThread.cpp" line="673"/> + <location filename="../../TransferThread.cpp" line="745"/> + <location filename="../../TransferThread.cpp" line="1315"/> <source>File not found</source> <translation type="unfinished"></translation> </message> @@ -725,60 +727,60 @@ </message> <message> <location filename="../../TransferThread.cpp" line="645"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="655"/> - <source>%1 - copy (%2)</source> + <location filename="../../TransferThread.cpp" line="652"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="715"/> - <location filename="../../TransferThread.cpp" line="830"/> + <location filename="../../TransferThread.cpp" line="711"/> + <location filename="../../TransferThread.cpp" line="826"/> <source>The source file doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="755"/> - <location filename="../../TransferThread.cpp" line="842"/> + <location filename="../../TransferThread.cpp" line="751"/> + <location filename="../../TransferThread.cpp" line="838"/> <source>Unable to do the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="791"/> + <location filename="../../TransferThread.cpp" line="787"/> <source>The source doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="836"/> + <location filename="../../TransferThread.cpp" line="832"/> <source>Another file exists at same place</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1138"/> + <location filename="../../TransferThread.cpp" line="1134"/> <source>The checksums do not match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1228"/> + <location filename="../../TransferThread.cpp" line="1224"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1243"/> + <location filename="../../TransferThread.cpp" line="1239"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1254"/> + <location filename="../../TransferThread.cpp" line="1250"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1319"/> - <location filename="../../TransferThread.cpp" line="1337"/> - <location filename="../../TransferThread.cpp" line="1352"/> + <location filename="../../TransferThread.cpp" line="1315"/> + <location filename="../../TransferThread.cpp" line="1333"/> + <location filename="../../TransferThread.cpp" line="1348"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -791,22 +793,22 @@ <context> <name>WriteThread</name> <message> - <location filename="../../WriteThread.cpp" line="80"/> + <location filename="../../WriteThread.cpp" line="83"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="269"/> + <location filename="../../WriteThread.cpp" line="277"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="672"/> + <location filename="../../WriteThread.cpp" line="680"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="697"/> + <location filename="../../WriteThread.cpp" line="705"/> <source>File truncated during read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -814,198 +816,198 @@ <context> <name>copyEngineOptions</name> <message> - <location filename="../../copyEngineOptions.ui" line="35"/> + <location filename="../../copyEngineOptions.ui" line="44"/> <source>Transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="44"/> + <location filename="../../copyEngineOptions.ui" line="53"/> <source>Move the whole folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="51"/> + <location filename="../../copyEngineOptions.ui" line="60"/> <source>Transfer the file rights</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="61"/> + <location filename="../../copyEngineOptions.ui" line="70"/> <source>Keep the file date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="74"/> + <location filename="../../copyEngineOptions.ui" line="83"/> <source>Autostart the transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="81"/> - <location filename="../../copyEngineOptions.ui" line="101"/> + <location filename="../../copyEngineOptions.ui" line="90"/> + <location filename="../../copyEngineOptions.ui" line="110"/> <source>Less performance if checked</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="104"/> + <location filename="../../copyEngineOptions.ui" line="113"/> <source>Follow the strict order</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="130"/> + <location filename="../../copyEngineOptions.ui" line="139"/> <source>Error and collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="136"/> + <location filename="../../copyEngineOptions.ui" line="145"/> <source>When folder error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="146"/> + <location filename="../../copyEngineOptions.ui" line="155"/> <source>When file error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="172"/> + <location filename="../../copyEngineOptions.ui" line="181"/> <source>When file collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="232"/> + <location filename="../../copyEngineOptions.ui" line="241"/> <source>When folder collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="263"/> + <location filename="../../copyEngineOptions.ui" line="272"/> <source>Check if destination folder exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="270"/> + <location filename="../../copyEngineOptions.ui" line="279"/> <source>Renaming rules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="290"/> + <location filename="../../copyEngineOptions.ui" line="299"/> <source>Delete partially transferred files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="303"/> + <location filename="../../copyEngineOptions.ui" line="312"/> <source>Rename the original destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="334"/> + <location filename="../../copyEngineOptions.ui" line="343"/> <source>Control</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="340"/> + <location filename="../../copyEngineOptions.ui" line="349"/> <source>Checksum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="349"/> + <location filename="../../copyEngineOptions.ui" line="358"/> <source>Only after error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="356"/> + <location filename="../../copyEngineOptions.ui" line="365"/> <source>Ignore if impossible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="373"/> + <location filename="../../copyEngineOptions.ui" line="382"/> <source>Verify checksums</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="405"/> + <location filename="../../copyEngineOptions.ui" line="414"/> <source>Performance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="411"/> + <location filename="../../copyEngineOptions.ui" line="420"/> <source>Parallel buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="418"/> - <location filename="../../copyEngineOptions.ui" line="431"/> - <location filename="../../copyEngineOptions.ui" line="444"/> - <location filename="../../copyEngineOptions.ui" line="481"/> - <location filename="../../copyEngineOptions.ui" line="550"/> + <location filename="../../copyEngineOptions.ui" line="427"/> + <location filename="../../copyEngineOptions.ui" line="440"/> + <location filename="../../copyEngineOptions.ui" line="453"/> + <location filename="../../copyEngineOptions.ui" line="490"/> + <location filename="../../copyEngineOptions.ui" line="559"/> <source>KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="460"/> + <location filename="../../copyEngineOptions.ui" line="469"/> <source>Block size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="467"/> + <location filename="../../copyEngineOptions.ui" line="476"/> <source>Sequential buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="474"/> + <location filename="../../copyEngineOptions.ui" line="483"/> <source>Enable OS buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="497"/> + <location filename="../../copyEngineOptions.ui" line="506"/> <source>OS buffer only if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="504"/> + <location filename="../../copyEngineOptions.ui" line="513"/> <source>Transfer algorithm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="543"/> + <location filename="../../copyEngineOptions.ui" line="552"/> <source>Parallelize if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="573"/> - <source>Inode threads</source> + <location filename="../../copyEngineOptions.ui" line="582"/> + <source>Inode threads (unsafe > 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="580"/> - <location filename="../../copyEngineOptions.ui" line="590"/> + <location filename="../../copyEngineOptions.ui" line="589"/> + <location filename="../../copyEngineOptions.ui" line="599"/> <source>More cpu, but better organisation on the disk</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="593"/> + <location filename="../../copyEngineOptions.ui" line="602"/> <source>Order the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="609"/> + <location filename="../../copyEngineOptions.ui" line="618"/> <source>Misc</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="615"/> + <location filename="../../copyEngineOptions.ui" line="624"/> <source>Check the disk space</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="625"/> + <location filename="../../copyEngineOptions.ui" line="634"/> <source>Use this folder when destination is not set</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="637"/> + <location filename="../../copyEngineOptions.ui" line="646"/> <source>Browse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="659"/> + <location filename="../../copyEngineOptions.ui" line="668"/> <source>Filters</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/CopyEngine/Ultracopier/Languages/hu/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/hu/translation.ts index 0745ac7..ca0151e 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/hu/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/hu/translation.ts @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="419"/> - <location filename="../../CopyEngineFactory.cpp" line="422"/> <location filename="../../CopyEngineFactory.cpp" line="427"/> - <location filename="../../CopyEngineFactory.cpp" line="431"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Ask</source> <translation>KĆ©rdezzen rĆ”</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> <location filename="../../CopyEngineFactory.cpp" line="428"/> <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Skip</source> <translation>Kihagy</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Merge</source> <translation>Ćsszeolvaszt</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="425"/> - <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> <source>Rename</source> <translation>Nevezze Ć”t</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> <source>Put at the end</source> <translation>Helyezze a vĆ©gĆ©re</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> <source>Overwrite</source> <translation>FelĆ¼lĆr</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> <source>Overwrite if different</source> <translation>FelĆ¼lĆr, ha kĆ¼lƶnbƶzik</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="443"/> <source>Overwrite if newer</source> <translation>FelĆ¼lĆr, ha Ćŗjabb</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> <source>Overwrite if older</source> <translation>FelĆ¼lĆr, ha rĆ©gebbi</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="447"/> <source>Automatic</source> <translation>Automatikus</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Sequential</source> <translation>SzekvenciĆ”lis</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Parallel</source> <translation>PĆ”rhuzamos</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options error</source> <translation>BeĆ”llĆtĆ”si hiba</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation>A beĆ”llĆtĆ”si motor nincs betƶltve. A szűrÅk elĆ©rĆ©se nem lehetsĆ©ges</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options engine is not loaded, can't access to the filters</source> <translation>A beĆ”llĆtĆ”si motor nincs betƶltve, a szűrÅk elĆ©rĆ©se nem lehetsĆ©ges</translation> </message> @@ -274,21 +274,21 @@ <name>FileExistsDialog</name> <message> <location filename="../../FileExistsDialog.cpp" line="137"/> - <source>%1 - copy</source> - <translation>%1 - mĆ”solĆ”s</translation> + <source>%name% - copy%suffix%</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="147"/> - <source>%1 - copy (%2)</source> - <translation>%1 - mĆ”solĆ”s (%2)</translation> + <location filename="../../FileExistsDialog.cpp" line="144"/> + <source>%name% - copy (%number%)%suffix%</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Error</source> <translation>Hiba</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Try rename with using special characters</source> <translation>ĆtnevezĆ©s speciĆ”lis karakterek hasznĆ”latĆ”val</translation> </message> @@ -297,21 +297,21 @@ <name>FileIsSameDialog</name> <message> <location filename="../../FileIsSameDialog.cpp" line="111"/> - <source>%1 - copy</source> - <translation>%1 - mĆ”solĆ”s</translation> + <source>%name% - copy</source> + <translation type="unfinished">%name% - mĆ”solĆ”s</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="121"/> - <source>%1 - copy (%2)</source> - <translation>%1 - mĆ”solĆ”s (%2)</translation> + <location filename="../../FileIsSameDialog.cpp" line="118"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">%name% - mĆ”solĆ”s (%number%)</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Error</source> <translation>Hiba</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Try rename with using special characters</source> <translation>ĆtnevezĆ©s speciĆ”lis karakterek hasznĆ”latĆ”val</translation> </message> @@ -464,21 +464,21 @@ </message> <message> <location filename="../../FolderExistsDialog.cpp" line="122"/> - <source>%1 - copy</source> - <translation>%1 - mĆ”solĆ”s</translation> + <source>%name% - copy</source> + <translation type="unfinished">%name% - mĆ”solĆ”s</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="132"/> - <source>%1 - copy (%2)</source> - <translation>%1 - mĆ”solĆ”s (%2)</translation> + <location filename="../../FolderExistsDialog.cpp" line="131"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">%name% - mĆ”solĆ”s (%number%)</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Error</source> <translation>Hiba</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Try rename with using special characters</source> <translation>ĆtnevezĆ©s speciĆ”lis karakterek hasznĆ”latĆ”val</translation> </message> @@ -486,49 +486,49 @@ <context> <name>ListThread</name> <message> - <location filename="../../ListThread.cpp" line="1482"/> - <location filename="../../ListThread.cpp" line="2414"/> + <location filename="../../ListThread.cpp" line="1487"/> + <location filename="../../ListThread.cpp" line="2419"/> <source>Unable do to move or copy item into wrong forced mode: %1</source> <translation>Elem mĆ”solĆ”sa vagy mozgatĆ”s nem lehetsĆ©ges a hibĆ”s kĆ©nyszerĆtett mĆ³dban: %1</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1489"/> - <location filename="../../ListThread.cpp" line="2421"/> + <location filename="../../ListThread.cpp" line="1494"/> + <location filename="../../ListThread.cpp" line="2426"/> <source>Unable to save the transfer list: %1</source> <translation>Ćtviteli lista mentĆ©se nem lehetsĆ©ges: %1</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1505"/> + <location filename="../../ListThread.cpp" line="1510"/> <source>Problem reading file, or file-size is 0</source> <translation>Hiba a fĆ”jl olvasĆ”sĆ”nĆ”l vagy a fĆ”lmĆ©ret 0</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1512"/> + <location filename="../../ListThread.cpp" line="1517"/> <source>Wrong header: "%1"</source> <translation>HibĆ”s fejlĆ©c: "%1"</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1521"/> + <location filename="../../ListThread.cpp" line="1526"/> <source>The transfer list is in mixed mode, but this instance is not in this mode</source> <translation>Az Ć”tviteli lista kevert mĆ³dban van, de ez a pĆ©ldĆ”ny nincs</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1530"/> + <location filename="../../ListThread.cpp" line="1535"/> <source>The transfer list is in copy mode, but this instance is not in this mode</source> <translation>Az Ć”tviteli lista mĆ”solĆ”s mĆ³dban van, de ez a pĆ©ldĆ”ny nincs</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1536"/> + <location filename="../../ListThread.cpp" line="1541"/> <source>The transfer list is in move mode, but this instance is not in this mode</source> <translation>Az Ć”tviteli lista mozgatĆ”s mĆ³dban van, de ez a pĆ©ldĆ”ny nincs</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1599"/> + <location filename="../../ListThread.cpp" line="1604"/> <source>Some errors have been found during the line parsing</source> <translation>NĆ©hĆ”ny hiba tƶrtĆ©nt a sorelemzĆ©s sorĆ”n</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1607"/> + <location filename="../../ListThread.cpp" line="1612"/> <source>Unable to open the transfer list: %1</source> <translation>Az Ć”tviteli lista megnyitĆ”sa nem lehetsĆ©ges: %1</translation> </message> @@ -570,24 +570,24 @@ <context> <name>ReadThread</name> <message> - <location filename="../../ReadThread.cpp" line="55"/> + <location filename="../../ReadThread.cpp" line="59"/> <source>Internal error, please report it!</source> <translation>BelsÅ hiba, kĆ©rlek jelentsd!</translation> </message> <message> - <location filename="../../ReadThread.cpp" line="184"/> + <location filename="../../ReadThread.cpp" line="188"/> <source>Internal error reading the source file:block size out of range</source> <translation>BelsÅ hiba tƶrtĆ©nt a forrĆ”sfĆ”jl olvasĆ”sakor: a blokkmĆ©ret tartomĆ”nyon kĆvĆ¼li</translation> </message> <message> - <location filename="../../ReadThread.cpp" line="192"/> - <location filename="../../ReadThread.cpp" line="408"/> + <location filename="../../ReadThread.cpp" line="196"/> + <location filename="../../ReadThread.cpp" line="420"/> <source>Unable to read the source file: </source> <translation>A forrĆ”sfĆ”jl olvasĆ”sa nem lehetsĆ©ges:</translation> </message> <message> - <location filename="../../ReadThread.cpp" line="233"/> - <location filename="../../ReadThread.cpp" line="456"/> + <location filename="../../ReadThread.cpp" line="237"/> + <location filename="../../ReadThread.cpp" line="468"/> <source>File truncated during the read, possible data change</source> <translation>A fĆ”jl olvasĆ”s sorĆ”n megcsonkult, valĆ³szĆnűleg adatvĆ”ltozĆ”s miatt</translation> </message> @@ -600,38 +600,32 @@ <translation>ĆtnevezĆ©si szabĆ”lyok</translation> </message> <message> - <location filename="../../RenamingRules.ui" line="26"/> + <location filename="../../RenamingRules.ui" line="35"/> <source>First renaming</source> <translation>ElsÅ Ć”tnevezĆ©s</translation> </message> <message> - <location filename="../../RenamingRules.ui" line="32"/> - <source>%name% - copy</source> + <location filename="../../RenamingRules.ui" line="41"/> + <source>%name% - copy%suffix%</source> <extracomment>%name% should not be translated</extracomment> - <translation>%name% - mĆ”solĆ”s</translation> - </message> - <message> - <location filename="../../RenamingRules.ui" line="39"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p></body></html></source> - <extracomment> should not be translated</extracomment> - <translation><html><head/><body><p>VĆ”ltozĆ³k: <span style=" font-weight:600;">%name%</span> az eredeti fĆ”jlnĆ©vhez</p></body></html></translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="49"/> - <source>Second renaming</source> - <translation>MĆ”sodik Ć”tnevezĆ©s</translation> + <location filename="../../RenamingRules.ui" line="57"/> + <source>%name% - copy (%number%)%suffix%</source> + <extracomment>%name%, %number% should not be translated</extracomment> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="55"/> - <source>%name% - copy (%number%)</source> + <location filename="../../RenamingRules.ui" line="67"/> + <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name, <span style=" font-weight:600;">%number%</span> for the extra number, <span style=" font-weight:600;">%suffix%</span> file suffix</p></body></html></source> <extracomment>%name%, %number% should not be translated</extracomment> - <translation>%name% - mĆ”solĆ”s (%number%)</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="62"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p><p><span style=" font-weight:600;">%number%</span> for the extra number</p></body></html></source> - <extracomment>%name%, %number% should not be translated</extracomment> - <translation><html><head/><body><p>VĆ”ltozĆ³k: <span style=" font-weight:600;">%name%</span> az eredeti fĆ”jlnĆ©vhez</p><p><span style=" font-weight:600;">%number%</span> az extra szĆ”mhoz</p></body></html></translation> + <location filename="../../RenamingRules.ui" line="51"/> + <source>Second renaming</source> + <translation>MĆ”sodik Ć”tnevezĆ©s</translation> </message> <message> <location filename="../../RenamingRules.cpp" line="39"/> @@ -655,33 +649,41 @@ </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="338"/> - <location filename="../../ScanFileOrFolder.cpp" line="404"/> <source>%1 - copy</source> <translation>%1 - mĆ”solĆ”s</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="348"/> - <location filename="../../ScanFileOrFolder.cpp" line="414"/> + <location filename="../../ScanFileOrFolder.cpp" line="345"/> <source>%1 - copy (%2)</source> <translation>%1 - mĆ”solĆ”s (%2)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> + <location filename="../../ScanFileOrFolder.cpp" line="401"/> + <source>%name% - copy</source> + <translation type="unfinished">%name% - mĆ”solĆ”s</translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="408"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">%name% - mĆ”solĆ”s (%number%)</translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="444"/> <source>This is not a folder</source> <translation>Ez nem mappa</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> + <location filename="../../ScanFileOrFolder.cpp" line="446"/> <source>The folder does exists</source> <translation>A mappa lĆ©tezik</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="448"/> <source>The folder is not readable</source> <translation>A mappa nem olvashatĆ³</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="467"/> + <location filename="../../ScanFileOrFolder.cpp" line="459"/> <source>Problem with name encoding</source> <translation>ProblĆ©ma a nĆ©vkĆ³dolĆ”ssal</translation> </message> @@ -690,9 +692,9 @@ <name>TransferThread</name> <message> <location filename="../../TransferThread.cpp" line="244"/> - <location filename="../../TransferThread.cpp" line="677"/> - <location filename="../../TransferThread.cpp" line="749"/> - <location filename="../../TransferThread.cpp" line="1319"/> + <location filename="../../TransferThread.cpp" line="673"/> + <location filename="../../TransferThread.cpp" line="745"/> + <location filename="../../TransferThread.cpp" line="1315"/> <source>File not found</source> <translation>FĆ”jl nem talĆ”lhatĆ³</translation> </message> @@ -712,23 +714,13 @@ <translation type="unfinished">gyƶkĆ©r</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="645"/> - <source>%1 - copy</source> - <translation type="unfinished">%1 - mĆ”solĆ”s</translation> - </message> - <message> - <location filename="../../TransferThread.cpp" line="655"/> - <source>%1 - copy (%2)</source> - <translation type="unfinished">%1 - mĆ”solĆ”s (%2)</translation> - </message> - <message> - <location filename="../../TransferThread.cpp" line="791"/> + <location filename="../../TransferThread.cpp" line="787"/> <source>The source doesn't exist</source> <translation type="unfinished">A forrĆ”s nem lĆ©tezik</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="755"/> - <location filename="../../TransferThread.cpp" line="842"/> + <location filename="../../TransferThread.cpp" line="751"/> + <location filename="../../TransferThread.cpp" line="838"/> <source>Unable to do the folder</source> <translation type="unfinished">Mappaművelet nem lehetsĆ©ges</translation> </message> @@ -750,40 +742,50 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="715"/> - <location filename="../../TransferThread.cpp" line="830"/> + <location filename="../../TransferThread.cpp" line="645"/> + <source>%name% - copy</source> + <translation type="unfinished">%name% - mĆ”solĆ”s</translation> + </message> + <message> + <location filename="../../TransferThread.cpp" line="652"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">%name% - mĆ”solĆ”s (%number%)</translation> + </message> + <message> + <location filename="../../TransferThread.cpp" line="711"/> + <location filename="../../TransferThread.cpp" line="826"/> <source>The source file doesn't exist</source> <translation type="unfinished">A forrĆ”sfĆ”jl nem lĆ©tezik</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="836"/> + <location filename="../../TransferThread.cpp" line="832"/> <source>Another file exists at same place</source> <translation type="unfinished">Egy mĆ”sik fĆ”jl lĆ©tezik ugyanazon a helyen</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1138"/> + <location filename="../../TransferThread.cpp" line="1134"/> <source>The checksums do not match</source> <translation type="unfinished">A checksumok nem egyeznek meg</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1228"/> + <location filename="../../TransferThread.cpp" line="1224"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished">BelsÅ hiba: a cĆ©l nincs bezĆ”rva</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1243"/> + <location filename="../../TransferThread.cpp" line="1239"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished">BelsÅ hiba: az Ć”tvitt mĆ©ret nem egyezik meg</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1254"/> + <location filename="../../TransferThread.cpp" line="1250"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished">BelsÅ hiba: a puffer nem Ć¼res</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1319"/> - <location filename="../../TransferThread.cpp" line="1337"/> - <location filename="../../TransferThread.cpp" line="1352"/> + <location filename="../../TransferThread.cpp" line="1315"/> + <location filename="../../TransferThread.cpp" line="1333"/> + <location filename="../../TransferThread.cpp" line="1348"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -791,22 +793,22 @@ <context> <name>WriteThread</name> <message> - <location filename="../../WriteThread.cpp" line="80"/> + <location filename="../../WriteThread.cpp" line="83"/> <source>Path resolution error (Empty path)</source> <translation>Ćtvonal feloldĆ”si hiba (Ćres Ćŗtvonal)</translation> </message> <message> - <location filename="../../WriteThread.cpp" line="269"/> + <location filename="../../WriteThread.cpp" line="277"/> <source>Internal error, please report it!</source> <translation>BelsÅ hiba, kĆ©rlek jelentsd!</translation> </message> <message> - <location filename="../../WriteThread.cpp" line="672"/> + <location filename="../../WriteThread.cpp" line="680"/> <source>Unable to read the source file: </source> <translation>A forrĆ”sfĆ”jl olvasĆ”sa nem lehetsĆ©ges:</translation> </message> <message> - <location filename="../../WriteThread.cpp" line="697"/> + <location filename="../../WriteThread.cpp" line="705"/> <source>File truncated during read, possible data change</source> <translation>FĆ”jl megsĆ©rĆ¼lt az olvasĆ”s kƶzben, valĆ³szĆnűleg adatvĆ”ltozĆ”s</translation> </message> @@ -814,198 +816,198 @@ <context> <name>copyEngineOptions</name> <message> - <location filename="../../copyEngineOptions.ui" line="35"/> + <location filename="../../copyEngineOptions.ui" line="44"/> <source>Transfer</source> <translation>Ćtvitel</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="44"/> + <location filename="../../copyEngineOptions.ui" line="53"/> <source>Move the whole folder</source> <translation>Mozgassa Ć”t az egĆ©sz mappĆ”t</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="51"/> + <location filename="../../copyEngineOptions.ui" line="60"/> <source>Transfer the file rights</source> <translation>FĆ”jljogok Ć”tadĆ”sa</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="61"/> + <location filename="../../copyEngineOptions.ui" line="70"/> <source>Keep the file date</source> <translation>FĆ”jl dĆ”tumĆ”nak megtartĆ”sa</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="74"/> + <location filename="../../copyEngineOptions.ui" line="83"/> <source>Autostart the transfer</source> <translation>Ćtvitel automatikus indĆtĆ”sa</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="81"/> - <location filename="../../copyEngineOptions.ui" line="101"/> + <location filename="../../copyEngineOptions.ui" line="90"/> + <location filename="../../copyEngineOptions.ui" line="110"/> <source>Less performance if checked</source> <translation>Kisebb teljesĆtmĆ©ny, ha be van jelƶlve</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="104"/> + <location filename="../../copyEngineOptions.ui" line="113"/> <source>Follow the strict order</source> <translation>Kƶvesse a szigorĆŗ sorrendet</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="130"/> + <location filename="../../copyEngineOptions.ui" line="139"/> <source>Error and collision</source> <translation>Hiba Ć©s Ć¼tkƶzĆ©s</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="136"/> + <location filename="../../copyEngineOptions.ui" line="145"/> <source>When folder error</source> <translation>Mappa hiba esetĆ©n</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="146"/> + <location filename="../../copyEngineOptions.ui" line="155"/> <source>When file error</source> <translation>FĆ”jl hiba esetĆ©n</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="172"/> + <location filename="../../copyEngineOptions.ui" line="181"/> <source>When file collision</source> <translation>FĆ”jl Ć¼tkƶzĆ©s esetĆ©n</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="232"/> + <location filename="../../copyEngineOptions.ui" line="241"/> <source>When folder collision</source> <translation>Mappa Ć¼tkƶzĆ©s esetĆ©n</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="263"/> + <location filename="../../copyEngineOptions.ui" line="272"/> <source>Check if destination folder exists</source> <translation>CĆ©lmappa lĆ©tezĆ©sĆ©nek ellenÅrzĆ©se</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="270"/> + <location filename="../../copyEngineOptions.ui" line="279"/> <source>Renaming rules</source> <translation>ĆtnevezĆ©si szabĆ”lyok</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="290"/> + <location filename="../../copyEngineOptions.ui" line="299"/> <source>Delete partially transferred files</source> <translation>RĆ©szben Ć”tvitt fĆ”jlok tƶrlĆ©se</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="303"/> + <location filename="../../copyEngineOptions.ui" line="312"/> <source>Rename the original destination</source> <translation>Eredeti cĆ©l Ć”tnevezĆ©se</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="334"/> + <location filename="../../copyEngineOptions.ui" line="343"/> <source>Control</source> <translation>IrĆ”nyĆtĆ”s</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="340"/> + <location filename="../../copyEngineOptions.ui" line="349"/> <source>Checksum</source> <translation>Checksum</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="349"/> + <location filename="../../copyEngineOptions.ui" line="358"/> <source>Only after error</source> <translation>Csak hiba utĆ”n</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="356"/> + <location filename="../../copyEngineOptions.ui" line="365"/> <source>Ignore if impossible</source> <translation>Hagyja ki, ha nem lehetsĆ©ges</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="373"/> + <location filename="../../copyEngineOptions.ui" line="382"/> <source>Verify checksums</source> <translation>Checksumok ellenÅrzĆ©se</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="405"/> + <location filename="../../copyEngineOptions.ui" line="414"/> <source>Performance</source> <translation>TeljesĆtmĆ©ny</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="411"/> + <location filename="../../copyEngineOptions.ui" line="420"/> <source>Parallel buffer</source> <translation>PĆ”rhuzamos puffer</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="418"/> - <location filename="../../copyEngineOptions.ui" line="431"/> - <location filename="../../copyEngineOptions.ui" line="444"/> - <location filename="../../copyEngineOptions.ui" line="481"/> - <location filename="../../copyEngineOptions.ui" line="550"/> + <location filename="../../copyEngineOptions.ui" line="427"/> + <location filename="../../copyEngineOptions.ui" line="440"/> + <location filename="../../copyEngineOptions.ui" line="453"/> + <location filename="../../copyEngineOptions.ui" line="490"/> + <location filename="../../copyEngineOptions.ui" line="559"/> <source>KB</source> <translation>KB</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="460"/> + <location filename="../../copyEngineOptions.ui" line="469"/> <source>Block size</source> <translation>BlokkmĆ©ret</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="467"/> + <location filename="../../copyEngineOptions.ui" line="476"/> <source>Sequential buffer</source> <translation>SzekvenciĆ”lis puffer</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="474"/> + <location filename="../../copyEngineOptions.ui" line="483"/> <source>Enable OS buffer</source> <translation>OS puffer engedĆ©lyezĆ©se</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="497"/> + <location filename="../../copyEngineOptions.ui" line="506"/> <source>OS buffer only if smaller than</source> <translation>OS buffer csak akkor, ha kisebb mint</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="504"/> + <location filename="../../copyEngineOptions.ui" line="513"/> <source>Transfer algorithm</source> <translation>Ćtviteli algoritmus</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="543"/> + <location filename="../../copyEngineOptions.ui" line="552"/> <source>Parallelize if smaller than</source> <translation>PĆ”rhuzamosĆtĆ”s, ha kisebb mint</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="573"/> - <source>Inode threads</source> - <translation>Inode szĆ”lak</translation> + <location filename="../../copyEngineOptions.ui" line="582"/> + <source>Inode threads (unsafe > 1)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="580"/> - <location filename="../../copyEngineOptions.ui" line="590"/> + <location filename="../../copyEngineOptions.ui" line="589"/> + <location filename="../../copyEngineOptions.ui" line="599"/> <source>More cpu, but better organisation on the disk</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="593"/> + <location filename="../../copyEngineOptions.ui" line="602"/> <source>Order the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="609"/> + <location filename="../../copyEngineOptions.ui" line="618"/> <source>Misc</source> <translation>EgyĆ©b</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="615"/> + <location filename="../../copyEngineOptions.ui" line="624"/> <source>Check the disk space</source> <translation>LemezterĆ¼let ellenÅrzĆ©se</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="625"/> + <location filename="../../copyEngineOptions.ui" line="634"/> <source>Use this folder when destination is not set</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="637"/> + <location filename="../../copyEngineOptions.ui" line="646"/> <source>Browse</source> <translation>TallĆ³zĆ”s</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="659"/> + <location filename="../../copyEngineOptions.ui" line="668"/> <source>Filters</source> <translation>SzűrÅk</translation> </message> diff --git a/plugins/CopyEngine/Ultracopier/Languages/id/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/id/translation.ts index 4d395a0..e17b3f2 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/id/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/id/translation.ts @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="419"/> - <location filename="../../CopyEngineFactory.cpp" line="422"/> <location filename="../../CopyEngineFactory.cpp" line="427"/> - <location filename="../../CopyEngineFactory.cpp" line="431"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> <location filename="../../CopyEngineFactory.cpp" line="428"/> <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="425"/> - <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="443"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="447"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -274,21 +274,21 @@ <name>FileExistsDialog</name> <message> <location filename="../../FileExistsDialog.cpp" line="137"/> - <source>%1 - copy</source> + <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="147"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileExistsDialog.cpp" line="144"/> + <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -297,21 +297,21 @@ <name>FileIsSameDialog</name> <message> <location filename="../../FileIsSameDialog.cpp" line="111"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="121"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileIsSameDialog.cpp" line="118"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -464,21 +464,21 @@ </message> <message> <location filename="../../FolderExistsDialog.cpp" line="122"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="132"/> - <source>%1 - copy (%2)</source> + <location filename="../../FolderExistsDialog.cpp" line="131"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -486,49 +486,49 @@ <context> <name>ListThread</name> <message> - <location filename="../../ListThread.cpp" line="1482"/> - <location filename="../../ListThread.cpp" line="2414"/> + <location filename="../../ListThread.cpp" line="1487"/> + <location filename="../../ListThread.cpp" line="2419"/> <source>Unable do to move or copy item into wrong forced mode: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1489"/> - <location filename="../../ListThread.cpp" line="2421"/> + <location filename="../../ListThread.cpp" line="1494"/> + <location filename="../../ListThread.cpp" line="2426"/> <source>Unable to save the transfer list: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1505"/> + <location filename="../../ListThread.cpp" line="1510"/> <source>Problem reading file, or file-size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1512"/> + <location filename="../../ListThread.cpp" line="1517"/> <source>Wrong header: "%1"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1521"/> + <location filename="../../ListThread.cpp" line="1526"/> <source>The transfer list is in mixed mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1530"/> + <location filename="../../ListThread.cpp" line="1535"/> <source>The transfer list is in copy mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1536"/> + <location filename="../../ListThread.cpp" line="1541"/> <source>The transfer list is in move mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1599"/> + <location filename="../../ListThread.cpp" line="1604"/> <source>Some errors have been found during the line parsing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1607"/> + <location filename="../../ListThread.cpp" line="1612"/> <source>Unable to open the transfer list: %1</source> <translation type="unfinished"></translation> </message> @@ -570,24 +570,24 @@ <context> <name>ReadThread</name> <message> - <location filename="../../ReadThread.cpp" line="55"/> + <location filename="../../ReadThread.cpp" line="59"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="184"/> + <location filename="../../ReadThread.cpp" line="188"/> <source>Internal error reading the source file:block size out of range</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="192"/> - <location filename="../../ReadThread.cpp" line="408"/> + <location filename="../../ReadThread.cpp" line="196"/> + <location filename="../../ReadThread.cpp" line="420"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="233"/> - <location filename="../../ReadThread.cpp" line="456"/> + <location filename="../../ReadThread.cpp" line="237"/> + <location filename="../../ReadThread.cpp" line="468"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -595,37 +595,31 @@ <context> <name>RenamingRules</name> <message> - <location filename="../../RenamingRules.ui" line="26"/> + <location filename="../../RenamingRules.ui" line="35"/> <source>First renaming</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="32"/> - <source>%name% - copy</source> + <location filename="../../RenamingRules.ui" line="41"/> + <source>%name% - copy%suffix%</source> <extracomment>%name% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="39"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p></body></html></source> - <extracomment> should not be translated</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../RenamingRules.ui" line="49"/> - <source>Second renaming</source> + <location filename="../../RenamingRules.ui" line="57"/> + <source>%name% - copy (%number%)%suffix%</source> + <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="55"/> - <source>%name% - copy (%number%)</source> + <location filename="../../RenamingRules.ui" line="67"/> + <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name, <span style=" font-weight:600;">%number%</span> for the extra number, <span style=" font-weight:600;">%suffix%</span> file suffix</p></body></html></source> <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="62"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p><p><span style=" font-weight:600;">%number%</span> for the extra number</p></body></html></source> - <extracomment>%name%, %number% should not be translated</extracomment> + <location filename="../../RenamingRules.ui" line="51"/> + <source>Second renaming</source> <translation type="unfinished"></translation> </message> <message> @@ -655,33 +649,41 @@ </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="338"/> - <location filename="../../ScanFileOrFolder.cpp" line="404"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="348"/> - <location filename="../../ScanFileOrFolder.cpp" line="414"/> + <location filename="../../ScanFileOrFolder.cpp" line="345"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> + <location filename="../../ScanFileOrFolder.cpp" line="401"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="408"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="444"/> <source>This is not a folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> + <location filename="../../ScanFileOrFolder.cpp" line="446"/> <source>The folder does exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="448"/> <source>The folder is not readable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="467"/> + <location filename="../../ScanFileOrFolder.cpp" line="459"/> <source>Problem with name encoding</source> <translation type="unfinished"></translation> </message> @@ -690,9 +692,9 @@ <name>TransferThread</name> <message> <location filename="../../TransferThread.cpp" line="244"/> - <location filename="../../TransferThread.cpp" line="677"/> - <location filename="../../TransferThread.cpp" line="749"/> - <location filename="../../TransferThread.cpp" line="1319"/> + <location filename="../../TransferThread.cpp" line="673"/> + <location filename="../../TransferThread.cpp" line="745"/> + <location filename="../../TransferThread.cpp" line="1315"/> <source>File not found</source> <translation type="unfinished"></translation> </message> @@ -725,60 +727,60 @@ </message> <message> <location filename="../../TransferThread.cpp" line="645"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="655"/> - <source>%1 - copy (%2)</source> + <location filename="../../TransferThread.cpp" line="652"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="715"/> - <location filename="../../TransferThread.cpp" line="830"/> + <location filename="../../TransferThread.cpp" line="711"/> + <location filename="../../TransferThread.cpp" line="826"/> <source>The source file doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="755"/> - <location filename="../../TransferThread.cpp" line="842"/> + <location filename="../../TransferThread.cpp" line="751"/> + <location filename="../../TransferThread.cpp" line="838"/> <source>Unable to do the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="791"/> + <location filename="../../TransferThread.cpp" line="787"/> <source>The source doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="836"/> + <location filename="../../TransferThread.cpp" line="832"/> <source>Another file exists at same place</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1138"/> + <location filename="../../TransferThread.cpp" line="1134"/> <source>The checksums do not match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1228"/> + <location filename="../../TransferThread.cpp" line="1224"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1243"/> + <location filename="../../TransferThread.cpp" line="1239"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1254"/> + <location filename="../../TransferThread.cpp" line="1250"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1319"/> - <location filename="../../TransferThread.cpp" line="1337"/> - <location filename="../../TransferThread.cpp" line="1352"/> + <location filename="../../TransferThread.cpp" line="1315"/> + <location filename="../../TransferThread.cpp" line="1333"/> + <location filename="../../TransferThread.cpp" line="1348"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -791,22 +793,22 @@ <context> <name>WriteThread</name> <message> - <location filename="../../WriteThread.cpp" line="80"/> + <location filename="../../WriteThread.cpp" line="83"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="269"/> + <location filename="../../WriteThread.cpp" line="277"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="672"/> + <location filename="../../WriteThread.cpp" line="680"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="697"/> + <location filename="../../WriteThread.cpp" line="705"/> <source>File truncated during read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -814,198 +816,198 @@ <context> <name>copyEngineOptions</name> <message> - <location filename="../../copyEngineOptions.ui" line="35"/> + <location filename="../../copyEngineOptions.ui" line="44"/> <source>Transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="44"/> + <location filename="../../copyEngineOptions.ui" line="53"/> <source>Move the whole folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="51"/> + <location filename="../../copyEngineOptions.ui" line="60"/> <source>Transfer the file rights</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="61"/> + <location filename="../../copyEngineOptions.ui" line="70"/> <source>Keep the file date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="74"/> + <location filename="../../copyEngineOptions.ui" line="83"/> <source>Autostart the transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="81"/> - <location filename="../../copyEngineOptions.ui" line="101"/> + <location filename="../../copyEngineOptions.ui" line="90"/> + <location filename="../../copyEngineOptions.ui" line="110"/> <source>Less performance if checked</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="104"/> + <location filename="../../copyEngineOptions.ui" line="113"/> <source>Follow the strict order</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="130"/> + <location filename="../../copyEngineOptions.ui" line="139"/> <source>Error and collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="136"/> + <location filename="../../copyEngineOptions.ui" line="145"/> <source>When folder error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="146"/> + <location filename="../../copyEngineOptions.ui" line="155"/> <source>When file error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="172"/> + <location filename="../../copyEngineOptions.ui" line="181"/> <source>When file collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="232"/> + <location filename="../../copyEngineOptions.ui" line="241"/> <source>When folder collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="263"/> + <location filename="../../copyEngineOptions.ui" line="272"/> <source>Check if destination folder exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="270"/> + <location filename="../../copyEngineOptions.ui" line="279"/> <source>Renaming rules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="290"/> + <location filename="../../copyEngineOptions.ui" line="299"/> <source>Delete partially transferred files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="303"/> + <location filename="../../copyEngineOptions.ui" line="312"/> <source>Rename the original destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="334"/> + <location filename="../../copyEngineOptions.ui" line="343"/> <source>Control</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="340"/> + <location filename="../../copyEngineOptions.ui" line="349"/> <source>Checksum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="349"/> + <location filename="../../copyEngineOptions.ui" line="358"/> <source>Only after error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="356"/> + <location filename="../../copyEngineOptions.ui" line="365"/> <source>Ignore if impossible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="373"/> + <location filename="../../copyEngineOptions.ui" line="382"/> <source>Verify checksums</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="405"/> + <location filename="../../copyEngineOptions.ui" line="414"/> <source>Performance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="411"/> + <location filename="../../copyEngineOptions.ui" line="420"/> <source>Parallel buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="418"/> - <location filename="../../copyEngineOptions.ui" line="431"/> - <location filename="../../copyEngineOptions.ui" line="444"/> - <location filename="../../copyEngineOptions.ui" line="481"/> - <location filename="../../copyEngineOptions.ui" line="550"/> + <location filename="../../copyEngineOptions.ui" line="427"/> + <location filename="../../copyEngineOptions.ui" line="440"/> + <location filename="../../copyEngineOptions.ui" line="453"/> + <location filename="../../copyEngineOptions.ui" line="490"/> + <location filename="../../copyEngineOptions.ui" line="559"/> <source>KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="460"/> + <location filename="../../copyEngineOptions.ui" line="469"/> <source>Block size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="467"/> + <location filename="../../copyEngineOptions.ui" line="476"/> <source>Sequential buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="474"/> + <location filename="../../copyEngineOptions.ui" line="483"/> <source>Enable OS buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="497"/> + <location filename="../../copyEngineOptions.ui" line="506"/> <source>OS buffer only if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="504"/> + <location filename="../../copyEngineOptions.ui" line="513"/> <source>Transfer algorithm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="543"/> + <location filename="../../copyEngineOptions.ui" line="552"/> <source>Parallelize if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="573"/> - <source>Inode threads</source> + <location filename="../../copyEngineOptions.ui" line="582"/> + <source>Inode threads (unsafe > 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="580"/> - <location filename="../../copyEngineOptions.ui" line="590"/> + <location filename="../../copyEngineOptions.ui" line="589"/> + <location filename="../../copyEngineOptions.ui" line="599"/> <source>More cpu, but better organisation on the disk</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="593"/> + <location filename="../../copyEngineOptions.ui" line="602"/> <source>Order the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="609"/> + <location filename="../../copyEngineOptions.ui" line="618"/> <source>Misc</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="615"/> + <location filename="../../copyEngineOptions.ui" line="624"/> <source>Check the disk space</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="625"/> + <location filename="../../copyEngineOptions.ui" line="634"/> <source>Use this folder when destination is not set</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="637"/> + <location filename="../../copyEngineOptions.ui" line="646"/> <source>Browse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="659"/> + <location filename="../../copyEngineOptions.ui" line="668"/> <source>Filters</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/CopyEngine/Ultracopier/Languages/it/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/it/translation.ts index 2a4f172..cba024c 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/it/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/it/translation.ts @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="419"/> - <location filename="../../CopyEngineFactory.cpp" line="422"/> <location filename="../../CopyEngineFactory.cpp" line="427"/> - <location filename="../../CopyEngineFactory.cpp" line="431"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Ask</source> <translation>Chiedi</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> <location filename="../../CopyEngineFactory.cpp" line="428"/> <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Skip</source> <translation>Salta</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Merge</source> <translation>Unisci</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="425"/> - <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> <source>Rename</source> <translation>Rinomina</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> <source>Put at the end</source> <translation>Metti in coda</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> <source>Overwrite</source> <translation>Sovrascrivi</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> <source>Overwrite if different</source> <translation>Sovrascrivi se differente</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="443"/> <source>Overwrite if newer</source> <translation>Sovrascrivi se piĆ¹ recente</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> <source>Overwrite if older</source> <translation>Sovrascrivi se meno recente</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="447"/> <source>Automatic</source> <translation>Automatico</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Sequential</source> <translation>Sequenziale</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Parallel</source> <translation>Parallelo</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options error</source> <translation>Opzioni di errore</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options engine is not loaded, can't access to the filters</source> <translation>Le opzioni del motore per la copia non vengono caricate, impossibile accedere ai filtri</translation> </message> @@ -274,21 +274,21 @@ <name>FileExistsDialog</name> <message> <location filename="../../FileExistsDialog.cpp" line="137"/> - <source>%1 - copy</source> - <translation>%1 - copia</translation> + <source>%name% - copy%suffix%</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="147"/> - <source>%1 - copy (%2)</source> - <translation>%1 - copia (%2)</translation> + <location filename="../../FileExistsDialog.cpp" line="144"/> + <source>%name% - copy (%number%)%suffix%</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Error</source> <translation>Errore</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -297,21 +297,21 @@ <name>FileIsSameDialog</name> <message> <location filename="../../FileIsSameDialog.cpp" line="111"/> - <source>%1 - copy</source> - <translation>%1 - copia</translation> + <source>%name% - copy</source> + <translation type="unfinished">Copia di %name%</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="121"/> - <source>%1 - copy (%2)</source> - <translation>%1 - copia (%2)</translation> + <location filename="../../FileIsSameDialog.cpp" line="118"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">Copia di %name% (%number%)</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Error</source> <translation>Errore</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -467,21 +467,21 @@ </message> <message> <location filename="../../FolderExistsDialog.cpp" line="122"/> - <source>%1 - copy</source> - <translation>%1 - copia</translation> + <source>%name% - copy</source> + <translation type="unfinished">Copia di %name%</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="132"/> - <source>%1 - copy (%2)</source> - <translation>%1 - copia (%2)</translation> + <location filename="../../FolderExistsDialog.cpp" line="131"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">Copia di %name% (%number%)</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Error</source> <translation>Errore</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -489,50 +489,50 @@ <context> <name>ListThread</name> <message> - <location filename="../../ListThread.cpp" line="1482"/> - <location filename="../../ListThread.cpp" line="2414"/> + <location filename="../../ListThread.cpp" line="1487"/> + <location filename="../../ListThread.cpp" line="2419"/> <source>Unable do to move or copy item into wrong forced mode: %1</source> <translation>Impossibile spostare o copiare elementi in modalitĆ forzata anomala: %1</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1489"/> - <location filename="../../ListThread.cpp" line="2421"/> + <location filename="../../ListThread.cpp" line="1494"/> + <location filename="../../ListThread.cpp" line="2426"/> <source>Unable to save the transfer list: %1</source> <translation>Impossibile salvare la lista dei trasferimenti: %1</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1505"/> + <location filename="../../ListThread.cpp" line="1510"/> <source>Problem reading file, or file-size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1512"/> + <location filename="../../ListThread.cpp" line="1517"/> <source>Wrong header: "%1"</source> <translatorcomment>Header si riferisce all'intestazione?</translatorcomment> <translation>Intestazione sbagliata: "%1"</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1521"/> + <location filename="../../ListThread.cpp" line="1526"/> <source>The transfer list is in mixed mode, but this instance is not in this mode</source> <translation>La lista dei trasferimenti ĆØ in modalitĆ mista, ma questa istanza non ĆØ in questa modalitĆ </translation> </message> <message> - <location filename="../../ListThread.cpp" line="1530"/> + <location filename="../../ListThread.cpp" line="1535"/> <source>The transfer list is in copy mode, but this instance is not in this mode</source> <translation>La lista dei trasferimenti ĆØ in modalitĆ di copia, ma questa istanza non ĆØ in questa modalitĆ </translation> </message> <message> - <location filename="../../ListThread.cpp" line="1536"/> + <location filename="../../ListThread.cpp" line="1541"/> <source>The transfer list is in move mode, but this instance is not in this mode</source> <translation>La lista dei trasferimenti ĆØ in modalitĆ di spostamento, ma questa istanza non ĆØ in questa modalitĆ </translation> </message> <message> - <location filename="../../ListThread.cpp" line="1599"/> + <location filename="../../ListThread.cpp" line="1604"/> <source>Some errors have been found during the line parsing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1607"/> + <location filename="../../ListThread.cpp" line="1612"/> <source>Unable to open the transfer list: %1</source> <translation>Impossibile aprire la lista dei trasferimenti: %1</translation> </message> @@ -574,24 +574,24 @@ <context> <name>ReadThread</name> <message> - <location filename="../../ReadThread.cpp" line="55"/> + <location filename="../../ReadThread.cpp" line="59"/> <source>Internal error, please report it!</source> <translation>Errore interno, pregasi di segnalarlo!</translation> </message> <message> - <location filename="../../ReadThread.cpp" line="184"/> + <location filename="../../ReadThread.cpp" line="188"/> <source>Internal error reading the source file:block size out of range</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="192"/> - <location filename="../../ReadThread.cpp" line="408"/> + <location filename="../../ReadThread.cpp" line="196"/> + <location filename="../../ReadThread.cpp" line="420"/> <source>Unable to read the source file: </source> <translation>Impossibile leggere il file di origine: </translation> </message> <message> - <location filename="../../ReadThread.cpp" line="233"/> - <location filename="../../ReadThread.cpp" line="456"/> + <location filename="../../ReadThread.cpp" line="237"/> + <location filename="../../ReadThread.cpp" line="468"/> <source>File truncated during the read, possible data change</source> <translation>File troncato durante la lettura, possibili variazioni di dati</translation> </message> @@ -599,44 +599,34 @@ <context> <name>RenamingRules</name> <message> - <location filename="../../RenamingRules.ui" line="26"/> + <location filename="../../RenamingRules.ui" line="35"/> <source>First renaming</source> <translatorcomment>o Prima ridenominazione?</translatorcomment> <translation>Prima rinomina</translation> </message> <message> - <location filename="../../RenamingRules.ui" line="32"/> - <source>%name% - copy</source> + <location filename="../../RenamingRules.ui" line="41"/> + <source>%name% - copy%suffix%</source> <extracomment>%name% should not be translated</extracomment> - <translatorcomment>%name% non dovrĆ essere tradotto</translatorcomment> - <translation>Copia di %name%</translation> - </message> - <message> - <location filename="../../RenamingRules.ui" line="39"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p></body></html></source> - <extracomment> should not be translated</extracomment> - <translatorcomment>o per il nome originale del file</translatorcomment> - <translation><html><head/><body><p>variabili: <span style=" font-weight:600;">%name%</span> per il nome del file di origine</p></body></html></translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="49"/> - <source>Second renaming</source> - <translatorcomment>o Seconda ridenominazione?</translatorcomment> - <translation>Seconda rinomina</translation> + <location filename="../../RenamingRules.ui" line="57"/> + <source>%name% - copy (%number%)%suffix%</source> + <extracomment>%name%, %number% should not be translated</extracomment> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="55"/> - <source>%name% - copy (%number%)</source> + <location filename="../../RenamingRules.ui" line="67"/> + <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name, <span style=" font-weight:600;">%number%</span> for the extra number, <span style=" font-weight:600;">%suffix%</span> file suffix</p></body></html></source> <extracomment>%name%, %number% should not be translated</extracomment> - <translatorcomment>%name% e %number% non dovranno essere tradotti</translatorcomment> - <translation>Copia di %name% (%number%)</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="62"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p><p><span style=" font-weight:600;">%number%</span> for the extra number</p></body></html></source> - <extracomment>%name%, %number% should not be translated</extracomment> - <translatorcomment>%name% e %number% non dovranno essere tradotti</translatorcomment> - <translation><html><head/><body><p>variabili: <span style=" font-weight:600;">%name%</span> per il nome del file di origine</p><p><span style=" font-weight:600;">%number%</span> per il numero progressivo</p></body></html></translation> + <location filename="../../RenamingRules.ui" line="51"/> + <source>Second renaming</source> + <translatorcomment>o Seconda ridenominazione?</translatorcomment> + <translation>Seconda rinomina</translation> </message> <message> <location filename="../../RenamingRules.cpp" line="39"/> @@ -665,33 +655,41 @@ </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="338"/> - <location filename="../../ScanFileOrFolder.cpp" line="404"/> <source>%1 - copy</source> <translation>%1 - copia</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="348"/> - <location filename="../../ScanFileOrFolder.cpp" line="414"/> + <location filename="../../ScanFileOrFolder.cpp" line="345"/> <source>%1 - copy (%2)</source> <translation>%1 - copia (%2)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> + <location filename="../../ScanFileOrFolder.cpp" line="401"/> + <source>%name% - copy</source> + <translation type="unfinished">Copia di %name%</translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="408"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">Copia di %name% (%number%)</translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="444"/> <source>This is not a folder</source> <translation>Questa non ĆØ una cartella</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> + <location filename="../../ScanFileOrFolder.cpp" line="446"/> <source>The folder does exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="448"/> <source>The folder is not readable</source> <translation>La cartella non ĆØ leggibile</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="467"/> + <location filename="../../ScanFileOrFolder.cpp" line="459"/> <source>Problem with name encoding</source> <translation>Problema con la codifica del nome</translation> </message> @@ -700,9 +698,9 @@ <name>TransferThread</name> <message> <location filename="../../TransferThread.cpp" line="244"/> - <location filename="../../TransferThread.cpp" line="677"/> - <location filename="../../TransferThread.cpp" line="749"/> - <location filename="../../TransferThread.cpp" line="1319"/> + <location filename="../../TransferThread.cpp" line="673"/> + <location filename="../../TransferThread.cpp" line="745"/> + <location filename="../../TransferThread.cpp" line="1315"/> <source>File not found</source> <translation>File non trovato</translation> </message> @@ -734,24 +732,14 @@ <translation type="unfinished">root</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="645"/> - <source>%1 - copy</source> - <translation type="unfinished">%1 - copia</translation> - </message> - <message> - <location filename="../../TransferThread.cpp" line="655"/> - <source>%1 - copy (%2)</source> - <translation type="unfinished">%1 - copia (%2)</translation> - </message> - <message> - <location filename="../../TransferThread.cpp" line="715"/> - <location filename="../../TransferThread.cpp" line="830"/> + <location filename="../../TransferThread.cpp" line="711"/> + <location filename="../../TransferThread.cpp" line="826"/> <source>The source file doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="755"/> - <location filename="../../TransferThread.cpp" line="842"/> + <location filename="../../TransferThread.cpp" line="751"/> + <location filename="../../TransferThread.cpp" line="838"/> <source>Unable to do the folder</source> <translation type="unfinished">Impossibile creare la cartella</translation> </message> @@ -761,39 +749,49 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="791"/> + <location filename="../../TransferThread.cpp" line="645"/> + <source>%name% - copy</source> + <translation type="unfinished">Copia di %name%</translation> + </message> + <message> + <location filename="../../TransferThread.cpp" line="652"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">Copia di %name% (%number%)</translation> + </message> + <message> + <location filename="../../TransferThread.cpp" line="787"/> <source>The source doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="836"/> + <location filename="../../TransferThread.cpp" line="832"/> <source>Another file exists at same place</source> <translation type="unfinished">Nello stesso percorso ĆØ presente un altro file</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1138"/> + <location filename="../../TransferThread.cpp" line="1134"/> <source>The checksums do not match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1228"/> + <location filename="../../TransferThread.cpp" line="1224"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished">Errore interno: la cartella di destinazione non ĆØ chiusa</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1243"/> + <location filename="../../TransferThread.cpp" line="1239"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1254"/> + <location filename="../../TransferThread.cpp" line="1250"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished">Errore interno: il buffer non ĆØ vuoto</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1319"/> - <location filename="../../TransferThread.cpp" line="1337"/> - <location filename="../../TransferThread.cpp" line="1352"/> + <location filename="../../TransferThread.cpp" line="1315"/> + <location filename="../../TransferThread.cpp" line="1333"/> + <location filename="../../TransferThread.cpp" line="1348"/> <source>Unable to change the date</source> <translation type="unfinished">Impossibile cambiare la data</translation> </message> @@ -801,22 +799,22 @@ <context> <name>WriteThread</name> <message> - <location filename="../../WriteThread.cpp" line="80"/> + <location filename="../../WriteThread.cpp" line="83"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="269"/> + <location filename="../../WriteThread.cpp" line="277"/> <source>Internal error, please report it!</source> <translation>Errore interno, pregasi di segnalarlo!</translation> </message> <message> - <location filename="../../WriteThread.cpp" line="672"/> + <location filename="../../WriteThread.cpp" line="680"/> <source>Unable to read the source file: </source> <translation>Impossibile leggere il file di origine: </translation> </message> <message> - <location filename="../../WriteThread.cpp" line="697"/> + <location filename="../../WriteThread.cpp" line="705"/> <source>File truncated during read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -824,198 +822,198 @@ <context> <name>copyEngineOptions</name> <message> - <location filename="../../copyEngineOptions.ui" line="35"/> + <location filename="../../copyEngineOptions.ui" line="44"/> <source>Transfer</source> <translation>Trasferisci</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="44"/> + <location filename="../../copyEngineOptions.ui" line="53"/> <source>Move the whole folder</source> <translation>Spostare l'intera cartella</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="51"/> + <location filename="../../copyEngineOptions.ui" line="60"/> <source>Transfer the file rights</source> <translation>Trasferire le autorizzazioni dei file</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="61"/> + <location filename="../../copyEngineOptions.ui" line="70"/> <source>Keep the file date</source> <translation>Mantenere la data del file</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="74"/> + <location filename="../../copyEngineOptions.ui" line="83"/> <source>Autostart the transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="81"/> - <location filename="../../copyEngineOptions.ui" line="101"/> + <location filename="../../copyEngineOptions.ui" line="90"/> + <location filename="../../copyEngineOptions.ui" line="110"/> <source>Less performance if checked</source> <translation>Se selezionato si avranno prestazioni ridotte</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="104"/> + <location filename="../../copyEngineOptions.ui" line="113"/> <source>Follow the strict order</source> <translation>Seguire rigorosamente l'ordine</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="130"/> + <location filename="../../copyEngineOptions.ui" line="139"/> <source>Error and collision</source> <translation>Errori di coincidenze</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="136"/> + <location filename="../../copyEngineOptions.ui" line="145"/> <source>When folder error</source> <translation>Quando si verifica un errore nelle cartelle</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="146"/> + <location filename="../../copyEngineOptions.ui" line="155"/> <source>When file error</source> <translation>Quando si verifica un errore nei file</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="172"/> + <location filename="../../copyEngineOptions.ui" line="181"/> <source>When file collision</source> <translation>Quando i file coincidono</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="232"/> + <location filename="../../copyEngineOptions.ui" line="241"/> <source>When folder collision</source> <translation>Quando le cartelle coincidono</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="263"/> + <location filename="../../copyEngineOptions.ui" line="272"/> <source>Check if destination folder exists</source> <translation>Controllare se la cartella di destinazione esiste</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="270"/> + <location filename="../../copyEngineOptions.ui" line="279"/> <source>Renaming rules</source> <translation>Regole di rinomina</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="290"/> + <location filename="../../copyEngineOptions.ui" line="299"/> <source>Delete partially transferred files</source> <translation>Eliminare i file parzialmente trasferiti</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="303"/> + <location filename="../../copyEngineOptions.ui" line="312"/> <source>Rename the original destination</source> <translation>Rinominare la destinazione all'origine</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="334"/> + <location filename="../../copyEngineOptions.ui" line="343"/> <source>Control</source> <translation>Controllare</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="340"/> + <location filename="../../copyEngineOptions.ui" line="349"/> <source>Checksum</source> <translation>Codice di controllo (Checksum)</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="349"/> + <location filename="../../copyEngineOptions.ui" line="358"/> <source>Only after error</source> <translation>Solo dopo l'errore</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="356"/> + <location filename="../../copyEngineOptions.ui" line="365"/> <source>Ignore if impossible</source> <translation>Ignora se non corrisponde</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="373"/> + <location filename="../../copyEngineOptions.ui" line="382"/> <source>Verify checksums</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="405"/> + <location filename="../../copyEngineOptions.ui" line="414"/> <source>Performance</source> <translation>Prestazioni</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="411"/> + <location filename="../../copyEngineOptions.ui" line="420"/> <source>Parallel buffer</source> <translation>Buffer parallelo</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="418"/> - <location filename="../../copyEngineOptions.ui" line="431"/> - <location filename="../../copyEngineOptions.ui" line="444"/> - <location filename="../../copyEngineOptions.ui" line="481"/> - <location filename="../../copyEngineOptions.ui" line="550"/> + <location filename="../../copyEngineOptions.ui" line="427"/> + <location filename="../../copyEngineOptions.ui" line="440"/> + <location filename="../../copyEngineOptions.ui" line="453"/> + <location filename="../../copyEngineOptions.ui" line="490"/> + <location filename="../../copyEngineOptions.ui" line="559"/> <source>KB</source> <translation>KB</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="460"/> + <location filename="../../copyEngineOptions.ui" line="469"/> <source>Block size</source> <translation>Dimensione del blocco</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="467"/> + <location filename="../../copyEngineOptions.ui" line="476"/> <source>Sequential buffer</source> <translation>Buffer sequenziale</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="474"/> + <location filename="../../copyEngineOptions.ui" line="483"/> <source>Enable OS buffer</source> <translation>Attivare il buffer del sistema operativo</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="497"/> + <location filename="../../copyEngineOptions.ui" line="506"/> <source>OS buffer only if smaller than</source> <translation>Buffer del sistema operativo solo se inferiore a</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="504"/> + <location filename="../../copyEngineOptions.ui" line="513"/> <source>Transfer algorithm</source> <translation>Algoritmo di trasferimento </translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="543"/> + <location filename="../../copyEngineOptions.ui" line="552"/> <source>Parallelize if smaller than</source> <translation>Affiancare se inferiore a</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="573"/> - <source>Inode threads</source> - <translation>Inode threads</translation> + <location filename="../../copyEngineOptions.ui" line="582"/> + <source>Inode threads (unsafe > 1)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="580"/> - <location filename="../../copyEngineOptions.ui" line="590"/> + <location filename="../../copyEngineOptions.ui" line="589"/> + <location filename="../../copyEngineOptions.ui" line="599"/> <source>More cpu, but better organisation on the disk</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="593"/> + <location filename="../../copyEngineOptions.ui" line="602"/> <source>Order the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="609"/> + <location filename="../../copyEngineOptions.ui" line="618"/> <source>Misc</source> <translation>Varie</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="615"/> + <location filename="../../copyEngineOptions.ui" line="624"/> <source>Check the disk space</source> <translation>Controllare lo spazio su disco</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="625"/> + <location filename="../../copyEngineOptions.ui" line="634"/> <source>Use this folder when destination is not set</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="637"/> + <location filename="../../copyEngineOptions.ui" line="646"/> <source>Browse</source> <translation>Sfoglia</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="659"/> + <location filename="../../copyEngineOptions.ui" line="668"/> <source>Filters</source> <translation>Filtri</translation> </message> diff --git a/plugins/CopyEngine/Ultracopier/Languages/ja/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/ja/translation.ts index f8a7792..19bfabd 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/ja/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/ja/translation.ts @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="419"/> - <location filename="../../CopyEngineFactory.cpp" line="422"/> <location filename="../../CopyEngineFactory.cpp" line="427"/> - <location filename="../../CopyEngineFactory.cpp" line="431"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> <location filename="../../CopyEngineFactory.cpp" line="428"/> <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="425"/> - <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="443"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="447"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -274,21 +274,21 @@ <name>FileExistsDialog</name> <message> <location filename="../../FileExistsDialog.cpp" line="137"/> - <source>%1 - copy</source> + <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="147"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileExistsDialog.cpp" line="144"/> + <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -297,21 +297,21 @@ <name>FileIsSameDialog</name> <message> <location filename="../../FileIsSameDialog.cpp" line="111"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="121"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileIsSameDialog.cpp" line="118"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -464,21 +464,21 @@ </message> <message> <location filename="../../FolderExistsDialog.cpp" line="122"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="132"/> - <source>%1 - copy (%2)</source> + <location filename="../../FolderExistsDialog.cpp" line="131"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -486,49 +486,49 @@ <context> <name>ListThread</name> <message> - <location filename="../../ListThread.cpp" line="1482"/> - <location filename="../../ListThread.cpp" line="2414"/> + <location filename="../../ListThread.cpp" line="1487"/> + <location filename="../../ListThread.cpp" line="2419"/> <source>Unable do to move or copy item into wrong forced mode: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1489"/> - <location filename="../../ListThread.cpp" line="2421"/> + <location filename="../../ListThread.cpp" line="1494"/> + <location filename="../../ListThread.cpp" line="2426"/> <source>Unable to save the transfer list: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1505"/> + <location filename="../../ListThread.cpp" line="1510"/> <source>Problem reading file, or file-size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1512"/> + <location filename="../../ListThread.cpp" line="1517"/> <source>Wrong header: "%1"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1521"/> + <location filename="../../ListThread.cpp" line="1526"/> <source>The transfer list is in mixed mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1530"/> + <location filename="../../ListThread.cpp" line="1535"/> <source>The transfer list is in copy mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1536"/> + <location filename="../../ListThread.cpp" line="1541"/> <source>The transfer list is in move mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1599"/> + <location filename="../../ListThread.cpp" line="1604"/> <source>Some errors have been found during the line parsing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1607"/> + <location filename="../../ListThread.cpp" line="1612"/> <source>Unable to open the transfer list: %1</source> <translation type="unfinished"></translation> </message> @@ -570,24 +570,24 @@ <context> <name>ReadThread</name> <message> - <location filename="../../ReadThread.cpp" line="55"/> + <location filename="../../ReadThread.cpp" line="59"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="184"/> + <location filename="../../ReadThread.cpp" line="188"/> <source>Internal error reading the source file:block size out of range</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="192"/> - <location filename="../../ReadThread.cpp" line="408"/> + <location filename="../../ReadThread.cpp" line="196"/> + <location filename="../../ReadThread.cpp" line="420"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="233"/> - <location filename="../../ReadThread.cpp" line="456"/> + <location filename="../../ReadThread.cpp" line="237"/> + <location filename="../../ReadThread.cpp" line="468"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -600,37 +600,31 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="26"/> + <location filename="../../RenamingRules.ui" line="35"/> <source>First renaming</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="32"/> - <source>%name% - copy</source> + <location filename="../../RenamingRules.ui" line="41"/> + <source>%name% - copy%suffix%</source> <extracomment>%name% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="39"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p></body></html></source> - <extracomment> should not be translated</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../RenamingRules.ui" line="49"/> - <source>Second renaming</source> + <location filename="../../RenamingRules.ui" line="57"/> + <source>%name% - copy (%number%)%suffix%</source> + <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="55"/> - <source>%name% - copy (%number%)</source> + <location filename="../../RenamingRules.ui" line="67"/> + <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name, <span style=" font-weight:600;">%number%</span> for the extra number, <span style=" font-weight:600;">%suffix%</span> file suffix</p></body></html></source> <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="62"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p><p><span style=" font-weight:600;">%number%</span> for the extra number</p></body></html></source> - <extracomment>%name%, %number% should not be translated</extracomment> + <location filename="../../RenamingRules.ui" line="51"/> + <source>Second renaming</source> <translation type="unfinished"></translation> </message> <message> @@ -655,33 +649,41 @@ </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="338"/> - <location filename="../../ScanFileOrFolder.cpp" line="404"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="348"/> - <location filename="../../ScanFileOrFolder.cpp" line="414"/> + <location filename="../../ScanFileOrFolder.cpp" line="345"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> + <location filename="../../ScanFileOrFolder.cpp" line="401"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="408"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="444"/> <source>This is not a folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> + <location filename="../../ScanFileOrFolder.cpp" line="446"/> <source>The folder does exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="448"/> <source>The folder is not readable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="467"/> + <location filename="../../ScanFileOrFolder.cpp" line="459"/> <source>Problem with name encoding</source> <translation type="unfinished"></translation> </message> @@ -690,9 +692,9 @@ <name>TransferThread</name> <message> <location filename="../../TransferThread.cpp" line="244"/> - <location filename="../../TransferThread.cpp" line="677"/> - <location filename="../../TransferThread.cpp" line="749"/> - <location filename="../../TransferThread.cpp" line="1319"/> + <location filename="../../TransferThread.cpp" line="673"/> + <location filename="../../TransferThread.cpp" line="745"/> + <location filename="../../TransferThread.cpp" line="1315"/> <source>File not found</source> <translation type="unfinished"></translation> </message> @@ -725,60 +727,60 @@ </message> <message> <location filename="../../TransferThread.cpp" line="645"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="655"/> - <source>%1 - copy (%2)</source> + <location filename="../../TransferThread.cpp" line="652"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="715"/> - <location filename="../../TransferThread.cpp" line="830"/> + <location filename="../../TransferThread.cpp" line="711"/> + <location filename="../../TransferThread.cpp" line="826"/> <source>The source file doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="755"/> - <location filename="../../TransferThread.cpp" line="842"/> + <location filename="../../TransferThread.cpp" line="751"/> + <location filename="../../TransferThread.cpp" line="838"/> <source>Unable to do the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="791"/> + <location filename="../../TransferThread.cpp" line="787"/> <source>The source doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="836"/> + <location filename="../../TransferThread.cpp" line="832"/> <source>Another file exists at same place</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1138"/> + <location filename="../../TransferThread.cpp" line="1134"/> <source>The checksums do not match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1228"/> + <location filename="../../TransferThread.cpp" line="1224"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1243"/> + <location filename="../../TransferThread.cpp" line="1239"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1254"/> + <location filename="../../TransferThread.cpp" line="1250"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1319"/> - <location filename="../../TransferThread.cpp" line="1337"/> - <location filename="../../TransferThread.cpp" line="1352"/> + <location filename="../../TransferThread.cpp" line="1315"/> + <location filename="../../TransferThread.cpp" line="1333"/> + <location filename="../../TransferThread.cpp" line="1348"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -791,22 +793,22 @@ <context> <name>WriteThread</name> <message> - <location filename="../../WriteThread.cpp" line="80"/> + <location filename="../../WriteThread.cpp" line="83"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="269"/> + <location filename="../../WriteThread.cpp" line="277"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="672"/> + <location filename="../../WriteThread.cpp" line="680"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="697"/> + <location filename="../../WriteThread.cpp" line="705"/> <source>File truncated during read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -814,198 +816,198 @@ <context> <name>copyEngineOptions</name> <message> - <location filename="../../copyEngineOptions.ui" line="35"/> + <location filename="../../copyEngineOptions.ui" line="44"/> <source>Transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="44"/> + <location filename="../../copyEngineOptions.ui" line="53"/> <source>Move the whole folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="51"/> + <location filename="../../copyEngineOptions.ui" line="60"/> <source>Transfer the file rights</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="61"/> + <location filename="../../copyEngineOptions.ui" line="70"/> <source>Keep the file date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="74"/> + <location filename="../../copyEngineOptions.ui" line="83"/> <source>Autostart the transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="81"/> - <location filename="../../copyEngineOptions.ui" line="101"/> + <location filename="../../copyEngineOptions.ui" line="90"/> + <location filename="../../copyEngineOptions.ui" line="110"/> <source>Less performance if checked</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="104"/> + <location filename="../../copyEngineOptions.ui" line="113"/> <source>Follow the strict order</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="130"/> + <location filename="../../copyEngineOptions.ui" line="139"/> <source>Error and collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="136"/> + <location filename="../../copyEngineOptions.ui" line="145"/> <source>When folder error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="146"/> + <location filename="../../copyEngineOptions.ui" line="155"/> <source>When file error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="172"/> + <location filename="../../copyEngineOptions.ui" line="181"/> <source>When file collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="232"/> + <location filename="../../copyEngineOptions.ui" line="241"/> <source>When folder collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="263"/> + <location filename="../../copyEngineOptions.ui" line="272"/> <source>Check if destination folder exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="270"/> + <location filename="../../copyEngineOptions.ui" line="279"/> <source>Renaming rules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="290"/> + <location filename="../../copyEngineOptions.ui" line="299"/> <source>Delete partially transferred files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="303"/> + <location filename="../../copyEngineOptions.ui" line="312"/> <source>Rename the original destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="334"/> + <location filename="../../copyEngineOptions.ui" line="343"/> <source>Control</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="340"/> + <location filename="../../copyEngineOptions.ui" line="349"/> <source>Checksum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="349"/> + <location filename="../../copyEngineOptions.ui" line="358"/> <source>Only after error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="356"/> + <location filename="../../copyEngineOptions.ui" line="365"/> <source>Ignore if impossible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="373"/> + <location filename="../../copyEngineOptions.ui" line="382"/> <source>Verify checksums</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="405"/> + <location filename="../../copyEngineOptions.ui" line="414"/> <source>Performance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="411"/> + <location filename="../../copyEngineOptions.ui" line="420"/> <source>Parallel buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="418"/> - <location filename="../../copyEngineOptions.ui" line="431"/> - <location filename="../../copyEngineOptions.ui" line="444"/> - <location filename="../../copyEngineOptions.ui" line="481"/> - <location filename="../../copyEngineOptions.ui" line="550"/> + <location filename="../../copyEngineOptions.ui" line="427"/> + <location filename="../../copyEngineOptions.ui" line="440"/> + <location filename="../../copyEngineOptions.ui" line="453"/> + <location filename="../../copyEngineOptions.ui" line="490"/> + <location filename="../../copyEngineOptions.ui" line="559"/> <source>KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="460"/> + <location filename="../../copyEngineOptions.ui" line="469"/> <source>Block size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="467"/> + <location filename="../../copyEngineOptions.ui" line="476"/> <source>Sequential buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="474"/> + <location filename="../../copyEngineOptions.ui" line="483"/> <source>Enable OS buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="497"/> + <location filename="../../copyEngineOptions.ui" line="506"/> <source>OS buffer only if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="504"/> + <location filename="../../copyEngineOptions.ui" line="513"/> <source>Transfer algorithm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="543"/> + <location filename="../../copyEngineOptions.ui" line="552"/> <source>Parallelize if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="573"/> - <source>Inode threads</source> + <location filename="../../copyEngineOptions.ui" line="582"/> + <source>Inode threads (unsafe > 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="580"/> - <location filename="../../copyEngineOptions.ui" line="590"/> + <location filename="../../copyEngineOptions.ui" line="589"/> + <location filename="../../copyEngineOptions.ui" line="599"/> <source>More cpu, but better organisation on the disk</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="593"/> + <location filename="../../copyEngineOptions.ui" line="602"/> <source>Order the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="609"/> + <location filename="../../copyEngineOptions.ui" line="618"/> <source>Misc</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="615"/> + <location filename="../../copyEngineOptions.ui" line="624"/> <source>Check the disk space</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="625"/> + <location filename="../../copyEngineOptions.ui" line="634"/> <source>Use this folder when destination is not set</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="637"/> + <location filename="../../copyEngineOptions.ui" line="646"/> <source>Browse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="659"/> + <location filename="../../copyEngineOptions.ui" line="668"/> <source>Filters</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/CopyEngine/Ultracopier/Languages/ko/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/ko/translation.ts index 8972a9e..7698857 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/ko/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/ko/translation.ts @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="419"/> - <location filename="../../CopyEngineFactory.cpp" line="422"/> <location filename="../../CopyEngineFactory.cpp" line="427"/> - <location filename="../../CopyEngineFactory.cpp" line="431"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Ask</source> <translation type="unfinished">ķģø</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> <location filename="../../CopyEngineFactory.cpp" line="428"/> <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Skip</source> <translation type="unfinished">ź±“ėė°źø°</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Merge</source> <translation type="unfinished">ķ©ģ¹źø°</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="425"/> - <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> <source>Rename</source> <translation type="unfinished">ģ“ė¦ ė°ź¾øźø°</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="443"/> <source>Overwrite if newer</source> <translation type="unfinished">ė ģµģ ģ“ė©“ ė®ģ“ģģ°źø°</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="447"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -274,21 +274,21 @@ <name>FileExistsDialog</name> <message> <location filename="../../FileExistsDialog.cpp" line="137"/> - <source>%1 - copy</source> + <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="147"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileExistsDialog.cpp" line="144"/> + <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Error</source> <translation type="unfinished">ģ¤ė„</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -297,21 +297,21 @@ <name>FileIsSameDialog</name> <message> <location filename="../../FileIsSameDialog.cpp" line="111"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="121"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileIsSameDialog.cpp" line="118"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Error</source> <translation type="unfinished">ģ¤ė„</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -464,21 +464,21 @@ </message> <message> <location filename="../../FolderExistsDialog.cpp" line="122"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="132"/> - <source>%1 - copy (%2)</source> + <location filename="../../FolderExistsDialog.cpp" line="131"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Error</source> <translation type="unfinished">ģ¤ė„</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -486,49 +486,49 @@ <context> <name>ListThread</name> <message> - <location filename="../../ListThread.cpp" line="1482"/> - <location filename="../../ListThread.cpp" line="2414"/> + <location filename="../../ListThread.cpp" line="1487"/> + <location filename="../../ListThread.cpp" line="2419"/> <source>Unable do to move or copy item into wrong forced mode: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1489"/> - <location filename="../../ListThread.cpp" line="2421"/> + <location filename="../../ListThread.cpp" line="1494"/> + <location filename="../../ListThread.cpp" line="2426"/> <source>Unable to save the transfer list: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1505"/> + <location filename="../../ListThread.cpp" line="1510"/> <source>Problem reading file, or file-size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1512"/> + <location filename="../../ListThread.cpp" line="1517"/> <source>Wrong header: "%1"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1521"/> + <location filename="../../ListThread.cpp" line="1526"/> <source>The transfer list is in mixed mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1530"/> + <location filename="../../ListThread.cpp" line="1535"/> <source>The transfer list is in copy mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1536"/> + <location filename="../../ListThread.cpp" line="1541"/> <source>The transfer list is in move mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1599"/> + <location filename="../../ListThread.cpp" line="1604"/> <source>Some errors have been found during the line parsing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1607"/> + <location filename="../../ListThread.cpp" line="1612"/> <source>Unable to open the transfer list: %1</source> <translation type="unfinished"></translation> </message> @@ -570,24 +570,24 @@ <context> <name>ReadThread</name> <message> - <location filename="../../ReadThread.cpp" line="55"/> + <location filename="../../ReadThread.cpp" line="59"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="184"/> + <location filename="../../ReadThread.cpp" line="188"/> <source>Internal error reading the source file:block size out of range</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="192"/> - <location filename="../../ReadThread.cpp" line="408"/> + <location filename="../../ReadThread.cpp" line="196"/> + <location filename="../../ReadThread.cpp" line="420"/> <source>Unable to read the source file: </source> <translation>ģė³ø ķģ¼ ģ½źø° ė¶ź°:</translation> </message> <message> - <location filename="../../ReadThread.cpp" line="233"/> - <location filename="../../ReadThread.cpp" line="456"/> + <location filename="../../ReadThread.cpp" line="237"/> + <location filename="../../ReadThread.cpp" line="468"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -600,37 +600,31 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="26"/> + <location filename="../../RenamingRules.ui" line="35"/> <source>First renaming</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="32"/> - <source>%name% - copy</source> + <location filename="../../RenamingRules.ui" line="41"/> + <source>%name% - copy%suffix%</source> <extracomment>%name% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="39"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p></body></html></source> - <extracomment> should not be translated</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../RenamingRules.ui" line="49"/> - <source>Second renaming</source> + <location filename="../../RenamingRules.ui" line="57"/> + <source>%name% - copy (%number%)%suffix%</source> + <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="55"/> - <source>%name% - copy (%number%)</source> + <location filename="../../RenamingRules.ui" line="67"/> + <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name, <span style=" font-weight:600;">%number%</span> for the extra number, <span style=" font-weight:600;">%suffix%</span> file suffix</p></body></html></source> <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="62"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p><p><span style=" font-weight:600;">%number%</span> for the extra number</p></body></html></source> - <extracomment>%name%, %number% should not be translated</extracomment> + <location filename="../../RenamingRules.ui" line="51"/> + <source>Second renaming</source> <translation type="unfinished"></translation> </message> <message> @@ -655,33 +649,41 @@ </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="338"/> - <location filename="../../ScanFileOrFolder.cpp" line="404"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="348"/> - <location filename="../../ScanFileOrFolder.cpp" line="414"/> + <location filename="../../ScanFileOrFolder.cpp" line="345"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> + <location filename="../../ScanFileOrFolder.cpp" line="401"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="408"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="444"/> <source>This is not a folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> + <location filename="../../ScanFileOrFolder.cpp" line="446"/> <source>The folder does exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="448"/> <source>The folder is not readable</source> <translation type="unfinished">ķ“ėė„¼ ģ½ģ ģ ģģµėė¤</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="467"/> + <location filename="../../ScanFileOrFolder.cpp" line="459"/> <source>Problem with name encoding</source> <translation type="unfinished"></translation> </message> @@ -690,9 +692,9 @@ <name>TransferThread</name> <message> <location filename="../../TransferThread.cpp" line="244"/> - <location filename="../../TransferThread.cpp" line="677"/> - <location filename="../../TransferThread.cpp" line="749"/> - <location filename="../../TransferThread.cpp" line="1319"/> + <location filename="../../TransferThread.cpp" line="673"/> + <location filename="../../TransferThread.cpp" line="745"/> + <location filename="../../TransferThread.cpp" line="1315"/> <source>File not found</source> <translation type="unfinished"></translation> </message> @@ -725,60 +727,60 @@ </message> <message> <location filename="../../TransferThread.cpp" line="645"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="655"/> - <source>%1 - copy (%2)</source> + <location filename="../../TransferThread.cpp" line="652"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="715"/> - <location filename="../../TransferThread.cpp" line="830"/> + <location filename="../../TransferThread.cpp" line="711"/> + <location filename="../../TransferThread.cpp" line="826"/> <source>The source file doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="755"/> - <location filename="../../TransferThread.cpp" line="842"/> + <location filename="../../TransferThread.cpp" line="751"/> + <location filename="../../TransferThread.cpp" line="838"/> <source>Unable to do the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="791"/> + <location filename="../../TransferThread.cpp" line="787"/> <source>The source doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="836"/> + <location filename="../../TransferThread.cpp" line="832"/> <source>Another file exists at same place</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1138"/> + <location filename="../../TransferThread.cpp" line="1134"/> <source>The checksums do not match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1228"/> + <location filename="../../TransferThread.cpp" line="1224"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1243"/> + <location filename="../../TransferThread.cpp" line="1239"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1254"/> + <location filename="../../TransferThread.cpp" line="1250"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1319"/> - <location filename="../../TransferThread.cpp" line="1337"/> - <location filename="../../TransferThread.cpp" line="1352"/> + <location filename="../../TransferThread.cpp" line="1315"/> + <location filename="../../TransferThread.cpp" line="1333"/> + <location filename="../../TransferThread.cpp" line="1348"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -791,22 +793,22 @@ <context> <name>WriteThread</name> <message> - <location filename="../../WriteThread.cpp" line="80"/> + <location filename="../../WriteThread.cpp" line="83"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="269"/> + <location filename="../../WriteThread.cpp" line="277"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="672"/> + <location filename="../../WriteThread.cpp" line="680"/> <source>Unable to read the source file: </source> <translation type="unfinished">ģė³ø ķģ¼ ģ½źø° ė¶ź°:</translation> </message> <message> - <location filename="../../WriteThread.cpp" line="697"/> + <location filename="../../WriteThread.cpp" line="705"/> <source>File truncated during read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -814,198 +816,198 @@ <context> <name>copyEngineOptions</name> <message> - <location filename="../../copyEngineOptions.ui" line="35"/> + <location filename="../../copyEngineOptions.ui" line="44"/> <source>Transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="44"/> + <location filename="../../copyEngineOptions.ui" line="53"/> <source>Move the whole folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="51"/> + <location filename="../../copyEngineOptions.ui" line="60"/> <source>Transfer the file rights</source> <translation type="unfinished">ķģ¼ ź¶ķ ģ ģ”</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="61"/> + <location filename="../../copyEngineOptions.ui" line="70"/> <source>Keep the file date</source> <translation type="unfinished">ķģ¼ ė ģ§ ė³“ģ”“</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="74"/> + <location filename="../../copyEngineOptions.ui" line="83"/> <source>Autostart the transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="81"/> - <location filename="../../copyEngineOptions.ui" line="101"/> + <location filename="../../copyEngineOptions.ui" line="90"/> + <location filename="../../copyEngineOptions.ui" line="110"/> <source>Less performance if checked</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="104"/> + <location filename="../../copyEngineOptions.ui" line="113"/> <source>Follow the strict order</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="130"/> + <location filename="../../copyEngineOptions.ui" line="139"/> <source>Error and collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="136"/> + <location filename="../../copyEngineOptions.ui" line="145"/> <source>When folder error</source> <translation type="unfinished">ķ“ė ģ¤ė„ģ</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="146"/> + <location filename="../../copyEngineOptions.ui" line="155"/> <source>When file error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="172"/> + <location filename="../../copyEngineOptions.ui" line="181"/> <source>When file collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="232"/> + <location filename="../../copyEngineOptions.ui" line="241"/> <source>When folder collision</source> <translation type="unfinished">ķ“ė ģ¶©ėģ</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="263"/> + <location filename="../../copyEngineOptions.ui" line="272"/> <source>Check if destination folder exists</source> <translation type="unfinished">ėģ ķ“ė ģ”“ģ¬ģ ķģø</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="270"/> + <location filename="../../copyEngineOptions.ui" line="279"/> <source>Renaming rules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="290"/> + <location filename="../../copyEngineOptions.ui" line="299"/> <source>Delete partially transferred files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="303"/> + <location filename="../../copyEngineOptions.ui" line="312"/> <source>Rename the original destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="334"/> + <location filename="../../copyEngineOptions.ui" line="343"/> <source>Control</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="340"/> + <location filename="../../copyEngineOptions.ui" line="349"/> <source>Checksum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="349"/> + <location filename="../../copyEngineOptions.ui" line="358"/> <source>Only after error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="356"/> + <location filename="../../copyEngineOptions.ui" line="365"/> <source>Ignore if impossible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="373"/> + <location filename="../../copyEngineOptions.ui" line="382"/> <source>Verify checksums</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="405"/> + <location filename="../../copyEngineOptions.ui" line="414"/> <source>Performance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="411"/> + <location filename="../../copyEngineOptions.ui" line="420"/> <source>Parallel buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="418"/> - <location filename="../../copyEngineOptions.ui" line="431"/> - <location filename="../../copyEngineOptions.ui" line="444"/> - <location filename="../../copyEngineOptions.ui" line="481"/> - <location filename="../../copyEngineOptions.ui" line="550"/> + <location filename="../../copyEngineOptions.ui" line="427"/> + <location filename="../../copyEngineOptions.ui" line="440"/> + <location filename="../../copyEngineOptions.ui" line="453"/> + <location filename="../../copyEngineOptions.ui" line="490"/> + <location filename="../../copyEngineOptions.ui" line="559"/> <source>KB</source> <translation type="unfinished">KB</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="460"/> + <location filename="../../copyEngineOptions.ui" line="469"/> <source>Block size</source> <translation type="unfinished">ėøė ķ¬źø°</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="467"/> + <location filename="../../copyEngineOptions.ui" line="476"/> <source>Sequential buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="474"/> + <location filename="../../copyEngineOptions.ui" line="483"/> <source>Enable OS buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="497"/> + <location filename="../../copyEngineOptions.ui" line="506"/> <source>OS buffer only if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="504"/> + <location filename="../../copyEngineOptions.ui" line="513"/> <source>Transfer algorithm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="543"/> + <location filename="../../copyEngineOptions.ui" line="552"/> <source>Parallelize if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="573"/> - <source>Inode threads</source> + <location filename="../../copyEngineOptions.ui" line="582"/> + <source>Inode threads (unsafe > 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="580"/> - <location filename="../../copyEngineOptions.ui" line="590"/> + <location filename="../../copyEngineOptions.ui" line="589"/> + <location filename="../../copyEngineOptions.ui" line="599"/> <source>More cpu, but better organisation on the disk</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="593"/> + <location filename="../../copyEngineOptions.ui" line="602"/> <source>Order the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="609"/> + <location filename="../../copyEngineOptions.ui" line="618"/> <source>Misc</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="615"/> + <location filename="../../copyEngineOptions.ui" line="624"/> <source>Check the disk space</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="625"/> + <location filename="../../copyEngineOptions.ui" line="634"/> <source>Use this folder when destination is not set</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="637"/> + <location filename="../../copyEngineOptions.ui" line="646"/> <source>Browse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="659"/> + <location filename="../../copyEngineOptions.ui" line="668"/> <source>Filters</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/CopyEngine/Ultracopier/Languages/nl/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/nl/translation.ts index 4d395a0..e17b3f2 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/nl/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/nl/translation.ts @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="419"/> - <location filename="../../CopyEngineFactory.cpp" line="422"/> <location filename="../../CopyEngineFactory.cpp" line="427"/> - <location filename="../../CopyEngineFactory.cpp" line="431"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> <location filename="../../CopyEngineFactory.cpp" line="428"/> <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="425"/> - <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="443"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="447"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -274,21 +274,21 @@ <name>FileExistsDialog</name> <message> <location filename="../../FileExistsDialog.cpp" line="137"/> - <source>%1 - copy</source> + <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="147"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileExistsDialog.cpp" line="144"/> + <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -297,21 +297,21 @@ <name>FileIsSameDialog</name> <message> <location filename="../../FileIsSameDialog.cpp" line="111"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="121"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileIsSameDialog.cpp" line="118"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -464,21 +464,21 @@ </message> <message> <location filename="../../FolderExistsDialog.cpp" line="122"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="132"/> - <source>%1 - copy (%2)</source> + <location filename="../../FolderExistsDialog.cpp" line="131"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -486,49 +486,49 @@ <context> <name>ListThread</name> <message> - <location filename="../../ListThread.cpp" line="1482"/> - <location filename="../../ListThread.cpp" line="2414"/> + <location filename="../../ListThread.cpp" line="1487"/> + <location filename="../../ListThread.cpp" line="2419"/> <source>Unable do to move or copy item into wrong forced mode: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1489"/> - <location filename="../../ListThread.cpp" line="2421"/> + <location filename="../../ListThread.cpp" line="1494"/> + <location filename="../../ListThread.cpp" line="2426"/> <source>Unable to save the transfer list: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1505"/> + <location filename="../../ListThread.cpp" line="1510"/> <source>Problem reading file, or file-size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1512"/> + <location filename="../../ListThread.cpp" line="1517"/> <source>Wrong header: "%1"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1521"/> + <location filename="../../ListThread.cpp" line="1526"/> <source>The transfer list is in mixed mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1530"/> + <location filename="../../ListThread.cpp" line="1535"/> <source>The transfer list is in copy mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1536"/> + <location filename="../../ListThread.cpp" line="1541"/> <source>The transfer list is in move mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1599"/> + <location filename="../../ListThread.cpp" line="1604"/> <source>Some errors have been found during the line parsing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1607"/> + <location filename="../../ListThread.cpp" line="1612"/> <source>Unable to open the transfer list: %1</source> <translation type="unfinished"></translation> </message> @@ -570,24 +570,24 @@ <context> <name>ReadThread</name> <message> - <location filename="../../ReadThread.cpp" line="55"/> + <location filename="../../ReadThread.cpp" line="59"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="184"/> + <location filename="../../ReadThread.cpp" line="188"/> <source>Internal error reading the source file:block size out of range</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="192"/> - <location filename="../../ReadThread.cpp" line="408"/> + <location filename="../../ReadThread.cpp" line="196"/> + <location filename="../../ReadThread.cpp" line="420"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="233"/> - <location filename="../../ReadThread.cpp" line="456"/> + <location filename="../../ReadThread.cpp" line="237"/> + <location filename="../../ReadThread.cpp" line="468"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -595,37 +595,31 @@ <context> <name>RenamingRules</name> <message> - <location filename="../../RenamingRules.ui" line="26"/> + <location filename="../../RenamingRules.ui" line="35"/> <source>First renaming</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="32"/> - <source>%name% - copy</source> + <location filename="../../RenamingRules.ui" line="41"/> + <source>%name% - copy%suffix%</source> <extracomment>%name% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="39"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p></body></html></source> - <extracomment> should not be translated</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../RenamingRules.ui" line="49"/> - <source>Second renaming</source> + <location filename="../../RenamingRules.ui" line="57"/> + <source>%name% - copy (%number%)%suffix%</source> + <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="55"/> - <source>%name% - copy (%number%)</source> + <location filename="../../RenamingRules.ui" line="67"/> + <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name, <span style=" font-weight:600;">%number%</span> for the extra number, <span style=" font-weight:600;">%suffix%</span> file suffix</p></body></html></source> <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="62"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p><p><span style=" font-weight:600;">%number%</span> for the extra number</p></body></html></source> - <extracomment>%name%, %number% should not be translated</extracomment> + <location filename="../../RenamingRules.ui" line="51"/> + <source>Second renaming</source> <translation type="unfinished"></translation> </message> <message> @@ -655,33 +649,41 @@ </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="338"/> - <location filename="../../ScanFileOrFolder.cpp" line="404"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="348"/> - <location filename="../../ScanFileOrFolder.cpp" line="414"/> + <location filename="../../ScanFileOrFolder.cpp" line="345"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> + <location filename="../../ScanFileOrFolder.cpp" line="401"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="408"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="444"/> <source>This is not a folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> + <location filename="../../ScanFileOrFolder.cpp" line="446"/> <source>The folder does exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="448"/> <source>The folder is not readable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="467"/> + <location filename="../../ScanFileOrFolder.cpp" line="459"/> <source>Problem with name encoding</source> <translation type="unfinished"></translation> </message> @@ -690,9 +692,9 @@ <name>TransferThread</name> <message> <location filename="../../TransferThread.cpp" line="244"/> - <location filename="../../TransferThread.cpp" line="677"/> - <location filename="../../TransferThread.cpp" line="749"/> - <location filename="../../TransferThread.cpp" line="1319"/> + <location filename="../../TransferThread.cpp" line="673"/> + <location filename="../../TransferThread.cpp" line="745"/> + <location filename="../../TransferThread.cpp" line="1315"/> <source>File not found</source> <translation type="unfinished"></translation> </message> @@ -725,60 +727,60 @@ </message> <message> <location filename="../../TransferThread.cpp" line="645"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="655"/> - <source>%1 - copy (%2)</source> + <location filename="../../TransferThread.cpp" line="652"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="715"/> - <location filename="../../TransferThread.cpp" line="830"/> + <location filename="../../TransferThread.cpp" line="711"/> + <location filename="../../TransferThread.cpp" line="826"/> <source>The source file doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="755"/> - <location filename="../../TransferThread.cpp" line="842"/> + <location filename="../../TransferThread.cpp" line="751"/> + <location filename="../../TransferThread.cpp" line="838"/> <source>Unable to do the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="791"/> + <location filename="../../TransferThread.cpp" line="787"/> <source>The source doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="836"/> + <location filename="../../TransferThread.cpp" line="832"/> <source>Another file exists at same place</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1138"/> + <location filename="../../TransferThread.cpp" line="1134"/> <source>The checksums do not match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1228"/> + <location filename="../../TransferThread.cpp" line="1224"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1243"/> + <location filename="../../TransferThread.cpp" line="1239"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1254"/> + <location filename="../../TransferThread.cpp" line="1250"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1319"/> - <location filename="../../TransferThread.cpp" line="1337"/> - <location filename="../../TransferThread.cpp" line="1352"/> + <location filename="../../TransferThread.cpp" line="1315"/> + <location filename="../../TransferThread.cpp" line="1333"/> + <location filename="../../TransferThread.cpp" line="1348"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -791,22 +793,22 @@ <context> <name>WriteThread</name> <message> - <location filename="../../WriteThread.cpp" line="80"/> + <location filename="../../WriteThread.cpp" line="83"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="269"/> + <location filename="../../WriteThread.cpp" line="277"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="672"/> + <location filename="../../WriteThread.cpp" line="680"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="697"/> + <location filename="../../WriteThread.cpp" line="705"/> <source>File truncated during read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -814,198 +816,198 @@ <context> <name>copyEngineOptions</name> <message> - <location filename="../../copyEngineOptions.ui" line="35"/> + <location filename="../../copyEngineOptions.ui" line="44"/> <source>Transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="44"/> + <location filename="../../copyEngineOptions.ui" line="53"/> <source>Move the whole folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="51"/> + <location filename="../../copyEngineOptions.ui" line="60"/> <source>Transfer the file rights</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="61"/> + <location filename="../../copyEngineOptions.ui" line="70"/> <source>Keep the file date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="74"/> + <location filename="../../copyEngineOptions.ui" line="83"/> <source>Autostart the transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="81"/> - <location filename="../../copyEngineOptions.ui" line="101"/> + <location filename="../../copyEngineOptions.ui" line="90"/> + <location filename="../../copyEngineOptions.ui" line="110"/> <source>Less performance if checked</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="104"/> + <location filename="../../copyEngineOptions.ui" line="113"/> <source>Follow the strict order</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="130"/> + <location filename="../../copyEngineOptions.ui" line="139"/> <source>Error and collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="136"/> + <location filename="../../copyEngineOptions.ui" line="145"/> <source>When folder error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="146"/> + <location filename="../../copyEngineOptions.ui" line="155"/> <source>When file error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="172"/> + <location filename="../../copyEngineOptions.ui" line="181"/> <source>When file collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="232"/> + <location filename="../../copyEngineOptions.ui" line="241"/> <source>When folder collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="263"/> + <location filename="../../copyEngineOptions.ui" line="272"/> <source>Check if destination folder exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="270"/> + <location filename="../../copyEngineOptions.ui" line="279"/> <source>Renaming rules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="290"/> + <location filename="../../copyEngineOptions.ui" line="299"/> <source>Delete partially transferred files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="303"/> + <location filename="../../copyEngineOptions.ui" line="312"/> <source>Rename the original destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="334"/> + <location filename="../../copyEngineOptions.ui" line="343"/> <source>Control</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="340"/> + <location filename="../../copyEngineOptions.ui" line="349"/> <source>Checksum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="349"/> + <location filename="../../copyEngineOptions.ui" line="358"/> <source>Only after error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="356"/> + <location filename="../../copyEngineOptions.ui" line="365"/> <source>Ignore if impossible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="373"/> + <location filename="../../copyEngineOptions.ui" line="382"/> <source>Verify checksums</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="405"/> + <location filename="../../copyEngineOptions.ui" line="414"/> <source>Performance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="411"/> + <location filename="../../copyEngineOptions.ui" line="420"/> <source>Parallel buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="418"/> - <location filename="../../copyEngineOptions.ui" line="431"/> - <location filename="../../copyEngineOptions.ui" line="444"/> - <location filename="../../copyEngineOptions.ui" line="481"/> - <location filename="../../copyEngineOptions.ui" line="550"/> + <location filename="../../copyEngineOptions.ui" line="427"/> + <location filename="../../copyEngineOptions.ui" line="440"/> + <location filename="../../copyEngineOptions.ui" line="453"/> + <location filename="../../copyEngineOptions.ui" line="490"/> + <location filename="../../copyEngineOptions.ui" line="559"/> <source>KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="460"/> + <location filename="../../copyEngineOptions.ui" line="469"/> <source>Block size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="467"/> + <location filename="../../copyEngineOptions.ui" line="476"/> <source>Sequential buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="474"/> + <location filename="../../copyEngineOptions.ui" line="483"/> <source>Enable OS buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="497"/> + <location filename="../../copyEngineOptions.ui" line="506"/> <source>OS buffer only if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="504"/> + <location filename="../../copyEngineOptions.ui" line="513"/> <source>Transfer algorithm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="543"/> + <location filename="../../copyEngineOptions.ui" line="552"/> <source>Parallelize if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="573"/> - <source>Inode threads</source> + <location filename="../../copyEngineOptions.ui" line="582"/> + <source>Inode threads (unsafe > 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="580"/> - <location filename="../../copyEngineOptions.ui" line="590"/> + <location filename="../../copyEngineOptions.ui" line="589"/> + <location filename="../../copyEngineOptions.ui" line="599"/> <source>More cpu, but better organisation on the disk</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="593"/> + <location filename="../../copyEngineOptions.ui" line="602"/> <source>Order the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="609"/> + <location filename="../../copyEngineOptions.ui" line="618"/> <source>Misc</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="615"/> + <location filename="../../copyEngineOptions.ui" line="624"/> <source>Check the disk space</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="625"/> + <location filename="../../copyEngineOptions.ui" line="634"/> <source>Use this folder when destination is not set</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="637"/> + <location filename="../../copyEngineOptions.ui" line="646"/> <source>Browse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="659"/> + <location filename="../../copyEngineOptions.ui" line="668"/> <source>Filters</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/CopyEngine/Ultracopier/Languages/no/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/no/translation.ts index 4d395a0..e17b3f2 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/no/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/no/translation.ts @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="419"/> - <location filename="../../CopyEngineFactory.cpp" line="422"/> <location filename="../../CopyEngineFactory.cpp" line="427"/> - <location filename="../../CopyEngineFactory.cpp" line="431"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> <location filename="../../CopyEngineFactory.cpp" line="428"/> <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="425"/> - <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="443"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="447"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -274,21 +274,21 @@ <name>FileExistsDialog</name> <message> <location filename="../../FileExistsDialog.cpp" line="137"/> - <source>%1 - copy</source> + <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="147"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileExistsDialog.cpp" line="144"/> + <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -297,21 +297,21 @@ <name>FileIsSameDialog</name> <message> <location filename="../../FileIsSameDialog.cpp" line="111"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="121"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileIsSameDialog.cpp" line="118"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -464,21 +464,21 @@ </message> <message> <location filename="../../FolderExistsDialog.cpp" line="122"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="132"/> - <source>%1 - copy (%2)</source> + <location filename="../../FolderExistsDialog.cpp" line="131"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -486,49 +486,49 @@ <context> <name>ListThread</name> <message> - <location filename="../../ListThread.cpp" line="1482"/> - <location filename="../../ListThread.cpp" line="2414"/> + <location filename="../../ListThread.cpp" line="1487"/> + <location filename="../../ListThread.cpp" line="2419"/> <source>Unable do to move or copy item into wrong forced mode: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1489"/> - <location filename="../../ListThread.cpp" line="2421"/> + <location filename="../../ListThread.cpp" line="1494"/> + <location filename="../../ListThread.cpp" line="2426"/> <source>Unable to save the transfer list: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1505"/> + <location filename="../../ListThread.cpp" line="1510"/> <source>Problem reading file, or file-size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1512"/> + <location filename="../../ListThread.cpp" line="1517"/> <source>Wrong header: "%1"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1521"/> + <location filename="../../ListThread.cpp" line="1526"/> <source>The transfer list is in mixed mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1530"/> + <location filename="../../ListThread.cpp" line="1535"/> <source>The transfer list is in copy mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1536"/> + <location filename="../../ListThread.cpp" line="1541"/> <source>The transfer list is in move mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1599"/> + <location filename="../../ListThread.cpp" line="1604"/> <source>Some errors have been found during the line parsing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1607"/> + <location filename="../../ListThread.cpp" line="1612"/> <source>Unable to open the transfer list: %1</source> <translation type="unfinished"></translation> </message> @@ -570,24 +570,24 @@ <context> <name>ReadThread</name> <message> - <location filename="../../ReadThread.cpp" line="55"/> + <location filename="../../ReadThread.cpp" line="59"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="184"/> + <location filename="../../ReadThread.cpp" line="188"/> <source>Internal error reading the source file:block size out of range</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="192"/> - <location filename="../../ReadThread.cpp" line="408"/> + <location filename="../../ReadThread.cpp" line="196"/> + <location filename="../../ReadThread.cpp" line="420"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="233"/> - <location filename="../../ReadThread.cpp" line="456"/> + <location filename="../../ReadThread.cpp" line="237"/> + <location filename="../../ReadThread.cpp" line="468"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -595,37 +595,31 @@ <context> <name>RenamingRules</name> <message> - <location filename="../../RenamingRules.ui" line="26"/> + <location filename="../../RenamingRules.ui" line="35"/> <source>First renaming</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="32"/> - <source>%name% - copy</source> + <location filename="../../RenamingRules.ui" line="41"/> + <source>%name% - copy%suffix%</source> <extracomment>%name% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="39"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p></body></html></source> - <extracomment> should not be translated</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../RenamingRules.ui" line="49"/> - <source>Second renaming</source> + <location filename="../../RenamingRules.ui" line="57"/> + <source>%name% - copy (%number%)%suffix%</source> + <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="55"/> - <source>%name% - copy (%number%)</source> + <location filename="../../RenamingRules.ui" line="67"/> + <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name, <span style=" font-weight:600;">%number%</span> for the extra number, <span style=" font-weight:600;">%suffix%</span> file suffix</p></body></html></source> <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="62"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p><p><span style=" font-weight:600;">%number%</span> for the extra number</p></body></html></source> - <extracomment>%name%, %number% should not be translated</extracomment> + <location filename="../../RenamingRules.ui" line="51"/> + <source>Second renaming</source> <translation type="unfinished"></translation> </message> <message> @@ -655,33 +649,41 @@ </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="338"/> - <location filename="../../ScanFileOrFolder.cpp" line="404"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="348"/> - <location filename="../../ScanFileOrFolder.cpp" line="414"/> + <location filename="../../ScanFileOrFolder.cpp" line="345"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> + <location filename="../../ScanFileOrFolder.cpp" line="401"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="408"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="444"/> <source>This is not a folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> + <location filename="../../ScanFileOrFolder.cpp" line="446"/> <source>The folder does exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="448"/> <source>The folder is not readable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="467"/> + <location filename="../../ScanFileOrFolder.cpp" line="459"/> <source>Problem with name encoding</source> <translation type="unfinished"></translation> </message> @@ -690,9 +692,9 @@ <name>TransferThread</name> <message> <location filename="../../TransferThread.cpp" line="244"/> - <location filename="../../TransferThread.cpp" line="677"/> - <location filename="../../TransferThread.cpp" line="749"/> - <location filename="../../TransferThread.cpp" line="1319"/> + <location filename="../../TransferThread.cpp" line="673"/> + <location filename="../../TransferThread.cpp" line="745"/> + <location filename="../../TransferThread.cpp" line="1315"/> <source>File not found</source> <translation type="unfinished"></translation> </message> @@ -725,60 +727,60 @@ </message> <message> <location filename="../../TransferThread.cpp" line="645"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="655"/> - <source>%1 - copy (%2)</source> + <location filename="../../TransferThread.cpp" line="652"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="715"/> - <location filename="../../TransferThread.cpp" line="830"/> + <location filename="../../TransferThread.cpp" line="711"/> + <location filename="../../TransferThread.cpp" line="826"/> <source>The source file doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="755"/> - <location filename="../../TransferThread.cpp" line="842"/> + <location filename="../../TransferThread.cpp" line="751"/> + <location filename="../../TransferThread.cpp" line="838"/> <source>Unable to do the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="791"/> + <location filename="../../TransferThread.cpp" line="787"/> <source>The source doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="836"/> + <location filename="../../TransferThread.cpp" line="832"/> <source>Another file exists at same place</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1138"/> + <location filename="../../TransferThread.cpp" line="1134"/> <source>The checksums do not match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1228"/> + <location filename="../../TransferThread.cpp" line="1224"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1243"/> + <location filename="../../TransferThread.cpp" line="1239"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1254"/> + <location filename="../../TransferThread.cpp" line="1250"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1319"/> - <location filename="../../TransferThread.cpp" line="1337"/> - <location filename="../../TransferThread.cpp" line="1352"/> + <location filename="../../TransferThread.cpp" line="1315"/> + <location filename="../../TransferThread.cpp" line="1333"/> + <location filename="../../TransferThread.cpp" line="1348"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -791,22 +793,22 @@ <context> <name>WriteThread</name> <message> - <location filename="../../WriteThread.cpp" line="80"/> + <location filename="../../WriteThread.cpp" line="83"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="269"/> + <location filename="../../WriteThread.cpp" line="277"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="672"/> + <location filename="../../WriteThread.cpp" line="680"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="697"/> + <location filename="../../WriteThread.cpp" line="705"/> <source>File truncated during read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -814,198 +816,198 @@ <context> <name>copyEngineOptions</name> <message> - <location filename="../../copyEngineOptions.ui" line="35"/> + <location filename="../../copyEngineOptions.ui" line="44"/> <source>Transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="44"/> + <location filename="../../copyEngineOptions.ui" line="53"/> <source>Move the whole folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="51"/> + <location filename="../../copyEngineOptions.ui" line="60"/> <source>Transfer the file rights</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="61"/> + <location filename="../../copyEngineOptions.ui" line="70"/> <source>Keep the file date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="74"/> + <location filename="../../copyEngineOptions.ui" line="83"/> <source>Autostart the transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="81"/> - <location filename="../../copyEngineOptions.ui" line="101"/> + <location filename="../../copyEngineOptions.ui" line="90"/> + <location filename="../../copyEngineOptions.ui" line="110"/> <source>Less performance if checked</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="104"/> + <location filename="../../copyEngineOptions.ui" line="113"/> <source>Follow the strict order</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="130"/> + <location filename="../../copyEngineOptions.ui" line="139"/> <source>Error and collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="136"/> + <location filename="../../copyEngineOptions.ui" line="145"/> <source>When folder error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="146"/> + <location filename="../../copyEngineOptions.ui" line="155"/> <source>When file error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="172"/> + <location filename="../../copyEngineOptions.ui" line="181"/> <source>When file collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="232"/> + <location filename="../../copyEngineOptions.ui" line="241"/> <source>When folder collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="263"/> + <location filename="../../copyEngineOptions.ui" line="272"/> <source>Check if destination folder exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="270"/> + <location filename="../../copyEngineOptions.ui" line="279"/> <source>Renaming rules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="290"/> + <location filename="../../copyEngineOptions.ui" line="299"/> <source>Delete partially transferred files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="303"/> + <location filename="../../copyEngineOptions.ui" line="312"/> <source>Rename the original destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="334"/> + <location filename="../../copyEngineOptions.ui" line="343"/> <source>Control</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="340"/> + <location filename="../../copyEngineOptions.ui" line="349"/> <source>Checksum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="349"/> + <location filename="../../copyEngineOptions.ui" line="358"/> <source>Only after error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="356"/> + <location filename="../../copyEngineOptions.ui" line="365"/> <source>Ignore if impossible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="373"/> + <location filename="../../copyEngineOptions.ui" line="382"/> <source>Verify checksums</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="405"/> + <location filename="../../copyEngineOptions.ui" line="414"/> <source>Performance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="411"/> + <location filename="../../copyEngineOptions.ui" line="420"/> <source>Parallel buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="418"/> - <location filename="../../copyEngineOptions.ui" line="431"/> - <location filename="../../copyEngineOptions.ui" line="444"/> - <location filename="../../copyEngineOptions.ui" line="481"/> - <location filename="../../copyEngineOptions.ui" line="550"/> + <location filename="../../copyEngineOptions.ui" line="427"/> + <location filename="../../copyEngineOptions.ui" line="440"/> + <location filename="../../copyEngineOptions.ui" line="453"/> + <location filename="../../copyEngineOptions.ui" line="490"/> + <location filename="../../copyEngineOptions.ui" line="559"/> <source>KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="460"/> + <location filename="../../copyEngineOptions.ui" line="469"/> <source>Block size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="467"/> + <location filename="../../copyEngineOptions.ui" line="476"/> <source>Sequential buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="474"/> + <location filename="../../copyEngineOptions.ui" line="483"/> <source>Enable OS buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="497"/> + <location filename="../../copyEngineOptions.ui" line="506"/> <source>OS buffer only if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="504"/> + <location filename="../../copyEngineOptions.ui" line="513"/> <source>Transfer algorithm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="543"/> + <location filename="../../copyEngineOptions.ui" line="552"/> <source>Parallelize if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="573"/> - <source>Inode threads</source> + <location filename="../../copyEngineOptions.ui" line="582"/> + <source>Inode threads (unsafe > 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="580"/> - <location filename="../../copyEngineOptions.ui" line="590"/> + <location filename="../../copyEngineOptions.ui" line="589"/> + <location filename="../../copyEngineOptions.ui" line="599"/> <source>More cpu, but better organisation on the disk</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="593"/> + <location filename="../../copyEngineOptions.ui" line="602"/> <source>Order the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="609"/> + <location filename="../../copyEngineOptions.ui" line="618"/> <source>Misc</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="615"/> + <location filename="../../copyEngineOptions.ui" line="624"/> <source>Check the disk space</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="625"/> + <location filename="../../copyEngineOptions.ui" line="634"/> <source>Use this folder when destination is not set</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="637"/> + <location filename="../../copyEngineOptions.ui" line="646"/> <source>Browse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="659"/> + <location filename="../../copyEngineOptions.ui" line="668"/> <source>Filters</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/CopyEngine/Ultracopier/Languages/pl/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/pl/translation.ts index 4d395a0..e17b3f2 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/pl/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/pl/translation.ts @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="419"/> - <location filename="../../CopyEngineFactory.cpp" line="422"/> <location filename="../../CopyEngineFactory.cpp" line="427"/> - <location filename="../../CopyEngineFactory.cpp" line="431"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> <location filename="../../CopyEngineFactory.cpp" line="428"/> <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="425"/> - <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="443"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="447"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -274,21 +274,21 @@ <name>FileExistsDialog</name> <message> <location filename="../../FileExistsDialog.cpp" line="137"/> - <source>%1 - copy</source> + <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="147"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileExistsDialog.cpp" line="144"/> + <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -297,21 +297,21 @@ <name>FileIsSameDialog</name> <message> <location filename="../../FileIsSameDialog.cpp" line="111"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="121"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileIsSameDialog.cpp" line="118"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -464,21 +464,21 @@ </message> <message> <location filename="../../FolderExistsDialog.cpp" line="122"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="132"/> - <source>%1 - copy (%2)</source> + <location filename="../../FolderExistsDialog.cpp" line="131"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -486,49 +486,49 @@ <context> <name>ListThread</name> <message> - <location filename="../../ListThread.cpp" line="1482"/> - <location filename="../../ListThread.cpp" line="2414"/> + <location filename="../../ListThread.cpp" line="1487"/> + <location filename="../../ListThread.cpp" line="2419"/> <source>Unable do to move or copy item into wrong forced mode: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1489"/> - <location filename="../../ListThread.cpp" line="2421"/> + <location filename="../../ListThread.cpp" line="1494"/> + <location filename="../../ListThread.cpp" line="2426"/> <source>Unable to save the transfer list: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1505"/> + <location filename="../../ListThread.cpp" line="1510"/> <source>Problem reading file, or file-size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1512"/> + <location filename="../../ListThread.cpp" line="1517"/> <source>Wrong header: "%1"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1521"/> + <location filename="../../ListThread.cpp" line="1526"/> <source>The transfer list is in mixed mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1530"/> + <location filename="../../ListThread.cpp" line="1535"/> <source>The transfer list is in copy mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1536"/> + <location filename="../../ListThread.cpp" line="1541"/> <source>The transfer list is in move mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1599"/> + <location filename="../../ListThread.cpp" line="1604"/> <source>Some errors have been found during the line parsing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1607"/> + <location filename="../../ListThread.cpp" line="1612"/> <source>Unable to open the transfer list: %1</source> <translation type="unfinished"></translation> </message> @@ -570,24 +570,24 @@ <context> <name>ReadThread</name> <message> - <location filename="../../ReadThread.cpp" line="55"/> + <location filename="../../ReadThread.cpp" line="59"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="184"/> + <location filename="../../ReadThread.cpp" line="188"/> <source>Internal error reading the source file:block size out of range</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="192"/> - <location filename="../../ReadThread.cpp" line="408"/> + <location filename="../../ReadThread.cpp" line="196"/> + <location filename="../../ReadThread.cpp" line="420"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="233"/> - <location filename="../../ReadThread.cpp" line="456"/> + <location filename="../../ReadThread.cpp" line="237"/> + <location filename="../../ReadThread.cpp" line="468"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -595,37 +595,31 @@ <context> <name>RenamingRules</name> <message> - <location filename="../../RenamingRules.ui" line="26"/> + <location filename="../../RenamingRules.ui" line="35"/> <source>First renaming</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="32"/> - <source>%name% - copy</source> + <location filename="../../RenamingRules.ui" line="41"/> + <source>%name% - copy%suffix%</source> <extracomment>%name% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="39"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p></body></html></source> - <extracomment> should not be translated</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../RenamingRules.ui" line="49"/> - <source>Second renaming</source> + <location filename="../../RenamingRules.ui" line="57"/> + <source>%name% - copy (%number%)%suffix%</source> + <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="55"/> - <source>%name% - copy (%number%)</source> + <location filename="../../RenamingRules.ui" line="67"/> + <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name, <span style=" font-weight:600;">%number%</span> for the extra number, <span style=" font-weight:600;">%suffix%</span> file suffix</p></body></html></source> <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="62"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p><p><span style=" font-weight:600;">%number%</span> for the extra number</p></body></html></source> - <extracomment>%name%, %number% should not be translated</extracomment> + <location filename="../../RenamingRules.ui" line="51"/> + <source>Second renaming</source> <translation type="unfinished"></translation> </message> <message> @@ -655,33 +649,41 @@ </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="338"/> - <location filename="../../ScanFileOrFolder.cpp" line="404"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="348"/> - <location filename="../../ScanFileOrFolder.cpp" line="414"/> + <location filename="../../ScanFileOrFolder.cpp" line="345"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> + <location filename="../../ScanFileOrFolder.cpp" line="401"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="408"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="444"/> <source>This is not a folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> + <location filename="../../ScanFileOrFolder.cpp" line="446"/> <source>The folder does exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="448"/> <source>The folder is not readable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="467"/> + <location filename="../../ScanFileOrFolder.cpp" line="459"/> <source>Problem with name encoding</source> <translation type="unfinished"></translation> </message> @@ -690,9 +692,9 @@ <name>TransferThread</name> <message> <location filename="../../TransferThread.cpp" line="244"/> - <location filename="../../TransferThread.cpp" line="677"/> - <location filename="../../TransferThread.cpp" line="749"/> - <location filename="../../TransferThread.cpp" line="1319"/> + <location filename="../../TransferThread.cpp" line="673"/> + <location filename="../../TransferThread.cpp" line="745"/> + <location filename="../../TransferThread.cpp" line="1315"/> <source>File not found</source> <translation type="unfinished"></translation> </message> @@ -725,60 +727,60 @@ </message> <message> <location filename="../../TransferThread.cpp" line="645"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="655"/> - <source>%1 - copy (%2)</source> + <location filename="../../TransferThread.cpp" line="652"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="715"/> - <location filename="../../TransferThread.cpp" line="830"/> + <location filename="../../TransferThread.cpp" line="711"/> + <location filename="../../TransferThread.cpp" line="826"/> <source>The source file doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="755"/> - <location filename="../../TransferThread.cpp" line="842"/> + <location filename="../../TransferThread.cpp" line="751"/> + <location filename="../../TransferThread.cpp" line="838"/> <source>Unable to do the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="791"/> + <location filename="../../TransferThread.cpp" line="787"/> <source>The source doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="836"/> + <location filename="../../TransferThread.cpp" line="832"/> <source>Another file exists at same place</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1138"/> + <location filename="../../TransferThread.cpp" line="1134"/> <source>The checksums do not match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1228"/> + <location filename="../../TransferThread.cpp" line="1224"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1243"/> + <location filename="../../TransferThread.cpp" line="1239"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1254"/> + <location filename="../../TransferThread.cpp" line="1250"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1319"/> - <location filename="../../TransferThread.cpp" line="1337"/> - <location filename="../../TransferThread.cpp" line="1352"/> + <location filename="../../TransferThread.cpp" line="1315"/> + <location filename="../../TransferThread.cpp" line="1333"/> + <location filename="../../TransferThread.cpp" line="1348"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -791,22 +793,22 @@ <context> <name>WriteThread</name> <message> - <location filename="../../WriteThread.cpp" line="80"/> + <location filename="../../WriteThread.cpp" line="83"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="269"/> + <location filename="../../WriteThread.cpp" line="277"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="672"/> + <location filename="../../WriteThread.cpp" line="680"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="697"/> + <location filename="../../WriteThread.cpp" line="705"/> <source>File truncated during read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -814,198 +816,198 @@ <context> <name>copyEngineOptions</name> <message> - <location filename="../../copyEngineOptions.ui" line="35"/> + <location filename="../../copyEngineOptions.ui" line="44"/> <source>Transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="44"/> + <location filename="../../copyEngineOptions.ui" line="53"/> <source>Move the whole folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="51"/> + <location filename="../../copyEngineOptions.ui" line="60"/> <source>Transfer the file rights</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="61"/> + <location filename="../../copyEngineOptions.ui" line="70"/> <source>Keep the file date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="74"/> + <location filename="../../copyEngineOptions.ui" line="83"/> <source>Autostart the transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="81"/> - <location filename="../../copyEngineOptions.ui" line="101"/> + <location filename="../../copyEngineOptions.ui" line="90"/> + <location filename="../../copyEngineOptions.ui" line="110"/> <source>Less performance if checked</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="104"/> + <location filename="../../copyEngineOptions.ui" line="113"/> <source>Follow the strict order</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="130"/> + <location filename="../../copyEngineOptions.ui" line="139"/> <source>Error and collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="136"/> + <location filename="../../copyEngineOptions.ui" line="145"/> <source>When folder error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="146"/> + <location filename="../../copyEngineOptions.ui" line="155"/> <source>When file error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="172"/> + <location filename="../../copyEngineOptions.ui" line="181"/> <source>When file collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="232"/> + <location filename="../../copyEngineOptions.ui" line="241"/> <source>When folder collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="263"/> + <location filename="../../copyEngineOptions.ui" line="272"/> <source>Check if destination folder exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="270"/> + <location filename="../../copyEngineOptions.ui" line="279"/> <source>Renaming rules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="290"/> + <location filename="../../copyEngineOptions.ui" line="299"/> <source>Delete partially transferred files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="303"/> + <location filename="../../copyEngineOptions.ui" line="312"/> <source>Rename the original destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="334"/> + <location filename="../../copyEngineOptions.ui" line="343"/> <source>Control</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="340"/> + <location filename="../../copyEngineOptions.ui" line="349"/> <source>Checksum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="349"/> + <location filename="../../copyEngineOptions.ui" line="358"/> <source>Only after error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="356"/> + <location filename="../../copyEngineOptions.ui" line="365"/> <source>Ignore if impossible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="373"/> + <location filename="../../copyEngineOptions.ui" line="382"/> <source>Verify checksums</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="405"/> + <location filename="../../copyEngineOptions.ui" line="414"/> <source>Performance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="411"/> + <location filename="../../copyEngineOptions.ui" line="420"/> <source>Parallel buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="418"/> - <location filename="../../copyEngineOptions.ui" line="431"/> - <location filename="../../copyEngineOptions.ui" line="444"/> - <location filename="../../copyEngineOptions.ui" line="481"/> - <location filename="../../copyEngineOptions.ui" line="550"/> + <location filename="../../copyEngineOptions.ui" line="427"/> + <location filename="../../copyEngineOptions.ui" line="440"/> + <location filename="../../copyEngineOptions.ui" line="453"/> + <location filename="../../copyEngineOptions.ui" line="490"/> + <location filename="../../copyEngineOptions.ui" line="559"/> <source>KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="460"/> + <location filename="../../copyEngineOptions.ui" line="469"/> <source>Block size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="467"/> + <location filename="../../copyEngineOptions.ui" line="476"/> <source>Sequential buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="474"/> + <location filename="../../copyEngineOptions.ui" line="483"/> <source>Enable OS buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="497"/> + <location filename="../../copyEngineOptions.ui" line="506"/> <source>OS buffer only if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="504"/> + <location filename="../../copyEngineOptions.ui" line="513"/> <source>Transfer algorithm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="543"/> + <location filename="../../copyEngineOptions.ui" line="552"/> <source>Parallelize if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="573"/> - <source>Inode threads</source> + <location filename="../../copyEngineOptions.ui" line="582"/> + <source>Inode threads (unsafe > 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="580"/> - <location filename="../../copyEngineOptions.ui" line="590"/> + <location filename="../../copyEngineOptions.ui" line="589"/> + <location filename="../../copyEngineOptions.ui" line="599"/> <source>More cpu, but better organisation on the disk</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="593"/> + <location filename="../../copyEngineOptions.ui" line="602"/> <source>Order the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="609"/> + <location filename="../../copyEngineOptions.ui" line="618"/> <source>Misc</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="615"/> + <location filename="../../copyEngineOptions.ui" line="624"/> <source>Check the disk space</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="625"/> + <location filename="../../copyEngineOptions.ui" line="634"/> <source>Use this folder when destination is not set</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="637"/> + <location filename="../../copyEngineOptions.ui" line="646"/> <source>Browse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="659"/> + <location filename="../../copyEngineOptions.ui" line="668"/> <source>Filters</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/CopyEngine/Ultracopier/Languages/pt/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/pt/translation.ts index 4d395a0..e17b3f2 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/pt/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/pt/translation.ts @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="419"/> - <location filename="../../CopyEngineFactory.cpp" line="422"/> <location filename="../../CopyEngineFactory.cpp" line="427"/> - <location filename="../../CopyEngineFactory.cpp" line="431"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> <location filename="../../CopyEngineFactory.cpp" line="428"/> <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="425"/> - <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="443"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="447"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -274,21 +274,21 @@ <name>FileExistsDialog</name> <message> <location filename="../../FileExistsDialog.cpp" line="137"/> - <source>%1 - copy</source> + <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="147"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileExistsDialog.cpp" line="144"/> + <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -297,21 +297,21 @@ <name>FileIsSameDialog</name> <message> <location filename="../../FileIsSameDialog.cpp" line="111"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="121"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileIsSameDialog.cpp" line="118"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -464,21 +464,21 @@ </message> <message> <location filename="../../FolderExistsDialog.cpp" line="122"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="132"/> - <source>%1 - copy (%2)</source> + <location filename="../../FolderExistsDialog.cpp" line="131"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -486,49 +486,49 @@ <context> <name>ListThread</name> <message> - <location filename="../../ListThread.cpp" line="1482"/> - <location filename="../../ListThread.cpp" line="2414"/> + <location filename="../../ListThread.cpp" line="1487"/> + <location filename="../../ListThread.cpp" line="2419"/> <source>Unable do to move or copy item into wrong forced mode: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1489"/> - <location filename="../../ListThread.cpp" line="2421"/> + <location filename="../../ListThread.cpp" line="1494"/> + <location filename="../../ListThread.cpp" line="2426"/> <source>Unable to save the transfer list: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1505"/> + <location filename="../../ListThread.cpp" line="1510"/> <source>Problem reading file, or file-size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1512"/> + <location filename="../../ListThread.cpp" line="1517"/> <source>Wrong header: "%1"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1521"/> + <location filename="../../ListThread.cpp" line="1526"/> <source>The transfer list is in mixed mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1530"/> + <location filename="../../ListThread.cpp" line="1535"/> <source>The transfer list is in copy mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1536"/> + <location filename="../../ListThread.cpp" line="1541"/> <source>The transfer list is in move mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1599"/> + <location filename="../../ListThread.cpp" line="1604"/> <source>Some errors have been found during the line parsing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1607"/> + <location filename="../../ListThread.cpp" line="1612"/> <source>Unable to open the transfer list: %1</source> <translation type="unfinished"></translation> </message> @@ -570,24 +570,24 @@ <context> <name>ReadThread</name> <message> - <location filename="../../ReadThread.cpp" line="55"/> + <location filename="../../ReadThread.cpp" line="59"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="184"/> + <location filename="../../ReadThread.cpp" line="188"/> <source>Internal error reading the source file:block size out of range</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="192"/> - <location filename="../../ReadThread.cpp" line="408"/> + <location filename="../../ReadThread.cpp" line="196"/> + <location filename="../../ReadThread.cpp" line="420"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="233"/> - <location filename="../../ReadThread.cpp" line="456"/> + <location filename="../../ReadThread.cpp" line="237"/> + <location filename="../../ReadThread.cpp" line="468"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -595,37 +595,31 @@ <context> <name>RenamingRules</name> <message> - <location filename="../../RenamingRules.ui" line="26"/> + <location filename="../../RenamingRules.ui" line="35"/> <source>First renaming</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="32"/> - <source>%name% - copy</source> + <location filename="../../RenamingRules.ui" line="41"/> + <source>%name% - copy%suffix%</source> <extracomment>%name% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="39"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p></body></html></source> - <extracomment> should not be translated</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../RenamingRules.ui" line="49"/> - <source>Second renaming</source> + <location filename="../../RenamingRules.ui" line="57"/> + <source>%name% - copy (%number%)%suffix%</source> + <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="55"/> - <source>%name% - copy (%number%)</source> + <location filename="../../RenamingRules.ui" line="67"/> + <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name, <span style=" font-weight:600;">%number%</span> for the extra number, <span style=" font-weight:600;">%suffix%</span> file suffix</p></body></html></source> <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="62"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p><p><span style=" font-weight:600;">%number%</span> for the extra number</p></body></html></source> - <extracomment>%name%, %number% should not be translated</extracomment> + <location filename="../../RenamingRules.ui" line="51"/> + <source>Second renaming</source> <translation type="unfinished"></translation> </message> <message> @@ -655,33 +649,41 @@ </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="338"/> - <location filename="../../ScanFileOrFolder.cpp" line="404"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="348"/> - <location filename="../../ScanFileOrFolder.cpp" line="414"/> + <location filename="../../ScanFileOrFolder.cpp" line="345"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> + <location filename="../../ScanFileOrFolder.cpp" line="401"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="408"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="444"/> <source>This is not a folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> + <location filename="../../ScanFileOrFolder.cpp" line="446"/> <source>The folder does exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="448"/> <source>The folder is not readable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="467"/> + <location filename="../../ScanFileOrFolder.cpp" line="459"/> <source>Problem with name encoding</source> <translation type="unfinished"></translation> </message> @@ -690,9 +692,9 @@ <name>TransferThread</name> <message> <location filename="../../TransferThread.cpp" line="244"/> - <location filename="../../TransferThread.cpp" line="677"/> - <location filename="../../TransferThread.cpp" line="749"/> - <location filename="../../TransferThread.cpp" line="1319"/> + <location filename="../../TransferThread.cpp" line="673"/> + <location filename="../../TransferThread.cpp" line="745"/> + <location filename="../../TransferThread.cpp" line="1315"/> <source>File not found</source> <translation type="unfinished"></translation> </message> @@ -725,60 +727,60 @@ </message> <message> <location filename="../../TransferThread.cpp" line="645"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="655"/> - <source>%1 - copy (%2)</source> + <location filename="../../TransferThread.cpp" line="652"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="715"/> - <location filename="../../TransferThread.cpp" line="830"/> + <location filename="../../TransferThread.cpp" line="711"/> + <location filename="../../TransferThread.cpp" line="826"/> <source>The source file doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="755"/> - <location filename="../../TransferThread.cpp" line="842"/> + <location filename="../../TransferThread.cpp" line="751"/> + <location filename="../../TransferThread.cpp" line="838"/> <source>Unable to do the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="791"/> + <location filename="../../TransferThread.cpp" line="787"/> <source>The source doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="836"/> + <location filename="../../TransferThread.cpp" line="832"/> <source>Another file exists at same place</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1138"/> + <location filename="../../TransferThread.cpp" line="1134"/> <source>The checksums do not match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1228"/> + <location filename="../../TransferThread.cpp" line="1224"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1243"/> + <location filename="../../TransferThread.cpp" line="1239"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1254"/> + <location filename="../../TransferThread.cpp" line="1250"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1319"/> - <location filename="../../TransferThread.cpp" line="1337"/> - <location filename="../../TransferThread.cpp" line="1352"/> + <location filename="../../TransferThread.cpp" line="1315"/> + <location filename="../../TransferThread.cpp" line="1333"/> + <location filename="../../TransferThread.cpp" line="1348"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -791,22 +793,22 @@ <context> <name>WriteThread</name> <message> - <location filename="../../WriteThread.cpp" line="80"/> + <location filename="../../WriteThread.cpp" line="83"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="269"/> + <location filename="../../WriteThread.cpp" line="277"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="672"/> + <location filename="../../WriteThread.cpp" line="680"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="697"/> + <location filename="../../WriteThread.cpp" line="705"/> <source>File truncated during read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -814,198 +816,198 @@ <context> <name>copyEngineOptions</name> <message> - <location filename="../../copyEngineOptions.ui" line="35"/> + <location filename="../../copyEngineOptions.ui" line="44"/> <source>Transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="44"/> + <location filename="../../copyEngineOptions.ui" line="53"/> <source>Move the whole folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="51"/> + <location filename="../../copyEngineOptions.ui" line="60"/> <source>Transfer the file rights</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="61"/> + <location filename="../../copyEngineOptions.ui" line="70"/> <source>Keep the file date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="74"/> + <location filename="../../copyEngineOptions.ui" line="83"/> <source>Autostart the transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="81"/> - <location filename="../../copyEngineOptions.ui" line="101"/> + <location filename="../../copyEngineOptions.ui" line="90"/> + <location filename="../../copyEngineOptions.ui" line="110"/> <source>Less performance if checked</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="104"/> + <location filename="../../copyEngineOptions.ui" line="113"/> <source>Follow the strict order</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="130"/> + <location filename="../../copyEngineOptions.ui" line="139"/> <source>Error and collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="136"/> + <location filename="../../copyEngineOptions.ui" line="145"/> <source>When folder error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="146"/> + <location filename="../../copyEngineOptions.ui" line="155"/> <source>When file error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="172"/> + <location filename="../../copyEngineOptions.ui" line="181"/> <source>When file collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="232"/> + <location filename="../../copyEngineOptions.ui" line="241"/> <source>When folder collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="263"/> + <location filename="../../copyEngineOptions.ui" line="272"/> <source>Check if destination folder exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="270"/> + <location filename="../../copyEngineOptions.ui" line="279"/> <source>Renaming rules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="290"/> + <location filename="../../copyEngineOptions.ui" line="299"/> <source>Delete partially transferred files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="303"/> + <location filename="../../copyEngineOptions.ui" line="312"/> <source>Rename the original destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="334"/> + <location filename="../../copyEngineOptions.ui" line="343"/> <source>Control</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="340"/> + <location filename="../../copyEngineOptions.ui" line="349"/> <source>Checksum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="349"/> + <location filename="../../copyEngineOptions.ui" line="358"/> <source>Only after error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="356"/> + <location filename="../../copyEngineOptions.ui" line="365"/> <source>Ignore if impossible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="373"/> + <location filename="../../copyEngineOptions.ui" line="382"/> <source>Verify checksums</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="405"/> + <location filename="../../copyEngineOptions.ui" line="414"/> <source>Performance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="411"/> + <location filename="../../copyEngineOptions.ui" line="420"/> <source>Parallel buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="418"/> - <location filename="../../copyEngineOptions.ui" line="431"/> - <location filename="../../copyEngineOptions.ui" line="444"/> - <location filename="../../copyEngineOptions.ui" line="481"/> - <location filename="../../copyEngineOptions.ui" line="550"/> + <location filename="../../copyEngineOptions.ui" line="427"/> + <location filename="../../copyEngineOptions.ui" line="440"/> + <location filename="../../copyEngineOptions.ui" line="453"/> + <location filename="../../copyEngineOptions.ui" line="490"/> + <location filename="../../copyEngineOptions.ui" line="559"/> <source>KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="460"/> + <location filename="../../copyEngineOptions.ui" line="469"/> <source>Block size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="467"/> + <location filename="../../copyEngineOptions.ui" line="476"/> <source>Sequential buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="474"/> + <location filename="../../copyEngineOptions.ui" line="483"/> <source>Enable OS buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="497"/> + <location filename="../../copyEngineOptions.ui" line="506"/> <source>OS buffer only if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="504"/> + <location filename="../../copyEngineOptions.ui" line="513"/> <source>Transfer algorithm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="543"/> + <location filename="../../copyEngineOptions.ui" line="552"/> <source>Parallelize if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="573"/> - <source>Inode threads</source> + <location filename="../../copyEngineOptions.ui" line="582"/> + <source>Inode threads (unsafe > 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="580"/> - <location filename="../../copyEngineOptions.ui" line="590"/> + <location filename="../../copyEngineOptions.ui" line="589"/> + <location filename="../../copyEngineOptions.ui" line="599"/> <source>More cpu, but better organisation on the disk</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="593"/> + <location filename="../../copyEngineOptions.ui" line="602"/> <source>Order the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="609"/> + <location filename="../../copyEngineOptions.ui" line="618"/> <source>Misc</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="615"/> + <location filename="../../copyEngineOptions.ui" line="624"/> <source>Check the disk space</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="625"/> + <location filename="../../copyEngineOptions.ui" line="634"/> <source>Use this folder when destination is not set</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="637"/> + <location filename="../../copyEngineOptions.ui" line="646"/> <source>Browse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="659"/> + <location filename="../../copyEngineOptions.ui" line="668"/> <source>Filters</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/CopyEngine/Ultracopier/Languages/ru/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/ru/translation.ts index 314af56..3b103c5 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/ru/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/ru/translation.ts @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="419"/> - <location filename="../../CopyEngineFactory.cpp" line="422"/> <location filename="../../CopyEngineFactory.cpp" line="427"/> - <location filename="../../CopyEngineFactory.cpp" line="431"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Ask</source> <translation type="unfinished">ŠæŃŠ¾ŃŠøŃŃ</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> <location filename="../../CopyEngineFactory.cpp" line="428"/> <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Skip</source> <translation type="unfinished">ŠæŃŠ¾ŠæŃŃŠŗŠ°ŃŃ</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Merge</source> <translation type="unfinished">ŃŠ»ŠøŃŠ½ŠøŠµ</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="425"/> - <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> <source>Rename</source> <translation type="unfinished">ŠæŠµŃŠµŠøŠ¼ŠµŠ½Š¾Š²Š°ŃŃ</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="443"/> <source>Overwrite if newer</source> <translation type="unfinished">ŠŠ°Š¼ŠµŠ½ŠøŃŃ, ŠµŃŠ»Šø Š½Š¾Š²ŠµŠµ</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="447"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options error</source> <translation type="unfinished">ŠŠæŃŠøŠø Š¾ŃŠøŠ±ŠŗŠµ</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished">ŠŠ°ŃŠ°Š¼ŠµŃŃŃ Š“Š²ŠøŠ³Š°ŃŠµŠ»Ń Š½Šµ Š·Š°Š³ŃŃŠ¶Š°ŠµŃŃŃ, Š½Šµ Š¼Š¾Š¶ŠµŃ ŠæŠ¾Š»ŃŃŠøŃŃ Š“Š¾ŃŃŃŠæ Šŗ ŃŠøŠ»ŃŃŃŠ°Š¼</translation> </message> @@ -274,21 +274,21 @@ <name>FileExistsDialog</name> <message> <location filename="../../FileExistsDialog.cpp" line="137"/> - <source>%1 - copy</source> - <translation type="unfinished">%1 - ŠŗŠ¾ŠæŠøŃ</translation> + <source>%name% - copy%suffix%</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="147"/> - <source>%1 - copy (%2)</source> - <translation type="unfinished">%1 - ŠŗŠ¾ŠæŠøŃ (%2)</translation> + <location filename="../../FileExistsDialog.cpp" line="144"/> + <source>%name% - copy (%number%)%suffix%</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Error</source> <translation type="unfinished">Š¾ŃŠøŠ±ŠŗŠ°</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -297,21 +297,21 @@ <name>FileIsSameDialog</name> <message> <location filename="../../FileIsSameDialog.cpp" line="111"/> - <source>%1 - copy</source> - <translation type="unfinished">%1 - ŠŗŠ¾ŠæŠøŃ</translation> + <source>%name% - copy</source> + <translation type="unfinished">%name% - ŠŗŠ¾ŠæŠøŃ</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="121"/> - <source>%1 - copy (%2)</source> - <translation type="unfinished">%1 - ŠŗŠ¾ŠæŠøŃ (%2)</translation> + <location filename="../../FileIsSameDialog.cpp" line="118"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">%name% - ŠŗŠ¾ŠæŠøŃ (%number%)</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Error</source> <translation type="unfinished">Š¾ŃŠøŠ±ŠŗŠ°</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -464,21 +464,21 @@ </message> <message> <location filename="../../FolderExistsDialog.cpp" line="122"/> - <source>%1 - copy</source> - <translation type="unfinished">%1 - ŠŗŠ¾ŠæŠøŃ</translation> + <source>%name% - copy</source> + <translation type="unfinished">%name% - ŠŗŠ¾ŠæŠøŃ</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="132"/> - <source>%1 - copy (%2)</source> - <translation type="unfinished">%1 - ŠŗŠ¾ŠæŠøŃ (%2)</translation> + <location filename="../../FolderExistsDialog.cpp" line="131"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">%name% - ŠŗŠ¾ŠæŠøŃ (%number%)</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Error</source> <translation type="unfinished">Š¾ŃŠøŠ±ŠŗŠ°</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -486,49 +486,49 @@ <context> <name>ListThread</name> <message> - <location filename="../../ListThread.cpp" line="1482"/> - <location filename="../../ListThread.cpp" line="2414"/> + <location filename="../../ListThread.cpp" line="1487"/> + <location filename="../../ListThread.cpp" line="2419"/> <source>Unable do to move or copy item into wrong forced mode: %1</source> <translation>ŠŠµŠ²Š¾Š·Š¼Š¾Š¶Š½Š¾ ŃŠ“ŠµŠ»Š°ŃŃ, ŃŃŠ¾Š±Ń ŃŠŗŠ¾ŠæŠøŃŠ¾Š²Š°ŃŃ ŠøŠ»Šø ŠæŠµŃŠµŠ¼ŠµŃŃŠøŃŃ ŃŠ»ŠµŠ¼ŠµŠ½Ń Š² Š½ŠµŠæŃŠ°Š²ŠøŠ»ŃŠ½Š¾Š¼ ŃŠ¾ŃŃŠøŃŠ¾Š²Š°Š½Š½Š¾Š¼ ŃŠµŠ¶ŠøŠ¼Šµ: %1</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1489"/> - <location filename="../../ListThread.cpp" line="2421"/> + <location filename="../../ListThread.cpp" line="1494"/> + <location filename="../../ListThread.cpp" line="2426"/> <source>Unable to save the transfer list: %1</source> <translation>ŠŠµŠ²Š¾Š·Š¼Š¾Š¶Š½Š¾ ŃŠ¾Ń
ŃŠ°Š½ŠøŃŃ ŃŃŠ°Š½ŃŃŠµŃ: %1</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1505"/> + <location filename="../../ListThread.cpp" line="1510"/> <source>Problem reading file, or file-size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1512"/> + <location filename="../../ListThread.cpp" line="1517"/> <source>Wrong header: "%1"</source> <translation>ŠŠµŠæŃŠ°Š²ŠøŠ»ŃŠ½ŃŠ¹ Š·Š°Š³Š¾Š»Š¾Š²Š¾Šŗ: "%1"</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1521"/> + <location filename="../../ListThread.cpp" line="1526"/> <source>The transfer list is in mixed mode, but this instance is not in this mode</source> <translation>Š¢ŃŠ°Š½ŃŃŠµŃ Š² ŃŠ¼ŠµŃŠ°Š½Š½Š¾Š¼ ŃŠµŠ¶ŠøŠ¼Šµ, Š½Š¾ ŃŃŠ¾Ń ŃŠŗŠ·ŠµŠ¼ŠæŠ»ŃŃ Š½Šµ Š² ŃŃŠ¾Š¼ ŃŠµŠ¶ŠøŠ¼Šµ</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1530"/> + <location filename="../../ListThread.cpp" line="1535"/> <source>The transfer list is in copy mode, but this instance is not in this mode</source> <translation>ŠŠµŃŠµŠ“Š°ŃŠ° ŃŠæŠøŃŠŗŠ° Š² ŃŠµŠ¶ŠøŠ¼Šµ ŠŗŠ¾ŠæŠøŃŠ¾Š²Š°Š½ŠøŃ, Š½Š¾ ŃŃŠ¾Ń ŃŠŗŠ·ŠµŠ¼ŠæŠ»ŃŃ Š½Šµ Š² ŃŃŠ¾Š¼ ŃŠµŠ¶ŠøŠ¼Šµ</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1536"/> + <location filename="../../ListThread.cpp" line="1541"/> <source>The transfer list is in move mode, but this instance is not in this mode</source> <translation>Š¢ŃŠ°Š½ŃŃŠµŃ Š² ŃŠµŠ¶ŠøŠ¼ ŠæŠµŃŠµŠ¼ŠµŃŠµŠ½ŠøŃ, Š½Š¾ ŃŃŠ¾Ń ŃŠŗŠ·ŠµŠ¼ŠæŠ»ŃŃ Š½Šµ Š² ŃŃŠ¾Š¼ ŃŠµŠ¶ŠøŠ¼Šµ</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1599"/> + <location filename="../../ListThread.cpp" line="1604"/> <source>Some errors have been found during the line parsing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1607"/> + <location filename="../../ListThread.cpp" line="1612"/> <source>Unable to open the transfer list: %1</source> <translation>ŠŠµ ŃŠ“Š°ŠµŃŃŃ Š¾ŃŠŗŃŃŃŃ ŃŃŠ°Š½ŃŃŠµŃ: %1</translation> </message> @@ -570,24 +570,24 @@ <context> <name>ReadThread</name> <message> - <location filename="../../ReadThread.cpp" line="55"/> + <location filename="../../ReadThread.cpp" line="59"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="184"/> + <location filename="../../ReadThread.cpp" line="188"/> <source>Internal error reading the source file:block size out of range</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="192"/> - <location filename="../../ReadThread.cpp" line="408"/> + <location filename="../../ReadThread.cpp" line="196"/> + <location filename="../../ReadThread.cpp" line="420"/> <source>Unable to read the source file: </source> <translation>ŠŠµŠ²Š¾Š·Š¼Š¾Š¶Š½Š¾ ŠæŃŠ¾ŃŠøŃŠ°ŃŃ ŠøŃŃ
Š¾Š“Š½ŃŠ¹ ŃŠ°Š¹Š»: </translation> </message> <message> - <location filename="../../ReadThread.cpp" line="233"/> - <location filename="../../ReadThread.cpp" line="456"/> + <location filename="../../ReadThread.cpp" line="237"/> + <location filename="../../ReadThread.cpp" line="468"/> <source>File truncated during the read, possible data change</source> <translation>Š¤Š°Š¹Š» ŃŃŠµŃŠµŠ½Ń Š²Š¾ Š²ŃŠµŠ¼Ń ŃŃŠµŠ½ŠøŃ, Š²Š¾Š·Š¼Š¾Š¶Š½Š¾ŃŃŃ ŠøŠ·Š¼ŠµŠ½ŠµŠ½ŠøŃ Š“Š°Š½Š½ŃŃ
</translation> </message> @@ -595,38 +595,32 @@ <context> <name>RenamingRules</name> <message> - <location filename="../../RenamingRules.ui" line="26"/> + <location filename="../../RenamingRules.ui" line="35"/> <source>First renaming</source> <translation>ŠŠµŃŠ²Š¾Šµ ŠæŠµŃŠµŠøŠ¼ŠµŠ½Š¾Š²Š°Š½ŠøŠµ</translation> </message> <message> - <location filename="../../RenamingRules.ui" line="32"/> - <source>%name% - copy</source> + <location filename="../../RenamingRules.ui" line="41"/> + <source>%name% - copy%suffix%</source> <extracomment>%name% should not be translated</extracomment> - <translation>%name% - ŠŗŠ¾ŠæŠøŃ</translation> - </message> - <message> - <location filename="../../RenamingRules.ui" line="39"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p></body></html></source> - <extracomment> should not be translated</extracomment> - <translation><html><head/><body><p>ŠŠµŃŠµŠ¼ŠµŠ½Š½ŃŠµ: <span style=" font-weight:600;">%name%</span> ŠæŠ¾ Š¾ŃŠøŠ³ŠøŠ½Š°Š»ŃŠ½Š¾Š¼Ń Š½Š°Š·Š²Š°Š½ŠøŃ ŃŠ°Š¹Š»Š°</p></body></html></translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="49"/> - <source>Second renaming</source> - <translation>ŠŃŠ¾ŃŠ¾Šµ ŠæŠµŃŠµŠøŠ¼ŠµŠ½Š¾Š²Š°Š½ŠøŠµ</translation> + <location filename="../../RenamingRules.ui" line="57"/> + <source>%name% - copy (%number%)%suffix%</source> + <extracomment>%name%, %number% should not be translated</extracomment> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="55"/> - <source>%name% - copy (%number%)</source> + <location filename="../../RenamingRules.ui" line="67"/> + <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name, <span style=" font-weight:600;">%number%</span> for the extra number, <span style=" font-weight:600;">%suffix%</span> file suffix</p></body></html></source> <extracomment>%name%, %number% should not be translated</extracomment> - <translation>%name% - ŠŗŠ¾ŠæŠøŃ (%number%)</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="62"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p><p><span style=" font-weight:600;">%number%</span> for the extra number</p></body></html></source> - <extracomment>%name%, %number% should not be translated</extracomment> - <translation><html><head/><body><p>ŠŠµŃŠµŠ¼ŠµŠ½Š½ŃŠµ: <span style=" font-weight:600;">%name%</span> ŠæŠ¾ Š¾ŃŠøŠ³ŠøŠ½Š°Š»ŃŠ½Š¾Š¼Ń Š½Š°Š·Š²Š°Š½ŠøŃ ŃŠ°Š¹Š»Š°</p><p><span style=" font-weight:600;">%number%</span> Š·Š° Š“Š¾ŠæŠ¾Š»Š½ŠøŃŠµŠ»ŃŠ½ŃŠ¹ Š½Š¾Š¼ŠµŃ</p></body></html></translation> + <location filename="../../RenamingRules.ui" line="51"/> + <source>Second renaming</source> + <translation>ŠŃŠ¾ŃŠ¾Šµ ŠæŠµŃŠµŠøŠ¼ŠµŠ½Š¾Š²Š°Š½ŠøŠµ</translation> </message> <message> <location filename="../../RenamingRules.cpp" line="39"/> @@ -655,33 +649,41 @@ </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="338"/> - <location filename="../../ScanFileOrFolder.cpp" line="404"/> <source>%1 - copy</source> <translation type="unfinished">%1 - ŠŗŠ¾ŠæŠøŃ</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="348"/> - <location filename="../../ScanFileOrFolder.cpp" line="414"/> + <location filename="../../ScanFileOrFolder.cpp" line="345"/> <source>%1 - copy (%2)</source> <translation type="unfinished">%1 - ŠŗŠ¾ŠæŠøŃ (%2)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> + <location filename="../../ScanFileOrFolder.cpp" line="401"/> + <source>%name% - copy</source> + <translation type="unfinished">%name% - ŠŗŠ¾ŠæŠøŃ</translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="408"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">%name% - ŠŗŠ¾ŠæŠøŃ (%number%)</translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="444"/> <source>This is not a folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> + <location filename="../../ScanFileOrFolder.cpp" line="446"/> <source>The folder does exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="448"/> <source>The folder is not readable</source> <translation type="unfinished">ŠŠ°ŠæŠŗŠø Š½Šµ ŃŠøŃŠ°ŠµŃŃŃ</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="467"/> + <location filename="../../ScanFileOrFolder.cpp" line="459"/> <source>Problem with name encoding</source> <translation type="unfinished"></translation> </message> @@ -690,9 +692,9 @@ <name>TransferThread</name> <message> <location filename="../../TransferThread.cpp" line="244"/> - <location filename="../../TransferThread.cpp" line="677"/> - <location filename="../../TransferThread.cpp" line="749"/> - <location filename="../../TransferThread.cpp" line="1319"/> + <location filename="../../TransferThread.cpp" line="673"/> + <location filename="../../TransferThread.cpp" line="745"/> + <location filename="../../TransferThread.cpp" line="1315"/> <source>File not found</source> <translation type="unfinished"></translation> </message> @@ -725,60 +727,60 @@ </message> <message> <location filename="../../TransferThread.cpp" line="645"/> - <source>%1 - copy</source> - <translation type="unfinished">%1 - ŠŗŠ¾ŠæŠøŃ</translation> + <source>%name% - copy</source> + <translation type="unfinished">%name% - ŠŗŠ¾ŠæŠøŃ</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="655"/> - <source>%1 - copy (%2)</source> - <translation type="unfinished">%1 - ŠŗŠ¾ŠæŠøŃ (%2)</translation> + <location filename="../../TransferThread.cpp" line="652"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">%name% - ŠŗŠ¾ŠæŠøŃ (%number%)</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="715"/> - <location filename="../../TransferThread.cpp" line="830"/> + <location filename="../../TransferThread.cpp" line="711"/> + <location filename="../../TransferThread.cpp" line="826"/> <source>The source file doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="755"/> - <location filename="../../TransferThread.cpp" line="842"/> + <location filename="../../TransferThread.cpp" line="751"/> + <location filename="../../TransferThread.cpp" line="838"/> <source>Unable to do the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="791"/> + <location filename="../../TransferThread.cpp" line="787"/> <source>The source doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="836"/> + <location filename="../../TransferThread.cpp" line="832"/> <source>Another file exists at same place</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1138"/> + <location filename="../../TransferThread.cpp" line="1134"/> <source>The checksums do not match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1228"/> + <location filename="../../TransferThread.cpp" line="1224"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1243"/> + <location filename="../../TransferThread.cpp" line="1239"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1254"/> + <location filename="../../TransferThread.cpp" line="1250"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1319"/> - <location filename="../../TransferThread.cpp" line="1337"/> - <location filename="../../TransferThread.cpp" line="1352"/> + <location filename="../../TransferThread.cpp" line="1315"/> + <location filename="../../TransferThread.cpp" line="1333"/> + <location filename="../../TransferThread.cpp" line="1348"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -791,22 +793,22 @@ <context> <name>WriteThread</name> <message> - <location filename="../../WriteThread.cpp" line="80"/> + <location filename="../../WriteThread.cpp" line="83"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="269"/> + <location filename="../../WriteThread.cpp" line="277"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="672"/> + <location filename="../../WriteThread.cpp" line="680"/> <source>Unable to read the source file: </source> <translation>ŠŠµŠ²Š¾Š·Š¼Š¾Š¶Š½Š¾ ŠæŃŠ¾ŃŠøŃŠ°ŃŃ ŠøŃŃ
Š¾Š“Š½ŃŠ¹ ŃŠ°Š¹Š»: </translation> </message> <message> - <location filename="../../WriteThread.cpp" line="697"/> + <location filename="../../WriteThread.cpp" line="705"/> <source>File truncated during read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -814,198 +816,198 @@ <context> <name>copyEngineOptions</name> <message> - <location filename="../../copyEngineOptions.ui" line="35"/> + <location filename="../../copyEngineOptions.ui" line="44"/> <source>Transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="44"/> + <location filename="../../copyEngineOptions.ui" line="53"/> <source>Move the whole folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="51"/> + <location filename="../../copyEngineOptions.ui" line="60"/> <source>Transfer the file rights</source> <translation type="unfinished">ŠŠµŃŠµŠ“Š°ŃŠ° ŃŠ°Š¹Š»Š¾Š² ŠæŃŠ°Š²</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="61"/> + <location filename="../../copyEngineOptions.ui" line="70"/> <source>Keep the file date</source> <translation type="unfinished">ŠŠµŃŠ¶ŠøŃŠµ Š“Š°ŃŃ ŃŠ°Š¹Š»Š°</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="74"/> + <location filename="../../copyEngineOptions.ui" line="83"/> <source>Autostart the transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="81"/> - <location filename="../../copyEngineOptions.ui" line="101"/> + <location filename="../../copyEngineOptions.ui" line="90"/> + <location filename="../../copyEngineOptions.ui" line="110"/> <source>Less performance if checked</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="104"/> + <location filename="../../copyEngineOptions.ui" line="113"/> <source>Follow the strict order</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="130"/> + <location filename="../../copyEngineOptions.ui" line="139"/> <source>Error and collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="136"/> + <location filename="../../copyEngineOptions.ui" line="145"/> <source>When folder error</source> <translation type="unfinished">ŠŠ¾Š³Š“Š° ŠæŠ°ŠæŠŗŠ° Š¾ŃŠøŠ±ŠŗŠ°</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="146"/> + <location filename="../../copyEngineOptions.ui" line="155"/> <source>When file error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="172"/> + <location filename="../../copyEngineOptions.ui" line="181"/> <source>When file collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="232"/> + <location filename="../../copyEngineOptions.ui" line="241"/> <source>When folder collision</source> <translation type="unfinished">ŠŠ¾Š³Š“Š° ŠæŠ°ŠæŠŗŠ° ŃŃŠ¾Š»ŠŗŠ½Š¾Š²ŠµŠ½ŠøŃ</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="263"/> + <location filename="../../copyEngineOptions.ui" line="272"/> <source>Check if destination folder exists</source> <translation type="unfinished">Š£Š±ŠµŠ“ŠøŃŠµŃŃ, ŃŃŠ¾ ŠæŠ°ŠæŠŗŠ° ŃŃŃŠµŃŃŠ²ŃŠµŃ</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="270"/> + <location filename="../../copyEngineOptions.ui" line="279"/> <source>Renaming rules</source> <translation type="unfinished">ŠŠµŃŠµŠøŠ¼ŠµŠ½Š¾Š²Š°Š½ŠøŠµ ŠæŃŠ°Š²ŠøŠ»Š°</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="290"/> + <location filename="../../copyEngineOptions.ui" line="299"/> <source>Delete partially transferred files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="303"/> + <location filename="../../copyEngineOptions.ui" line="312"/> <source>Rename the original destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="334"/> + <location filename="../../copyEngineOptions.ui" line="343"/> <source>Control</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="340"/> + <location filename="../../copyEngineOptions.ui" line="349"/> <source>Checksum</source> <translation type="unfinished">ŠŠ¾Š½ŃŃŠ¾Š»ŃŠ½Š°Ń</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="349"/> + <location filename="../../copyEngineOptions.ui" line="358"/> <source>Only after error</source> <translation type="unfinished">Š¢Š¾Š»ŃŠŗŠ¾ ŠæŠ¾ŃŠ»Šµ ŃŠ¾Š³Š¾, ŠŗŠ°Šŗ Š¾ŃŠøŠ±ŠŗŠ°</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="356"/> + <location filename="../../copyEngineOptions.ui" line="365"/> <source>Ignore if impossible</source> <translation type="unfinished">ŠŠ³Š½Š¾ŃŠøŃŠ¾Š²Š°ŃŃ, ŠµŃŠ»Šø Š½ŠµŠ²Š¾Š·Š¼Š¾Š¶Š½Š¾</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="373"/> + <location filename="../../copyEngineOptions.ui" line="382"/> <source>Verify checksums</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="405"/> + <location filename="../../copyEngineOptions.ui" line="414"/> <source>Performance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="411"/> + <location filename="../../copyEngineOptions.ui" line="420"/> <source>Parallel buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="418"/> - <location filename="../../copyEngineOptions.ui" line="431"/> - <location filename="../../copyEngineOptions.ui" line="444"/> - <location filename="../../copyEngineOptions.ui" line="481"/> - <location filename="../../copyEngineOptions.ui" line="550"/> + <location filename="../../copyEngineOptions.ui" line="427"/> + <location filename="../../copyEngineOptions.ui" line="440"/> + <location filename="../../copyEngineOptions.ui" line="453"/> + <location filename="../../copyEngineOptions.ui" line="490"/> + <location filename="../../copyEngineOptions.ui" line="559"/> <source>KB</source> <translation type="unfinished">KB</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="460"/> + <location filename="../../copyEngineOptions.ui" line="469"/> <source>Block size</source> <translation type="unfinished">ŃŠ°Š·Š¼ŠµŃ Š±Š»Š¾ŠŗŠ°</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="467"/> + <location filename="../../copyEngineOptions.ui" line="476"/> <source>Sequential buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="474"/> + <location filename="../../copyEngineOptions.ui" line="483"/> <source>Enable OS buffer</source> <translation type="unfinished">ŠŠŗŠ»ŃŃŠøŃŃ OS Š±ŃŃŠµŃ</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="497"/> + <location filename="../../copyEngineOptions.ui" line="506"/> <source>OS buffer only if smaller than</source> <translation type="unfinished">ŠŠ” Š±ŃŃŠµŃ, ŃŠ¾Š»ŃŠŗŠ¾ ŠµŃŠ»Šø Š¼ŠµŠ½ŃŃŠµ</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="504"/> + <location filename="../../copyEngineOptions.ui" line="513"/> <source>Transfer algorithm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="543"/> + <location filename="../../copyEngineOptions.ui" line="552"/> <source>Parallelize if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="573"/> - <source>Inode threads</source> + <location filename="../../copyEngineOptions.ui" line="582"/> + <source>Inode threads (unsafe > 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="580"/> - <location filename="../../copyEngineOptions.ui" line="590"/> + <location filename="../../copyEngineOptions.ui" line="589"/> + <location filename="../../copyEngineOptions.ui" line="599"/> <source>More cpu, but better organisation on the disk</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="593"/> + <location filename="../../copyEngineOptions.ui" line="602"/> <source>Order the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="609"/> + <location filename="../../copyEngineOptions.ui" line="618"/> <source>Misc</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="615"/> + <location filename="../../copyEngineOptions.ui" line="624"/> <source>Check the disk space</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="625"/> + <location filename="../../copyEngineOptions.ui" line="634"/> <source>Use this folder when destination is not set</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="637"/> + <location filename="../../copyEngineOptions.ui" line="646"/> <source>Browse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="659"/> + <location filename="../../copyEngineOptions.ui" line="668"/> <source>Filters</source> <translation type="unfinished">Š¤ŠøŠ»ŃŃŃŃ</translation> </message> diff --git a/plugins/CopyEngine/Ultracopier/Languages/th/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/th/translation.ts index 4d395a0..e17b3f2 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/th/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/th/translation.ts @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="419"/> - <location filename="../../CopyEngineFactory.cpp" line="422"/> <location filename="../../CopyEngineFactory.cpp" line="427"/> - <location filename="../../CopyEngineFactory.cpp" line="431"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> <location filename="../../CopyEngineFactory.cpp" line="428"/> <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="425"/> - <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="443"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="447"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -274,21 +274,21 @@ <name>FileExistsDialog</name> <message> <location filename="../../FileExistsDialog.cpp" line="137"/> - <source>%1 - copy</source> + <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="147"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileExistsDialog.cpp" line="144"/> + <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -297,21 +297,21 @@ <name>FileIsSameDialog</name> <message> <location filename="../../FileIsSameDialog.cpp" line="111"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="121"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileIsSameDialog.cpp" line="118"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -464,21 +464,21 @@ </message> <message> <location filename="../../FolderExistsDialog.cpp" line="122"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="132"/> - <source>%1 - copy (%2)</source> + <location filename="../../FolderExistsDialog.cpp" line="131"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -486,49 +486,49 @@ <context> <name>ListThread</name> <message> - <location filename="../../ListThread.cpp" line="1482"/> - <location filename="../../ListThread.cpp" line="2414"/> + <location filename="../../ListThread.cpp" line="1487"/> + <location filename="../../ListThread.cpp" line="2419"/> <source>Unable do to move or copy item into wrong forced mode: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1489"/> - <location filename="../../ListThread.cpp" line="2421"/> + <location filename="../../ListThread.cpp" line="1494"/> + <location filename="../../ListThread.cpp" line="2426"/> <source>Unable to save the transfer list: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1505"/> + <location filename="../../ListThread.cpp" line="1510"/> <source>Problem reading file, or file-size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1512"/> + <location filename="../../ListThread.cpp" line="1517"/> <source>Wrong header: "%1"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1521"/> + <location filename="../../ListThread.cpp" line="1526"/> <source>The transfer list is in mixed mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1530"/> + <location filename="../../ListThread.cpp" line="1535"/> <source>The transfer list is in copy mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1536"/> + <location filename="../../ListThread.cpp" line="1541"/> <source>The transfer list is in move mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1599"/> + <location filename="../../ListThread.cpp" line="1604"/> <source>Some errors have been found during the line parsing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1607"/> + <location filename="../../ListThread.cpp" line="1612"/> <source>Unable to open the transfer list: %1</source> <translation type="unfinished"></translation> </message> @@ -570,24 +570,24 @@ <context> <name>ReadThread</name> <message> - <location filename="../../ReadThread.cpp" line="55"/> + <location filename="../../ReadThread.cpp" line="59"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="184"/> + <location filename="../../ReadThread.cpp" line="188"/> <source>Internal error reading the source file:block size out of range</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="192"/> - <location filename="../../ReadThread.cpp" line="408"/> + <location filename="../../ReadThread.cpp" line="196"/> + <location filename="../../ReadThread.cpp" line="420"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="233"/> - <location filename="../../ReadThread.cpp" line="456"/> + <location filename="../../ReadThread.cpp" line="237"/> + <location filename="../../ReadThread.cpp" line="468"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -595,37 +595,31 @@ <context> <name>RenamingRules</name> <message> - <location filename="../../RenamingRules.ui" line="26"/> + <location filename="../../RenamingRules.ui" line="35"/> <source>First renaming</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="32"/> - <source>%name% - copy</source> + <location filename="../../RenamingRules.ui" line="41"/> + <source>%name% - copy%suffix%</source> <extracomment>%name% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="39"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p></body></html></source> - <extracomment> should not be translated</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../RenamingRules.ui" line="49"/> - <source>Second renaming</source> + <location filename="../../RenamingRules.ui" line="57"/> + <source>%name% - copy (%number%)%suffix%</source> + <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="55"/> - <source>%name% - copy (%number%)</source> + <location filename="../../RenamingRules.ui" line="67"/> + <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name, <span style=" font-weight:600;">%number%</span> for the extra number, <span style=" font-weight:600;">%suffix%</span> file suffix</p></body></html></source> <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="62"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p><p><span style=" font-weight:600;">%number%</span> for the extra number</p></body></html></source> - <extracomment>%name%, %number% should not be translated</extracomment> + <location filename="../../RenamingRules.ui" line="51"/> + <source>Second renaming</source> <translation type="unfinished"></translation> </message> <message> @@ -655,33 +649,41 @@ </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="338"/> - <location filename="../../ScanFileOrFolder.cpp" line="404"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="348"/> - <location filename="../../ScanFileOrFolder.cpp" line="414"/> + <location filename="../../ScanFileOrFolder.cpp" line="345"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> + <location filename="../../ScanFileOrFolder.cpp" line="401"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="408"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="444"/> <source>This is not a folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> + <location filename="../../ScanFileOrFolder.cpp" line="446"/> <source>The folder does exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="448"/> <source>The folder is not readable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="467"/> + <location filename="../../ScanFileOrFolder.cpp" line="459"/> <source>Problem with name encoding</source> <translation type="unfinished"></translation> </message> @@ -690,9 +692,9 @@ <name>TransferThread</name> <message> <location filename="../../TransferThread.cpp" line="244"/> - <location filename="../../TransferThread.cpp" line="677"/> - <location filename="../../TransferThread.cpp" line="749"/> - <location filename="../../TransferThread.cpp" line="1319"/> + <location filename="../../TransferThread.cpp" line="673"/> + <location filename="../../TransferThread.cpp" line="745"/> + <location filename="../../TransferThread.cpp" line="1315"/> <source>File not found</source> <translation type="unfinished"></translation> </message> @@ -725,60 +727,60 @@ </message> <message> <location filename="../../TransferThread.cpp" line="645"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="655"/> - <source>%1 - copy (%2)</source> + <location filename="../../TransferThread.cpp" line="652"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="715"/> - <location filename="../../TransferThread.cpp" line="830"/> + <location filename="../../TransferThread.cpp" line="711"/> + <location filename="../../TransferThread.cpp" line="826"/> <source>The source file doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="755"/> - <location filename="../../TransferThread.cpp" line="842"/> + <location filename="../../TransferThread.cpp" line="751"/> + <location filename="../../TransferThread.cpp" line="838"/> <source>Unable to do the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="791"/> + <location filename="../../TransferThread.cpp" line="787"/> <source>The source doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="836"/> + <location filename="../../TransferThread.cpp" line="832"/> <source>Another file exists at same place</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1138"/> + <location filename="../../TransferThread.cpp" line="1134"/> <source>The checksums do not match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1228"/> + <location filename="../../TransferThread.cpp" line="1224"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1243"/> + <location filename="../../TransferThread.cpp" line="1239"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1254"/> + <location filename="../../TransferThread.cpp" line="1250"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1319"/> - <location filename="../../TransferThread.cpp" line="1337"/> - <location filename="../../TransferThread.cpp" line="1352"/> + <location filename="../../TransferThread.cpp" line="1315"/> + <location filename="../../TransferThread.cpp" line="1333"/> + <location filename="../../TransferThread.cpp" line="1348"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -791,22 +793,22 @@ <context> <name>WriteThread</name> <message> - <location filename="../../WriteThread.cpp" line="80"/> + <location filename="../../WriteThread.cpp" line="83"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="269"/> + <location filename="../../WriteThread.cpp" line="277"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="672"/> + <location filename="../../WriteThread.cpp" line="680"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="697"/> + <location filename="../../WriteThread.cpp" line="705"/> <source>File truncated during read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -814,198 +816,198 @@ <context> <name>copyEngineOptions</name> <message> - <location filename="../../copyEngineOptions.ui" line="35"/> + <location filename="../../copyEngineOptions.ui" line="44"/> <source>Transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="44"/> + <location filename="../../copyEngineOptions.ui" line="53"/> <source>Move the whole folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="51"/> + <location filename="../../copyEngineOptions.ui" line="60"/> <source>Transfer the file rights</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="61"/> + <location filename="../../copyEngineOptions.ui" line="70"/> <source>Keep the file date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="74"/> + <location filename="../../copyEngineOptions.ui" line="83"/> <source>Autostart the transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="81"/> - <location filename="../../copyEngineOptions.ui" line="101"/> + <location filename="../../copyEngineOptions.ui" line="90"/> + <location filename="../../copyEngineOptions.ui" line="110"/> <source>Less performance if checked</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="104"/> + <location filename="../../copyEngineOptions.ui" line="113"/> <source>Follow the strict order</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="130"/> + <location filename="../../copyEngineOptions.ui" line="139"/> <source>Error and collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="136"/> + <location filename="../../copyEngineOptions.ui" line="145"/> <source>When folder error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="146"/> + <location filename="../../copyEngineOptions.ui" line="155"/> <source>When file error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="172"/> + <location filename="../../copyEngineOptions.ui" line="181"/> <source>When file collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="232"/> + <location filename="../../copyEngineOptions.ui" line="241"/> <source>When folder collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="263"/> + <location filename="../../copyEngineOptions.ui" line="272"/> <source>Check if destination folder exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="270"/> + <location filename="../../copyEngineOptions.ui" line="279"/> <source>Renaming rules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="290"/> + <location filename="../../copyEngineOptions.ui" line="299"/> <source>Delete partially transferred files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="303"/> + <location filename="../../copyEngineOptions.ui" line="312"/> <source>Rename the original destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="334"/> + <location filename="../../copyEngineOptions.ui" line="343"/> <source>Control</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="340"/> + <location filename="../../copyEngineOptions.ui" line="349"/> <source>Checksum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="349"/> + <location filename="../../copyEngineOptions.ui" line="358"/> <source>Only after error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="356"/> + <location filename="../../copyEngineOptions.ui" line="365"/> <source>Ignore if impossible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="373"/> + <location filename="../../copyEngineOptions.ui" line="382"/> <source>Verify checksums</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="405"/> + <location filename="../../copyEngineOptions.ui" line="414"/> <source>Performance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="411"/> + <location filename="../../copyEngineOptions.ui" line="420"/> <source>Parallel buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="418"/> - <location filename="../../copyEngineOptions.ui" line="431"/> - <location filename="../../copyEngineOptions.ui" line="444"/> - <location filename="../../copyEngineOptions.ui" line="481"/> - <location filename="../../copyEngineOptions.ui" line="550"/> + <location filename="../../copyEngineOptions.ui" line="427"/> + <location filename="../../copyEngineOptions.ui" line="440"/> + <location filename="../../copyEngineOptions.ui" line="453"/> + <location filename="../../copyEngineOptions.ui" line="490"/> + <location filename="../../copyEngineOptions.ui" line="559"/> <source>KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="460"/> + <location filename="../../copyEngineOptions.ui" line="469"/> <source>Block size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="467"/> + <location filename="../../copyEngineOptions.ui" line="476"/> <source>Sequential buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="474"/> + <location filename="../../copyEngineOptions.ui" line="483"/> <source>Enable OS buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="497"/> + <location filename="../../copyEngineOptions.ui" line="506"/> <source>OS buffer only if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="504"/> + <location filename="../../copyEngineOptions.ui" line="513"/> <source>Transfer algorithm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="543"/> + <location filename="../../copyEngineOptions.ui" line="552"/> <source>Parallelize if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="573"/> - <source>Inode threads</source> + <location filename="../../copyEngineOptions.ui" line="582"/> + <source>Inode threads (unsafe > 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="580"/> - <location filename="../../copyEngineOptions.ui" line="590"/> + <location filename="../../copyEngineOptions.ui" line="589"/> + <location filename="../../copyEngineOptions.ui" line="599"/> <source>More cpu, but better organisation on the disk</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="593"/> + <location filename="../../copyEngineOptions.ui" line="602"/> <source>Order the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="609"/> + <location filename="../../copyEngineOptions.ui" line="618"/> <source>Misc</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="615"/> + <location filename="../../copyEngineOptions.ui" line="624"/> <source>Check the disk space</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="625"/> + <location filename="../../copyEngineOptions.ui" line="634"/> <source>Use this folder when destination is not set</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="637"/> + <location filename="../../copyEngineOptions.ui" line="646"/> <source>Browse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="659"/> + <location filename="../../copyEngineOptions.ui" line="668"/> <source>Filters</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/CopyEngine/Ultracopier/Languages/tr/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/tr/translation.ts index 4d395a0..e17b3f2 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/tr/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/tr/translation.ts @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="419"/> - <location filename="../../CopyEngineFactory.cpp" line="422"/> <location filename="../../CopyEngineFactory.cpp" line="427"/> - <location filename="../../CopyEngineFactory.cpp" line="431"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> <location filename="../../CopyEngineFactory.cpp" line="428"/> <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="425"/> - <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="443"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="447"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -274,21 +274,21 @@ <name>FileExistsDialog</name> <message> <location filename="../../FileExistsDialog.cpp" line="137"/> - <source>%1 - copy</source> + <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="147"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileExistsDialog.cpp" line="144"/> + <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -297,21 +297,21 @@ <name>FileIsSameDialog</name> <message> <location filename="../../FileIsSameDialog.cpp" line="111"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="121"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileIsSameDialog.cpp" line="118"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -464,21 +464,21 @@ </message> <message> <location filename="../../FolderExistsDialog.cpp" line="122"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="132"/> - <source>%1 - copy (%2)</source> + <location filename="../../FolderExistsDialog.cpp" line="131"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -486,49 +486,49 @@ <context> <name>ListThread</name> <message> - <location filename="../../ListThread.cpp" line="1482"/> - <location filename="../../ListThread.cpp" line="2414"/> + <location filename="../../ListThread.cpp" line="1487"/> + <location filename="../../ListThread.cpp" line="2419"/> <source>Unable do to move or copy item into wrong forced mode: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1489"/> - <location filename="../../ListThread.cpp" line="2421"/> + <location filename="../../ListThread.cpp" line="1494"/> + <location filename="../../ListThread.cpp" line="2426"/> <source>Unable to save the transfer list: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1505"/> + <location filename="../../ListThread.cpp" line="1510"/> <source>Problem reading file, or file-size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1512"/> + <location filename="../../ListThread.cpp" line="1517"/> <source>Wrong header: "%1"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1521"/> + <location filename="../../ListThread.cpp" line="1526"/> <source>The transfer list is in mixed mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1530"/> + <location filename="../../ListThread.cpp" line="1535"/> <source>The transfer list is in copy mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1536"/> + <location filename="../../ListThread.cpp" line="1541"/> <source>The transfer list is in move mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1599"/> + <location filename="../../ListThread.cpp" line="1604"/> <source>Some errors have been found during the line parsing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1607"/> + <location filename="../../ListThread.cpp" line="1612"/> <source>Unable to open the transfer list: %1</source> <translation type="unfinished"></translation> </message> @@ -570,24 +570,24 @@ <context> <name>ReadThread</name> <message> - <location filename="../../ReadThread.cpp" line="55"/> + <location filename="../../ReadThread.cpp" line="59"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="184"/> + <location filename="../../ReadThread.cpp" line="188"/> <source>Internal error reading the source file:block size out of range</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="192"/> - <location filename="../../ReadThread.cpp" line="408"/> + <location filename="../../ReadThread.cpp" line="196"/> + <location filename="../../ReadThread.cpp" line="420"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="233"/> - <location filename="../../ReadThread.cpp" line="456"/> + <location filename="../../ReadThread.cpp" line="237"/> + <location filename="../../ReadThread.cpp" line="468"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -595,37 +595,31 @@ <context> <name>RenamingRules</name> <message> - <location filename="../../RenamingRules.ui" line="26"/> + <location filename="../../RenamingRules.ui" line="35"/> <source>First renaming</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="32"/> - <source>%name% - copy</source> + <location filename="../../RenamingRules.ui" line="41"/> + <source>%name% - copy%suffix%</source> <extracomment>%name% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="39"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p></body></html></source> - <extracomment> should not be translated</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../RenamingRules.ui" line="49"/> - <source>Second renaming</source> + <location filename="../../RenamingRules.ui" line="57"/> + <source>%name% - copy (%number%)%suffix%</source> + <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="55"/> - <source>%name% - copy (%number%)</source> + <location filename="../../RenamingRules.ui" line="67"/> + <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name, <span style=" font-weight:600;">%number%</span> for the extra number, <span style=" font-weight:600;">%suffix%</span> file suffix</p></body></html></source> <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="62"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p><p><span style=" font-weight:600;">%number%</span> for the extra number</p></body></html></source> - <extracomment>%name%, %number% should not be translated</extracomment> + <location filename="../../RenamingRules.ui" line="51"/> + <source>Second renaming</source> <translation type="unfinished"></translation> </message> <message> @@ -655,33 +649,41 @@ </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="338"/> - <location filename="../../ScanFileOrFolder.cpp" line="404"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="348"/> - <location filename="../../ScanFileOrFolder.cpp" line="414"/> + <location filename="../../ScanFileOrFolder.cpp" line="345"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> + <location filename="../../ScanFileOrFolder.cpp" line="401"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="408"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="444"/> <source>This is not a folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> + <location filename="../../ScanFileOrFolder.cpp" line="446"/> <source>The folder does exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="448"/> <source>The folder is not readable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="467"/> + <location filename="../../ScanFileOrFolder.cpp" line="459"/> <source>Problem with name encoding</source> <translation type="unfinished"></translation> </message> @@ -690,9 +692,9 @@ <name>TransferThread</name> <message> <location filename="../../TransferThread.cpp" line="244"/> - <location filename="../../TransferThread.cpp" line="677"/> - <location filename="../../TransferThread.cpp" line="749"/> - <location filename="../../TransferThread.cpp" line="1319"/> + <location filename="../../TransferThread.cpp" line="673"/> + <location filename="../../TransferThread.cpp" line="745"/> + <location filename="../../TransferThread.cpp" line="1315"/> <source>File not found</source> <translation type="unfinished"></translation> </message> @@ -725,60 +727,60 @@ </message> <message> <location filename="../../TransferThread.cpp" line="645"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="655"/> - <source>%1 - copy (%2)</source> + <location filename="../../TransferThread.cpp" line="652"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="715"/> - <location filename="../../TransferThread.cpp" line="830"/> + <location filename="../../TransferThread.cpp" line="711"/> + <location filename="../../TransferThread.cpp" line="826"/> <source>The source file doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="755"/> - <location filename="../../TransferThread.cpp" line="842"/> + <location filename="../../TransferThread.cpp" line="751"/> + <location filename="../../TransferThread.cpp" line="838"/> <source>Unable to do the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="791"/> + <location filename="../../TransferThread.cpp" line="787"/> <source>The source doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="836"/> + <location filename="../../TransferThread.cpp" line="832"/> <source>Another file exists at same place</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1138"/> + <location filename="../../TransferThread.cpp" line="1134"/> <source>The checksums do not match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1228"/> + <location filename="../../TransferThread.cpp" line="1224"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1243"/> + <location filename="../../TransferThread.cpp" line="1239"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1254"/> + <location filename="../../TransferThread.cpp" line="1250"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1319"/> - <location filename="../../TransferThread.cpp" line="1337"/> - <location filename="../../TransferThread.cpp" line="1352"/> + <location filename="../../TransferThread.cpp" line="1315"/> + <location filename="../../TransferThread.cpp" line="1333"/> + <location filename="../../TransferThread.cpp" line="1348"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -791,22 +793,22 @@ <context> <name>WriteThread</name> <message> - <location filename="../../WriteThread.cpp" line="80"/> + <location filename="../../WriteThread.cpp" line="83"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="269"/> + <location filename="../../WriteThread.cpp" line="277"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="672"/> + <location filename="../../WriteThread.cpp" line="680"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="697"/> + <location filename="../../WriteThread.cpp" line="705"/> <source>File truncated during read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -814,198 +816,198 @@ <context> <name>copyEngineOptions</name> <message> - <location filename="../../copyEngineOptions.ui" line="35"/> + <location filename="../../copyEngineOptions.ui" line="44"/> <source>Transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="44"/> + <location filename="../../copyEngineOptions.ui" line="53"/> <source>Move the whole folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="51"/> + <location filename="../../copyEngineOptions.ui" line="60"/> <source>Transfer the file rights</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="61"/> + <location filename="../../copyEngineOptions.ui" line="70"/> <source>Keep the file date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="74"/> + <location filename="../../copyEngineOptions.ui" line="83"/> <source>Autostart the transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="81"/> - <location filename="../../copyEngineOptions.ui" line="101"/> + <location filename="../../copyEngineOptions.ui" line="90"/> + <location filename="../../copyEngineOptions.ui" line="110"/> <source>Less performance if checked</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="104"/> + <location filename="../../copyEngineOptions.ui" line="113"/> <source>Follow the strict order</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="130"/> + <location filename="../../copyEngineOptions.ui" line="139"/> <source>Error and collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="136"/> + <location filename="../../copyEngineOptions.ui" line="145"/> <source>When folder error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="146"/> + <location filename="../../copyEngineOptions.ui" line="155"/> <source>When file error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="172"/> + <location filename="../../copyEngineOptions.ui" line="181"/> <source>When file collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="232"/> + <location filename="../../copyEngineOptions.ui" line="241"/> <source>When folder collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="263"/> + <location filename="../../copyEngineOptions.ui" line="272"/> <source>Check if destination folder exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="270"/> + <location filename="../../copyEngineOptions.ui" line="279"/> <source>Renaming rules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="290"/> + <location filename="../../copyEngineOptions.ui" line="299"/> <source>Delete partially transferred files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="303"/> + <location filename="../../copyEngineOptions.ui" line="312"/> <source>Rename the original destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="334"/> + <location filename="../../copyEngineOptions.ui" line="343"/> <source>Control</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="340"/> + <location filename="../../copyEngineOptions.ui" line="349"/> <source>Checksum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="349"/> + <location filename="../../copyEngineOptions.ui" line="358"/> <source>Only after error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="356"/> + <location filename="../../copyEngineOptions.ui" line="365"/> <source>Ignore if impossible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="373"/> + <location filename="../../copyEngineOptions.ui" line="382"/> <source>Verify checksums</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="405"/> + <location filename="../../copyEngineOptions.ui" line="414"/> <source>Performance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="411"/> + <location filename="../../copyEngineOptions.ui" line="420"/> <source>Parallel buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="418"/> - <location filename="../../copyEngineOptions.ui" line="431"/> - <location filename="../../copyEngineOptions.ui" line="444"/> - <location filename="../../copyEngineOptions.ui" line="481"/> - <location filename="../../copyEngineOptions.ui" line="550"/> + <location filename="../../copyEngineOptions.ui" line="427"/> + <location filename="../../copyEngineOptions.ui" line="440"/> + <location filename="../../copyEngineOptions.ui" line="453"/> + <location filename="../../copyEngineOptions.ui" line="490"/> + <location filename="../../copyEngineOptions.ui" line="559"/> <source>KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="460"/> + <location filename="../../copyEngineOptions.ui" line="469"/> <source>Block size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="467"/> + <location filename="../../copyEngineOptions.ui" line="476"/> <source>Sequential buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="474"/> + <location filename="../../copyEngineOptions.ui" line="483"/> <source>Enable OS buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="497"/> + <location filename="../../copyEngineOptions.ui" line="506"/> <source>OS buffer only if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="504"/> + <location filename="../../copyEngineOptions.ui" line="513"/> <source>Transfer algorithm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="543"/> + <location filename="../../copyEngineOptions.ui" line="552"/> <source>Parallelize if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="573"/> - <source>Inode threads</source> + <location filename="../../copyEngineOptions.ui" line="582"/> + <source>Inode threads (unsafe > 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="580"/> - <location filename="../../copyEngineOptions.ui" line="590"/> + <location filename="../../copyEngineOptions.ui" line="589"/> + <location filename="../../copyEngineOptions.ui" line="599"/> <source>More cpu, but better organisation on the disk</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="593"/> + <location filename="../../copyEngineOptions.ui" line="602"/> <source>Order the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="609"/> + <location filename="../../copyEngineOptions.ui" line="618"/> <source>Misc</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="615"/> + <location filename="../../copyEngineOptions.ui" line="624"/> <source>Check the disk space</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="625"/> + <location filename="../../copyEngineOptions.ui" line="634"/> <source>Use this folder when destination is not set</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="637"/> + <location filename="../../copyEngineOptions.ui" line="646"/> <source>Browse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="659"/> + <location filename="../../copyEngineOptions.ui" line="668"/> <source>Filters</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/CopyEngine/Ultracopier/Languages/zh/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/zh/translation.ts index f8a7792..19bfabd 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/zh/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/zh/translation.ts @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="419"/> - <location filename="../../CopyEngineFactory.cpp" line="422"/> <location filename="../../CopyEngineFactory.cpp" line="427"/> - <location filename="../../CopyEngineFactory.cpp" line="431"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> <location filename="../../CopyEngineFactory.cpp" line="428"/> <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="425"/> - <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="443"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="447"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -274,21 +274,21 @@ <name>FileExistsDialog</name> <message> <location filename="../../FileExistsDialog.cpp" line="137"/> - <source>%1 - copy</source> + <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="147"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileExistsDialog.cpp" line="144"/> + <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -297,21 +297,21 @@ <name>FileIsSameDialog</name> <message> <location filename="../../FileIsSameDialog.cpp" line="111"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="121"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileIsSameDialog.cpp" line="118"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -464,21 +464,21 @@ </message> <message> <location filename="../../FolderExistsDialog.cpp" line="122"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="132"/> - <source>%1 - copy (%2)</source> + <location filename="../../FolderExistsDialog.cpp" line="131"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -486,49 +486,49 @@ <context> <name>ListThread</name> <message> - <location filename="../../ListThread.cpp" line="1482"/> - <location filename="../../ListThread.cpp" line="2414"/> + <location filename="../../ListThread.cpp" line="1487"/> + <location filename="../../ListThread.cpp" line="2419"/> <source>Unable do to move or copy item into wrong forced mode: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1489"/> - <location filename="../../ListThread.cpp" line="2421"/> + <location filename="../../ListThread.cpp" line="1494"/> + <location filename="../../ListThread.cpp" line="2426"/> <source>Unable to save the transfer list: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1505"/> + <location filename="../../ListThread.cpp" line="1510"/> <source>Problem reading file, or file-size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1512"/> + <location filename="../../ListThread.cpp" line="1517"/> <source>Wrong header: "%1"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1521"/> + <location filename="../../ListThread.cpp" line="1526"/> <source>The transfer list is in mixed mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1530"/> + <location filename="../../ListThread.cpp" line="1535"/> <source>The transfer list is in copy mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1536"/> + <location filename="../../ListThread.cpp" line="1541"/> <source>The transfer list is in move mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1599"/> + <location filename="../../ListThread.cpp" line="1604"/> <source>Some errors have been found during the line parsing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1607"/> + <location filename="../../ListThread.cpp" line="1612"/> <source>Unable to open the transfer list: %1</source> <translation type="unfinished"></translation> </message> @@ -570,24 +570,24 @@ <context> <name>ReadThread</name> <message> - <location filename="../../ReadThread.cpp" line="55"/> + <location filename="../../ReadThread.cpp" line="59"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="184"/> + <location filename="../../ReadThread.cpp" line="188"/> <source>Internal error reading the source file:block size out of range</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="192"/> - <location filename="../../ReadThread.cpp" line="408"/> + <location filename="../../ReadThread.cpp" line="196"/> + <location filename="../../ReadThread.cpp" line="420"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="233"/> - <location filename="../../ReadThread.cpp" line="456"/> + <location filename="../../ReadThread.cpp" line="237"/> + <location filename="../../ReadThread.cpp" line="468"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -600,37 +600,31 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="26"/> + <location filename="../../RenamingRules.ui" line="35"/> <source>First renaming</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="32"/> - <source>%name% - copy</source> + <location filename="../../RenamingRules.ui" line="41"/> + <source>%name% - copy%suffix%</source> <extracomment>%name% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="39"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p></body></html></source> - <extracomment> should not be translated</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../RenamingRules.ui" line="49"/> - <source>Second renaming</source> + <location filename="../../RenamingRules.ui" line="57"/> + <source>%name% - copy (%number%)%suffix%</source> + <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="55"/> - <source>%name% - copy (%number%)</source> + <location filename="../../RenamingRules.ui" line="67"/> + <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name, <span style=" font-weight:600;">%number%</span> for the extra number, <span style=" font-weight:600;">%suffix%</span> file suffix</p></body></html></source> <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="62"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p><p><span style=" font-weight:600;">%number%</span> for the extra number</p></body></html></source> - <extracomment>%name%, %number% should not be translated</extracomment> + <location filename="../../RenamingRules.ui" line="51"/> + <source>Second renaming</source> <translation type="unfinished"></translation> </message> <message> @@ -655,33 +649,41 @@ </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="338"/> - <location filename="../../ScanFileOrFolder.cpp" line="404"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="348"/> - <location filename="../../ScanFileOrFolder.cpp" line="414"/> + <location filename="../../ScanFileOrFolder.cpp" line="345"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> + <location filename="../../ScanFileOrFolder.cpp" line="401"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="408"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="444"/> <source>This is not a folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> + <location filename="../../ScanFileOrFolder.cpp" line="446"/> <source>The folder does exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="448"/> <source>The folder is not readable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="467"/> + <location filename="../../ScanFileOrFolder.cpp" line="459"/> <source>Problem with name encoding</source> <translation type="unfinished"></translation> </message> @@ -690,9 +692,9 @@ <name>TransferThread</name> <message> <location filename="../../TransferThread.cpp" line="244"/> - <location filename="../../TransferThread.cpp" line="677"/> - <location filename="../../TransferThread.cpp" line="749"/> - <location filename="../../TransferThread.cpp" line="1319"/> + <location filename="../../TransferThread.cpp" line="673"/> + <location filename="../../TransferThread.cpp" line="745"/> + <location filename="../../TransferThread.cpp" line="1315"/> <source>File not found</source> <translation type="unfinished"></translation> </message> @@ -725,60 +727,60 @@ </message> <message> <location filename="../../TransferThread.cpp" line="645"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="655"/> - <source>%1 - copy (%2)</source> + <location filename="../../TransferThread.cpp" line="652"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="715"/> - <location filename="../../TransferThread.cpp" line="830"/> + <location filename="../../TransferThread.cpp" line="711"/> + <location filename="../../TransferThread.cpp" line="826"/> <source>The source file doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="755"/> - <location filename="../../TransferThread.cpp" line="842"/> + <location filename="../../TransferThread.cpp" line="751"/> + <location filename="../../TransferThread.cpp" line="838"/> <source>Unable to do the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="791"/> + <location filename="../../TransferThread.cpp" line="787"/> <source>The source doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="836"/> + <location filename="../../TransferThread.cpp" line="832"/> <source>Another file exists at same place</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1138"/> + <location filename="../../TransferThread.cpp" line="1134"/> <source>The checksums do not match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1228"/> + <location filename="../../TransferThread.cpp" line="1224"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1243"/> + <location filename="../../TransferThread.cpp" line="1239"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1254"/> + <location filename="../../TransferThread.cpp" line="1250"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1319"/> - <location filename="../../TransferThread.cpp" line="1337"/> - <location filename="../../TransferThread.cpp" line="1352"/> + <location filename="../../TransferThread.cpp" line="1315"/> + <location filename="../../TransferThread.cpp" line="1333"/> + <location filename="../../TransferThread.cpp" line="1348"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -791,22 +793,22 @@ <context> <name>WriteThread</name> <message> - <location filename="../../WriteThread.cpp" line="80"/> + <location filename="../../WriteThread.cpp" line="83"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="269"/> + <location filename="../../WriteThread.cpp" line="277"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="672"/> + <location filename="../../WriteThread.cpp" line="680"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="697"/> + <location filename="../../WriteThread.cpp" line="705"/> <source>File truncated during read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -814,198 +816,198 @@ <context> <name>copyEngineOptions</name> <message> - <location filename="../../copyEngineOptions.ui" line="35"/> + <location filename="../../copyEngineOptions.ui" line="44"/> <source>Transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="44"/> + <location filename="../../copyEngineOptions.ui" line="53"/> <source>Move the whole folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="51"/> + <location filename="../../copyEngineOptions.ui" line="60"/> <source>Transfer the file rights</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="61"/> + <location filename="../../copyEngineOptions.ui" line="70"/> <source>Keep the file date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="74"/> + <location filename="../../copyEngineOptions.ui" line="83"/> <source>Autostart the transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="81"/> - <location filename="../../copyEngineOptions.ui" line="101"/> + <location filename="../../copyEngineOptions.ui" line="90"/> + <location filename="../../copyEngineOptions.ui" line="110"/> <source>Less performance if checked</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="104"/> + <location filename="../../copyEngineOptions.ui" line="113"/> <source>Follow the strict order</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="130"/> + <location filename="../../copyEngineOptions.ui" line="139"/> <source>Error and collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="136"/> + <location filename="../../copyEngineOptions.ui" line="145"/> <source>When folder error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="146"/> + <location filename="../../copyEngineOptions.ui" line="155"/> <source>When file error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="172"/> + <location filename="../../copyEngineOptions.ui" line="181"/> <source>When file collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="232"/> + <location filename="../../copyEngineOptions.ui" line="241"/> <source>When folder collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="263"/> + <location filename="../../copyEngineOptions.ui" line="272"/> <source>Check if destination folder exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="270"/> + <location filename="../../copyEngineOptions.ui" line="279"/> <source>Renaming rules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="290"/> + <location filename="../../copyEngineOptions.ui" line="299"/> <source>Delete partially transferred files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="303"/> + <location filename="../../copyEngineOptions.ui" line="312"/> <source>Rename the original destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="334"/> + <location filename="../../copyEngineOptions.ui" line="343"/> <source>Control</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="340"/> + <location filename="../../copyEngineOptions.ui" line="349"/> <source>Checksum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="349"/> + <location filename="../../copyEngineOptions.ui" line="358"/> <source>Only after error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="356"/> + <location filename="../../copyEngineOptions.ui" line="365"/> <source>Ignore if impossible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="373"/> + <location filename="../../copyEngineOptions.ui" line="382"/> <source>Verify checksums</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="405"/> + <location filename="../../copyEngineOptions.ui" line="414"/> <source>Performance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="411"/> + <location filename="../../copyEngineOptions.ui" line="420"/> <source>Parallel buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="418"/> - <location filename="../../copyEngineOptions.ui" line="431"/> - <location filename="../../copyEngineOptions.ui" line="444"/> - <location filename="../../copyEngineOptions.ui" line="481"/> - <location filename="../../copyEngineOptions.ui" line="550"/> + <location filename="../../copyEngineOptions.ui" line="427"/> + <location filename="../../copyEngineOptions.ui" line="440"/> + <location filename="../../copyEngineOptions.ui" line="453"/> + <location filename="../../copyEngineOptions.ui" line="490"/> + <location filename="../../copyEngineOptions.ui" line="559"/> <source>KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="460"/> + <location filename="../../copyEngineOptions.ui" line="469"/> <source>Block size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="467"/> + <location filename="../../copyEngineOptions.ui" line="476"/> <source>Sequential buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="474"/> + <location filename="../../copyEngineOptions.ui" line="483"/> <source>Enable OS buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="497"/> + <location filename="../../copyEngineOptions.ui" line="506"/> <source>OS buffer only if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="504"/> + <location filename="../../copyEngineOptions.ui" line="513"/> <source>Transfer algorithm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="543"/> + <location filename="../../copyEngineOptions.ui" line="552"/> <source>Parallelize if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="573"/> - <source>Inode threads</source> + <location filename="../../copyEngineOptions.ui" line="582"/> + <source>Inode threads (unsafe > 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="580"/> - <location filename="../../copyEngineOptions.ui" line="590"/> + <location filename="../../copyEngineOptions.ui" line="589"/> + <location filename="../../copyEngineOptions.ui" line="599"/> <source>More cpu, but better organisation on the disk</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="593"/> + <location filename="../../copyEngineOptions.ui" line="602"/> <source>Order the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="609"/> + <location filename="../../copyEngineOptions.ui" line="618"/> <source>Misc</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="615"/> + <location filename="../../copyEngineOptions.ui" line="624"/> <source>Check the disk space</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="625"/> + <location filename="../../copyEngineOptions.ui" line="634"/> <source>Use this folder when destination is not set</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="637"/> + <location filename="../../copyEngineOptions.ui" line="646"/> <source>Browse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="659"/> + <location filename="../../copyEngineOptions.ui" line="668"/> <source>Filters</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/CopyEngine/Ultracopier/ListThread.cpp b/plugins/CopyEngine/Ultracopier/ListThread.cpp index 970536a..bb0bce6 100644 --- a/plugins/CopyEngine/Ultracopier/ListThread.cpp +++ b/plugins/CopyEngine/Ultracopier/ListThread.cpp @@ -491,6 +491,9 @@ bool ListThread::newCopy(const std::vector<std::string> &sources,const std::stri while(index<sources.size()) { std::string source=sources.at(index); + //can be: file://192.168.0.99/share/file.txt + //can be: file:///C:/file.txt + //can be: file:///home/user/fileatrootunderunix #ifndef Q_OS_WIN if(stringStartWith(source,"file:///")) source.replace(0,7,""); @@ -498,12 +501,14 @@ bool ListThread::newCopy(const std::vector<std::string> &sources,const std::stri if(stringStartWith(source,"file:///")) source.replace(0,8,""); else if(stringStartWith(source,"file://")) - source.replace(0,7,""); + source.replace(0,5,""); else if(stringStartWith(source,"file:/")) source.replace(0,6,""); #endif else if (std::regex_match(source, base_match, base_regex)) return false; + if(index<99) + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,sources.at(index)+" -> "+source); index++; sourcesClean.push_back(source); } diff --git a/plugins/CopyEngine/Ultracopier/README.md b/plugins/CopyEngine/Ultracopier/README.md new file mode 100644 index 0000000..a15b943 --- /dev/null +++ b/plugins/CopyEngine/Ultracopier/README.md @@ -0,0 +1,3 @@ +# Copy Engine: Ultracopier + +This is the default copy engine. diff --git a/plugins/CopyEngine/Ultracopier/ReadThread.cpp b/plugins/CopyEngine/Ultracopier/ReadThread.cpp index e843d9b..7bdb60c 100644 --- a/plugins/CopyEngine/Ultracopier/ReadThread.cpp +++ b/plugins/CopyEngine/Ultracopier/ReadThread.cpp @@ -1,5 +1,9 @@ #include "ReadThread.h" +#ifdef Q_OS_LINUX +#include <fcntl.h> +#endif + ReadThread::ReadThread() { start(); @@ -286,6 +290,14 @@ bool ReadThread::internalOpen(bool resetLastGoodPosition) return false; } pauseMutex.tryAcquire(pauseMutex.available()); + #ifdef Q_OS_LINUX + const int intfd=file.handle(); + if(intfd!=-1) + { + posix_fadvise(intfd, 0, 0, POSIX_FADV_WILLNEED); + posix_fadvise(intfd, 0, 0, POSIX_FADV_SEQUENTIAL); + } + #endif if(stopIt) { file.close(); diff --git a/plugins/CopyEngine/Ultracopier/RenamingRules.ui b/plugins/CopyEngine/Ultracopier/RenamingRules.ui index 9e84f4b..0219249 100644 --- a/plugins/CopyEngine/Ultracopier/RenamingRules.ui +++ b/plugins/CopyEngine/Ultracopier/RenamingRules.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>303</width> - <height>213</height> + <width>491</width> + <height>293</height> </rect> </property> <property name="windowTitle"> @@ -17,7 +17,16 @@ <property name="spacing"> <number>2</number> </property> - <property name="margin"> + <property name="leftMargin"> + <number>2</number> + </property> + <property name="topMargin"> + <number>2</number> + </property> + <property name="rightMargin"> + <number>2</number> + </property> + <property name="bottomMargin"> <number>2</number> </property> <item> @@ -29,14 +38,7 @@ <item> <widget class="QLineEdit" name="firstRenamingRule"> <property name="placeholderText"> - <string extracomment="%name% should not be translated">%name% - copy</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="label_3"> - <property name="text"> - <string extracomment=" should not be translated"><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p></body></html></string> + <string extracomment="%name% should not be translated">%name% - copy%suffix%</string> </property> </widget> </item> @@ -52,14 +54,7 @@ <item> <widget class="QLineEdit" name="otherRenamingRule"> <property name="placeholderText"> - <string extracomment="%name%, %number% should not be translated">%name% - copy (%number%)</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="label_4"> - <property name="text"> - <string extracomment="%name%, %number% should not be translated"><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p><p><span style=" font-weight:600;">%number%</span> for the extra number</p></body></html></string> + <string extracomment="%name%, %number% should not be translated">%name% - copy (%number%)%suffix%</string> </property> </widget> </item> @@ -67,6 +62,16 @@ </widget> </item> <item> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string extracomment="%name%, %number% should not be translated"><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name, <span style=" font-weight:600;">%number%</span> for the extra number, <span style=" font-weight:600;">%suffix%</span> file suffix</p></body></html></string> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + </widget> + </item> + <item> <spacer name="verticalSpacer"> <property name="orientation"> <enum>Qt::Vertical</enum> diff --git a/plugins/CopyEngine/Ultracopier/ScanFileOrFolder.cpp b/plugins/CopyEngine/Ultracopier/ScanFileOrFolder.cpp index 736f589..9dd48f3 100644 --- a/plugins/CopyEngine/Ultracopier/ScanFileOrFolder.cpp +++ b/plugins/CopyEngine/Ultracopier/ScanFileOrFolder.cpp @@ -337,10 +337,7 @@ void ScanFileOrFolder::listFolder(QFileInfo source,QFileInfo destination) if(firstRenamingRule.empty()) destinationSuffixPath=tr("%1 - copy").arg(destination.baseName()).toStdString(); else - { destinationSuffixPath=firstRenamingRule; - stringreplaceAll(destinationSuffixPath,"%name%",destination.baseName().toStdString()); - } } else { @@ -349,10 +346,10 @@ void ScanFileOrFolder::listFolder(QFileInfo source,QFileInfo destination) else { destinationSuffixPath=otherRenamingRule; - stringreplaceAll(destinationSuffixPath,"%name%",destination.baseName().toStdString()); stringreplaceAll(destinationSuffixPath,"%number%",std::to_string(num)); } } + stringreplaceAll(destinationSuffixPath,"%name%",destination.baseName().toStdString()); num++; if(destination.completeSuffix().isEmpty()) destination.setFile(destination.absolutePath()+QString::fromStdString(text_slash)+QString::fromStdString(destinationSuffixPath)); @@ -401,24 +398,19 @@ void ScanFileOrFolder::listFolder(QFileInfo source,QFileInfo destination) if(num==1) { if(firstRenamingRule.empty()) - destinationSuffixPath=tr("%1 - copy").arg(destination.baseName()).toStdString(); + destinationSuffixPath=tr("%name% - copy").toStdString(); else - { destinationSuffixPath=firstRenamingRule; - stringreplaceAll(destinationSuffixPath,"%name%",destination.baseName().toStdString()); - } } else { if(otherRenamingRule.empty()) - destinationSuffixPath=tr("%1 - copy (%2)").arg(destination.baseName()).arg(num).toStdString(); + destinationSuffixPath=tr("%name% - copy (%number%)").toStdString(); else - { destinationSuffixPath=otherRenamingRule; - stringreplaceAll(destinationSuffixPath,"%name%",destination.baseName().toStdString()); - stringreplaceAll(destinationSuffixPath,"%number%",std::to_string(num)); - } + stringreplaceAll(destinationSuffixPath,"%number%",std::to_string(num)); } + stringreplaceAll(destinationSuffixPath,"%name%",destination.baseName().toStdString()); destinationInfo.setFile(destinationInfo.absolutePath()+QString::fromStdString(text_slash)+QString::fromStdString(destinationSuffixPath)); num++; } diff --git a/plugins/CopyEngine/Ultracopier/TransferThread.cpp b/plugins/CopyEngine/Ultracopier/TransferThread.cpp index 3b748a5..210c221 100644 --- a/plugins/CopyEngine/Ultracopier/TransferThread.cpp +++ b/plugins/CopyEngine/Ultracopier/TransferThread.cpp @@ -642,25 +642,21 @@ bool TransferThread::checkAlwaysRename() if(num==1) { if(firstRenamingRule.empty()) - newFileName=tr("%1 - copy").arg(QString::fromStdString(fileName)).toStdString(); + newFileName=tr("%name% - copy").toStdString(); else - { newFileName=firstRenamingRule; - stringreplaceAll(newFileName,"%name%",fileName); - } } else { if(otherRenamingRule.empty()) - newFileName=tr("%1 - copy (%2)").arg(QString::fromStdString(fileName)).arg(num).toStdString(); + newFileName=tr("%name% - copy (%number%)").toStdString(); else - { newFileName=otherRenamingRule; - stringreplaceAll(newFileName,"%name%",fileName); - stringreplaceAll(newFileName,"%number%",std::to_string(num)); - } + stringreplaceAll(newFileName,"%number%",std::to_string(num)); } - newDestination.setFile(newDestination.absolutePath()+CURRENTSEPARATOR+QString::fromStdString(newFileName+suffix)); + stringreplaceAll(newFileName,"%name%",fileName); + stringreplaceAll(newFileName,"%suffix%",suffix); + newDestination.setFile(newDestination.absolutePath()+CURRENTSEPARATOR+QString::fromStdString(newFileName)); num++; } while(newDestination.exists()); diff --git a/plugins/CopyEngine/Ultracopier/WriteThread.cpp b/plugins/CopyEngine/Ultracopier/WriteThread.cpp index 9993961..bbb35fa 100644 --- a/plugins/CopyEngine/Ultracopier/WriteThread.cpp +++ b/plugins/CopyEngine/Ultracopier/WriteThread.cpp @@ -1,5 +1,8 @@ #include "WriteThread.h" +#ifdef Q_OS_LINUX +#include <fcntl.h> +#endif #include <QDir> QMultiHash<QString,WriteThread *> WriteThread::writeFileList; @@ -174,6 +177,11 @@ bool WriteThread::internalOpen() } } pauseMutex.tryAcquire(pauseMutex.available()); + #ifdef Q_OS_LINUX + const int intfd=file.handle(); + if(intfd!=-1) + posix_fadvise(intfd, 0, 0, POSIX_FADV_SEQUENTIAL); + #endif ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] after the pause mutex"); if(stopIt) { diff --git a/plugins/CopyEngine/Ultracopier/copyEngineOptions.ui b/plugins/CopyEngine/Ultracopier/copyEngineOptions.ui index 4870480..73e57f9 100644 --- a/plugins/CopyEngine/Ultracopier/copyEngineOptions.ui +++ b/plugins/CopyEngine/Ultracopier/copyEngineOptions.ui @@ -14,13 +14,22 @@ <property name="spacing"> <number>0</number> </property> - <property name="margin"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> <number>0</number> </property> <item> <widget class="QToolBox" name="toolBox"> <property name="currentIndex"> - <number>0</number> + <number>3</number> </property> <widget class="QWidget" name="page_trasnfer"> <property name="geometry"> @@ -28,7 +37,7 @@ <x>0</x> <y>0</y> <width>791</width> - <height>364</height> + <height>349</height> </rect> </property> <attribute name="label"> @@ -122,8 +131,8 @@ <rect> <x>0</x> <y>0</y> - <width>502</width> - <height>218</height> + <width>791</width> + <height>349</height> </rect> </property> <attribute name="label"> @@ -326,8 +335,8 @@ <rect> <x>0</x> <y>0</y> - <width>172</width> - <height>119</height> + <width>791</width> + <height>349</height> </rect> </property> <attribute name="label"> @@ -398,7 +407,7 @@ <x>0</x> <y>0</y> <width>791</width> - <height>364</height> + <height>349</height> </rect> </property> <attribute name="label"> @@ -570,7 +579,7 @@ <item row="7" column="0"> <widget class="QLabel" name="label_21"> <property name="text"> - <string>Inode threads</string> + <string>Inode threads (unsafe > 1)</string> </property> </widget> </item> @@ -601,8 +610,8 @@ <rect> <x>0</x> <y>0</y> - <width>449</width> - <height>89</height> + <width>791</width> + <height>349</height> </rect> </property> <attribute name="label"> diff --git a/plugins/CopyEngine/Ultracopier/informations.xml b/plugins/CopyEngine/Ultracopier/informations.xml index ff4cb0d..fcb8c8f 100644 --- a/plugins/CopyEngine/Ultracopier/informations.xml +++ b/plugins/CopyEngine/Ultracopier/informations.xml @@ -17,7 +17,7 @@ <description xml:lang="en"><![CDATA[Copy engine of Ultracopier, do in Qt for all platform, and copy by stream]]></description> <description xml:lang="fr"><![CDATA[Moteur de copie d'ultracopier, fait en Qt pour toutes les plateformes, et copie par stream]]></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>1.4.0.8</version> + <version>1.6.1.3</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>Ultracopier</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. --> |