diff options
author | Thomas Preud'homme <robotux@celest.fr> | 2018-02-23 23:49:48 +0000 |
---|---|---|
committer | Thomas Preud'homme <robotux@celest.fr> | 2018-02-23 23:49:48 +0000 |
commit | bd56579c7d9de94c17287adefa118290e6b7ba33 (patch) | |
tree | 666d7d0b6945b442573b7a3145969f66a53aa460 /plugins/CopyEngine | |
parent | b3c8bdcc0d1e4b2ab298847a7902b6d60410a5bc (diff) |
New upstream version 1.4.0.3
Diffstat (limited to 'plugins/CopyEngine')
64 files changed, 4259 insertions, 4226 deletions
diff --git a/plugins/CopyEngine/Rsync/Rsync.pro b/plugins/CopyEngine/Rsync/Rsync.pro index 168fadd..e525f27 100644 --- a/plugins/CopyEngine/Rsync/Rsync.pro +++ b/plugins/CopyEngine/Rsync/Rsync.pro @@ -1,2 +1,2 @@ -include(../Ultracopier/CopyEngine.pro) +include($$PWD/../Ultracopier/CopyEngine.pro) DEFINES += ULTRACOPIER_PLUGIN_RSYNC diff --git a/plugins/CopyEngine/Rsync/informations.xml b/plugins/CopyEngine/Rsync/informations.xml new file mode 100644 index 0000000..46cbf7e --- /dev/null +++ b/plugins/CopyEngine/Rsync/informations.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<package> + <title xml:lang="en"><![CDATA[Rsync copy engine]]></title><!-- english is required --> + <!-- What kind of plugin this is --> + <category>CopyEngine</category> + <!-- Who wrote this plugin --> + <author><![CDATA[BRULE Herman, alpha_one_x86 (alpha_one_x86@first-world.info)]]></author> + <!-- URL of page or site for this plugin (may provide additional information, bug reports, feature requests). --> + <website xml:lang="en"><![CDATA[http://ultracopier.first-world.info/]]></website><!-- not required --> + <!-- the date-time format should be in timestamps format --> + <pubDate>1287496800</pubDate> + <!-- the architecture code of this plugin, found PlatformMacro.h into ultracopier source --> + <architecture>windows-x86</architecture> + <!-- Detailed description --> + <description xml:lang="en"><![CDATA[Copy engine of Ultracopier which uses rsync as backend]]></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.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. --> + <dependencies><![CDATA[ + ]]></dependencies> +</package> diff --git a/plugins/CopyEngine/Ultracopier/CopyEngine-collision-and-error.cpp b/plugins/CopyEngine/Ultracopier/CopyEngine-collision-and-error.cpp index 5315c84..16c36ae 100644 --- a/plugins/CopyEngine/Ultracopier/CopyEngine-collision-and-error.cpp +++ b/plugins/CopyEngine/Ultracopier/CopyEngine-collision-and-error.cpp @@ -14,7 +14,7 @@ void CopyEngine::fileAlreadyExistsSlot(QFileInfo source,QFileInfo destination,bo } /// \note Can be call without queue because all call will be serialized -void CopyEngine::errorOnFileSlot(QFileInfo fileInfo,QString errorString,TransferThread * thread,const ErrorType &errorType) +void CopyEngine::errorOnFileSlot(QFileInfo fileInfo,std::string errorString,TransferThread * thread,const ErrorType &errorType) { errorOnFile(fileInfo,errorString,thread,errorType); } @@ -26,13 +26,13 @@ void CopyEngine::folderAlreadyExistsSlot(QFileInfo source,QFileInfo destination, } /// \note Can be call without queue because all call will be serialized -void CopyEngine::errorOnFolderSlot(QFileInfo fileInfo,QString errorString,ScanFileOrFolder * thread,ErrorType errorType) +void CopyEngine::errorOnFolderSlot(QFileInfo fileInfo,std::string errorString,ScanFileOrFolder * thread,ErrorType errorType) { errorOnFolder(fileInfo,errorString,thread,errorType); } //mkpath event -void CopyEngine::mkPathErrorOnFolderSlot(QFileInfo folder,QString error,ErrorType errorType) +void CopyEngine::mkPathErrorOnFolderSlot(QFileInfo folder,std::string error,ErrorType errorType) { mkPathErrorOnFolder(folder,error,errorType); } @@ -50,7 +50,7 @@ void CopyEngine::fileAlreadyExists(QFileInfo source,QFileInfo destination,bool i //load the action if(isSame) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"file is same: "+source.absoluteFilePath()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"file is same: "+source.absoluteFilePath().toStdString()); FileExistsAction tempFileExistsAction=alwaysDoThisActionForFileExists; if(tempFileExistsAction==FileExists_Overwrite || tempFileExistsAction==FileExists_OverwriteIfNewer || tempFileExistsAction==FileExists_OverwriteIfNotSame || tempFileExistsAction==FileExists_OverwriteIfOlder) tempFileExistsAction=FileExists_NotSet; @@ -69,7 +69,7 @@ void CopyEngine::fileAlreadyExists(QFileInfo source,QFileInfo destination,bool i newItem.isSame=isSame; newItem.transfer=thread; newItem.scan=NULL; - alreadyExistsQueue << newItem; + alreadyExistsQueue.push_back(newItem); return; } dialogIsOpen=true; @@ -79,7 +79,7 @@ void CopyEngine::fileAlreadyExists(QFileInfo source,QFileInfo destination,bool i dialog.exec();/// \bug crash when external close FileExistsAction newAction=dialog.getAction(); emit isInPause(false); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"close dialog: "+QString::number(newAction)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"close dialog: "+std::to_string(newAction)); if(newAction==FileExists_Cancel) { emit cancelAll(); @@ -114,7 +114,7 @@ void CopyEngine::fileAlreadyExists(QFileInfo source,QFileInfo destination,bool i } else { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"file already exists: "+source.absoluteFilePath()+", destination: "+destination.absoluteFilePath()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"file already exists: "+source.absoluteFilePath().toStdString()+", destination: "+destination.absoluteFilePath().toStdString()); FileExistsAction tempFileExistsAction=alwaysDoThisActionForFileExists; switch(tempFileExistsAction) { @@ -124,7 +124,7 @@ void CopyEngine::fileAlreadyExists(QFileInfo source,QFileInfo destination,bool i case FileExists_OverwriteIfNewer: case FileExists_OverwriteIfOlder: case FileExists_OverwriteIfNotSame: - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"always do this action: "+QString::number(tempFileExistsAction)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"always do this action: "+std::to_string(tempFileExistsAction)); thread->setFileExistsAction(tempFileExistsAction); break; default: @@ -133,6 +133,7 @@ void CopyEngine::fileAlreadyExists(QFileInfo source,QFileInfo destination,bool i ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("dialog open, put in queue: %1 %2") .arg(source.absoluteFilePath()) .arg(destination.absoluteFilePath()) + .toStdString() ); alreadyExistsQueueItem newItem; newItem.source=source; @@ -140,7 +141,7 @@ void CopyEngine::fileAlreadyExists(QFileInfo source,QFileInfo destination,bool i newItem.isSame=isSame; newItem.transfer=thread; newItem.scan=NULL; - alreadyExistsQueue << newItem; + alreadyExistsQueue.push_back(newItem); return; } dialogIsOpen=true; @@ -150,7 +151,7 @@ void CopyEngine::fileAlreadyExists(QFileInfo source,QFileInfo destination,bool i dialog.exec();/// \bug crash when external close FileExistsAction newAction=dialog.getAction(); emit isInPause(false); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"close dialog: "+QString::number(newAction)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"close dialog: "+std::to_string(newAction)); if(newAction==FileExists_Cancel) { emit cancelAll(); @@ -201,7 +202,7 @@ void CopyEngine::fileAlreadyExists(QFileInfo source,QFileInfo destination,bool i ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"stop"); } -void CopyEngine::haveNeedPutAtBottom(bool needPutAtBottom, const QFileInfo &fileInfo, const QString &errorString,TransferThread *thread,const ErrorType &errorType) +void CopyEngine::haveNeedPutAtBottom(bool needPutAtBottom, const QFileInfo &fileInfo, const std::string &errorString,TransferThread *thread,const ErrorType &errorType) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); if(!needPutAtBottom) @@ -217,12 +218,12 @@ void CopyEngine::haveNeedPutAtBottom(bool needPutAtBottom, const QFileInfo &file newItem.scan=NULL; newItem.transfer=thread; newItem.errorType=errorType; - errorQueue << newItem; + errorQueue.push_back(newItem); showOneNewDialog(); } } -void CopyEngine::missingDiskSpace(QList<Diskspace> list) +void CopyEngine::missingDiskSpace(std::vector<Diskspace> list) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"show dialog"); DiskSpace dialog(facilityEngine,list,interface); @@ -230,7 +231,7 @@ void CopyEngine::missingDiskSpace(QList<Diskspace> list) dialog.exec();/// \bug crash when external close bool ok=dialog.getAction(); emit isInPause(false); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"cancel: "+QString::number(ok)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"cancel: "+std::to_string(ok)); if(!ok) emit cancelAll(); else @@ -238,11 +239,11 @@ void CopyEngine::missingDiskSpace(QList<Diskspace> list) } /// \note Can be call without queue because all call will be serialized -void CopyEngine::errorOnFile(QFileInfo fileInfo,QString errorString,TransferThread * thread,const ErrorType &errorType,bool isCalledByShowOneNewDialog) +void CopyEngine::errorOnFile(QFileInfo fileInfo,std::string errorString,TransferThread * thread,const ErrorType &errorType,bool isCalledByShowOneNewDialog) { if(stopIt) return; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"file have error: "+fileInfo.absoluteFilePath()+", error: "+errorString); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"file have error: "+fileInfo.absoluteFilePath().toStdString()+", error: "+errorString); if(thread==NULL) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"unable to locate the thread"); @@ -274,18 +275,18 @@ void CopyEngine::errorOnFile(QFileInfo fileInfo,QString errorString,TransferThre newItem.scan=NULL; newItem.transfer=thread; newItem.errorType=errorType; - errorQueue << newItem; + errorQueue.push_back(newItem); return; } dialogIsOpen=true; ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"show dialog"); - emit error(fileInfo.absoluteFilePath(),fileInfo.size(),fileInfo.lastModified(),errorString); + emit error(fileInfo.absoluteFilePath().toStdString(),fileInfo.size(),fileInfo.lastModified().toMSecsSinceEpoch()/1000,errorString); FileErrorDialog dialog(interface,fileInfo,errorString,errorType); emit isInPause(true); dialog.exec();/// \bug crash when external close FileErrorAction newAction=dialog.getAction(); emit isInPause(false); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"close dialog: "+QString::number(newAction)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"close dialog: "+std::to_string(newAction)); if(newAction==FileError_Cancel) { emit cancelAll(); @@ -337,7 +338,7 @@ void CopyEngine::folderAlreadyExists(QFileInfo source,QFileInfo destination,bool { if(stopIt) return; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"folder already exists: "+source.absoluteFilePath()+", destination: "+destination.absoluteFilePath()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"folder already exists: "+source.absoluteFilePath().toStdString()+", destination: "+destination.absoluteFilePath().toStdString()); if(thread==NULL) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"unable to locate the thread"); @@ -361,7 +362,7 @@ void CopyEngine::folderAlreadyExists(QFileInfo source,QFileInfo destination,bool newItem.isSame=isSame; newItem.transfer=NULL; newItem.scan=thread; - alreadyExistsQueue << newItem; + alreadyExistsQueue.push_back(newItem); return; } dialogIsOpen=true; @@ -369,7 +370,7 @@ void CopyEngine::folderAlreadyExists(QFileInfo source,QFileInfo destination,bool FolderExistsDialog dialog(interface,source,isSame,destination,firstRenamingRule,otherRenamingRule); dialog.exec();/// \bug crash when external close FolderExistsAction newAction=dialog.getAction(); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"close dialog: "+QString::number(newAction)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"close dialog: "+std::to_string(newAction)); if(newAction==FolderExists_Cancel) { emit cancelAll(); @@ -391,11 +392,11 @@ void CopyEngine::folderAlreadyExists(QFileInfo source,QFileInfo destination,bool /// \note Can be call without queue because all call will be serialized /// \todo all this part -void CopyEngine::errorOnFolder(QFileInfo fileInfo, QString errorString, ScanFileOrFolder * thread, ErrorType errorType, bool isCalledByShowOneNewDialog) +void CopyEngine::errorOnFolder(QFileInfo fileInfo, std::string errorString, ScanFileOrFolder * thread, ErrorType errorType, bool isCalledByShowOneNewDialog) { if(stopIt) return; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"file have error: "+fileInfo.absoluteFilePath()+", error: "+errorString); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"file have error: "+fileInfo.absoluteFilePath().toStdString()+", error: "+errorString); if(thread==NULL) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"unable to locate the thread"); @@ -421,16 +422,16 @@ void CopyEngine::errorOnFolder(QFileInfo fileInfo, QString errorString, ScanFile newItem.scan=thread; newItem.transfer=NULL; newItem.errorType=errorType; - errorQueue << newItem; + errorQueue.push_back(newItem); return; } dialogIsOpen=true; ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"show dialog"); - emit error(fileInfo.absoluteFilePath(),fileInfo.size(),fileInfo.lastModified(),errorString); + emit error(fileInfo.absoluteFilePath().toStdString(),fileInfo.size(),fileInfo.lastModified().toMSecsSinceEpoch()/1000,errorString); FileErrorDialog dialog(interface,fileInfo,errorString,errorType); dialog.exec();/// \bug crash when external close FileErrorAction newAction=dialog.getAction(); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"close dialog: "+QString::number(newAction)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"close dialog: "+std::to_string(newAction)); if(newAction==FileError_Cancel) { emit cancelAll(); @@ -454,11 +455,11 @@ void CopyEngine::errorOnFolder(QFileInfo fileInfo, QString errorString, ScanFile // ----------------------------------------------------- //mkpath event -void CopyEngine::mkPathErrorOnFolder(QFileInfo folder,QString errorString,const ErrorType &errorType,bool isCalledByShowOneNewDialog) +void CopyEngine::mkPathErrorOnFolder(QFileInfo folder,std::string errorString,const ErrorType &errorType,bool isCalledByShowOneNewDialog) { if(stopIt) return; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"file have error: "+folder.absoluteFilePath()+", error: "+errorString); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"file have error: "+folder.absoluteFilePath().toStdString()+", error: "+errorString); //load the always action FileErrorAction tempFileErrorAction=alwaysDoThisActionForFolderError; switch(tempFileErrorAction) @@ -480,16 +481,16 @@ void CopyEngine::mkPathErrorOnFolder(QFileInfo folder,QString errorString,const newItem.scan=NULL; newItem.transfer=NULL; newItem.errorType=errorType; - errorQueue << newItem; + errorQueue.push_back(newItem); return; } dialogIsOpen=true; ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"show dialog"); - emit error(folder.absoluteFilePath(),folder.size(),folder.lastModified(),errorString); + emit error(folder.absoluteFilePath().toStdString(),folder.size(),folder.lastModified().toMSecsSinceEpoch()/1000,errorString); FileErrorDialog dialog(interface,folder,errorString,errorType); dialog.exec();/// \bug crash when external close FileErrorAction newAction=dialog.getAction(); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"close dialog: "+QString::number(newAction)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"close dialog: "+std::to_string(newAction)); if(newAction==FileError_Cancel) { emit cancelAll(); @@ -510,7 +511,7 @@ void CopyEngine::mkPathErrorOnFolder(QFileInfo folder,QString errorString,const listThread->mkPathQueue.retry(); break; default: - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unknow switch case: "+QString::number(newAction)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unknow switch case: "+std::to_string(newAction)); break; } if(!isCalledByShowOneNewDialog) @@ -526,42 +527,42 @@ void CopyEngine::showOneNewDialog() { if(stopIt) return; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"alreadyExistsQueue.size(): "+QString::number(alreadyExistsQueue.size())); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"errorQueue.size(): "+QString::number(errorQueue.size())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"alreadyExistsQueue.size(): "+std::to_string(alreadyExistsQueue.size())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"errorQueue.size(): "+std::to_string(errorQueue.size())); int loop_size=alreadyExistsQueue.size(); while(loop_size>0) { - if(alreadyExistsQueue.first().transfer!=NULL) + if(alreadyExistsQueue.front().transfer!=NULL) { - fileAlreadyExists(alreadyExistsQueue.first().source, - alreadyExistsQueue.first().destination, - alreadyExistsQueue.first().isSame, - alreadyExistsQueue.first().transfer, + fileAlreadyExists(alreadyExistsQueue.front().source, + alreadyExistsQueue.front().destination, + alreadyExistsQueue.front().isSame, + alreadyExistsQueue.front().transfer, true); } - else if(alreadyExistsQueue.first().scan!=NULL) - folderAlreadyExists(alreadyExistsQueue.first().source, - alreadyExistsQueue.first().destination, - alreadyExistsQueue.first().isSame, - alreadyExistsQueue.first().scan, + else if(alreadyExistsQueue.front().scan!=NULL) + folderAlreadyExists(alreadyExistsQueue.front().source, + alreadyExistsQueue.front().destination, + alreadyExistsQueue.front().isSame, + alreadyExistsQueue.front().scan, true); else ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"bug, no thread actived"); - alreadyExistsQueue.removeFirst(); + alreadyExistsQueue.erase(alreadyExistsQueue.cbegin()); loop_size--; } loop_size=errorQueue.size(); while(errorQueue.size()>0 && loop_size>0) { - if(errorQueue.first().transfer!=NULL) - errorOnFile(errorQueue.first().inode,errorQueue.first().errorString,errorQueue.first().transfer,errorQueue.first().errorType,true); - else if(errorQueue.first().scan!=NULL) - errorOnFolder(errorQueue.first().inode,errorQueue.first().errorString,errorQueue.first().scan,errorQueue.first().errorType,true); - else if(errorQueue.first().mkPath) - mkPathErrorOnFolder(errorQueue.first().inode,errorQueue.first().errorString,errorQueue.first().errorType,true); + if(errorQueue.front().transfer!=NULL) + errorOnFile(errorQueue.front().inode,errorQueue.front().errorString,errorQueue.front().transfer,errorQueue.front().errorType,true); + else if(errorQueue.front().scan!=NULL) + errorOnFolder(errorQueue.front().inode,errorQueue.front().errorString,errorQueue.front().scan,errorQueue.front().errorType,true); + else if(errorQueue.front().mkPath) + mkPathErrorOnFolder(errorQueue.front().inode,errorQueue.front().errorString,errorQueue.front().errorType,true); else ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"bug, no thread actived"); - errorQueue.removeFirst(); + errorQueue.erase(errorQueue.cbegin()); loop_size--; } } diff --git a/plugins/CopyEngine/Ultracopier/CopyEngine.cpp b/plugins/CopyEngine/Ultracopier/CopyEngine.cpp index f9e16f4..f3d6e04 100644 --- a/plugins/CopyEngine/Ultracopier/CopyEngine.cpp +++ b/plugins/CopyEngine/Ultracopier/CopyEngine.cpp @@ -208,7 +208,7 @@ void CopyEngine::connectTheSignalsSlots() } #ifdef ULTRACOPIER_PLUGIN_DEBUG_WINDOW -void CopyEngine::updateTheDebugInfo(const QStringList &newList, const QStringList &newList2, const int &numberOfInodeOperation) +void CopyEngine::updateTheDebugInfo(const std::vector<std::string> &newList, const std::vector<std::string> &newList2, const int &numberOfInodeOperation) { debugDialogWindow.setTransferThreadList(newList); debugDialogWindow.setTransferList(newList2); @@ -333,7 +333,7 @@ bool CopyEngine::getOptionsEngine(QWidget * tempWidget) ui->comboBoxFolderError->setCurrentIndex(1); break; default: - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Error, unknow index, ignored: "+QString::number(alwaysDoThisActionForFolderError)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Error, unknow index, ignored: "+std::to_string(alwaysDoThisActionForFolderError)); ui->comboBoxFolderError->setCurrentIndex(0); break; } @@ -411,31 +411,31 @@ void CopyEngine::setInterfacePointer(QWidget * interface) emit send_sendNewRenamingRules(firstRenamingRule,otherRenamingRule); } -bool CopyEngine::haveSameSource(const QStringList &sources) +bool CopyEngine::haveSameSource(const std::vector<std::string> &sources) { return listThread->haveSameSource(sources); } -bool CopyEngine::haveSameDestination(const QString &destination) +bool CopyEngine::haveSameDestination(const std::string &destination) { return listThread->haveSameDestination(destination); } -bool CopyEngine::newCopy(const QStringList &sources) +bool CopyEngine::newCopy(const std::vector<std::string> &sources) { if(forcedMode && mode!=Ultracopier::Copy) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"The engine is forced to move, you can't copy with it"); - QMessageBox::critical(NULL,facilityEngine->translateText(QStringLiteral("Internal error")),tr("The engine is forced to move, you can't copy with it")); + QMessageBox::critical(NULL,QString::fromStdString(facilityEngine->translateText("Internal error")),tr("The engine is forced to move, you can't copy with it")); return false; } ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); - QString destination; - if(!defaultDestinationFolder.isEmpty() && QDir(defaultDestinationFolder).exists()) + std::string destination; + if(!defaultDestinationFolder.empty() && QDir(QString::fromStdString(defaultDestinationFolder)).exists()) destination = defaultDestinationFolder; else destination = askDestination(); - if(destination.isEmpty()) + if(destination.empty()) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"Canceled by the user"); return false; @@ -443,32 +443,32 @@ bool CopyEngine::newCopy(const QStringList &sources) return listThread->newCopy(sources,destination); } -bool CopyEngine::newCopy(const QStringList &sources,const QString &destination) +bool CopyEngine::newCopy(const std::vector<std::string> &sources,const std::string &destination) { if(forcedMode && mode!=Ultracopier::Copy) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"The engine is forced to move, you can't copy with it"); - QMessageBox::critical(NULL,facilityEngine->translateText(QStringLiteral("Internal error")),tr("The engine is forced to move, you can't copy with it")); + QMessageBox::critical(NULL,QString::fromStdString(facilityEngine->translateText("Internal error")),tr("The engine is forced to move, you can't copy with it")); return false; } return listThread->newCopy(sources,destination); } -bool CopyEngine::newMove(const QStringList &sources) +bool CopyEngine::newMove(const std::vector<std::string> &sources) { if(forcedMode && mode!=Ultracopier::Move) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"The engine is forced to copy, you can't move with it"); - QMessageBox::critical(NULL,facilityEngine->translateText(QStringLiteral("Internal error")),tr("The engine is forced to copy, you can't move with it")); + QMessageBox::critical(NULL,QString::fromStdString(facilityEngine->translateText("Internal error")),tr("The engine is forced to copy, you can't move with it")); return false; } ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); - QString destination; + std::string destination; if(!ui->defaultDestinationFolder->text().isEmpty() && QDir(ui->defaultDestinationFolder->text()).exists()) - destination = ui->defaultDestinationFolder->text(); + destination = ui->defaultDestinationFolder->text().toStdString(); else destination = askDestination(); - if(destination.isEmpty()) + if(destination.empty()) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"Canceled by the user"); return false; @@ -476,12 +476,12 @@ bool CopyEngine::newMove(const QStringList &sources) return listThread->newMove(sources,destination); } -bool CopyEngine::newMove(const QStringList &sources,const QString &destination) +bool CopyEngine::newMove(const std::vector<std::string> &sources,const std::string &destination) { if(forcedMode && mode!=Ultracopier::Move) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"The engine is forced to copy, you can't move with it"); - QMessageBox::critical(NULL,facilityEngine->translateText(QStringLiteral("Internal error")),tr("The engine is forced to copy, you can't move with it")); + QMessageBox::critical(NULL,QString::fromStdString(facilityEngine->translateText("Internal error")),tr("The engine is forced to copy, you can't move with it")); return false; } return listThread->newMove(sources,destination); @@ -489,37 +489,39 @@ bool CopyEngine::newMove(const QStringList &sources,const QString &destination) void CopyEngine::defaultDestinationFolderBrowse() { - QString destination = askDestination(); - if(destination.isEmpty()) + std::string destination = askDestination(); + if(destination.empty()) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"Canceled by the user"); return; } ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"the value have changed"); if(uiIsInstalled) - ui->defaultDestinationFolder->setText(destination); + ui->defaultDestinationFolder->setText(QString::fromStdString(destination)); } -QString CopyEngine::askDestination() +std::string CopyEngine::askDestination() { - QString destination = listThread->getUniqueDestinationFolder(); - if(!destination.isEmpty()) + std::string destination = listThread->getUniqueDestinationFolder(); + if(!destination.empty()) { - QMessageBox::StandardButton button=QMessageBox::question(interface,tr("Destination"),tr("Use the actual destination \"%1\"?").arg(destination),QMessageBox::Yes | QMessageBox::No,QMessageBox::Yes); + QMessageBox::StandardButton button=QMessageBox::question(interface,tr("Destination"),tr("Use the actual destination \"%1\"?") + .arg(QString::fromStdString(destination)), + QMessageBox::Yes | QMessageBox::No,QMessageBox::Yes); if(button==QMessageBox::Yes) return destination; } - destination=QFileDialog::getExistingDirectory(interface,facilityEngine->translateText(QStringLiteral("Select destination directory")),QStringLiteral(""),QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks); + destination=QFileDialog::getExistingDirectory(interface,QString::fromStdString(facilityEngine->translateText("Select destination directory")),QStringLiteral(""),QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks).toStdString(); return destination; } -void CopyEngine::newTransferList(const QString &file) +void CopyEngine::newTransferList(const std::string &file) { emit signal_importTransferList(file); } //because direct access to list thread into the main thread can't be do -quint64 CopyEngine::realByteTransfered() +uint64_t CopyEngine::realByteTransfered() { return size_for_speed; } @@ -605,7 +607,7 @@ void CopyEngine::updateBufferCheckbox() ui->osBufferLimit->setEnabled(ui->osBuffer->isChecked() && ui->osBufferLimited->isChecked()); } -void CopyEngine::set_setFilters(QStringList includeStrings,QStringList includeOptions,QStringList excludeStrings,QStringList excludeOptions) +void CopyEngine::set_setFilters(std::vector<std::string> includeStrings,std::vector<std::string> includeOptions,std::vector<std::string> excludeStrings,std::vector<std::string> excludeOptions) { if(filters!=NULL) { @@ -618,20 +620,24 @@ void CopyEngine::set_setFilters(QStringList includeStrings,QStringList includeOp this->excludeOptions=excludeOptions; } -void CopyEngine::setRenamingRules(QString firstRenamingRule,QString otherRenamingRule) +void CopyEngine::setRenamingRules(std::string firstRenamingRule,std::string otherRenamingRule) { sendNewRenamingRules(firstRenamingRule,otherRenamingRule); } bool CopyEngine::userAddFolder(const Ultracopier::CopyMode &mode) { - QString source = QFileDialog::getExistingDirectory(interface,facilityEngine->translateText(QStringLiteral("Select source directory")),QStringLiteral(""),QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks); - if(source.isEmpty() || source.isNull() || source=="") + std::string source = QFileDialog::getExistingDirectory(interface,QString::fromStdString(facilityEngine->translateText("Select source directory")), + QStringLiteral(""), + QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks).toStdString(); + if(source.empty() || source=="") return false; + std::vector<std::string> sources; + sources.push_back(source); if(mode==Ultracopier::Copy) - return newCopy(QStringList() << source); + return newCopy(sources); else - return newMove(QStringList() << source); + return newMove(sources); } bool CopyEngine::userAddFile(const Ultracopier::CopyMode &mode) @@ -639,15 +645,24 @@ bool CopyEngine::userAddFile(const Ultracopier::CopyMode &mode) ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); QStringList sources = QFileDialog::getOpenFileNames( interface, - facilityEngine->translateText(QStringLiteral("Select one or more files to open")), + QString::fromStdString(facilityEngine->translateText("Select one or more files to open")), QStringLiteral(""), - facilityEngine->translateText(QStringLiteral("All files"))+QStringLiteral(" (*)")); - if(sources.isEmpty()) + QString::fromStdString(facilityEngine->translateText("All files"))+QStringLiteral(" (*)")); + + std::vector<std::string> sourcesstd; + unsigned int index=0; + while(index<(unsigned int)sources.size()) + { + sourcesstd.push_back(sources.at(index).toStdString()); + index++; + } + + if(sourcesstd.empty()) return false; if(mode==Ultracopier::Copy) - return newCopy(sources); + return newCopy(sourcesstd); else - return newMove(sources); + return newMove(sourcesstd); } void CopyEngine::pause() @@ -660,7 +675,7 @@ void CopyEngine::resume() emit signal_resume(); } -void CopyEngine::skip(const quint64 &id) +void CopyEngine::skip(const uint64_t &id) { emit signal_skip(id); } @@ -674,27 +689,27 @@ void CopyEngine::cancel() emit tryCancel(); } -void CopyEngine::removeItems(const QList<int> &ids) +void CopyEngine::removeItems(const std::vector<uint64_t> &ids) { emit signal_removeItems(ids); } -void CopyEngine::moveItemsOnTop(const QList<int> &ids) +void CopyEngine::moveItemsOnTop(const std::vector<uint64_t> &ids) { emit signal_moveItemsOnTop(ids); } -void CopyEngine::moveItemsUp(const QList<int> &ids) +void CopyEngine::moveItemsUp(const std::vector<uint64_t> &ids) { emit signal_moveItemsUp(ids); } -void CopyEngine::moveItemsDown(const QList<int> &ids) +void CopyEngine::moveItemsDown(const std::vector<uint64_t> &ids) { emit signal_moveItemsDown(ids); } -void CopyEngine::moveItemsOnBottom(const QList<int> &ids) +void CopyEngine::moveItemsOnBottom(const std::vector<uint64_t> &ids) { emit signal_moveItemsOnBottom(ids); } @@ -713,8 +728,8 @@ void CopyEngine::forceMode(const Ultracopier::CopyMode &mode) #endif if(forcedMode) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("Mode forced previously")); - QMessageBox::critical(NULL,facilityEngine->translateText(QStringLiteral("Internal error")),tr("The mode has been forced previously. This is an internal error, please report it")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Mode forced previously"); + QMessageBox::critical(NULL,QString::fromStdString(facilityEngine->translateText("Internal error")),tr("The mode has been forced previously. This is an internal error, please report it")); return; } #ifdef ULTRACOPIER_PLUGIN_RSYNC @@ -722,9 +737,9 @@ void CopyEngine::forceMode(const Ultracopier::CopyMode &mode) rsync=false; #endif if(mode==Ultracopier::Copy) - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("Force mode to copy")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"Force mode to copy"); else - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("Force mode to move")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"Force mode to move"); #ifdef ULTRACOPIER_PLUGIN_RSYNC if(uiIsInstalled) ui->rsync->setEnabled(mode==Ultracopier::Copy); @@ -736,33 +751,33 @@ void CopyEngine::forceMode(const Ultracopier::CopyMode &mode) void CopyEngine::exportTransferList() { - QString fileName = QFileDialog::getSaveFileName(interface,facilityEngine->translateText(QStringLiteral("Save transfer list")),QStringLiteral("transfer-list.lst"),facilityEngine->translateText(QStringLiteral("Transfer list"))+QStringLiteral(" (*.lst)")); - if(fileName.isEmpty()) + std::string fileName = QFileDialog::getSaveFileName(interface,QString::fromStdString(facilityEngine->translateText("Save transfer list")),QStringLiteral("transfer-list.lst"),QString::fromStdString(facilityEngine->translateText("Transfer list"))+QStringLiteral(" (*.lst)")).toStdString(); + if(fileName.empty()) return; emit signal_exportTransferList(fileName); } void CopyEngine::importTransferList() { - QString fileName = QFileDialog::getOpenFileName(interface,facilityEngine->translateText(QStringLiteral("Open transfer list")),QStringLiteral("transfer-list.lst"),facilityEngine->translateText(QStringLiteral("Transfer list"))+QStringLiteral(" (*.lst)")); - if(fileName.isEmpty()) + std::string fileName = QFileDialog::getOpenFileName(interface,QString::fromStdString(facilityEngine->translateText("Open transfer list")),QStringLiteral("transfer-list.lst"),QString::fromStdString(facilityEngine->translateText("Transfer list"))+QStringLiteral(" (*.lst)")).toStdString(); + if(fileName.empty()) return; emit signal_importTransferList(fileName); } -void CopyEngine::warningTransferList(const QString &warning) +void CopyEngine::warningTransferList(const std::string &warning) { - QMessageBox::warning(interface,facilityEngine->translateText(QStringLiteral("Error")),warning); + QMessageBox::warning(interface,QString::fromStdString(facilityEngine->translateText("Error")),QString::fromStdString(warning)); } -void CopyEngine::errorTransferList(const QString &error) +void CopyEngine::errorTransferList(const std::string &error) { - QMessageBox::critical(interface,facilityEngine->translateText(QStringLiteral("Error")),error); + QMessageBox::critical(interface,QString::fromStdString(facilityEngine->translateText("Error")),QString::fromStdString(error)); } -bool CopyEngine::setSpeedLimitation(const qint64 &speedLimitation) +bool CopyEngine::setSpeedLimitation(const int64_t &speedLimitation) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"maxSpeed: "+QString::number(speedLimitation)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"maxSpeed: "+std::to_string(speedLimitation)); maxSpeed=speedLimitation; emit send_speedLimitation(speedLimitation); return true; @@ -770,7 +785,7 @@ bool CopyEngine::setSpeedLimitation(const qint64 &speedLimitation) void CopyEngine::setFileCollision(int index) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("action index: %1").arg(index)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"action index: "+std::to_string(index)); if(uiIsInstalled) if(index!=ui->comboBoxFileCollision->currentIndex()) ui->comboBoxFileCollision->setCurrentIndex(index); @@ -807,7 +822,7 @@ void CopyEngine::setFileCollision(int index) void CopyEngine::setFileError(int index) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("action index: %1").arg(index)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"action index: "+std::to_string(index)); if(uiIsInstalled) if(index!=ui->comboBoxFileError->currentIndex()) ui->comboBoxFileError->setCurrentIndex(index); @@ -832,7 +847,7 @@ void CopyEngine::setFileError(int index) void CopyEngine::setTransferAlgorithm(int index) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("action index: %1").arg(index)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"action index: "+std::to_string(index)); if(uiIsInstalled) if(index!=ui->transferAlgorithm->currentIndex()) ui->transferAlgorithm->setCurrentIndex(index); @@ -977,7 +992,7 @@ void CopyEngine::setAutoStart(const bool autoStart) /// \brief set rsync void CopyEngine::setRsync(const bool rsync) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"set rsync: "+QString::number(rsync)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"set rsync: "+std::to_string(rsync)); this->rsync=rsync; if(uiIsInstalled) { @@ -1155,9 +1170,9 @@ void CopyEngine::sendNewFilters() emit send_setFilters(filters->getInclude(),filters->getExclude()); } -void CopyEngine::sendNewRenamingRules(QString firstRenamingRule,QString otherRenamingRule) +void CopyEngine::sendNewRenamingRules(std::string firstRenamingRule,std::string otherRenamingRule) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("new filter")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"new filter"); this->firstRenamingRule=firstRenamingRule; this->otherRenamingRule=otherRenamingRule; emit send_sendNewRenamingRules(firstRenamingRule,otherRenamingRule); @@ -1216,11 +1231,11 @@ void CopyEngine::setCheckDiskSpace(const bool &checkDiskSpace) listThread->setCheckDiskSpace(checkDiskSpace); } -void CopyEngine::setDefaultDestinationFolder(const QString &defaultDestinationFolder) +void CopyEngine::setDefaultDestinationFolder(const std::string &defaultDestinationFolder) { this->defaultDestinationFolder=defaultDestinationFolder; if(uiIsInstalled) - ui->defaultDestinationFolder->setText(defaultDestinationFolder); + ui->defaultDestinationFolder->setText(QString::fromStdString(defaultDestinationFolder)); } void CopyEngine::setCopyListOrder(const bool &order) @@ -1231,8 +1246,8 @@ void CopyEngine::setCopyListOrder(const bool &order) void CopyEngine::exportErrorIntoTransferList() { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"exportErrorIntoTransferList"); - QString fileName = QFileDialog::getSaveFileName(interface,facilityEngine->translateText(QStringLiteral("Save transfer list")),QStringLiteral("transfer-list.lst"),facilityEngine->translateText(QStringLiteral("Transfer list"))+QStringLiteral(" (*.lst)")); - if(fileName.isEmpty()) + std::string fileName = QFileDialog::getSaveFileName(interface,QString::fromStdString(facilityEngine->translateText("Save transfer list")),QStringLiteral("transfer-list.lst"),QString::fromStdString(facilityEngine->translateText("Transfer list"))+QStringLiteral(" (*.lst)")).toStdString(); + if(fileName.empty()) return; emit signal_exportErrorIntoTransferList(fileName); } diff --git a/plugins/CopyEngine/Ultracopier/CopyEngine.h b/plugins/CopyEngine/Ultracopier/CopyEngine.h index d38fd4e..e5311d8 100644 --- a/plugins/CopyEngine/Ultracopier/CopyEngine.h +++ b/plugins/CopyEngine/Ultracopier/CopyEngine.h @@ -6,7 +6,8 @@ #include <QWidget> #include <QObject> #include <QList> -#include <QStringList> +#include <vector> +#include <string> #include <QFileInfo> #include <QFile> #include <QFileDialog> @@ -55,7 +56,7 @@ private: Filters * filters; RenamingRules * renamingRules; FacilityInterface * facilityEngine; - quint32 maxSpeed; + uint32_t maxSpeed; bool doRightTransfer; bool keepDate; int blockSize; @@ -79,7 +80,7 @@ private: TransferAlgorithm transferAlgorithm; bool dialogIsOpen; volatile bool stopIt; - QString defaultDestinationFolder; + std::string defaultDestinationFolder; /// \brief error queue struct errorQueueItem { @@ -88,10 +89,10 @@ private: bool mkPath; bool rmPath; QFileInfo inode; - QString errorString; + std::string errorString; ErrorType errorType; }; - QList<errorQueueItem> errorQueue; + std::vector<errorQueueItem> errorQueue; /// \brief already exists queue struct alreadyExistsQueueItem { @@ -101,8 +102,8 @@ private: QFileInfo destination; bool isSame; }; - QList<alreadyExistsQueueItem> alreadyExistsQueue; - quint64 size_for_speed;//because direct access to list thread into the main thread can't be do + std::vector<alreadyExistsQueueItem> alreadyExistsQueue; + uint64_t size_for_speed;//because direct access to list thread into the main thread can't be do Ultracopier::CopyMode mode; bool forcedMode; @@ -113,9 +114,9 @@ private: bool osBufferLimited; bool checkDiskSpace; unsigned int osBufferLimit; - QStringList includeStrings,includeOptions,excludeStrings,excludeOptions; - QString firstRenamingRule; - QString otherRenamingRule; + std::vector<std::string> includeStrings,includeOptions,excludeStrings,excludeOptions; + std::string firstRenamingRule; + std::string otherRenamingRule; //send action done timer QTimer timerActionDone; @@ -126,7 +127,7 @@ private: int putAtBottom;//to keep how many automatic put at bottom have been used private slots: #ifdef ULTRACOPIER_PLUGIN_DEBUG_WINDOW - void updateTheDebugInfo(const QStringList &newList, const QStringList &newList2, const int &numberOfInodeOperation); + void updateTheDebugInfo(const std::vector<std::string> &newList, const std::vector<std::string> &newList2, const int &numberOfInodeOperation); #endif /************* External call ********************/ @@ -134,25 +135,25 @@ private slots: /// \note Can be call without queue because all call will be serialized void fileAlreadyExistsSlot(QFileInfo source,QFileInfo destination,bool isSame,TransferThread * thread); /// \note Can be call without queue because all call will be serialized - void errorOnFileSlot(QFileInfo fileInfo, QString errorString, TransferThread * thread, const ErrorType &errorType); + void errorOnFileSlot(QFileInfo fileInfo, std::string errorString, TransferThread * thread, const ErrorType &errorType); /// \note Can be call without queue because all call will be serialized void folderAlreadyExistsSlot(QFileInfo source,QFileInfo destination,bool isSame,ScanFileOrFolder * thread); /// \note Can be call without queue because all call will be serialized - void errorOnFolderSlot(QFileInfo fileInfo, QString errorString, ScanFileOrFolder * thread, ErrorType errorType); + void errorOnFolderSlot(QFileInfo fileInfo, std::string errorString, ScanFileOrFolder * thread, ErrorType errorType); //mkpath event - void mkPathErrorOnFolderSlot(QFileInfo, QString, ErrorType errorType); + void mkPathErrorOnFolderSlot(QFileInfo, std::string, ErrorType errorType); //dialog message /// \note Can be call without queue because all call will be serialized void fileAlreadyExists(QFileInfo source,QFileInfo destination,bool isSame,TransferThread * thread,bool isCalledByShowOneNewDialog=false); /// \note Can be call without queue because all call will be serialized - void errorOnFile(QFileInfo fileInfo, QString errorString, TransferThread * thread, const ErrorType &errorType, bool isCalledByShowOneNewDialog=false); + void errorOnFile(QFileInfo fileInfo, std::string errorString, TransferThread * thread, const ErrorType &errorType, bool isCalledByShowOneNewDialog=false); /// \note Can be call without queue because all call will be serialized void folderAlreadyExists(QFileInfo source,QFileInfo destination,bool isSame,ScanFileOrFolder * thread,bool isCalledByShowOneNewDialog=false); /// \note Can be call without queue because all call will be serialized - void errorOnFolder(QFileInfo fileInfo,QString errorString,ScanFileOrFolder * thread, ErrorType errorType,bool isCalledByShowOneNewDialog=false); + void errorOnFolder(QFileInfo fileInfo, std::string errorString, ScanFileOrFolder * thread, ErrorType errorType, bool isCalledByShowOneNewDialog=false); //mkpath event - void mkPathErrorOnFolder(QFileInfo, QString, const ErrorType &errorType, bool isCalledByShowOneNewDialog=false); + void mkPathErrorOnFolder(QFileInfo, std::string, const ErrorType &errorType, bool isCalledByShowOneNewDialog=false); //show one new dialog if needed void showOneNewDialog(); @@ -165,14 +166,14 @@ private slots: void osBufferLimited_toggled(bool); void osBufferLimit_editingFinished(); void showFilterDialog(); - void sendNewRenamingRules(QString firstRenamingRule,QString otherRenamingRule); + void sendNewRenamingRules(std::string firstRenamingRule,std::string otherRenamingRule); void showRenamingRules(); void get_realBytesTransfered(quint64 realBytesTransfered); void newActionInProgess(Ultracopier::EngineActionInProgress); void updatedBlockSize(); void updateBufferCheckbox(); - void haveNeedPutAtBottom(bool needPutAtBottom, const QFileInfo &fileInfo, const QString &errorString, TransferThread *thread, const ErrorType &errorType); - void missingDiskSpace(QList<Diskspace> list); + void haveNeedPutAtBottom(bool needPutAtBottom, const QFileInfo &fileInfo, const std::string &errorString, TransferThread *thread, const ErrorType &errorType); + void missingDiskSpace(std::vector<Diskspace> list); void exportErrorIntoTransferList(); public: /** \brief to send the options panel @@ -186,37 +187,37 @@ public: /** \brief compare the current sources of the copy, with the passed arguments * \param sources the sources list to compares with the current sources list * \return true if have same sources, else false (or empty) */ - bool haveSameSource(const QStringList &sources); + bool haveSameSource(const std::vector<std::string> &sources); /** \brief compare the current destination of the copy, with the passed arguments * \param destination the destination to compares with the current destination * \return true if have same destination, else false (or empty) */ - bool haveSameDestination(const QString &destination); + bool haveSameDestination(const std::string &destination); //external soft like file browser have send copy/move list to do /** \brief send copy without destination, ask the destination * \param sources the sources list to copy * \return true if the copy have been accepted */ - bool newCopy(const QStringList &sources); + bool newCopy(const std::vector<std::string> &sources); /** \brief send copy with destination * \param sources the sources list to copy * \param destination the destination to copy * \return true if the copy have been accepted */ - bool newCopy(const QStringList &sources,const QString &destination); + bool newCopy(const std::vector<std::string> &sources,const std::string &destination); /** \brief send move without destination, ask the destination * \param sources the sources list to move * \return true if the move have been accepted */ - bool newMove(const QStringList &sources); + bool newMove(const std::vector<std::string> &sources); /** \brief send move without destination, ask the destination * \param sources the sources list to move * \param destination the destination to move * \return true if the move have been accepted */ - bool newMove(const QStringList &sources,const QString &destination); + bool newMove(const std::vector<std::string> &sources,const std::string &destination); /** \brief send the new transfer list * \param file the transfer list */ - void newTransferList(const QString &file); + void newTransferList(const std::string &file); /** \brief to get byte read, use by Ultracopier for the speed calculation * real size transfered to right speed calculation */ - quint64 realByteTransfered(); + uint64_t realByteTransfered(); /** \brief support speed limitation */ bool supportSpeedLimitation() const; @@ -233,16 +234,16 @@ public: void set_osBuffer(bool osBuffer); void set_osBufferLimited(bool osBufferLimited); void set_osBufferLimit(unsigned int osBufferLimit); - void set_setFilters(QStringList includeStrings,QStringList includeOptions,QStringList excludeStrings,QStringList excludeOptions); - void setRenamingRules(QString firstRenamingRule,QString otherRenamingRule); + void set_setFilters(std::vector<std::string> includeStrings,std::vector<std::string> includeOptions,std::vector<std::string> excludeStrings,std::vector<std::string> excludeOptions); + void setRenamingRules(std::string firstRenamingRule,std::string otherRenamingRule); #ifdef ULTRACOPIER_PLUGIN_RSYNC void setRsync(const bool rsync); #endif void setCheckDiskSpace(const bool &checkDiskSpace); - void setDefaultDestinationFolder(const QString &defaultDestinationFolder); + void setDefaultDestinationFolder(const std::string &defaultDestinationFolder); void setCopyListOrder(const bool &order); void defaultDestinationFolderBrowse(); - QString askDestination(); + std::string askDestination(); public slots: //user ask ask to add folder (add it with interface ask source/destination) /** \brief add folder called on the interface @@ -258,25 +259,25 @@ public slots: void resume(); /** \brief skip one transfer entry * \param id id of the file to remove */ - void skip(const quint64 &id); + void skip(const uint64_t &id); /// \brief cancel all the transfer void cancel(); //edit the transfer list /** \brief remove the selected item * \param ids ids is the id list of the selected items */ - void removeItems(const QList<int> &ids); + void removeItems(const std::vector<uint64_t> &ids); /** \brief move on top of the list the selected item * \param ids ids is the id list of the selected items */ - void moveItemsOnTop(const QList<int> &ids); + void moveItemsOnTop(const std::vector<uint64_t> &ids); /** \brief move up the list the selected item * \param ids ids is the id list of the selected items */ - void moveItemsUp(const QList<int> &ids); + void moveItemsUp(const std::vector<uint64_t> &ids); /** \brief move down the list the selected item * \param ids ids is the id list of the selected items */ - void moveItemsDown(const QList<int> &ids); + void moveItemsDown(const std::vector<uint64_t> &ids); /** \brief move on bottom of the list the selected item * \param ids ids is the id list of the selected items */ - void moveItemsOnBottom(const QList<int> &ids); + void moveItemsOnBottom(const std::vector<uint64_t> &ids); /** \brief give the forced mode, to export/import transfer list */ void forceMode(const Ultracopier::CopyMode &mode); @@ -287,7 +288,7 @@ public slots: /** \brief to set the speed limitation * -1 if not able, 0 if disabled */ - bool setSpeedLimitation(const qint64 &speedLimitation); + bool setSpeedLimitation(const int64_t &speedLimitation); // specific to this copy engine @@ -325,25 +326,25 @@ public slots: private slots: void setComboBoxFolderCollision(FolderExistsAction action,bool changeComboBox=true); void setComboBoxFolderError(FileErrorAction action,bool changeComboBox=true); - void warningTransferList(const QString &warning); - void errorTransferList(const QString &error); + void warningTransferList(const std::string &warning); + void errorTransferList(const std::string &error); signals: //action on the copy void signal_pause() const; void signal_resume() const; - void signal_skip(const quint64 &id) const; + void signal_skip(const uint64_t &id) const; //edit the transfer list - void signal_removeItems(const QList<int> &ids) const; - void signal_moveItemsOnTop(const QList<int> &ids) const; - void signal_moveItemsUp(const QList<int> &ids) const; - void signal_moveItemsDown(const QList<int> &ids) const; - void signal_moveItemsOnBottom(const QList<int> &ids) const; + void signal_removeItems(const std::vector<uint64_t> &ids) const; + void signal_moveItemsOnTop(const std::vector<uint64_t> &ids) const; + void signal_moveItemsUp(const std::vector<uint64_t> &ids) const; + void signal_moveItemsDown(const std::vector<uint64_t> &ids) const; + void signal_moveItemsOnBottom(const std::vector<uint64_t> &ids) const; void signal_forceMode(const Ultracopier::CopyMode &mode) const; - void signal_exportTransferList(const QString &fileName) const; - void signal_importTransferList(const QString &fileName) const; - void signal_exportErrorIntoTransferList(const QString &fileName) const; + void signal_exportTransferList(const std::string &fileName) const; + void signal_importTransferList(const std::string &fileName) const; + void signal_exportErrorIntoTransferList(const std::string &fileName) const; //action void signal_setTransferAlgorithm(TransferAlgorithm transferAlgorithm) const; @@ -353,21 +354,21 @@ signals: //internal cancel void tryCancel() const; - void getNeedPutAtBottom(const QFileInfo &fileInfo,const QString &errorString,TransferThread * thread,const ErrorType &errorType) const; + void getNeedPutAtBottom(const QFileInfo &fileInfo,const std::string &errorString,TransferThread * thread,const ErrorType &errorType) const; #ifdef ULTRACOPIER_PLUGIN_DEBUG /// \brief To debug source - void debugInformation(const Ultracopier::DebugLevel &level,QString fonction,QString text,QString file,int ligne) const; + void debugInformation(const Ultracopier::DebugLevel &level,std::string fonction,std::string text,std::string file,int ligne) const; #endif //other signals void queryOneNewDialog() const; - void send_speedLimitation(const qint64 &speedLimitation) const; + void send_speedLimitation(const uint64_t &speedLimitation) const; void send_blockSize(const int &blockSize) const; void send_osBufferLimit(const unsigned int &osBufferLimit) const; - void send_setFilters(const QList<Filters_rules> &include,const QList<Filters_rules> &exclude) const; - void send_sendNewRenamingRules(QString firstRenamingRule,QString otherRenamingRule) const; + void send_setFilters(const std::vector<Filters_rules> &include,const std::vector<Filters_rules> &exclude) const; + void send_sendNewRenamingRules(std::string firstRenamingRule,std::string otherRenamingRule) const; void send_parallelBuffer(const int ¶llelBuffer) const; void send_sequentialBuffer(const int &sequentialBuffer) const; void send_parallelizeIfSmallerThan(const int ¶llelizeIfSmallerThan) const; diff --git a/plugins/CopyEngine/Ultracopier/CopyEngine.pro b/plugins/CopyEngine/Ultracopier/CopyEngine.pro index 42078af..112e999 100644 --- a/plugins/CopyEngine/Ultracopier/CopyEngine.pro +++ b/plugins/CopyEngine/Ultracopier/CopyEngine.pro @@ -2,7 +2,7 @@ CONFIG += c++11 QMAKE_CXXFLAGS+="-std=c++0x -Wall -Wextra" mac:QMAKE_CXXFLAGS+="-stdlib=libc++" -QT += widgets +QT += widgets xml DEFINES += UNICODE _UNICODE TEMPLATE = lib CONFIG += plugin @@ -11,91 +11,96 @@ win32 { } HEADERS = \ - ../Ultracopier/StructEnumDefinition.h \ - ../Ultracopier/StructEnumDefinition_CopyEngine.h \ - ../Ultracopier/DebugEngineMacro.h \ - ../Ultracopier/Variable.h \ - ../Ultracopier/TransferThread.h \ - ../Ultracopier/ReadThread.h \ - ../Ultracopier/WriteThread.h \ - ../Ultracopier/MkPath.h \ - ../Ultracopier/AvancedQFile.h \ - ../Ultracopier/ListThread.h \ - ../../../interface/PluginInterface_CopyEngine.h \ - ../../../interface/OptionInterface.h \ - ../../../interface/FacilityInterface.h \ - ../Ultracopier/Filters.h \ - ../Ultracopier/FilterRules.h \ - ../Ultracopier/RenamingRules.h \ - ../Ultracopier/DriveManagement.h \ - ../Ultracopier/CopyEngine.h \ - ../Ultracopier/DebugDialog.h \ - ../Ultracopier/CopyEngineFactory.h \ - ../Ultracopier/FileErrorDialog.h \ - ../Ultracopier/FileExistsDialog.h \ - ../Ultracopier/FileIsSameDialog.h \ - ../Ultracopier/FolderExistsDialog.h \ - ../Ultracopier/ScanFileOrFolder.h \ - ../Ultracopier/DiskSpace.h + $$PWD/StructEnumDefinition.h \ + $$PWD/StructEnumDefinition_CopyEngine.h \ + $$PWD/DebugEngineMacro.h \ + $$PWD/Variable.h \ + $$PWD/TransferThread.h \ + $$PWD/ReadThread.h \ + $$PWD/WriteThread.h \ + $$PWD/MkPath.h \ + $$PWD/AvancedQFile.h \ + $$PWD/ListThread.h \ + $$PWD/../../../interface/PluginInterface_CopyEngine.h \ + $$PWD/../../../interface/OptionInterface.h \ + $$PWD/../../../interface/FacilityInterface.h \ + $$PWD/../../../cpp11addition.h \ + $$PWD/Filters.h \ + $$PWD/FilterRules.h \ + $$PWD/RenamingRules.h \ + $$PWD/DriveManagement.h \ + $$PWD/CopyEngine.h \ + $$PWD/DebugDialog.h \ + $$PWD/CopyEngineFactory.h \ + $$PWD/FileErrorDialog.h \ + $$PWD/FileExistsDialog.h \ + $$PWD/FileIsSameDialog.h \ + $$PWD/FolderExistsDialog.h \ + $$PWD/ScanFileOrFolder.h \ + $$PWD/DiskSpace.h SOURCES = \ - ../Ultracopier/TransferThread.cpp \ - ../Ultracopier/ReadThread.cpp \ - ../Ultracopier/WriteThread.cpp \ - ../Ultracopier/MkPath.cpp \ - ../Ultracopier/AvancedQFile.cpp \ - ../Ultracopier/ListThread.cpp \ - ../Ultracopier/Filters.cpp \ - ../Ultracopier/FilterRules.cpp \ - ../Ultracopier/RenamingRules.cpp \ - ../Ultracopier/ListThread_InodeAction.cpp \ - ../Ultracopier/DriveManagement.cpp \ - ../Ultracopier/CopyEngine-collision-and-error.cpp \ - ../Ultracopier/CopyEngine.cpp \ - ../Ultracopier/DebugDialog.cpp \ - ../Ultracopier/CopyEngineFactory.cpp \ - ../Ultracopier/FileErrorDialog.cpp \ - ../Ultracopier/FileExistsDialog.cpp \ - ../Ultracopier/FileIsSameDialog.cpp \ - ../Ultracopier/FolderExistsDialog.cpp \ - ../Ultracopier/ScanFileOrFolder.cpp \ - ../Ultracopier/DiskSpace.cpp + $$PWD/TransferThread.cpp \ + $$PWD/ReadThread.cpp \ + $$PWD/WriteThread.cpp \ + $$PWD/MkPath.cpp \ + $$PWD/AvancedQFile.cpp \ + $$PWD/ListThread.cpp \ + $$PWD/../../../cpp11addition.cpp \ + $$PWD/../../../cpp11additionstringtointcpp.cpp \ + $$PWD/Filters.cpp \ + $$PWD/FilterRules.cpp \ + $$PWD/RenamingRules.cpp \ + $$PWD/ListThread_InodeAction.cpp \ + $$PWD/DriveManagement.cpp \ + $$PWD/CopyEngine-collision-and-error.cpp \ + $$PWD/CopyEngine.cpp \ + $$PWD/DebugDialog.cpp \ + $$PWD/CopyEngineFactory.cpp \ + $$PWD/FileErrorDialog.cpp \ + $$PWD/FileExistsDialog.cpp \ + $$PWD/FileIsSameDialog.cpp \ + $$PWD/FolderExistsDialog.cpp \ + $$PWD/ScanFileOrFolder.cpp \ + $$PWD/DiskSpace.cpp TARGET = $$qtLibraryTarget(copyEngine) -TRANSLATIONS += ../Ultracopier/Languages/ar/translation.ts \ - ../Ultracopier/Languages/de/translation.ts \ - ../Ultracopier/Languages/el/translation.ts \ - ../Ultracopier/Languages/en/translation.ts \ - ../Ultracopier/Languages/es/translation.ts \ - ../Ultracopier/Languages/fr/translation.ts \ - ../Ultracopier/Languages/hi/translation.ts \ - ../Ultracopier/Languages/hu/translation.ts \ - ../Ultracopier/Languages/id/translation.ts \ - ../Ultracopier/Languages/it/translation.ts \ - ../Ultracopier/Languages/ja/translation.ts \ - ../Ultracopier/Languages/ko/translation.ts \ - ../Ultracopier/Languages/nl/translation.ts \ - ../Ultracopier/Languages/no/translation.ts \ - ../Ultracopier/Languages/pl/translation.ts \ - ../Ultracopier/Languages/pt/translation.ts \ - ../Ultracopier/Languages/ru/translation.ts \ - ../Ultracopier/Languages/th/translation.ts \ - ../Ultracopier/Languages/tr/translation.ts \ - ../Ultracopier/Languages/zh/translation.ts +TRANSLATIONS += \ + $$PWD/Languages/ar/translation.ts \ + $$PWD/Languages/de/translation.ts \ + $$PWD/Languages/el/translation.ts \ + $$PWD/Languages/en/translation.ts \ + $$PWD/Languages/es/translation.ts \ + $$PWD/Languages/fr/translation.ts \ + $$PWD/Languages/hi/translation.ts \ + $$PWD/Languages/hu/translation.ts \ + $$PWD/Languages/id/translation.ts \ + $$PWD/Languages/it/translation.ts \ + $$PWD/Languages/ja/translation.ts \ + $$PWD/Languages/ko/translation.ts \ + $$PWD/Languages/nl/translation.ts \ + $$PWD/Languages/no/translation.ts \ + $$PWD/Languages/pl/translation.ts \ + $$PWD/Languages/pt/translation.ts \ + $$PWD/Languages/ru/translation.ts \ + $$PWD/Languages/th/translation.ts \ + $$PWD/Languages/tr/translation.ts \ + $$PWD/Languages/zh/translation.ts FORMS += \ - ../Ultracopier/fileErrorDialog.ui \ - ../Ultracopier/fileExistsDialog.ui \ - ../Ultracopier/fileIsSameDialog.ui \ - ../Ultracopier/debugDialog.ui \ - ../Ultracopier/folderExistsDialog.ui \ - ../Ultracopier/Filters.ui \ - ../Ultracopier/FilterRules.ui \ - ../Ultracopier/RenamingRules.ui \ - ../Ultracopier/copyEngineOptions.ui \ - ../Ultracopier/DiskSpace.ui + $$PWD/fileErrorDialog.ui \ + $$PWD/fileExistsDialog.ui \ + $$PWD/fileIsSameDialog.ui \ + $$PWD/debugDialog.ui \ + $$PWD/folderExistsDialog.ui \ + $$PWD/Filters.ui \ + $$PWD/FilterRules.ui \ + $$PWD/RenamingRules.ui \ + $$PWD/copyEngineOptions.ui \ + $$PWD/DiskSpace.ui -OTHER_FILES += informations.xml +OTHER_FILES += \ + $$PWD/informations.xml !CONFIG(static) { RESOURCES += \ - ../Ultracopier/copyEngineResources.qrc + $$PWD/copyEngineResources.qrc } diff --git a/plugins/CopyEngine/Ultracopier/CopyEngineFactory.cpp b/plugins/CopyEngine/Ultracopier/CopyEngineFactory.cpp index d4d4bb6..6507ce2 100644 --- a/plugins/CopyEngine/Ultracopier/CopyEngineFactory.cpp +++ b/plugins/CopyEngine/Ultracopier/CopyEngineFactory.cpp @@ -8,6 +8,7 @@ #include <cmath> #include <QStorageInfo> +#include "../../../cpp11addition.h" #include "CopyEngineFactory.h" // The cmath header from MSVC does not contain round() @@ -32,6 +33,7 @@ CopyEngineFactory::CopyEngineFactory() : qRegisterMetaType<QList<Diskspace> >("QList<Diskspace>"); qRegisterMetaType<QFileInfo>("QFileInfo"); qRegisterMetaType<Ultracopier::CopyMode>("Ultracopier::CopyMode"); + qRegisterMetaType<std::vector<Filters_rules> >("std::vector<Filters_rules>"); tempWidget=new QWidget(); ui->setupUi(tempWidget); @@ -138,14 +140,14 @@ PluginInterface_CopyEngine * CopyEngineFactory::getInstance() realObject->setInodeThreads(ui->inodeThreads->value()); realObject->setRenameTheOriginalDestination(ui->renameTheOriginalDestination->isChecked()); realObject->setCheckDiskSpace(ui->checkDiskSpace->isChecked()); - realObject->setDefaultDestinationFolder(ui->defaultDestinationFolder->text()); + realObject->setDefaultDestinationFolder(ui->defaultDestinationFolder->text().toStdString()); realObject->setCopyListOrder(ui->copyListOrder->isChecked()); return newTransferEngine; } -void CopyEngineFactory::setResources(OptionInterface * options,const QString &writePath,const QString &pluginPath,FacilityInterface * facilityInterface,const bool &portableVersion) +void CopyEngineFactory::setResources(OptionInterface * options,const std::string &writePath,const std::string &pluginPath,FacilityInterface * facilityInterface,const bool &portableVersion) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start, writePath: ")+writePath+QStringLiteral(", pluginPath:")+pluginPath); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start, writePath: "+writePath+", pluginPath:"+pluginPath); this->facilityEngine=facilityInterface; Q_UNUSED(portableVersion); #ifndef ULTRACOPIER_PLUGIN_DEBUG @@ -157,23 +159,23 @@ void CopyEngineFactory::setResources(OptionInterface * options,const QString &wr #endif ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,COMPILERINFO); #if defined (ULTRACOPIER_PLUGIN_CHECKLISTTYPE) - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,QStringLiteral("CHECK LIST TYPE set")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"CHECK LIST TYPE set"); #else - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,QStringLiteral("CHECK LIST TYPE not set")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"CHECK LIST TYPE not set"); #endif if(options!=NULL) { //load the options - QList<QPair<QString, QVariant> > KeysList; - KeysList.append(qMakePair(QStringLiteral("doRightTransfer"),QVariant(true))); + std::vector<std::pair<std::string, std::string> > KeysList; + KeysList.push_back(std::pair<std::string, std::string>("doRightTransfer","true")); #ifndef Q_OS_LINUX - KeysList.append(qMakePair(QStringLiteral("keepDate"),QVariant(false))); + KeysList.push_back(std::pair<std::string, std::string>("keepDate","false")); #else - KeysList.append(qMakePair(QStringLiteral("keepDate"),QVariant(true))); + KeysList.push_back(std::pair<std::string, std::string>("keepDate","true")); #endif - KeysList.append(qMakePair(QStringLiteral("blockSize"),QVariant(ULTRACOPIER_PLUGIN_DEFAULT_BLOCK_SIZE))); - quint32 sequentialBuffer=ULTRACOPIER_PLUGIN_DEFAULT_BLOCK_SIZE*ULTRACOPIER_PLUGIN_DEFAULT_SEQUENTIAL_NUMBER_OF_BLOCK; - quint32 parallelBuffer=ULTRACOPIER_PLUGIN_DEFAULT_BLOCK_SIZE*ULTRACOPIER_PLUGIN_DEFAULT_PARALLEL_NUMBER_OF_BLOCK; + KeysList.push_back(std::pair<std::string, std::string>("blockSize",std::to_string(ULTRACOPIER_PLUGIN_DEFAULT_BLOCK_SIZE))); + uint32_t sequentialBuffer=ULTRACOPIER_PLUGIN_DEFAULT_BLOCK_SIZE*ULTRACOPIER_PLUGIN_DEFAULT_SEQUENTIAL_NUMBER_OF_BLOCK; + uint32_t parallelBuffer=ULTRACOPIER_PLUGIN_DEFAULT_BLOCK_SIZE*ULTRACOPIER_PLUGIN_DEFAULT_PARALLEL_NUMBER_OF_BLOCK; //to prevent swap and other bad effect, only under windows and unix for now #if defined(Q_OS_WIN32) or (defined(Q_OS_LINUX) and defined(_SC_PHYS_PAGES)) size_t max_memory=getTotalSystemMemory()/1024; @@ -184,95 +186,95 @@ void CopyEngineFactory::setResources(OptionInterface * options,const QString &wr if(parallelBuffer>(max_memory/100)) parallelBuffer=max_memory/100; } - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,QStringLiteral("detected memory: %1MB").arg(max_memory/1024)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,QStringLiteral("detected memory: %1MB").arg(max_memory/1024).toStdString()); #endif - KeysList.append(qMakePair(QStringLiteral("sequentialBuffer"),QVariant(sequentialBuffer))); - KeysList.append(qMakePair(QStringLiteral("parallelBuffer"),QVariant(parallelBuffer))); - KeysList.append(qMakePair(QStringLiteral("parallelizeIfSmallerThan"),QVariant(128)));//128KB, better for modern hardware: Multiple queue en linux, SSD, ... - KeysList.append(qMakePair(QStringLiteral("autoStart"),QVariant(true))); + KeysList.push_back(std::pair<std::string, std::string>("sequentialBuffer",std::to_string(sequentialBuffer))); + KeysList.push_back(std::pair<std::string, std::string>("parallelBuffer",std::to_string(parallelBuffer))); + KeysList.push_back(std::pair<std::string, std::string>("parallelizeIfSmallerThan",std::to_string(128)));//128KB, better for modern hardware: Multiple queue en linux, SSD, ... + KeysList.push_back(std::pair<std::string, std::string>("autoStart","true")); #ifdef ULTRACOPIER_PLUGIN_RSYNC - KeysList.append(qMakePair(QStringLiteral("rsync"),QVariant(true))); + KeysList.push_back(std::pair<std::string, std::string>("rsync","true")); #endif - KeysList.append(qMakePair(QStringLiteral("folderError"),QVariant(0))); - KeysList.append(qMakePair(QStringLiteral("folderCollision"),QVariant(0))); - KeysList.append(qMakePair(QStringLiteral("fileError"),QVariant(2))); - KeysList.append(qMakePair(QStringLiteral("fileCollision"),QVariant(0))); - KeysList.append(qMakePair(QStringLiteral("transferAlgorithm"),QVariant(0))); - KeysList.append(qMakePair(QStringLiteral("checkDestinationFolder"),QVariant(true))); - KeysList.append(qMakePair(QStringLiteral("includeStrings"),QVariant(QStringList()))); - KeysList.append(qMakePair(QStringLiteral("includeOptions"),QVariant(QStringList()))); - KeysList.append(qMakePair(QStringLiteral("excludeStrings"),QVariant(QStringList()))); - KeysList.append(qMakePair(QStringLiteral("excludeOptions"),QVariant(QStringList()))); - KeysList.append(qMakePair(QStringLiteral("doChecksum"),QVariant(false))); - KeysList.append(qMakePair(QStringLiteral("checksumIgnoreIfImpossible"),QVariant(true))); - KeysList.append(qMakePair(QStringLiteral("checksumOnlyOnError"),QVariant(true))); - KeysList.append(qMakePair(QStringLiteral("osBuffer"),QVariant(false))); - KeysList.append(qMakePair(QStringLiteral("firstRenamingRule"),QVariant(""))); - KeysList.append(qMakePair(QStringLiteral("otherRenamingRule"),QVariant(""))); - KeysList.append(qMakePair(QStringLiteral("osBufferLimited"),QVariant(false))); - KeysList.append(qMakePair(QStringLiteral("osBufferLimit"),QVariant(512))); - KeysList.append(qMakePair(QStringLiteral("deletePartiallyTransferredFiles"),QVariant(true))); - KeysList.append(qMakePair(QStringLiteral("moveTheWholeFolder"),QVariant(true))); - KeysList.append(qMakePair(QStringLiteral("followTheStrictOrder"),QVariant(false))); - KeysList.append(qMakePair(QStringLiteral("renameTheOriginalDestination"),QVariant(false))); - KeysList.append(qMakePair(QStringLiteral("checkDiskSpace"),QVariant(true))); - KeysList.append(qMakePair(QStringLiteral("defaultDestinationFolder"),QVariant(QString()))); - KeysList.append(qMakePair(QStringLiteral("inodeThreads"),QVariant(1))); - KeysList.append(qMakePair(QStringLiteral("copyListOrder"),QVariant(false))); + KeysList.push_back(std::pair<std::string, std::string>("folderError",std::to_string(0))); + KeysList.push_back(std::pair<std::string, std::string>("folderCollision",std::to_string(0))); + KeysList.push_back(std::pair<std::string, std::string>("fileError",std::to_string(2))); + KeysList.push_back(std::pair<std::string, std::string>("fileCollision",std::to_string(0))); + KeysList.push_back(std::pair<std::string, std::string>("transferAlgorithm",std::to_string(0))); + KeysList.push_back(std::pair<std::string, std::string>("checkDestinationFolder","true")); + KeysList.push_back(std::pair<std::string, std::string>("includeStrings","")); + KeysList.push_back(std::pair<std::string, std::string>("includeOptions","")); + KeysList.push_back(std::pair<std::string, std::string>("excludeStrings","")); + KeysList.push_back(std::pair<std::string, std::string>("excludeOptions","")); + KeysList.push_back(std::pair<std::string, std::string>("doChecksum","false")); + KeysList.push_back(std::pair<std::string, std::string>("checksumIgnoreIfImpossible","true")); + KeysList.push_back(std::pair<std::string, std::string>("checksumOnlyOnError","true")); + KeysList.push_back(std::pair<std::string, std::string>("osBuffer","false")); + KeysList.push_back(std::pair<std::string, std::string>("firstRenamingRule","")); + KeysList.push_back(std::pair<std::string, std::string>("otherRenamingRule","")); + KeysList.push_back(std::pair<std::string, std::string>("osBufferLimited","false")); + KeysList.push_back(std::pair<std::string, std::string>("osBufferLimit",std::to_string(512))); + KeysList.push_back(std::pair<std::string, std::string>("deletePartiallyTransferredFiles","true")); + KeysList.push_back(std::pair<std::string, std::string>("moveTheWholeFolder","true")); + KeysList.push_back(std::pair<std::string, std::string>("followTheStrictOrder","false")); + KeysList.push_back(std::pair<std::string, std::string>("renameTheOriginalDestination","false")); + KeysList.push_back(std::pair<std::string, std::string>("checkDiskSpace","true")); + KeysList.push_back(std::pair<std::string, std::string>("defaultDestinationFolder","")); + 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(options->getOptionValue(QStringLiteral("doRightTransfer")).toBool()); - ui->keepDate->setChecked(options->getOptionValue(QStringLiteral("keepDate")).toBool()); - ui->blockSize->setValue(options->getOptionValue(QStringLiteral("blockSize")).toUInt());//keep before sequentialBuffer and parallelBuffer - ui->autoStart->setChecked(options->getOptionValue(QStringLiteral("autoStart")).toBool()); + 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(options->getOptionValue(QStringLiteral("rsync")).toBool()); + ui->rsync->setChecked(stringtobool(options->getOptionValue("rsync"))); #else ui->label_rsync->setVisible(false); ui->rsync->setVisible(false); #endif - ui->comboBoxFolderError->setCurrentIndex(options->getOptionValue(QStringLiteral("folderError")).toUInt()); - ui->comboBoxFolderCollision->setCurrentIndex(options->getOptionValue(QStringLiteral("folderCollision")).toUInt()); - ui->comboBoxFileError->setCurrentIndex(options->getOptionValue(QStringLiteral("fileError")).toUInt()); - ui->comboBoxFileCollision->setCurrentIndex(options->getOptionValue(QStringLiteral("fileCollision")).toUInt()); - ui->transferAlgorithm->setCurrentIndex(options->getOptionValue(QStringLiteral("transferAlgorithm")).toUInt()); - ui->checkBoxDestinationFolderExists->setChecked(options->getOptionValue(QStringLiteral("checkDestinationFolder")).toBool()); - ui->parallelizeIfSmallerThan->setValue(options->getOptionValue(QStringLiteral("parallelizeIfSmallerThan")).toUInt()); - ui->sequentialBuffer->setValue(options->getOptionValue(QStringLiteral("sequentialBuffer")).toUInt()); - ui->parallelBuffer->setValue(options->getOptionValue(QStringLiteral("parallelBuffer")).toUInt()); + 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(options->getOptionValue(QStringLiteral("deletePartiallyTransferredFiles")).toBool()); - ui->moveTheWholeFolder->setChecked(options->getOptionValue(QStringLiteral("moveTheWholeFolder")).toBool()); - ui->followTheStrictOrder->setChecked(options->getOptionValue(QStringLiteral("followTheStrictOrder")).toBool()); - ui->inodeThreads->setValue(options->getOptionValue(QStringLiteral("inodeThreads")).toUInt()); - ui->renameTheOriginalDestination->setChecked(options->getOptionValue(QStringLiteral("renameTheOriginalDestination")).toBool()); - ui->checkDiskSpace->setChecked(options->getOptionValue(QStringLiteral("checkDiskSpace")).toBool()); - ui->defaultDestinationFolder->setText(options->getOptionValue(QStringLiteral("defaultDestinationFolder")).toString()); - - ui->doChecksum->setChecked(options->getOptionValue(QStringLiteral("doChecksum")).toBool()); - ui->checksumIgnoreIfImpossible->setChecked(options->getOptionValue(QStringLiteral("checksumIgnoreIfImpossible")).toBool()); - ui->checksumOnlyOnError->setChecked(options->getOptionValue(QStringLiteral("checksumOnlyOnError")).toBool()); - - ui->osBuffer->setChecked(options->getOptionValue(QStringLiteral("osBuffer")).toBool()); - ui->osBufferLimited->setChecked(options->getOptionValue(QStringLiteral("osBufferLimited")).toBool()); - ui->osBufferLimit->setValue(options->getOptionValue(QStringLiteral("osBufferLimit")).toUInt()); - //ui->autoStart->setChecked(options->getOptionValue(QStringLiteral("autoStart")).toBool());//moved from options(), wrong previous place - includeStrings=options->getOptionValue(QStringLiteral("includeStrings")).toStringList(); - includeOptions=options->getOptionValue(QStringLiteral("includeOptions")).toStringList(); - excludeStrings=options->getOptionValue(QStringLiteral("excludeStrings")).toStringList(); - excludeOptions=options->getOptionValue(QStringLiteral("excludeOptions")).toStringList(); + 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(QStringLiteral("firstRenamingRule")).toString(); - otherRenamingRule=options->getOptionValue(QStringLiteral("otherRenamingRule")).toString(); + 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(options->getOptionValue(QStringLiteral("copyListOrder")).toBool()); + ui->copyListOrder->setChecked(stringtobool(options->getOptionValue("copyListOrder"))); updateBufferCheckbox(); optionsEngine=options; @@ -281,14 +283,18 @@ void CopyEngineFactory::setResources(OptionInterface * options,const QString &wr } } -QStringList CopyEngineFactory::supportedProtocolsForTheSource() const +std::vector<std::string> CopyEngineFactory::supportedProtocolsForTheSource() const { - return QStringList() << QStringLiteral("file"); + std::vector<std::string> l; + l.push_back("file"); + return l; } -QStringList CopyEngineFactory::supportedProtocolsForTheDestination() const +std::vector<std::string> CopyEngineFactory::supportedProtocolsForTheDestination() const { - return QStringList() << QStringLiteral("file"); + std::vector<std::string> l; + l.push_back("file"); + return l; } Ultracopier::CopyType CopyEngineFactory::getCopyType() @@ -319,21 +325,21 @@ void CopyEngineFactory::setDoRightTransfer(bool doRightTransfer) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"the value have changed"); if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("doRightTransfer"),doRightTransfer); + optionsEngine->setOptionValue("doRightTransfer",booltostring(doRightTransfer)); } void CopyEngineFactory::setKeepDate(bool keepDate) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"the value have changed"); if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("keepDate"),keepDate); + optionsEngine->setOptionValue("keepDate",booltostring(keepDate)); } void CopyEngineFactory::setBlockSize(int blockSize) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"the value have changed"); if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("blockSize"),blockSize); + optionsEngine->setOptionValue("blockSize",std::to_string(blockSize)); updatedBlockSize(); } @@ -344,7 +350,7 @@ void CopyEngineFactory::setParallelBuffer(int parallelBuffer) ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"the value have changed"); parallelBuffer=round((float)parallelBuffer/(float)ui->blockSize->value())*ui->blockSize->value(); ui->parallelBuffer->setValue(parallelBuffer); - optionsEngine->setOptionValue(QStringLiteral("parallelBuffer"),parallelBuffer); + optionsEngine->setOptionValue("parallelBuffer",std::to_string(parallelBuffer)); } } @@ -352,10 +358,10 @@ void CopyEngineFactory::setSequentialBuffer(int sequentialBuffer) { if(optionsEngine!=NULL) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("the value have changed")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"the value have changed"); sequentialBuffer=round((float)sequentialBuffer/(float)ui->blockSize->value())*ui->blockSize->value(); ui->sequentialBuffer->setValue(sequentialBuffer); - optionsEngine->setOptionValue(QStringLiteral("sequentialBuffer"),sequentialBuffer); + optionsEngine->setOptionValue("sequentialBuffer",std::to_string(sequentialBuffer)); } } @@ -364,7 +370,7 @@ void CopyEngineFactory::setParallelizeIfSmallerThan(int parallelizeIfSmallerThan if(optionsEngine!=NULL) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"the value have changed"); - optionsEngine->setOptionValue(QStringLiteral("parallelizeIfSmallerThan"),parallelizeIfSmallerThan); + optionsEngine->setOptionValue("parallelizeIfSmallerThan",std::to_string(parallelizeIfSmallerThan)); } } @@ -372,35 +378,35 @@ void CopyEngineFactory::setAutoStart(bool autoStart) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"the value have changed"); if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("autoStart"),autoStart); + optionsEngine->setOptionValue("autoStart",booltostring(autoStart)); } void CopyEngineFactory::setFolderCollision(int index) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"the value have changed"); if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("folderCollision"),index); + optionsEngine->setOptionValue("folderCollision",std::to_string(index)); } void CopyEngineFactory::setFolderError(int index) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"the value have changed"); if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("folderError"),index); + optionsEngine->setOptionValue("folderError",std::to_string(index)); } void CopyEngineFactory::setTransferAlgorithm(int index) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"the value have changed"); if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("transferAlgorithm"),index); + optionsEngine->setOptionValue("transferAlgorithm",std::to_string(index)); } void CopyEngineFactory::setCheckDestinationFolder() { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"the value have changed"); if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("checkDestinationFolder"),ui->checkBoxDestinationFolderExists->isChecked()); + optionsEngine->setOptionValue("checkDestinationFolder",booltostring(ui->checkBoxDestinationFolderExists->isChecked())); } void CopyEngineFactory::newLanguageLoaded() @@ -445,21 +451,21 @@ void CopyEngineFactory::doChecksum_toggled(bool doChecksum) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"the value have changed"); if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("doChecksum"),doChecksum); + optionsEngine->setOptionValue("doChecksum",booltostring(doChecksum)); } void CopyEngineFactory::checksumOnlyOnError_toggled(bool checksumOnlyOnError) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"the value have changed"); if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("checksumOnlyOnError"),checksumOnlyOnError); + optionsEngine->setOptionValue("checksumOnlyOnError",booltostring(checksumOnlyOnError)); } void CopyEngineFactory::osBuffer_toggled(bool osBuffer) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"the value have changed"); if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("osBuffer"),osBuffer); + optionsEngine->setOptionValue("osBuffer",booltostring(osBuffer)); ui->osBufferLimit->setEnabled(ui->osBuffer->isChecked() && ui->osBufferLimited->isChecked()); } @@ -467,7 +473,7 @@ void CopyEngineFactory::osBufferLimited_toggled(bool osBufferLimited) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"the value have changed"); if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("osBufferLimited"),osBufferLimited); + optionsEngine->setOptionValue("osBufferLimited",booltostring(osBufferLimited)); ui->osBufferLimit->setEnabled(ui->osBuffer->isChecked() && ui->osBufferLimited->isChecked()); } @@ -475,7 +481,7 @@ void CopyEngineFactory::osBufferLimit_editingFinished() { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"the spinbox have changed"); if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("osBufferLimit"),ui->osBufferLimit->value()); + optionsEngine->setOptionValue("osBufferLimit",std::to_string(ui->osBufferLimit->value())); } void CopyEngineFactory::showFilterDialog() @@ -489,31 +495,31 @@ void CopyEngineFactory::showFilterDialog() filters->exec(); } -void CopyEngineFactory::sendNewFilters(const QStringList &includeStrings,const QStringList &includeOptions,const QStringList &excludeStrings,const QStringList &excludeOptions) +void CopyEngineFactory::sendNewFilters(const std::vector<std::string> &includeStrings,const std::vector<std::string> &includeOptions,const std::vector<std::string> &excludeStrings,const std::vector<std::string> &excludeOptions) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("new filter")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"new filter"); this->includeStrings=includeStrings; this->includeOptions=includeOptions; this->excludeStrings=excludeStrings; this->excludeOptions=excludeOptions; if(optionsEngine!=NULL) { - optionsEngine->setOptionValue(QStringLiteral("includeStrings"),includeStrings); - optionsEngine->setOptionValue(QStringLiteral("includeOptions"),includeOptions); - optionsEngine->setOptionValue(QStringLiteral("excludeStrings"),excludeStrings); - optionsEngine->setOptionValue(QStringLiteral("excludeOptions"),excludeOptions); + optionsEngine->setOptionValue("includeStrings",stringlisttostring(includeStrings)); + optionsEngine->setOptionValue("includeOptions",stringlisttostring(includeOptions)); + optionsEngine->setOptionValue("excludeStrings",stringlisttostring(excludeStrings)); + optionsEngine->setOptionValue("excludeOptions",stringlisttostring(excludeOptions)); } } -void CopyEngineFactory::sendNewRenamingRules(const QString &firstRenamingRule,const QString &otherRenamingRule) +void CopyEngineFactory::sendNewRenamingRules(const std::string &firstRenamingRule,const std::string &otherRenamingRule) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"new filter"); this->firstRenamingRule=firstRenamingRule; this->otherRenamingRule=otherRenamingRule; if(optionsEngine!=NULL) { - optionsEngine->setOptionValue(QStringLiteral("firstRenamingRule"),firstRenamingRule); - optionsEngine->setOptionValue(QStringLiteral("otherRenamingRule"),otherRenamingRule); + optionsEngine->setOptionValue("firstRenamingRule",firstRenamingRule); + optionsEngine->setOptionValue("otherRenamingRule",otherRenamingRule); } } @@ -538,12 +544,12 @@ void CopyEngineFactory::checksumIgnoreIfImpossible_toggled(bool checksumIgnoreIf { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"the value have changed"); if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("checksumIgnoreIfImpossible"),checksumIgnoreIfImpossible); + optionsEngine->setOptionValue("checksumIgnoreIfImpossible",booltostring(checksumIgnoreIfImpossible)); } void CopyEngineFactory::setFileCollision(int index) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("action index: %1").arg(index)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"action index: "+std::to_string(index)); if(optionsEngine==NULL) return; switch(index) @@ -555,7 +561,7 @@ void CopyEngineFactory::setFileCollision(int index) case 4: case 5: case 6: - optionsEngine->setOptionValue(QStringLiteral("fileCollision"),index); + optionsEngine->setOptionValue("fileCollision",std::to_string(index)); break; default: ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Error, unknow index, ignored"); @@ -565,7 +571,7 @@ void CopyEngineFactory::setFileCollision(int index) void CopyEngineFactory::setFileError(int index) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("action index: %1").arg(index)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"action index: "+std::to_string(index)); if(optionsEngine==NULL) return; switch(index) @@ -573,7 +579,7 @@ void CopyEngineFactory::setFileError(int index) case 0: case 1: case 2: - optionsEngine->setOptionValue(QStringLiteral("fileError"),index); + optionsEngine->setOptionValue("fileError",std::to_string(index)); break; default: ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Error, unknow index, ignored"); @@ -597,26 +603,28 @@ void CopyEngineFactory::deletePartiallyTransferredFiles(bool checked) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"the value have changed"); if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("deletePartiallyTransferredFiles"),checked); + optionsEngine->setOptionValue("deletePartiallyTransferredFiles",booltostring(checked)); } void CopyEngineFactory::renameTheOriginalDestination(bool checked) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"the value have changed"); if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("renameTheOriginalDestination"),checked); + optionsEngine->setOptionValue("renameTheOriginalDestination",booltostring(checked)); } void CopyEngineFactory::checkDiskSpace(bool checked) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"the value have changed"); if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("checkDiskSpace"),checked); + optionsEngine->setOptionValue("checkDiskSpace",booltostring(checked)); } void CopyEngineFactory::defaultDestinationFolderBrowse() { - QString destination = QFileDialog::getExistingDirectory(ui->defaultDestinationFolder,facilityEngine->translateText(QStringLiteral("Select destination directory")),QStringLiteral(""),QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks); + QString destination = QFileDialog::getExistingDirectory(ui->defaultDestinationFolder, + QString::fromStdString(facilityEngine->translateText("Select destination directory")), + "",QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks); if(destination.isEmpty()) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"Canceled by the user"); @@ -625,35 +633,35 @@ void CopyEngineFactory::defaultDestinationFolderBrowse() ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"the value have changed"); ui->defaultDestinationFolder->setText(destination); if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("defaultDestinationFolder"),destination); + optionsEngine->setOptionValue("defaultDestinationFolder",destination.toStdString()); } void CopyEngineFactory::defaultDestinationFolder() { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"the value have changed"); if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("defaultDestinationFolder"),ui->defaultDestinationFolder->text()); + optionsEngine->setOptionValue("defaultDestinationFolder",ui->defaultDestinationFolder->text().toStdString()); } void CopyEngineFactory::followTheStrictOrder(bool checked) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"the value have changed"); if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("followTheStrictOrder"),checked); + optionsEngine->setOptionValue("followTheStrictOrder",booltostring(checked)); } void CopyEngineFactory::moveTheWholeFolder(bool checked) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"the value have changed"); if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("moveTheWholeFolder"),checked); + optionsEngine->setOptionValue("moveTheWholeFolder",booltostring(checked)); } void CopyEngineFactory::on_inodeThreads_editingFinished() { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"the spinbox have changed"); if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("inodeThreads"),ui->inodeThreads->value()); + optionsEngine->setOptionValue("inodeThreads",std::to_string(ui->inodeThreads->value())); } #ifdef Q_OS_WIN32 @@ -680,7 +688,7 @@ void CopyEngineFactory::setRsync(bool rsync) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"the value have changed"); if(optionsEngine!=NULL) - optionsEngine->setOptionValue("rsync",rsync); + optionsEngine->setOptionValue("rsync",std::to_string(rsync)); } #endif @@ -688,5 +696,5 @@ void CopyEngineFactory::copyListOrder(bool checked) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"the value have changed"); if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("copyListOrder"),checked); + optionsEngine->setOptionValue("copyListOrder",booltostring(checked)); } diff --git a/plugins/CopyEngine/Ultracopier/CopyEngineFactory.h b/plugins/CopyEngine/Ultracopier/CopyEngineFactory.h index 548588f..59c4208 100644 --- a/plugins/CopyEngine/Ultracopier/CopyEngineFactory.h +++ b/plugins/CopyEngine/Ultracopier/CopyEngineFactory.h @@ -52,7 +52,7 @@ public: /// \brief to return the instance of the copy engine PluginInterface_CopyEngine * getInstance(); /// \brief set the resources, to store options, to have facilityInterface - void setResources(OptionInterface * options,const QString &writePath,const QString &pluginPath,FacilityInterface * facilityInterface,const bool &portableVersion); + void setResources(OptionInterface * options,const std::string &writePath,const std::string &pluginPath,FacilityInterface * facilityInterface,const bool &portableVersion); //get mode allowed /// \brief define if can copy file, folder or both Ultracopier::CopyType getCopyType(); @@ -61,9 +61,9 @@ public: /// \brief define if can only copy, or copy and move bool canDoOnlyCopy() const; /// \brief to get the supported protocols for the source - QStringList supportedProtocolsForTheSource() const; + std::vector<std::string> supportedProtocolsForTheSource() const; /// \brief to get the supported protocols for the destination - QStringList supportedProtocolsForTheDestination() const; + std::vector<std::string> supportedProtocolsForTheDestination() const; /// \brief to get the options of the copy engine QWidget * options(); @@ -77,8 +77,8 @@ private: RenamingRules *renamingRules; QStorageInfo storageInfo; QTimer lunchInitFunction; - QStringList includeStrings,includeOptions,excludeStrings,excludeOptions; - QString firstRenamingRule,otherRenamingRule; + std::vector<std::string> includeStrings,includeOptions,excludeStrings,excludeOptions; + std::string firstRenamingRule,otherRenamingRule; #if defined(Q_OS_WIN32) || (defined(Q_OS_LINUX) && defined(_SC_PHYS_PAGES)) static size_t getTotalSystemMemory(); @@ -100,14 +100,15 @@ private slots: void setTransferAlgorithm(int index); void setCheckDestinationFolder(); void showFilterDialog(); - void sendNewFilters(const QStringList &includeStrings,const QStringList &includeOptions,const QStringList &excludeStrings,const QStringList &excludeOptions); + void sendNewFilters(const std::vector<std::string> &includeStrings,const std::vector<std::string> &includeOptions, + const std::vector<std::string> &excludeStrings,const std::vector<std::string> &excludeOptions); void doChecksum_toggled(bool); void checksumOnlyOnError_toggled(bool); void osBuffer_toggled(bool); void osBufferLimited_toggled(bool); void osBufferLimit_editingFinished(); void checksumIgnoreIfImpossible_toggled(bool); - void sendNewRenamingRules(const QString &firstRenamingRule, const QString &otherRenamingRule); + void sendNewRenamingRules(const std::string &firstRenamingRule, const std::string &otherRenamingRule); void showRenamingRules(); void updateBufferCheckbox(); void setFileCollision(int index); diff --git a/plugins/CopyEngine/Ultracopier/DebugDialog.cpp b/plugins/CopyEngine/Ultracopier/DebugDialog.cpp index a20f054..0b3fec4 100644 --- a/plugins/CopyEngine/Ultracopier/DebugDialog.cpp +++ b/plugins/CopyEngine/Ultracopier/DebugDialog.cpp @@ -19,10 +19,15 @@ DebugDialog::~DebugDialog() delete ui; } -void DebugDialog::setTransferList(const QStringList &list) +void DebugDialog::setTransferList(const std::vector<std::string> &list) { ui->tranferList->clear(); - ui->tranferList->addItems(list); + unsigned int index=0; + while(index<list.size()) + { + ui->tranferList->addItem(QString::fromStdString(list.at(index))); + index++; + } } void DebugDialog::setActiveTransfer(const int &activeTransfer) @@ -35,10 +40,15 @@ void DebugDialog::setInodeUsage(const int &inodeUsage) ui->spinBoxNumberOfInode->setValue(inodeUsage); } -void DebugDialog::setTransferThreadList(const QStringList &list) +void DebugDialog::setTransferThreadList(const std::vector<std::string> &list) { ui->transferThreadList->clear(); - ui->transferThreadList->addItems(list); + unsigned int index=0; + while(index<list.size()) + { + ui->transferThreadList->addItem(QString::fromStdString(list.at(index))); + index++; + } } #endif diff --git a/plugins/CopyEngine/Ultracopier/DebugDialog.h b/plugins/CopyEngine/Ultracopier/DebugDialog.h index d2b1d6b..c84cfaa 100644 --- a/plugins/CopyEngine/Ultracopier/DebugDialog.h +++ b/plugins/CopyEngine/Ultracopier/DebugDialog.h @@ -23,9 +23,9 @@ public: explicit DebugDialog(QWidget *parent = 0); ~DebugDialog(); /// \brief to set the transfer list, limited in result to not slow down the application - void setTransferList(const QStringList &list); + void setTransferList(const std::vector<std::string> &list); /// \brief show the transfer thread, it show be a thread pool in normal time - void setTransferThreadList(const QStringList &list); + void setTransferThreadList(const std::vector<std::string> &list); /// \brief show how many transfer is active void setActiveTransfer(const int &activeTransfer); /// \brief show many many inode is manipulated diff --git a/plugins/CopyEngine/Ultracopier/DiskSpace.cpp b/plugins/CopyEngine/Ultracopier/DiskSpace.cpp index 2b8fec7..e9b996d 100644 --- a/plugins/CopyEngine/Ultracopier/DiskSpace.cpp +++ b/plugins/CopyEngine/Ultracopier/DiskSpace.cpp @@ -2,7 +2,7 @@ #include "ui_DiskSpace.h" #include "StructEnumDefinition_CopyEngine.h" -DiskSpace::DiskSpace(FacilityInterface * facilityEngine,QList<Diskspace> list,QWidget *parent) : +DiskSpace::DiskSpace(FacilityInterface * facilityEngine,std::vector<Diskspace> list,QWidget *parent) : QDialog(parent), ui(new Ui::DiskSpace) { @@ -21,9 +21,9 @@ DiskSpace::DiskSpace(FacilityInterface * facilityEngine,QList<Diskspace> list,QW while(index<size) { drives+=tr("Drives %1 have %2 available but need %3") - .arg(list.at(index).drive) - .arg(facilityEngine->sizeToString(list.at(index).freeSpace)) - .arg(facilityEngine->sizeToString(list.at(index).requiredSpace)); + .arg(QString::fromStdString(list.at(index).drive)) + .arg(QString::fromStdString(facilityEngine->sizeToString(list.at(index).freeSpace))) + .arg(QString::fromStdString(facilityEngine->sizeToString(list.at(index).requiredSpace))); drives+=QStringLiteral("<br />"); index++; } diff --git a/plugins/CopyEngine/Ultracopier/DiskSpace.h b/plugins/CopyEngine/Ultracopier/DiskSpace.h index 7d52b52..5a923ab 100644 --- a/plugins/CopyEngine/Ultracopier/DiskSpace.h +++ b/plugins/CopyEngine/Ultracopier/DiskSpace.h @@ -2,6 +2,7 @@ #define DISKSPACE_H #include <QDialog> +#include <vector> #include "../../../interface/PluginInterface_CopyEngine.h" #include "StructEnumDefinition_CopyEngine.h" @@ -14,7 +15,7 @@ class DiskSpace : public QDialog Q_OBJECT public: - explicit DiskSpace(FacilityInterface * facilityEngine,QList<Diskspace> list,QWidget *parent = 0); + explicit DiskSpace(FacilityInterface * facilityEngine,std::vector<Diskspace> list,QWidget *parent = 0); ~DiskSpace(); bool getAction() const; private slots: diff --git a/plugins/CopyEngine/Ultracopier/DriveManagement.cpp b/plugins/CopyEngine/Ultracopier/DriveManagement.cpp index 221b4e8..8deaf3c 100644 --- a/plugins/CopyEngine/Ultracopier/DriveManagement.cpp +++ b/plugins/CopyEngine/Ultracopier/DriveManagement.cpp @@ -4,75 +4,77 @@ #include <QFileInfoList> #include <QStorageInfo> +#include "../../../cpp11addition.h" + DriveManagement::DriveManagement() { tryUpdate(); #ifdef Q_OS_WIN32 - reg1=QRegularExpression(QStringLiteral("^(\\\\\\\\|//)[^\\\\\\\\/]+(\\\\|/)[^\\\\\\\\/]+")); - reg2=QRegularExpression(QStringLiteral("^((\\\\\\\\|//)[^\\\\\\\\/]+(\\\\|/)[^\\\\\\\\/]+).*$")); - reg3=QRegularExpression(QStringLiteral("^[a-zA-Z]:[\\\\/]")); - reg4=QRegularExpression(QStringLiteral("^([a-zA-Z]:[\\\\/]).*$")); + reg1=std::regex("^(\\\\\\\\|//)[^\\\\\\\\/]+(\\\\|/)[^\\\\\\\\/]+"); + reg2=std::regex("^((\\\\\\\\|//)[^\\\\\\\\/]+(\\\\|/)[^\\\\\\\\/]+).*$"); + reg3=std::regex("^[a-zA-Z]:[\\\\/]"); + reg4=std::regex("^([a-zA-Z]:[\\\\/]).*$"); #endif /// \warn ULTRACOPIER_DEBUGCONSOLE() don't work here because the sinal slot is not connected! } //get drive of an file or folder -QString DriveManagement::getDrive(const QString &fileOrFolder) const +std::string DriveManagement::getDrive(const std::string &fileOrFolder) const { - const QString &inode=QDir::toNativeSeparators(fileOrFolder); + const std::string &inode=QDir::toNativeSeparators(QString::fromStdString(fileOrFolder)).toStdString(); int size=mountSysPoint.size(); for (int i = 0; i < size; ++i) { - if(inode.startsWith(mountSysPoint.at(i))) - return QDir::toNativeSeparators(mountSysPoint.at(i)); + if(stringStartWith(inode,mountSysPoint.at(i))) + return QDir::toNativeSeparators(QString::fromStdString(mountSysPoint.at(i))).toStdString(); } #ifdef Q_OS_WIN32 - if(fileOrFolder.contains(reg1)) + if(std::regex_match(fileOrFolder,reg1)) { - QString returnString=fileOrFolder; - returnString.replace(reg2,QStringLiteral("\\1")); + std::string returnString=fileOrFolder; + std::regex_replace(returnString,reg2,"$1"); return returnString; } //due to lack of WMI support into mingw, the new drive event is never called, this is a workaround - if(fileOrFolder.contains(reg3)) + if(std::regex_match(fileOrFolder,reg3)) { - QString returnString=fileOrFolder; - returnString.replace(reg4,QStringLiteral("\\1")); - return QDir::toNativeSeparators(returnString).toUpper(); + std::string returnString=fileOrFolder; + std::regex_replace(returnString,reg4,"$1"); + return QDir::toNativeSeparators(QString::fromStdString(returnString)).toUpper().toStdString(); } #endif //if unable to locate the right mount point - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("unable to locate the right mount point for: %1, mount point: %2").arg(fileOrFolder).arg(mountSysPoint.join(";"))); - return QString(); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"unable to locate the right mount point for: "+fileOrFolder+", mount point: "+stringimplode(mountSysPoint,";")); + return std::string(); } -QByteArray DriveManagement::getDriveType(const QString &drive) const +QByteArray DriveManagement::getDriveType(const std::string &drive) const { - int index=mountSysPoint.indexOf(drive); + int index=vectorindexOf(mountSysPoint,drive); if(index!=-1) return driveType.at(index); return QByteArray(); } -bool DriveManagement::isSameDrive(const QString &file1,const QString &file2) const +bool DriveManagement::isSameDrive(const std::string &file1,const std::string &file2) const { if(mountSysPoint.size()==0) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("no mount point found")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"no mount point found"); return false; } - const QString &drive1=getDrive(file1); - if(drive1.isEmpty()) + const std::string &drive1=getDrive(file1); + if(drive1.empty()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("drive for the file1 not found: %1").arg(file1)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"drive for the file1 not found: "+file1); return false; } - const QString &drive2=getDrive(file2); - if(drive2.isEmpty()) + const std::string &drive2=getDrive(file2); + if(drive2.empty()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("drive for the file2 not found: %1").arg(file2)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"drive for the file2 not found: "+file2); return false; } - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("%1 is egal to %2?").arg(drive1).arg(drive2)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,drive1+" is egal to "+drive2); if(drive1==drive2) return true; else @@ -87,15 +89,15 @@ void DriveManagement::tryUpdate() int index=0; while(index<mountedVolumesList.size()) { - mountSysPoint << QDir::toNativeSeparators(mountedVolumesList.at(index).rootPath()); + mountSysPoint.push_back(QDir::toNativeSeparators(mountedVolumesList.at(index).rootPath()).toStdString()); #ifdef Q_OS_WIN32 - if(mountSysPoint.last()!="A:\\" && mountSysPoint.last()!="A:/" && mountSysPoint.last()!="A:" && mountSysPoint.last()!="A" && - mountSysPoint.last()!="a:\\" && mountSysPoint.last()!="a:/" && mountSysPoint.last()!="a:" && mountSysPoint.last()!="a") - driveType << mountedVolumesList.at(index).fileSystemType(); + if(mountSysPoint.back()!="A:\\" && mountSysPoint.back()!="A:/" && mountSysPoint.back()!="A:" && mountSysPoint.back()!="A" && + mountSysPoint.back()!="a:\\" && mountSysPoint.back()!="a:/" && mountSysPoint.back()!="a:" && mountSysPoint.back()!="a") + driveType.push_back(mountedVolumesList.at(index).fileSystemType()); else - driveType << QByteArray(); + driveType.push_back(QByteArray()); #else - driveType << mountedVolumesList.at(index).fileSystemType(); + driveType.push_back(mountedVolumesList.at(index).fileSystemType()); #endif index++; } diff --git a/plugins/CopyEngine/Ultracopier/DriveManagement.h b/plugins/CopyEngine/Ultracopier/DriveManagement.h index 765a753..8013b7c 100644 --- a/plugins/CopyEngine/Ultracopier/DriveManagement.h +++ b/plugins/CopyEngine/Ultracopier/DriveManagement.h @@ -15,20 +15,20 @@ class DriveManagement : public QObject Q_OBJECT public: explicit DriveManagement(); - bool isSameDrive(const QString &file1,const QString &file2) const; + bool isSameDrive(const std::string &file1, const std::string &file2) const; /// \brief get drive of an file or folder - QString getDrive(const QString &fileOrFolder) const; - QByteArray getDriveType(const QString &drive) const; + std::string getDrive(const std::string &fileOrFolder) const; + QByteArray getDriveType(const std::string &drive) const; void tryUpdate(); protected: - QStringList mountSysPoint; - QList<QByteArray> driveType; + std::vector<std::string> mountSysPoint; + std::vector<QByteArray> driveType; #ifdef Q_OS_WIN32 - QRegularExpression reg1,reg2,reg3,reg4; + std::regex reg1,reg2,reg3,reg4; #endif signals: /// \brief To debug source - void debugInformation(const Ultracopier::DebugLevel &level,const QString &fonction,const QString &text,const QString &file,const int &ligne) const; + void debugInformation(const Ultracopier::DebugLevel &level,const std::string &fonction,const std::string &text,const std::string &file,const int &ligne) const; }; #endif // DRIVEMANAGEMENT_H diff --git a/plugins/CopyEngine/Ultracopier/FileErrorDialog.cpp b/plugins/CopyEngine/Ultracopier/FileErrorDialog.cpp index 736cfeb..d88fb90 100644 --- a/plugins/CopyEngine/Ultracopier/FileErrorDialog.cpp +++ b/plugins/CopyEngine/Ultracopier/FileErrorDialog.cpp @@ -6,7 +6,7 @@ bool FileErrorDialog::isInAdmin=false; -FileErrorDialog::FileErrorDialog(QWidget *parent, QFileInfo fileInfo, QString errorString, const ErrorType &errorType) : +FileErrorDialog::FileErrorDialog(QWidget *parent, QFileInfo fileInfo, std::string errorString, const ErrorType &errorType) : QDialog(parent), ui(new Ui::fileErrorDialog) { @@ -19,10 +19,10 @@ FileErrorDialog::FileErrorDialog(QWidget *parent, QFileInfo fileInfo, QString er ui->setupUi(this); action=FileError_Cancel; - ui->label_error->setText(errorString); + ui->label_error->setText(QString::fromStdString(errorString)); if(fileInfo.exists()) { - ui->label_content_file_name->setText(TransferThread::resolvedName(fileInfo)); + ui->label_content_file_name->setText(QString::fromStdString(TransferThread::resolvedName(fileInfo))); if(ui->label_content_file_name->text().isEmpty()) { ui->label_content_file_name->setText(fileInfo.absoluteFilePath()); @@ -63,7 +63,7 @@ FileErrorDialog::FileErrorDialog(QWidget *parent, QFileInfo fileInfo, QString er } else { - ui->label_content_file_name->setText(TransferThread::resolvedName(fileInfo)); + ui->label_content_file_name->setText(QString::fromStdString(TransferThread::resolvedName(fileInfo))); if(ui->label_content_file_name->text().isEmpty()) { ui->label_content_file_name->setText(fileInfo.absoluteFilePath()); diff --git a/plugins/CopyEngine/Ultracopier/FileErrorDialog.h b/plugins/CopyEngine/Ultracopier/FileErrorDialog.h index 09a481e..133a8b0 100644 --- a/plugins/CopyEngine/Ultracopier/FileErrorDialog.h +++ b/plugins/CopyEngine/Ultracopier/FileErrorDialog.h @@ -25,7 +25,7 @@ class FileErrorDialog : public QDialog Q_OBJECT public: /// \brief create the object and pass all the informations to it - explicit FileErrorDialog(QWidget *parent,QFileInfo fileInfo,QString errorString,const ErrorType &errorType); + explicit FileErrorDialog(QWidget *parent,QFileInfo fileInfo,std::string errorString,const ErrorType &errorType); ~FileErrorDialog(); /// \brief return the the always checkbox is checked bool getAlways(); diff --git a/plugins/CopyEngine/Ultracopier/FileExistsDialog.cpp b/plugins/CopyEngine/Ultracopier/FileExistsDialog.cpp index 0e3ca78..91df1f8 100644 --- a/plugins/CopyEngine/Ultracopier/FileExistsDialog.cpp +++ b/plugins/CopyEngine/Ultracopier/FileExistsDialog.cpp @@ -2,11 +2,17 @@ #include "ui_fileExistsDialog.h" #include "TransferThread.h" +#ifdef Q_OS_WIN32 +#define CURRENTSEPARATOR "\\" +#else +#define CURRENTSEPARATOR "/" +#endif + #include <QRegularExpression> #include <QFileInfo> #include <QMessageBox> -FileExistsDialog::FileExistsDialog(QWidget *parent,QFileInfo source,QFileInfo destination,QString firstRenamingRule,QString otherRenamingRule) : +FileExistsDialog::FileExistsDialog(QWidget *parent, QFileInfo source, QFileInfo destination, std::string firstRenamingRule, std::string otherRenamingRule) : QDialog(parent), ui(new Ui::fileExistsDialog) { @@ -21,20 +27,20 @@ FileExistsDialog::FileExistsDialog(QWidget *parent,QFileInfo source,QFileInfo de action=FileExists_Cancel; destinationInfo=destination; oldName=TransferThread::resolvedName(destination); - ui->lineEditNewName->setText(oldName); - ui->lineEditNewName->setPlaceholderText(oldName); + ui->lineEditNewName->setText(QString::fromStdString(oldName)); + ui->lineEditNewName->setPlaceholderText(QString::fromStdString(oldName)); ui->Overwrite->addAction(ui->actionOverwrite_if_newer); ui->Overwrite->addAction(ui->actionOverwrite_if_not_same_modification_date); ui->label_content_source_size->setText(QString::number(source.size())); ui->label_content_source_modified->setText(source.lastModified().toString()); - ui->label_content_source_file_name->setText(TransferThread::resolvedName(source)); + ui->label_content_source_file_name->setText(QString::fromStdString(TransferThread::resolvedName(source))); QString folder=source.absolutePath(); if(folder.size()>80) folder=folder.mid(0,38)+"..."+folder.mid(folder.size()-38); ui->label_content_source_folder->setText(folder); ui->label_content_destination_size->setText(QString::number(destination.size())); ui->label_content_destination_modified->setText(destination.lastModified().toString()); - ui->label_content_destination_file_name->setText(TransferThread::resolvedName(destination)); + ui->label_content_destination_file_name->setText(QString::fromStdString(TransferThread::resolvedName(destination))); folder=destination.absolutePath(); if(folder.size()>80) folder=folder.mid(0,38)+"..."+folder.mid(folder.size()-38); @@ -98,19 +104,19 @@ void FileExistsDialog::changeEvent(QEvent *e) } } -QString FileExistsDialog::getNewName() +std::string FileExistsDialog::getNewName() { - if(oldName==ui->lineEditNewName->text() || ui->checkBoxAlways->isChecked()) + if(oldName==ui->lineEditNewName->text().toStdString() || ui->checkBoxAlways->isChecked()) return oldName; else - return ui->lineEditNewName->text(); + return ui->lineEditNewName->text().toStdString(); } void FileExistsDialog::on_SuggestNewName_clicked() { QFileInfo destinationInfo=this->destinationInfo; QString absolutePath=destinationInfo.absolutePath(); - QString fileName=TransferThread::resolvedName(destinationInfo); + QString fileName=QString::fromStdString(TransferThread::resolvedName(destinationInfo)); QString suffix=""; QString destination; QString newFileName; @@ -127,26 +133,26 @@ void FileExistsDialog::on_SuggestNewName_clicked() { if(num==1) { - if(firstRenamingRule==QStringLiteral("")) + if(firstRenamingRule.empty()) newFileName=tr("%1 - copy").arg(fileName); else { - newFileName=firstRenamingRule; + newFileName=QString::fromStdString(firstRenamingRule); newFileName.replace("%name%",fileName); } } else { - if(otherRenamingRule=="") + if(otherRenamingRule.empty()) newFileName=tr("%1 - copy (%2)").arg(fileName).arg(num); else { - newFileName=otherRenamingRule; + newFileName=QString::fromStdString(otherRenamingRule); newFileName.replace(QStringLiteral("%name%"),fileName); newFileName.replace(QStringLiteral("%number%"),QString::number(num)); } } - destination=absolutePath+QDir::separator()+newFileName+suffix; + destination=absolutePath+CURRENTSEPARATOR+newFileName+suffix; destinationInfo.setFile(destination); num++; } @@ -202,7 +208,7 @@ bool FileExistsDialog::getAlways() void FileExistsDialog::updateRenameButton() { - ui->Rename->setEnabled(ui->checkBoxAlways->isChecked() || (!ui->lineEditNewName->text().contains(QRegularExpression("[/\\\\\\*]")) && oldName!=ui->lineEditNewName->text() && !ui->lineEditNewName->text().isEmpty())); + ui->Rename->setEnabled(ui->checkBoxAlways->isChecked() || (!ui->lineEditNewName->text().contains(QRegularExpression("[/\\\\\\*]")) && oldName!=ui->lineEditNewName->text().toStdString() && !ui->lineEditNewName->text().isEmpty())); } void FileExistsDialog::on_checkBoxAlways_toggled(bool checked) diff --git a/plugins/CopyEngine/Ultracopier/FileExistsDialog.h b/plugins/CopyEngine/Ultracopier/FileExistsDialog.h index c637e3b..05ff7e0 100644 --- a/plugins/CopyEngine/Ultracopier/FileExistsDialog.h +++ b/plugins/CopyEngine/Ultracopier/FileExistsDialog.h @@ -24,14 +24,14 @@ class FileExistsDialog : public QDialog Q_OBJECT public: /// \brief create the object and pass all the informations to it - explicit FileExistsDialog(QWidget *parent,QFileInfo source,QFileInfo destination,QString firstRenamingRule,QString otherRenamingRule); + explicit FileExistsDialog(QWidget *parent,QFileInfo source,QFileInfo destination,std::string firstRenamingRule,std::string otherRenamingRule); ~FileExistsDialog(); /// \brief return the the always checkbox is checked bool getAlways(); /// \brief return the action clicked FileExistsAction getAction(); /// \brief return the new rename is case in manual renaming - QString getNewName(); + std::string getNewName(); protected: void changeEvent(QEvent *e); private slots: @@ -51,10 +51,10 @@ private slots: private: Ui::fileExistsDialog *ui; FileExistsAction action; - QString oldName; + std::string oldName; QFileInfo destinationInfo; - QString firstRenamingRule; - QString otherRenamingRule; + std::string firstRenamingRule; + std::string otherRenamingRule; }; #endif // FILEEXISTSDIALOG_H diff --git a/plugins/CopyEngine/Ultracopier/FileIsSameDialog.cpp b/plugins/CopyEngine/Ultracopier/FileIsSameDialog.cpp index 7f3d565..3bee3ae 100644 --- a/plugins/CopyEngine/Ultracopier/FileIsSameDialog.cpp +++ b/plugins/CopyEngine/Ultracopier/FileIsSameDialog.cpp @@ -2,11 +2,17 @@ #include "ui_fileIsSameDialog.h" #include "TransferThread.h" +#ifdef Q_OS_WIN32 +#define CURRENTSEPARATOR "\\" +#else +#define CURRENTSEPARATOR "/" +#endif + #include <QRegularExpression> #include <QFileInfo> #include <QMessageBox> -FileIsSameDialog::FileIsSameDialog(QWidget *parent,QFileInfo fileInfo,QString firstRenamingRule,QString otherRenamingRule) : +FileIsSameDialog::FileIsSameDialog(QWidget *parent, QFileInfo fileInfo, std::string firstRenamingRule, std::string otherRenamingRule) : QDialog(parent), ui(new Ui::fileIsSameDialog) { @@ -21,11 +27,11 @@ FileIsSameDialog::FileIsSameDialog(QWidget *parent,QFileInfo fileInfo,QString fi action=FileExists_Cancel; oldName=TransferThread::resolvedName(fileInfo); destinationInfo=fileInfo; - ui->lineEditNewName->setText(oldName); - ui->lineEditNewName->setPlaceholderText(oldName); + ui->lineEditNewName->setText(QString::fromStdString(oldName)); + ui->lineEditNewName->setPlaceholderText(QString::fromStdString(oldName)); ui->label_content_size->setText(QString::number(fileInfo.size())); ui->label_content_modified->setText(fileInfo.lastModified().toString()); - ui->label_content_file_name->setText(TransferThread::resolvedName(fileInfo)); + ui->label_content_file_name->setText(QString::fromStdString(TransferThread::resolvedName(fileInfo))); QString folder=fileInfo.absolutePath(); if(folder.size()>80) folder=folder.mid(0,38)+"..."+folder.mid(folder.size()-38); @@ -72,19 +78,19 @@ void FileIsSameDialog::changeEvent(QEvent *e) } } -QString FileIsSameDialog::getNewName() +std::string FileIsSameDialog::getNewName() { - if(oldName==ui->lineEditNewName->text() || ui->checkBoxAlways->isChecked()) + if(oldName==ui->lineEditNewName->text().toStdString() || ui->checkBoxAlways->isChecked()) return oldName; else - return ui->lineEditNewName->text(); + return ui->lineEditNewName->text().toStdString(); } void FileIsSameDialog::on_SuggestNewName_clicked() { QFileInfo destinationInfo=this->destinationInfo; QString absolutePath=destinationInfo.absolutePath(); - QString fileName=TransferThread::resolvedName(destinationInfo); + QString fileName=QString::fromStdString(TransferThread::resolvedName(destinationInfo)); QString suffix=""; QString destination; QString newFileName; @@ -101,26 +107,26 @@ void FileIsSameDialog::on_SuggestNewName_clicked() { if(num==1) { - if(firstRenamingRule=="") + if(firstRenamingRule.empty()) newFileName=tr("%1 - copy").arg(fileName); else { - newFileName=firstRenamingRule; + newFileName=QString::fromStdString(firstRenamingRule); newFileName.replace(QStringLiteral("%name%"),fileName); } } else { - if(otherRenamingRule=="") + if(otherRenamingRule.empty()) newFileName=tr("%1 - copy (%2)").arg(fileName).arg(num); else { - newFileName=otherRenamingRule; + newFileName=QString::fromStdString(otherRenamingRule); newFileName.replace(QStringLiteral("%name%"),fileName); newFileName.replace(QStringLiteral("%number%"),QString::number(num)); } } - destination=absolutePath+QDir::separator()+newFileName+suffix; + destination=absolutePath+CURRENTSEPARATOR+newFileName+suffix; destinationInfo.setFile(destination); num++; } @@ -158,7 +164,7 @@ bool FileIsSameDialog::getAlways() void FileIsSameDialog::updateRenameButton() { - ui->Rename->setEnabled(ui->checkBoxAlways->isChecked() || (!ui->lineEditNewName->text().contains(QRegularExpression("[/\\\\\\*]")) && oldName!=ui->lineEditNewName->text() && !ui->lineEditNewName->text().isEmpty())); + ui->Rename->setEnabled(ui->checkBoxAlways->isChecked() || (!ui->lineEditNewName->text().contains(QRegularExpression("[/\\\\\\*]")) && oldName!=ui->lineEditNewName->text().toStdString() && !ui->lineEditNewName->text().isEmpty())); } void FileIsSameDialog::on_lineEditNewName_textChanged(const QString &arg1) diff --git a/plugins/CopyEngine/Ultracopier/FileIsSameDialog.h b/plugins/CopyEngine/Ultracopier/FileIsSameDialog.h index c9be99c..5dc0067 100644 --- a/plugins/CopyEngine/Ultracopier/FileIsSameDialog.h +++ b/plugins/CopyEngine/Ultracopier/FileIsSameDialog.h @@ -24,14 +24,14 @@ class FileIsSameDialog : public QDialog Q_OBJECT public: /// \brief create the object and pass all the informations to it - explicit FileIsSameDialog(QWidget *parent,QFileInfo fileInfo,QString firstRenamingRule,QString otherRenamingRule); + explicit FileIsSameDialog(QWidget *parent,QFileInfo fileInfo,std::string firstRenamingRule,std::string otherRenamingRule); ~FileIsSameDialog(); /// \brief return the the always checkbox is checked bool getAlways(); /// \brief return the action clicked FileExistsAction getAction(); /// \brief return the new rename is case in manual renaming - QString getNewName(); + std::string getNewName(); protected: void changeEvent(QEvent *e); private slots: @@ -47,10 +47,10 @@ private slots: private: Ui::fileIsSameDialog *ui; FileExistsAction action; - QString oldName; + std::string oldName; QFileInfo destinationInfo; - QString firstRenamingRule; - QString otherRenamingRule; + std::string firstRenamingRule; + std::string otherRenamingRule; }; diff --git a/plugins/CopyEngine/Ultracopier/FilterRules.cpp b/plugins/CopyEngine/Ultracopier/FilterRules.cpp index 5d1827e..0f6bf2c 100644 --- a/plugins/CopyEngine/Ultracopier/FilterRules.cpp +++ b/plugins/CopyEngine/Ultracopier/FilterRules.cpp @@ -22,9 +22,9 @@ bool FilterRules::getIsValid() return isValid && haveBeenValided; } -QString FilterRules::get_search_text() +std::string FilterRules::get_search_text() { - return ui->search->text(); + return ui->search->text().toStdString(); } SearchType FilterRules::get_search_type() @@ -60,9 +60,9 @@ bool FilterRules::get_need_match_all() return ui->need_match_all->isChecked(); } -void FilterRules::set_search_text(QString search_text) +void FilterRules::set_search_text(std::string search_text) { - ui->search->setText(search_text); + ui->search->setText(QString::fromStdString(search_text)); } void FilterRules::set_search_type(SearchType search_type) @@ -102,7 +102,7 @@ void FilterRules::set_need_match_all(bool need_match_all) ui->need_match_all->setChecked(need_match_all); } -void FilterRules::on_search_textChanged(const QString &arg1) +void FilterRules::on_search_textChanged(const std::string &arg1) { Q_UNUSED(arg1); updateChecking(); @@ -159,7 +159,7 @@ void FilterRules::on_isValid_clicked() updateChecking(); } -void FilterRules::on_testString_textChanged(const QString &arg1) +void FilterRules::on_testString_textChanged(const std::string &arg1) { Q_UNUSED(arg1); updateChecking(); diff --git a/plugins/CopyEngine/Ultracopier/FilterRules.h b/plugins/CopyEngine/Ultracopier/FilterRules.h index f06f0cb..0838792 100644 --- a/plugins/CopyEngine/Ultracopier/FilterRules.h +++ b/plugins/CopyEngine/Ultracopier/FilterRules.h @@ -14,33 +14,33 @@ class FilterRules; /** All the filter rules to include/exclude some file during the listing */ class FilterRules : public QDialog { - Q_OBJECT - + Q_OBJECT + public: - explicit FilterRules(QWidget *parent = 0); - ~FilterRules(); - bool getIsValid(); - QString get_search_text(); - SearchType get_search_type(); - ApplyOn get_apply_on(); - bool get_need_match_all(); - void set_search_text(QString search_text); - void set_search_type(SearchType search_type); - void set_apply_on(ApplyOn apply_on); - void set_need_match_all(bool need_match_all); + explicit FilterRules(QWidget *parent = 0); + ~FilterRules(); + bool getIsValid(); + std::string get_search_text(); + SearchType get_search_type(); + ApplyOn get_apply_on(); + bool get_need_match_all(); + void set_search_text(std::string search_text); + void set_search_type(SearchType search_type); + void set_apply_on(ApplyOn apply_on); + void set_need_match_all(bool need_match_all); private slots: - void on_search_textChanged(const QString &arg1); - void on_isValid_clicked(); - void on_testString_textChanged(const QString &arg1); - void on_matched_clicked(); - void on_search_type_currentIndexChanged(int index); - void on_need_match_all_clicked(); - void on_buttonBox_clicked(QAbstractButton *button); + void on_search_textChanged(const std::string &arg1); + void on_isValid_clicked(); + void on_testString_textChanged(const std::string &arg1); + void on_matched_clicked(); + void on_search_type_currentIndexChanged(int index); + void on_need_match_all_clicked(); + void on_buttonBox_clicked(QAbstractButton *button); private: - Ui::FilterRules *ui; - void updateChecking(); - bool isValid; - bool haveBeenValided; + Ui::FilterRules *ui; + void updateChecking(); + bool isValid; + bool haveBeenValided; }; #endif // FILTERRULES_H diff --git a/plugins/CopyEngine/Ultracopier/Filters.cpp b/plugins/CopyEngine/Ultracopier/Filters.cpp index 3bb81d1..c7b1526 100644 --- a/plugins/CopyEngine/Ultracopier/Filters.cpp +++ b/plugins/CopyEngine/Ultracopier/Filters.cpp @@ -1,5 +1,6 @@ #include "Filters.h" #include "ui_Filters.h" +#include "../../../cpp11addition.h" #include <QRegularExpression> @@ -15,35 +16,35 @@ Filters::~Filters() delete ui; } -void Filters::setFilters(QStringList includeStrings,QStringList includeOptions,QStringList excludeStrings,QStringList excludeOptions) +void Filters::setFilters(std::vector<std::string> includeStrings,std::vector<std::string> includeOptions,std::vector<std::string> excludeStrings,std::vector<std::string> excludeOptions) { if(includeStrings.size()!=includeOptions.size() || excludeStrings.size()!=excludeOptions.size()) return; Filters_rules new_item; include.clear(); - int index=0; - while(index<includeStrings.size()) + unsigned int index=0; + while(index<(unsigned int)includeStrings.size()) { new_item.search_text=includeStrings.at(index); - QStringList options=includeOptions.at(index).split(QStringLiteral(";")); + std::vector<std::string> options=stringsplit(includeOptions.at(index),';'); new_item.need_match_all=false; new_item.search_type=SearchType_rawText; new_item.apply_on=ApplyOn_fileAndFolder; - if(options.contains(QStringLiteral("SearchType_simpleRegex"))) + if(vectorcontainsAtLeastOne(options,std::string("SearchType_simpleRegex"))) new_item.search_type=SearchType_simpleRegex; - if(options.contains(QStringLiteral("SearchType_perlRegex"))) + if(vectorcontainsAtLeastOne(options,std::string("SearchType_perlRegex"))) new_item.search_type=SearchType_perlRegex; - if(options.contains(QStringLiteral("ApplyOn_file"))) + if(vectorcontainsAtLeastOne(options,std::string("ApplyOn_file"))) new_item.apply_on=ApplyOn_file; - if(options.contains(QStringLiteral("ApplyOn_folder"))) + if(vectorcontainsAtLeastOne(options,std::string("ApplyOn_folder"))) new_item.apply_on=ApplyOn_folder; - if(options.contains(QStringLiteral("need_match_all"))) + if(vectorcontainsAtLeastOne(options,std::string("need_match_all"))) new_item.need_match_all=true; if(convertToRegex(new_item)) - include << new_item; + include.push_back(new_item); index++; } @@ -53,24 +54,24 @@ void Filters::setFilters(QStringList includeStrings,QStringList includeOptions,Q while(index<excludeStrings.size()) { new_item.search_text=excludeStrings.at(index); - QStringList options=excludeOptions.at(index).split(QStringLiteral(";")); + std::vector<std::string> options=stringsplit(excludeOptions.at(index),';'); new_item.need_match_all=false; new_item.search_type=SearchType_rawText; new_item.apply_on=ApplyOn_fileAndFolder; - if(options.contains(QStringLiteral("SearchType_simpleRegex"))) + if(vectorcontainsAtLeastOne(options,std::string("SearchType_simpleRegex"))) new_item.search_type=SearchType_simpleRegex; - if(options.contains(QStringLiteral("SearchType_perlRegex"))) + if(vectorcontainsAtLeastOne(options,std::string("SearchType_perlRegex"))) new_item.search_type=SearchType_perlRegex; - if(options.contains(QStringLiteral("ApplyOn_file"))) + if(vectorcontainsAtLeastOne(options,std::string("ApplyOn_file"))) new_item.apply_on=ApplyOn_file; - if(options.contains(QStringLiteral("ApplyOn_folder"))) + if(vectorcontainsAtLeastOne(options,std::string("ApplyOn_folder"))) new_item.apply_on=ApplyOn_folder; - if(options.contains(QStringLiteral("need_match_all"))) + if(vectorcontainsAtLeastOne(options,std::string("need_match_all"))) new_item.need_match_all=true; if(convertToRegex(new_item)) - exclude << new_item; + exclude.push_back(new_item); index++; } @@ -81,21 +82,21 @@ void Filters::setFilters(QStringList includeStrings,QStringList includeOptions,Q void Filters::reShowAll() { ui->inclusion->clear(); - int index=0; - while(index<include.size()) + unsigned int index=0; + while(index<(unsigned int)include.size()) { - QString entryShow=include.at(index).search_text+QStringLiteral(" ("); - QStringList optionsToShow; + std::string entryShow=include.at(index).search_text+" ("; + std::vector<std::string> optionsToShow; switch(include.at(index).search_type) { case SearchType_rawText: - optionsToShow << tr("Raw text"); + optionsToShow.push_back(tr("Raw text").toStdString()); break; case SearchType_simpleRegex: - optionsToShow << tr("Simplified regex"); + optionsToShow.push_back(tr("Simplified regex").toStdString()); break; case SearchType_perlRegex: - optionsToShow << tr("Perl's regex"); + optionsToShow.push_back(tr("Perl's regex").toStdString()); break; default: break; @@ -103,37 +104,37 @@ void Filters::reShowAll() switch(include.at(index).apply_on) { case ApplyOn_file: - optionsToShow << tr("Only on file"); + optionsToShow.push_back(tr("Only on file").toStdString()); break; case ApplyOn_folder: - optionsToShow << tr("Only on folder"); + optionsToShow.push_back(tr("Only on folder").toStdString()); break; default: break; } if(include.at(index).need_match_all) - optionsToShow << tr("Full match"); - entryShow+=optionsToShow.join(QStringLiteral(",")); + optionsToShow.push_back(tr("Full match").toStdString()); + entryShow+=stringimplode(optionsToShow,","); entryShow+=")"; - ui->inclusion->addItem(new QListWidgetItem(entryShow)); + ui->inclusion->addItem(new QListWidgetItem(QString::fromStdString(entryShow))); index++; } ui->exclusion->clear(); index=0; - while(index<exclude.size()) + while(index<(unsigned int)exclude.size()) { - QString entryShow=exclude.at(index).search_text+QStringLiteral(" ("); - QStringList optionsToShow; + std::string entryShow=exclude.at(index).search_text+" ("; + std::vector<std::string> optionsToShow; switch(exclude.at(index).search_type) { case SearchType_rawText: - optionsToShow << tr("Raw text"); + optionsToShow.push_back(tr("Raw text").toStdString()); break; case SearchType_simpleRegex: - optionsToShow << tr("Simplified regex"); + optionsToShow.push_back(tr("Simplified regex").toStdString()); break; case SearchType_perlRegex: - optionsToShow << tr("Perl's regex"); + optionsToShow.push_back(tr("Perl's regex").toStdString()); break; default: break; @@ -141,29 +142,29 @@ void Filters::reShowAll() switch(exclude.at(index).apply_on) { case ApplyOn_file: - optionsToShow << tr("Only on file"); + optionsToShow.push_back(tr("Only on file").toStdString()); break; case ApplyOn_folder: - optionsToShow << tr("Only on folder"); + optionsToShow.push_back(tr("Only on folder").toStdString()); break; default: break; } if(exclude.at(index).need_match_all) - optionsToShow << tr("Full match"); - entryShow+=optionsToShow.join(QStringLiteral(",")); + optionsToShow.push_back(tr("Full match").toStdString()); + entryShow+=stringimplode(optionsToShow,","); entryShow+=")"; - ui->exclusion->addItem(new QListWidgetItem(entryShow)); + ui->exclusion->addItem(new QListWidgetItem(QString::fromStdString(entryShow))); index++; } } -QList<Filters_rules> Filters::getInclude() const +std::vector<Filters_rules> Filters::getInclude() const { return include; } -QList<Filters_rules> Filters::getExclude() const +std::vector<Filters_rules> Filters::getExclude() const { return exclude; } @@ -176,23 +177,23 @@ void Filters::newLanguageLoaded() void Filters::updateFilters() { - QStringList includeStrings,includeOptions,excludeStrings,excludeOptions; - int index=0; - while(index<include.size()) + std::vector<std::string> includeStrings,includeOptions,excludeStrings,excludeOptions; + unsigned int index=0; + while(index<(unsigned int)include.size()) { - includeStrings<<include.at(index).search_text; - QStringList optionsToShow; + includeStrings.push_back(include.at(index).search_text); + std::vector<std::string> optionsToShow; switch(include.at(index).search_type) { case SearchType_rawText: - optionsToShow << QStringLiteral("SearchType_rawText"); + optionsToShow.push_back("SearchType_rawText"); break; case SearchType_simpleRegex: - optionsToShow << QStringLiteral("SearchType_simpleRegex"); + optionsToShow.push_back("SearchType_simpleRegex"); break; case SearchType_perlRegex: - optionsToShow << QStringLiteral("SearchType_perlRegex"); + optionsToShow.push_back("SearchType_perlRegex"); break; default: break; @@ -200,38 +201,38 @@ void Filters::updateFilters() switch(include.at(index).apply_on) { case ApplyOn_file: - optionsToShow << QStringLiteral("ApplyOn_file"); + optionsToShow.push_back("ApplyOn_file"); break; case ApplyOn_fileAndFolder: - optionsToShow << QStringLiteral("ApplyOn_fileAndFolder"); + optionsToShow.push_back("ApplyOn_fileAndFolder"); break; case ApplyOn_folder: - optionsToShow << QStringLiteral("ApplyOn_folder"); + optionsToShow.push_back("ApplyOn_folder"); break; default: break; } if(include.at(index).need_match_all) - optionsToShow << tr("Full match"); - includeOptions<<optionsToShow.join(QStringLiteral(";")); + optionsToShow.push_back(tr("Full match").toStdString()); + includeOptions.push_back(stringimplode(optionsToShow,";")); index++; } index=0; - while(index<exclude.size()) + while(index<(unsigned int)exclude.size()) { - excludeStrings<<exclude.at(index).search_text; - QStringList optionsToShow; + excludeStrings.push_back(exclude.at(index).search_text); + std::vector<std::string> optionsToShow; switch(exclude.at(index).search_type) { case SearchType_rawText: - optionsToShow << QStringLiteral("SearchType_rawText"); + optionsToShow.push_back("SearchType_rawText"); break; case SearchType_simpleRegex: - optionsToShow << QStringLiteral("SearchType_simpleRegex"); + optionsToShow.push_back("SearchType_simpleRegex"); break; case SearchType_perlRegex: - optionsToShow << QStringLiteral("SearchType_perlRegex"); + optionsToShow.push_back("SearchType_perlRegex"); break; default: break; @@ -239,20 +240,20 @@ void Filters::updateFilters() switch(exclude.at(index).apply_on) { case ApplyOn_file: - optionsToShow << QStringLiteral("ApplyOn_file"); + optionsToShow.push_back("ApplyOn_file"); break; case ApplyOn_fileAndFolder: - optionsToShow << QStringLiteral("ApplyOn_fileAndFolder"); + optionsToShow.push_back("ApplyOn_fileAndFolder"); break; case ApplyOn_folder: - optionsToShow << QStringLiteral("ApplyOn_folder"); + optionsToShow.push_back("ApplyOn_folder"); break; default: break; } if(exclude.at(index).need_match_all) - optionsToShow << tr("Full match"); - excludeOptions<<optionsToShow.join(QStringLiteral(";")); + optionsToShow.push_back(tr("Full match").toStdString()); + excludeOptions.push_back(stringimplode(optionsToShow,";")); index++; } emit sendNewFilters(includeStrings,includeOptions,excludeStrings,excludeOptions); @@ -261,38 +262,40 @@ void Filters::updateFilters() bool Filters::convertToRegex(Filters_rules &item) { - bool isValid=!item.search_text.isEmpty(); + bool isValid=!item.search_text.empty(); if(isValid) { - QRegularExpression regex; - QString tempString; + std::regex regex; + std::string tempString; if(item.search_type==SearchType_rawText) { - tempString=QRegularExpression::escape(item.search_text); - if(tempString.contains('/') || tempString.contains('\\')) + tempString=QRegularExpression::escape(QString::fromStdString(item.search_text)).toStdString(); + if(tempString.find('/') != std::string::npos || tempString.find('\\') != std::string::npos) isValid=false; } else if(item.search_type==SearchType_simpleRegex) { - tempString=QRegularExpression::escape(item.search_text); - tempString.replace(QStringLiteral("\\*"),QStringLiteral("[^\\\\/]*")); + tempString=QRegularExpression::escape(QString::fromStdString(item.search_text)).toStdString(); + stringreplaceAll(tempString,"\\*","[^\\\\/]*"); } else if(item.search_type==SearchType_perlRegex) { tempString=item.search_text; - if(tempString.startsWith('^') && tempString.endsWith('$')) + if(stringStartWith(tempString,'^') && stringEndsWith(tempString,'$')) { item.need_match_all=true; - tempString.remove(QRegularExpression("^\\^")); - tempString.remove(QRegularExpression("\\$$")); + if(stringStartWith(tempString,'^')) + tempString=tempString.substr(1,tempString.size()-1); + if(stringEndsWith(tempString,'$')) + tempString=tempString.substr(0,tempString.size()-1); item.search_text=tempString; } } if(isValid) { if(item.need_match_all==true) - tempString=QStringLiteral("^")+tempString+QStringLiteral("$"); - regex=QRegularExpression(tempString); + tempString="^"+tempString+"$"; + regex=std::regex(tempString); //isValid=regex.isValid(); item.regex=regex; return true; @@ -312,7 +315,7 @@ void Filters::on_remove_exclusion_clicked() if(ui->exclusion->item(index)->isSelected()) { delete ui->exclusion->item(index); - exclude.removeAt(index); + exclude.erase(exclude.cbegin()+index); removedEntry=true; } else @@ -334,7 +337,7 @@ void Filters::on_remove_inclusion_clicked() if(ui->inclusion->item(index)->isSelected()) { delete ui->inclusion->item(index); - include.removeAt(index); + include.erase(include.cbegin()+index); removedEntry=true; } else @@ -358,7 +361,7 @@ void Filters::on_add_exclusion_clicked() new_item.need_match_all=dialog.get_need_match_all(); new_item.search_text=dialog.get_search_text(); new_item.search_type=dialog.get_search_type(); - exclude << new_item; + exclude.push_back(new_item); reShowAll(); updateFilters(); } @@ -382,7 +385,7 @@ void Filters::on_add_inclusion_clicked() new_item.search_text=dialog.get_search_text(); new_item.search_type=dialog.get_search_type(); if(convertToRegex(new_item)) - include << new_item; + include.push_back(new_item); reShowAll(); updateFilters(); } @@ -409,7 +412,7 @@ void Filters::on_edit_exclusion_clicked() exclude[index].search_text=dialog.get_search_text(); exclude[index].search_type=dialog.get_search_type(); if(!convertToRegex(exclude[index])) - exclude.removeAt(index); + exclude.erase(exclude.cbegin()+index); editedEntry=true; } } @@ -443,7 +446,7 @@ void Filters::on_edit_inclusion_clicked() exclude[index].search_text=dialog.get_search_text(); exclude[index].search_type=dialog.get_search_type(); if(!convertToRegex(exclude[index])) - exclude.removeAt(index); + exclude.erase(exclude.cbegin()+index); editedEntry=true; } } diff --git a/plugins/CopyEngine/Ultracopier/Filters.h b/plugins/CopyEngine/Ultracopier/Filters.h index 337f8cb..6645afc 100644 --- a/plugins/CopyEngine/Ultracopier/Filters.h +++ b/plugins/CopyEngine/Ultracopier/Filters.h @@ -18,19 +18,19 @@ class Filters : public QDialog public: explicit Filters(QWidget *parent = 0); ~Filters(); - void setFilters(QStringList includeStrings,QStringList includeOptions,QStringList excludeStrings,QStringList excludeOptions); + void setFilters(std::vector<std::string> includeStrings, std::vector<std::string> includeOptions, std::vector<std::string> excludeStrings, std::vector<std::string> excludeOptions); void reShowAll(); - QList<Filters_rules> getInclude() const; - QList<Filters_rules> getExclude() const; + std::vector<Filters_rules> getInclude() const; + std::vector<Filters_rules> getExclude() const; void newLanguageLoaded(); private: Ui::Filters *ui; - QList<Filters_rules> include; - QList<Filters_rules> exclude; + std::vector<Filters_rules> include; + std::vector<Filters_rules> exclude; void updateFilters(); bool convertToRegex(Filters_rules &item); signals: - void sendNewFilters(const QStringList &includeStrings,const QStringList &includeOptions,const QStringList &excludeStrings,const QStringList &excludeOptions) const; + void sendNewFilters(const std::vector<std::string> &includeStrings,const std::vector<std::string> &includeOptions,const std::vector<std::string> &excludeStrings,const std::vector<std::string> &excludeOptions) const; void haveNewFilters() const; private slots: void on_remove_exclusion_clicked(); diff --git a/plugins/CopyEngine/Ultracopier/FolderExistsDialog.cpp b/plugins/CopyEngine/Ultracopier/FolderExistsDialog.cpp index ac1e74e..d05a715 100644 --- a/plugins/CopyEngine/Ultracopier/FolderExistsDialog.cpp +++ b/plugins/CopyEngine/Ultracopier/FolderExistsDialog.cpp @@ -2,11 +2,17 @@ #include "ui_folderExistsDialog.h" #include "TransferThread.h" +#ifdef Q_OS_WIN32 +#define CURRENTSEPARATOR "\\" +#else +#define CURRENTSEPARATOR "/" +#endif + #include <QMessageBox> #include <QFileInfo> #include <QMessageBox> -FolderExistsDialog::FolderExistsDialog(QWidget *parent,QFileInfo source,bool isSame,QFileInfo destination,QString firstRenamingRule,QString otherRenamingRule) : +FolderExistsDialog::FolderExistsDialog(QWidget *parent, QFileInfo source, bool isSame, QFileInfo destination, std::string firstRenamingRule, std::string otherRenamingRule) : QDialog(parent), ui(new Ui::folderExistsDialog) { @@ -20,8 +26,8 @@ FolderExistsDialog::FolderExistsDialog(QWidget *parent,QFileInfo source,bool isS ui->setupUi(this); action=FolderExists_Cancel; oldName=TransferThread::resolvedName(destination); - ui->lineEditNewName->setText(oldName); - ui->lineEditNewName->setPlaceholderText(oldName); + ui->lineEditNewName->setText(QString::fromStdString(oldName)); + ui->lineEditNewName->setPlaceholderText(QString::fromStdString(oldName)); ui->label_content_source_modified->setText(source.lastModified().toString()); ui->label_content_source_folder_name->setText(source.fileName()); QString folder=source.absolutePath(); @@ -83,20 +89,20 @@ void FolderExistsDialog::changeEvent(QEvent *e) } } -QString FolderExistsDialog::getNewName() +std::string FolderExistsDialog::getNewName() { - if(oldName==ui->lineEditNewName->text() || ui->checkBoxAlways->isChecked()) + if(oldName==ui->lineEditNewName->text().toStdString() || ui->checkBoxAlways->isChecked()) return ""; else - return ui->lineEditNewName->text(); + return ui->lineEditNewName->text().toStdString(); } void FolderExistsDialog::on_SuggestNewName_clicked() { QFileInfo destinationInfo=this->destinationInfo; QString absolutePath=destinationInfo.absolutePath(); - QString fileName=TransferThread::resolvedName(destinationInfo); - QString suffix=QStringLiteral(""); + QString fileName=QString::fromStdString(TransferThread::resolvedName(destinationInfo)); + QString suffix; QString destination; QString newFileName; //resolv the suffix @@ -112,26 +118,26 @@ void FolderExistsDialog::on_SuggestNewName_clicked() { if(num==1) { - if(firstRenamingRule.isEmpty()) + if(firstRenamingRule.empty()) newFileName=tr("%1 - copy").arg(fileName); else { - newFileName=firstRenamingRule; + newFileName=QString::fromStdString(firstRenamingRule); newFileName.replace(QStringLiteral("%name%"),fileName); } } else { - if(otherRenamingRule.isEmpty()) + if(otherRenamingRule.empty()) newFileName=tr("%1 - copy (%2)").arg(fileName).arg(num); else { - newFileName=otherRenamingRule; + newFileName=QString::fromStdString(otherRenamingRule); newFileName.replace(QStringLiteral("%name%"),fileName); newFileName.replace(QStringLiteral("%number%"),QString::number(num)); } } - destination=absolutePath+QDir::separator()+newFileName+suffix; + destination=absolutePath+CURRENTSEPARATOR+newFileName+suffix; destinationInfo.setFile(destination); num++; } @@ -187,7 +193,7 @@ void FolderExistsDialog::on_lineEditNewName_returnPressed() QMessageBox::warning(this,tr("Error"),tr("Try rename with using special characters")); } -void FolderExistsDialog::on_lineEditNewName_textChanged(const QString &arg1) +void FolderExistsDialog::on_lineEditNewName_textChanged(const std::string &arg1) { Q_UNUSED(arg1); updateRenameButton(); @@ -195,5 +201,5 @@ void FolderExistsDialog::on_lineEditNewName_textChanged(const QString &arg1) void FolderExistsDialog::updateRenameButton() { - ui->Rename->setEnabled(ui->checkBoxAlways->isChecked() || (!ui->lineEditNewName->text().contains(QRegularExpression("[/\\\\\\*]")) && oldName!=ui->lineEditNewName->text() && !ui->lineEditNewName->text().isEmpty())); + ui->Rename->setEnabled(ui->checkBoxAlways->isChecked() || (!ui->lineEditNewName->text().contains(QRegularExpression("[/\\\\\\*]")) && oldName!=ui->lineEditNewName->text().toStdString() && !ui->lineEditNewName->text().isEmpty())); } diff --git a/plugins/CopyEngine/Ultracopier/FolderExistsDialog.h b/plugins/CopyEngine/Ultracopier/FolderExistsDialog.h index c043f65..a3bcf67 100644 --- a/plugins/CopyEngine/Ultracopier/FolderExistsDialog.h +++ b/plugins/CopyEngine/Ultracopier/FolderExistsDialog.h @@ -25,14 +25,14 @@ class FolderExistsDialog : public QDialog public: /// \brief create the object and pass all the informations to it - explicit FolderExistsDialog(QWidget *parent,QFileInfo source,bool isSame,QFileInfo destination,QString firstRenamingRule,QString otherRenamingRule); + explicit FolderExistsDialog(QWidget *parent,QFileInfo source,bool isSame,QFileInfo destination,std::string firstRenamingRule,std::string otherRenamingRule); ~FolderExistsDialog(); /// \brief return the the always checkbox is checked bool getAlways(); /// \brief return the action clicked FolderExistsAction getAction(); /// \brief return the new rename is case in manual renaming - QString getNewName(); + std::string getNewName(); protected: void changeEvent(QEvent *e); private slots: @@ -44,13 +44,13 @@ private slots: void on_Merge_clicked(); void on_lineEditNewName_editingFinished(); void on_lineEditNewName_returnPressed(); - void on_lineEditNewName_textChanged(const QString &arg1); + void on_lineEditNewName_textChanged(const std::string &arg1); private: Ui::folderExistsDialog *ui; FolderExistsAction action; - QString oldName; - QString firstRenamingRule; - QString otherRenamingRule; + std::string oldName; + std::string firstRenamingRule; + std::string otherRenamingRule; QFileInfo destinationInfo; }; diff --git a/plugins/CopyEngine/Ultracopier/Languages/ar/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/ar/translation.ts index 3362659..a00b0cd 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/ar/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/ar/translation.ts @@ -61,84 +61,84 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="717"/> + <location filename="../../CopyEngine.cpp" line="732"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1047"/> - <location filename="../../CopyEngine.cpp" line="1050"/> - <location filename="../../CopyEngine.cpp" line="1055"/> - <location filename="../../CopyEngine.cpp" line="1059"/> + <location filename="../../CopyEngine.cpp" line="1062"/> + <location filename="../../CopyEngine.cpp" line="1065"/> + <location filename="../../CopyEngine.cpp" line="1070"/> + <location filename="../../CopyEngine.cpp" line="1074"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1048"/> - <location filename="../../CopyEngine.cpp" line="1052"/> - <location filename="../../CopyEngine.cpp" line="1056"/> - <location filename="../../CopyEngine.cpp" line="1060"/> + <location filename="../../CopyEngine.cpp" line="1063"/> + <location filename="../../CopyEngine.cpp" line="1067"/> + <location filename="../../CopyEngine.cpp" line="1071"/> + <location filename="../../CopyEngine.cpp" line="1075"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1051"/> + <location filename="../../CopyEngine.cpp" line="1066"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1053"/> - <location filename="../../CopyEngine.cpp" line="1065"/> + <location filename="../../CopyEngine.cpp" line="1068"/> + <location filename="../../CopyEngine.cpp" line="1080"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1057"/> + <location filename="../../CopyEngine.cpp" line="1072"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1061"/> + <location filename="../../CopyEngine.cpp" line="1076"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1062"/> + <location filename="../../CopyEngine.cpp" line="1077"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1063"/> + <location filename="../../CopyEngine.cpp" line="1078"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1079"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1067"/> + <location filename="../../CopyEngine.cpp" line="1082"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1068"/> + <location filename="../../CopyEngine.cpp" line="1083"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1069"/> + <location filename="../../CopyEngine.cpp" line="1084"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1170"/> + <location filename="../../CopyEngine.cpp" line="1185"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1170"/> + <location filename="../../CopyEngine.cpp" line="1185"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="412"/> - <location filename="../../CopyEngineFactory.cpp" line="415"/> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> + <location filename="../../CopyEngineFactory.cpp" line="418"/> + <location filename="../../CopyEngineFactory.cpp" line="421"/> + <location filename="../../CopyEngineFactory.cpp" line="426"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="413"/> - <location filename="../../CopyEngineFactory.cpp" line="417"/> - <location filename="../../CopyEngineFactory.cpp" line="421"/> - <location filename="../../CopyEngineFactory.cpp" line="425"/> + <location filename="../../CopyEngineFactory.cpp" line="419"/> + <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="427"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="416"/> + <location filename="../../CopyEngineFactory.cpp" line="422"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="418"/> - <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="424"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="422"/> + <location filename="../../CopyEngineFactory.cpp" line="428"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="426"/> + <location filename="../../CopyEngineFactory.cpp" line="432"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="427"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="428"/> + <location filename="../../CopyEngineFactory.cpp" line="434"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="438"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="485"/> - <location filename="../../CopyEngineFactory.cpp" line="524"/> + <location filename="../../CopyEngineFactory.cpp" line="491"/> + <location filename="../../CopyEngineFactory.cpp" line="530"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="485"/> + <location filename="../../CopyEngineFactory.cpp" line="491"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="524"/> + <location filename="../../CopyEngineFactory.cpp" line="530"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -273,22 +273,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="131"/> + <location filename="../../FileExistsDialog.cpp" line="137"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="141"/> + <location filename="../../FileExistsDialog.cpp" line="147"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="226"/> + <location filename="../../FileExistsDialog.cpp" line="232"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="226"/> + <location filename="../../FileExistsDialog.cpp" line="232"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -296,22 +296,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="105"/> + <location filename="../../FileIsSameDialog.cpp" line="111"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="115"/> + <location filename="../../FileIsSameDialog.cpp" line="121"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="182"/> + <location filename="../../FileIsSameDialog.cpp" line="188"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="182"/> + <location filename="../../FileIsSameDialog.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -417,40 +417,40 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="92"/> - <location filename="../../Filters.cpp" line="130"/> + <location filename="../../Filters.cpp" line="93"/> + <location filename="../../Filters.cpp" line="131"/> <source>Raw text</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="95"/> - <location filename="../../Filters.cpp" line="133"/> + <location filename="../../Filters.cpp" line="96"/> + <location filename="../../Filters.cpp" line="134"/> <source>Simplified regex</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="98"/> - <location filename="../../Filters.cpp" line="136"/> + <location filename="../../Filters.cpp" line="99"/> + <location filename="../../Filters.cpp" line="137"/> <source>Perl's regex</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="106"/> - <location filename="../../Filters.cpp" line="144"/> + <location filename="../../Filters.cpp" line="107"/> + <location filename="../../Filters.cpp" line="145"/> <source>Only on file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="109"/> - <location filename="../../Filters.cpp" line="147"/> + <location filename="../../Filters.cpp" line="110"/> + <location filename="../../Filters.cpp" line="148"/> <source>Only on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="115"/> - <location filename="../../Filters.cpp" line="153"/> - <location filename="../../Filters.cpp" line="215"/> - <location filename="../../Filters.cpp" line="254"/> + <location filename="../../Filters.cpp" line="116"/> + <location filename="../../Filters.cpp" line="154"/> + <location filename="../../Filters.cpp" line="216"/> + <location filename="../../Filters.cpp" line="255"/> <source>Full match</source> <translation type="unfinished"></translation> </message> @@ -458,27 +458,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="51"/> + <location filename="../../FolderExistsDialog.cpp" line="57"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="116"/> + <location filename="../../FolderExistsDialog.cpp" line="122"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="126"/> + <location filename="../../FolderExistsDialog.cpp" line="132"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="187"/> + <location filename="../../FolderExistsDialog.cpp" line="193"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="187"/> + <location filename="../../FolderExistsDialog.cpp" line="193"/> <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="1447"/> - <location filename="../../ListThread.cpp" line="2369"/> + <location filename="../../ListThread.cpp" line="1458"/> + <location filename="../../ListThread.cpp" line="2390"/> <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="1454"/> - <location filename="../../ListThread.cpp" line="2376"/> + <location filename="../../ListThread.cpp" line="1465"/> + <location filename="../../ListThread.cpp" line="2397"/> <source>Unable to save the transfer list: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1470"/> + <location filename="../../ListThread.cpp" line="1481"/> <source>Problem reading file, or file-size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1477"/> + <location filename="../../ListThread.cpp" line="1488"/> <source>Wrong header: "%1"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1486"/> + <location filename="../../ListThread.cpp" line="1497"/> <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="1495"/> + <location filename="../../ListThread.cpp" line="1506"/> <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="1501"/> + <location filename="../../ListThread.cpp" line="1512"/> <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="1557"/> + <location filename="../../ListThread.cpp" line="1575"/> <source>Some errors have been found during the line parsing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1565"/> + <location filename="../../ListThread.cpp" line="1583"/> <source>Unable to open the transfer list: %1</source> <translation type="unfinished"></translation> </message> @@ -556,13 +556,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="232"/> + <location filename="../../MkPath.cpp" line="233"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../MkPath.cpp" line="93"/> - <location filename="../../MkPath.cpp" line="275"/> + <location filename="../../MkPath.cpp" line="276"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> @@ -649,39 +649,39 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="265"/> + <location filename="../../ScanFileOrFolder.cpp" line="274"/> <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="327"/> - <location filename="../../ScanFileOrFolder.cpp" line="393"/> + <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="337"/> - <location filename="../../ScanFileOrFolder.cpp" line="403"/> + <location filename="../../ScanFileOrFolder.cpp" line="348"/> + <location filename="../../ScanFileOrFolder.cpp" line="414"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="441"/> + <location filename="../../ScanFileOrFolder.cpp" line="452"/> <source>This is not a folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="443"/> + <location filename="../../ScanFileOrFolder.cpp" line="454"/> <source>The folder does exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="445"/> + <location filename="../../ScanFileOrFolder.cpp" line="456"/> <source>The folder is not readable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="467"/> <source>Problem with name encoding</source> <translation type="unfinished"></translation> </message> @@ -689,101 +689,101 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="235"/> - <location filename="../../TransferThread.cpp" line="663"/> - <location filename="../../TransferThread.cpp" line="735"/> - <location filename="../../TransferThread.cpp" line="1303"/> + <location filename="../../TransferThread.cpp" line="243"/> + <location filename="../../TransferThread.cpp" line="672"/> + <location filename="../../TransferThread.cpp" line="744"/> + <location filename="../../TransferThread.cpp" line="1314"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="336"/> - <location filename="../../TransferThread.cpp" line="353"/> + <location filename="../../TransferThread.cpp" line="344"/> + <location filename="../../TransferThread.cpp" line="361"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="408"/> - <location filename="../../TransferThread.cpp" line="431"/> + <location filename="../../TransferThread.cpp" line="416"/> + <location filename="../../TransferThread.cpp" line="439"/> <source>Internal error: Already opening</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="572"/> + <location filename="../../TransferThread.cpp" line="581"/> <source>Drive %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="574"/> + <location filename="../../TransferThread.cpp" line="583"/> <source>Unknown folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="578"/> + <location filename="../../TransferThread.cpp" line="587"/> <source>root</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="631"/> + <location filename="../../TransferThread.cpp" line="640"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="641"/> + <location filename="../../TransferThread.cpp" line="650"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="701"/> - <location filename="../../TransferThread.cpp" line="816"/> + <location filename="../../TransferThread.cpp" line="710"/> + <location filename="../../TransferThread.cpp" line="825"/> <source>The source file doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="741"/> - <location filename="../../TransferThread.cpp" line="828"/> + <location filename="../../TransferThread.cpp" line="750"/> + <location filename="../../TransferThread.cpp" line="837"/> <source>Unable to do the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="777"/> + <location filename="../../TransferThread.cpp" line="786"/> <source>The source doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="822"/> + <location filename="../../TransferThread.cpp" line="831"/> <source>Another file exists at same place</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1124"/> + <location filename="../../TransferThread.cpp" line="1133"/> <source>The checksums do not match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1213"/> + <location filename="../../TransferThread.cpp" line="1223"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1227"/> + <location filename="../../TransferThread.cpp" line="1238"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1238"/> + <location filename="../../TransferThread.cpp" line="1249"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1303"/> - <location filename="../../TransferThread.cpp" line="1321"/> - <location filename="../../TransferThread.cpp" line="1336"/> + <location filename="../../TransferThread.cpp" line="1314"/> + <location filename="../../TransferThread.cpp" line="1332"/> + <location filename="../../TransferThread.cpp" line="1347"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="219"/> + <location filename="../../TransferThread.cpp" line="227"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -796,17 +796,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="268"/> + <location filename="../../WriteThread.cpp" line="269"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="671"/> + <location filename="../../WriteThread.cpp" line="672"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="696"/> + <location filename="../../WriteThread.cpp" line="697"/> <source>File truncated during read, possible data change</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 2952152..cad2890 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/de/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/de/translation.ts @@ -62,84 +62,84 @@ <translation>Aktuelles Ziel: "%1" benutzen?</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="717"/> + <location filename="../../CopyEngine.cpp" line="732"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation>Der Modus wurde vorher erzwungen. Interner Fehler - Bitte bei mir melden! </translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1047"/> - <location filename="../../CopyEngine.cpp" line="1050"/> - <location filename="../../CopyEngine.cpp" line="1055"/> - <location filename="../../CopyEngine.cpp" line="1059"/> + <location filename="../../CopyEngine.cpp" line="1062"/> + <location filename="../../CopyEngine.cpp" line="1065"/> + <location filename="../../CopyEngine.cpp" line="1070"/> + <location filename="../../CopyEngine.cpp" line="1074"/> <source>Ask</source> <translation>Fragen</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1048"/> - <location filename="../../CopyEngine.cpp" line="1052"/> - <location filename="../../CopyEngine.cpp" line="1056"/> - <location filename="../../CopyEngine.cpp" line="1060"/> + <location filename="../../CopyEngine.cpp" line="1063"/> + <location filename="../../CopyEngine.cpp" line="1067"/> + <location filename="../../CopyEngine.cpp" line="1071"/> + <location filename="../../CopyEngine.cpp" line="1075"/> <source>Skip</source> <translation>Überspringen</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1051"/> + <location filename="../../CopyEngine.cpp" line="1066"/> <source>Merge</source> <translation>Fusionieren</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1053"/> - <location filename="../../CopyEngine.cpp" line="1065"/> + <location filename="../../CopyEngine.cpp" line="1068"/> + <location filename="../../CopyEngine.cpp" line="1080"/> <source>Rename</source> <translation>Umbenennen</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1057"/> + <location filename="../../CopyEngine.cpp" line="1072"/> <source>Put at the end</source> <translation>Ans Ende verschieben</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1061"/> + <location filename="../../CopyEngine.cpp" line="1076"/> <source>Overwrite</source> <translation>Überschreiben</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1062"/> + <location filename="../../CopyEngine.cpp" line="1077"/> <source>Overwrite if different</source> <translation>Überschreiben, falls verschieden</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1063"/> + <location filename="../../CopyEngine.cpp" line="1078"/> <source>Overwrite if newer</source> <translation>Überschreiben, falls neuer</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1079"/> <source>Overwrite if older</source> <translation>Überschreiben, falls älter</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1067"/> + <location filename="../../CopyEngine.cpp" line="1082"/> <source>Automatic</source> <translation>Automatisch</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1068"/> + <location filename="../../CopyEngine.cpp" line="1083"/> <source>Sequential</source> <translation>Sequentiell</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1069"/> + <location filename="../../CopyEngine.cpp" line="1084"/> <source>Parallel</source> <translation>Parallel</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1170"/> + <location filename="../../CopyEngine.cpp" line="1185"/> <source>Options error</source> <translation>Fehlerhafte Optionen</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1170"/> + <location filename="../../CopyEngine.cpp" line="1185"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation>Optionen nicht geladen - Kein Zugriff auf Filter</translation> </message> @@ -147,85 +147,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="412"/> - <location filename="../../CopyEngineFactory.cpp" line="415"/> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> + <location filename="../../CopyEngineFactory.cpp" line="418"/> + <location filename="../../CopyEngineFactory.cpp" line="421"/> + <location filename="../../CopyEngineFactory.cpp" line="426"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> <source>Ask</source> <translation>Fragen</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="413"/> - <location filename="../../CopyEngineFactory.cpp" line="417"/> - <location filename="../../CopyEngineFactory.cpp" line="421"/> - <location filename="../../CopyEngineFactory.cpp" line="425"/> + <location filename="../../CopyEngineFactory.cpp" line="419"/> + <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="427"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Skip</source> <translation>Überspringen</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="416"/> + <location filename="../../CopyEngineFactory.cpp" line="422"/> <source>Merge</source> <translation>Fusionieren</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="418"/> - <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="424"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> <source>Rename</source> <translation>Umbenennen</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="422"/> + <location filename="../../CopyEngineFactory.cpp" line="428"/> <source>Put at the end</source> <translation>Ans Ende verschieben</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="426"/> + <location filename="../../CopyEngineFactory.cpp" line="432"/> <source>Overwrite</source> <translation>Überschreiben</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="427"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> <source>Overwrite if different</source> <translation>Überschreiben, falls verschieden</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="428"/> + <location filename="../../CopyEngineFactory.cpp" line="434"/> <source>Overwrite if newer</source> <translation>Überschreiben, falls neuer</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> <source>Overwrite if older</source> <translation>Überschreiben, falls älter</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="438"/> <source>Automatic</source> <translation>Automatisch</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Sequential</source> <translation>Sequentiell</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Parallel</source> <translation>Parallel</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="485"/> - <location filename="../../CopyEngineFactory.cpp" line="524"/> + <location filename="../../CopyEngineFactory.cpp" line="491"/> + <location filename="../../CopyEngineFactory.cpp" line="530"/> <source>Options error</source> <translation>Fehlerhafte Optionen</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="485"/> + <location filename="../../CopyEngineFactory.cpp" line="491"/> <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="524"/> + <location filename="../../CopyEngineFactory.cpp" line="530"/> <source>Options engine is not loaded, can't access to the filters</source> <translation>Option nicht geladen - Kann nicht auf Filter zugreifen</translation> </message> @@ -274,22 +274,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="131"/> + <location filename="../../FileExistsDialog.cpp" line="137"/> <source>%1 - copy</source> <translation>%1 - Kopie</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="141"/> + <location filename="../../FileExistsDialog.cpp" line="147"/> <source>%1 - copy (%2)</source> <translation>%1 - Kopie (%2)</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="226"/> + <location filename="../../FileExistsDialog.cpp" line="232"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="226"/> + <location filename="../../FileExistsDialog.cpp" line="232"/> <source>Try rename with using special characters</source> <translation>Versuche Umbenennung mit Sonderzeichen</translation> </message> @@ -297,22 +297,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="105"/> + <location filename="../../FileIsSameDialog.cpp" line="111"/> <source>%1 - copy</source> <translation>%1 - kopieren</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="115"/> + <location filename="../../FileIsSameDialog.cpp" line="121"/> <source>%1 - copy (%2)</source> <translation>%1 - kopieren (%2)</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="182"/> + <location filename="../../FileIsSameDialog.cpp" line="188"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="182"/> + <location filename="../../FileIsSameDialog.cpp" line="188"/> <source>Try rename with using special characters</source> <translation>Versuche Umbenennung mit Sonderzeichen</translation> </message> @@ -418,40 +418,40 @@ <translation>Keiner = Alle einschließen</translation> </message> <message> - <location filename="../../Filters.cpp" line="92"/> - <location filename="../../Filters.cpp" line="130"/> + <location filename="../../Filters.cpp" line="93"/> + <location filename="../../Filters.cpp" line="131"/> <source>Raw text</source> <translation>Roh-Text</translation> </message> <message> - <location filename="../../Filters.cpp" line="95"/> - <location filename="../../Filters.cpp" line="133"/> + <location filename="../../Filters.cpp" line="96"/> + <location filename="../../Filters.cpp" line="134"/> <source>Simplified regex</source> <translation>Vereinfachte RegEx</translation> </message> <message> - <location filename="../../Filters.cpp" line="98"/> - <location filename="../../Filters.cpp" line="136"/> + <location filename="../../Filters.cpp" line="99"/> + <location filename="../../Filters.cpp" line="137"/> <source>Perl's regex</source> <translation>Perls RegEx</translation> </message> <message> - <location filename="../../Filters.cpp" line="106"/> - <location filename="../../Filters.cpp" line="144"/> + <location filename="../../Filters.cpp" line="107"/> + <location filename="../../Filters.cpp" line="145"/> <source>Only on file</source> <translation>Nur auf Datei</translation> </message> <message> - <location filename="../../Filters.cpp" line="109"/> - <location filename="../../Filters.cpp" line="147"/> + <location filename="../../Filters.cpp" line="110"/> + <location filename="../../Filters.cpp" line="148"/> <source>Only on folder</source> <translation>Nur auf Ordner</translation> </message> <message> - <location filename="../../Filters.cpp" line="115"/> - <location filename="../../Filters.cpp" line="153"/> - <location filename="../../Filters.cpp" line="215"/> - <location filename="../../Filters.cpp" line="254"/> + <location filename="../../Filters.cpp" line="116"/> + <location filename="../../Filters.cpp" line="154"/> + <location filename="../../Filters.cpp" line="216"/> + <location filename="../../Filters.cpp" line="255"/> <source>Full match</source> <translation>Volle Übereinstimmung</translation> </message> @@ -459,27 +459,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="51"/> + <location filename="../../FolderExistsDialog.cpp" line="57"/> <source>Folder already exists</source> <translation>Ordner existiert bereits</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="116"/> + <location filename="../../FolderExistsDialog.cpp" line="122"/> <source>%1 - copy</source> <translation>%1 - Kopie</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="126"/> + <location filename="../../FolderExistsDialog.cpp" line="132"/> <source>%1 - copy (%2)</source> <translation>%1 - Kopie (%2)</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="187"/> + <location filename="../../FolderExistsDialog.cpp" line="193"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="187"/> + <location filename="../../FolderExistsDialog.cpp" line="193"/> <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="1447"/> - <location filename="../../ListThread.cpp" line="2369"/> + <location filename="../../ListThread.cpp" line="1458"/> + <location filename="../../ListThread.cpp" line="2390"/> <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="1454"/> - <location filename="../../ListThread.cpp" line="2376"/> + <location filename="../../ListThread.cpp" line="1465"/> + <location filename="../../ListThread.cpp" line="2397"/> <source>Unable to save the transfer list: %1</source> <translation>Konnte die Transferliste: %1 nicht speichern</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1470"/> + <location filename="../../ListThread.cpp" line="1481"/> <source>Problem reading file, or file-size is 0</source> <translation>Lesefehler, oder Dateigröße=0</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1477"/> + <location filename="../../ListThread.cpp" line="1488"/> <source>Wrong header: "%1"</source> <translation>Falscher Header: "%1"</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1486"/> + <location filename="../../ListThread.cpp" line="1497"/> <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="1495"/> + <location filename="../../ListThread.cpp" line="1506"/> <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="1501"/> + <location filename="../../ListThread.cpp" line="1512"/> <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="1557"/> + <location filename="../../ListThread.cpp" line="1575"/> <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="1565"/> + <location filename="../../ListThread.cpp" line="1583"/> <source>Unable to open the transfer list: %1</source> <translation>Transferliste: %1 kann nicht geöffnet werden</translation> </message> @@ -557,13 +557,13 @@ <translation>Kann den Ordner nicht endgültig verschieben</translation> </message> <message> - <location filename="../../MkPath.cpp" line="232"/> + <location filename="../../MkPath.cpp" line="233"/> <source>Unable to move the folder</source> <translation>Kann den Ordner nicht verschieben</translation> </message> <message> <location filename="../../MkPath.cpp" line="93"/> - <location filename="../../MkPath.cpp" line="275"/> + <location filename="../../MkPath.cpp" line="276"/> <source>Unable to remove</source> <translation>Kann nicht löschen</translation> </message> @@ -650,39 +650,39 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="265"/> + <location filename="../../ScanFileOrFolder.cpp" line="274"/> <source>Blacklisted folder</source> <translation>Ordner der schwarzen Liste</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="327"/> - <location filename="../../ScanFileOrFolder.cpp" line="393"/> + <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="337"/> - <location filename="../../ScanFileOrFolder.cpp" line="403"/> + <location filename="../../ScanFileOrFolder.cpp" line="348"/> + <location filename="../../ScanFileOrFolder.cpp" line="414"/> <source>%1 - copy (%2)</source> <translation>%1 - Kopie (%2)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="441"/> + <location filename="../../ScanFileOrFolder.cpp" line="452"/> <source>This is not a folder</source> <translation>Dies ist kein Ordner</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="443"/> + <location filename="../../ScanFileOrFolder.cpp" line="454"/> <source>The folder does exists</source> <translation>Ordner existiert bereits</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="445"/> + <location filename="../../ScanFileOrFolder.cpp" line="456"/> <source>The folder is not readable</source> <translation>Der Ordner kann nicht gelesen werden</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="467"/> <source>Problem with name encoding</source> <translation>Problem mit der Namen-Encodierung</translation> </message> @@ -690,101 +690,101 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="235"/> - <location filename="../../TransferThread.cpp" line="663"/> - <location filename="../../TransferThread.cpp" line="735"/> - <location filename="../../TransferThread.cpp" line="1303"/> + <location filename="../../TransferThread.cpp" line="243"/> + <location filename="../../TransferThread.cpp" line="672"/> + <location filename="../../TransferThread.cpp" line="744"/> + <location filename="../../TransferThread.cpp" line="1314"/> <source>File not found</source> <translation>Datei nicht gefunden</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="336"/> - <location filename="../../TransferThread.cpp" line="353"/> + <location filename="../../TransferThread.cpp" line="344"/> + <location filename="../../TransferThread.cpp" line="361"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="408"/> - <location filename="../../TransferThread.cpp" line="431"/> + <location filename="../../TransferThread.cpp" line="416"/> + <location filename="../../TransferThread.cpp" line="439"/> <source>Internal error: Already opening</source> <translation type="unfinished">Interner Fehler: Bereits geöffnet</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="572"/> + <location filename="../../TransferThread.cpp" line="581"/> <source>Drive %1</source> <translation type="unfinished">Laufwerk %1</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="574"/> + <location filename="../../TransferThread.cpp" line="583"/> <source>Unknown folder</source> <translation type="unfinished">Unbekannter Ordner</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="578"/> + <location filename="../../TransferThread.cpp" line="587"/> <source>root</source> <translation type="unfinished">Stammverzeichnis</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="631"/> + <location filename="../../TransferThread.cpp" line="640"/> <source>%1 - copy</source> <translation type="unfinished">%1 - Kopie</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="641"/> + <location filename="../../TransferThread.cpp" line="650"/> <source>%1 - copy (%2)</source> <translation type="unfinished">%1 - Kopie (%2)</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="777"/> + <location filename="../../TransferThread.cpp" line="786"/> <source>The source doesn't exist</source> <translation type="unfinished">Quelle existiert nicht</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1303"/> - <location filename="../../TransferThread.cpp" line="1321"/> - <location filename="../../TransferThread.cpp" line="1336"/> + <location filename="../../TransferThread.cpp" line="1314"/> + <location filename="../../TransferThread.cpp" line="1332"/> + <location filename="../../TransferThread.cpp" line="1347"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="701"/> - <location filename="../../TransferThread.cpp" line="816"/> + <location filename="../../TransferThread.cpp" line="710"/> + <location filename="../../TransferThread.cpp" line="825"/> <source>The source file doesn't exist</source> <translation type="unfinished">Quelldatei existiert nicht</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1124"/> + <location filename="../../TransferThread.cpp" line="1133"/> <source>The checksums do not match</source> <translation type="unfinished">Prüfsummen sind verschieden</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1227"/> + <location filename="../../TransferThread.cpp" line="1238"/> <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="741"/> - <location filename="../../TransferThread.cpp" line="828"/> + <location filename="../../TransferThread.cpp" line="750"/> + <location filename="../../TransferThread.cpp" line="837"/> <source>Unable to do the folder</source> <translation type="unfinished">Ordner kann nicht erstellt werden</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="219"/> + <location filename="../../TransferThread.cpp" line="227"/> <source>Try rename with using special characters</source> <translation>Versuche Umbenennung mit Sonderzeichen</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="822"/> + <location filename="../../TransferThread.cpp" line="831"/> <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="1213"/> + <location filename="../../TransferThread.cpp" line="1223"/> <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="1238"/> + <location filename="../../TransferThread.cpp" line="1249"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished">Interner Fehler: Puffer ist nicht leer</translation> </message> @@ -797,17 +797,17 @@ <translation>Pfad-Auflösungsfehler (leerer Pfad)</translation> </message> <message> - <location filename="../../WriteThread.cpp" line="268"/> + <location filename="../../WriteThread.cpp" line="269"/> <source>Internal error, please report it!</source> <translation>Interner Fehler - Bitte bei mir melden!</translation> </message> <message> - <location filename="../../WriteThread.cpp" line="671"/> + <location filename="../../WriteThread.cpp" line="672"/> <source>Unable to read the source file: </source> <translation>Quelldatei kann nicht gelesen werden: </translation> </message> <message> - <location filename="../../WriteThread.cpp" line="696"/> + <location filename="../../WriteThread.cpp" line="697"/> <source>File truncated during read, possible data change</source> <translation>Datenabbruch beim Lesen, Daten wurden möglicherweise verändert</translation> </message> @@ -1001,10 +1001,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>Use this folder when destination is empty</source> - <translation type="obsolete">Benutze diesen Ordner wenn Ziel nicht benannt</translation> - </message> - <message> <location filename="../../copyEngineOptions.ui" line="637"/> <source>Browse</source> <translation>Wählen</translation> diff --git a/plugins/CopyEngine/Ultracopier/Languages/el/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/el/translation.ts index 3362659..a00b0cd 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/el/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/el/translation.ts @@ -61,84 +61,84 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="717"/> + <location filename="../../CopyEngine.cpp" line="732"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1047"/> - <location filename="../../CopyEngine.cpp" line="1050"/> - <location filename="../../CopyEngine.cpp" line="1055"/> - <location filename="../../CopyEngine.cpp" line="1059"/> + <location filename="../../CopyEngine.cpp" line="1062"/> + <location filename="../../CopyEngine.cpp" line="1065"/> + <location filename="../../CopyEngine.cpp" line="1070"/> + <location filename="../../CopyEngine.cpp" line="1074"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1048"/> - <location filename="../../CopyEngine.cpp" line="1052"/> - <location filename="../../CopyEngine.cpp" line="1056"/> - <location filename="../../CopyEngine.cpp" line="1060"/> + <location filename="../../CopyEngine.cpp" line="1063"/> + <location filename="../../CopyEngine.cpp" line="1067"/> + <location filename="../../CopyEngine.cpp" line="1071"/> + <location filename="../../CopyEngine.cpp" line="1075"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1051"/> + <location filename="../../CopyEngine.cpp" line="1066"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1053"/> - <location filename="../../CopyEngine.cpp" line="1065"/> + <location filename="../../CopyEngine.cpp" line="1068"/> + <location filename="../../CopyEngine.cpp" line="1080"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1057"/> + <location filename="../../CopyEngine.cpp" line="1072"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1061"/> + <location filename="../../CopyEngine.cpp" line="1076"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1062"/> + <location filename="../../CopyEngine.cpp" line="1077"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1063"/> + <location filename="../../CopyEngine.cpp" line="1078"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1079"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1067"/> + <location filename="../../CopyEngine.cpp" line="1082"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1068"/> + <location filename="../../CopyEngine.cpp" line="1083"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1069"/> + <location filename="../../CopyEngine.cpp" line="1084"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1170"/> + <location filename="../../CopyEngine.cpp" line="1185"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1170"/> + <location filename="../../CopyEngine.cpp" line="1185"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="412"/> - <location filename="../../CopyEngineFactory.cpp" line="415"/> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> + <location filename="../../CopyEngineFactory.cpp" line="418"/> + <location filename="../../CopyEngineFactory.cpp" line="421"/> + <location filename="../../CopyEngineFactory.cpp" line="426"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="413"/> - <location filename="../../CopyEngineFactory.cpp" line="417"/> - <location filename="../../CopyEngineFactory.cpp" line="421"/> - <location filename="../../CopyEngineFactory.cpp" line="425"/> + <location filename="../../CopyEngineFactory.cpp" line="419"/> + <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="427"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="416"/> + <location filename="../../CopyEngineFactory.cpp" line="422"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="418"/> - <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="424"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="422"/> + <location filename="../../CopyEngineFactory.cpp" line="428"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="426"/> + <location filename="../../CopyEngineFactory.cpp" line="432"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="427"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="428"/> + <location filename="../../CopyEngineFactory.cpp" line="434"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="438"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="485"/> - <location filename="../../CopyEngineFactory.cpp" line="524"/> + <location filename="../../CopyEngineFactory.cpp" line="491"/> + <location filename="../../CopyEngineFactory.cpp" line="530"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="485"/> + <location filename="../../CopyEngineFactory.cpp" line="491"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="524"/> + <location filename="../../CopyEngineFactory.cpp" line="530"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -273,22 +273,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="131"/> + <location filename="../../FileExistsDialog.cpp" line="137"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="141"/> + <location filename="../../FileExistsDialog.cpp" line="147"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="226"/> + <location filename="../../FileExistsDialog.cpp" line="232"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="226"/> + <location filename="../../FileExistsDialog.cpp" line="232"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -296,22 +296,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="105"/> + <location filename="../../FileIsSameDialog.cpp" line="111"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="115"/> + <location filename="../../FileIsSameDialog.cpp" line="121"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="182"/> + <location filename="../../FileIsSameDialog.cpp" line="188"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="182"/> + <location filename="../../FileIsSameDialog.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -417,40 +417,40 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="92"/> - <location filename="../../Filters.cpp" line="130"/> + <location filename="../../Filters.cpp" line="93"/> + <location filename="../../Filters.cpp" line="131"/> <source>Raw text</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="95"/> - <location filename="../../Filters.cpp" line="133"/> + <location filename="../../Filters.cpp" line="96"/> + <location filename="../../Filters.cpp" line="134"/> <source>Simplified regex</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="98"/> - <location filename="../../Filters.cpp" line="136"/> + <location filename="../../Filters.cpp" line="99"/> + <location filename="../../Filters.cpp" line="137"/> <source>Perl's regex</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="106"/> - <location filename="../../Filters.cpp" line="144"/> + <location filename="../../Filters.cpp" line="107"/> + <location filename="../../Filters.cpp" line="145"/> <source>Only on file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="109"/> - <location filename="../../Filters.cpp" line="147"/> + <location filename="../../Filters.cpp" line="110"/> + <location filename="../../Filters.cpp" line="148"/> <source>Only on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="115"/> - <location filename="../../Filters.cpp" line="153"/> - <location filename="../../Filters.cpp" line="215"/> - <location filename="../../Filters.cpp" line="254"/> + <location filename="../../Filters.cpp" line="116"/> + <location filename="../../Filters.cpp" line="154"/> + <location filename="../../Filters.cpp" line="216"/> + <location filename="../../Filters.cpp" line="255"/> <source>Full match</source> <translation type="unfinished"></translation> </message> @@ -458,27 +458,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="51"/> + <location filename="../../FolderExistsDialog.cpp" line="57"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="116"/> + <location filename="../../FolderExistsDialog.cpp" line="122"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="126"/> + <location filename="../../FolderExistsDialog.cpp" line="132"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="187"/> + <location filename="../../FolderExistsDialog.cpp" line="193"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="187"/> + <location filename="../../FolderExistsDialog.cpp" line="193"/> <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="1447"/> - <location filename="../../ListThread.cpp" line="2369"/> + <location filename="../../ListThread.cpp" line="1458"/> + <location filename="../../ListThread.cpp" line="2390"/> <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="1454"/> - <location filename="../../ListThread.cpp" line="2376"/> + <location filename="../../ListThread.cpp" line="1465"/> + <location filename="../../ListThread.cpp" line="2397"/> <source>Unable to save the transfer list: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1470"/> + <location filename="../../ListThread.cpp" line="1481"/> <source>Problem reading file, or file-size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1477"/> + <location filename="../../ListThread.cpp" line="1488"/> <source>Wrong header: "%1"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1486"/> + <location filename="../../ListThread.cpp" line="1497"/> <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="1495"/> + <location filename="../../ListThread.cpp" line="1506"/> <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="1501"/> + <location filename="../../ListThread.cpp" line="1512"/> <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="1557"/> + <location filename="../../ListThread.cpp" line="1575"/> <source>Some errors have been found during the line parsing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1565"/> + <location filename="../../ListThread.cpp" line="1583"/> <source>Unable to open the transfer list: %1</source> <translation type="unfinished"></translation> </message> @@ -556,13 +556,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="232"/> + <location filename="../../MkPath.cpp" line="233"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../MkPath.cpp" line="93"/> - <location filename="../../MkPath.cpp" line="275"/> + <location filename="../../MkPath.cpp" line="276"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> @@ -649,39 +649,39 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="265"/> + <location filename="../../ScanFileOrFolder.cpp" line="274"/> <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="327"/> - <location filename="../../ScanFileOrFolder.cpp" line="393"/> + <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="337"/> - <location filename="../../ScanFileOrFolder.cpp" line="403"/> + <location filename="../../ScanFileOrFolder.cpp" line="348"/> + <location filename="../../ScanFileOrFolder.cpp" line="414"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="441"/> + <location filename="../../ScanFileOrFolder.cpp" line="452"/> <source>This is not a folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="443"/> + <location filename="../../ScanFileOrFolder.cpp" line="454"/> <source>The folder does exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="445"/> + <location filename="../../ScanFileOrFolder.cpp" line="456"/> <source>The folder is not readable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="467"/> <source>Problem with name encoding</source> <translation type="unfinished"></translation> </message> @@ -689,101 +689,101 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="235"/> - <location filename="../../TransferThread.cpp" line="663"/> - <location filename="../../TransferThread.cpp" line="735"/> - <location filename="../../TransferThread.cpp" line="1303"/> + <location filename="../../TransferThread.cpp" line="243"/> + <location filename="../../TransferThread.cpp" line="672"/> + <location filename="../../TransferThread.cpp" line="744"/> + <location filename="../../TransferThread.cpp" line="1314"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="336"/> - <location filename="../../TransferThread.cpp" line="353"/> + <location filename="../../TransferThread.cpp" line="344"/> + <location filename="../../TransferThread.cpp" line="361"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="408"/> - <location filename="../../TransferThread.cpp" line="431"/> + <location filename="../../TransferThread.cpp" line="416"/> + <location filename="../../TransferThread.cpp" line="439"/> <source>Internal error: Already opening</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="572"/> + <location filename="../../TransferThread.cpp" line="581"/> <source>Drive %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="574"/> + <location filename="../../TransferThread.cpp" line="583"/> <source>Unknown folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="578"/> + <location filename="../../TransferThread.cpp" line="587"/> <source>root</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="631"/> + <location filename="../../TransferThread.cpp" line="640"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="641"/> + <location filename="../../TransferThread.cpp" line="650"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="701"/> - <location filename="../../TransferThread.cpp" line="816"/> + <location filename="../../TransferThread.cpp" line="710"/> + <location filename="../../TransferThread.cpp" line="825"/> <source>The source file doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="741"/> - <location filename="../../TransferThread.cpp" line="828"/> + <location filename="../../TransferThread.cpp" line="750"/> + <location filename="../../TransferThread.cpp" line="837"/> <source>Unable to do the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="777"/> + <location filename="../../TransferThread.cpp" line="786"/> <source>The source doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="822"/> + <location filename="../../TransferThread.cpp" line="831"/> <source>Another file exists at same place</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1124"/> + <location filename="../../TransferThread.cpp" line="1133"/> <source>The checksums do not match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1213"/> + <location filename="../../TransferThread.cpp" line="1223"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1227"/> + <location filename="../../TransferThread.cpp" line="1238"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1238"/> + <location filename="../../TransferThread.cpp" line="1249"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1303"/> - <location filename="../../TransferThread.cpp" line="1321"/> - <location filename="../../TransferThread.cpp" line="1336"/> + <location filename="../../TransferThread.cpp" line="1314"/> + <location filename="../../TransferThread.cpp" line="1332"/> + <location filename="../../TransferThread.cpp" line="1347"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="219"/> + <location filename="../../TransferThread.cpp" line="227"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -796,17 +796,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="268"/> + <location filename="../../WriteThread.cpp" line="269"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="671"/> + <location filename="../../WriteThread.cpp" line="672"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="696"/> + <location filename="../../WriteThread.cpp" line="697"/> <source>File truncated during read, possible data change</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 a6b1027..2c9ce27 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/en/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/en/translation.ts @@ -61,84 +61,84 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="717"/> + <location filename="../../CopyEngine.cpp" line="732"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1047"/> - <location filename="../../CopyEngine.cpp" line="1050"/> - <location filename="../../CopyEngine.cpp" line="1055"/> - <location filename="../../CopyEngine.cpp" line="1059"/> + <location filename="../../CopyEngine.cpp" line="1062"/> + <location filename="../../CopyEngine.cpp" line="1065"/> + <location filename="../../CopyEngine.cpp" line="1070"/> + <location filename="../../CopyEngine.cpp" line="1074"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1048"/> - <location filename="../../CopyEngine.cpp" line="1052"/> - <location filename="../../CopyEngine.cpp" line="1056"/> - <location filename="../../CopyEngine.cpp" line="1060"/> + <location filename="../../CopyEngine.cpp" line="1063"/> + <location filename="../../CopyEngine.cpp" line="1067"/> + <location filename="../../CopyEngine.cpp" line="1071"/> + <location filename="../../CopyEngine.cpp" line="1075"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1051"/> + <location filename="../../CopyEngine.cpp" line="1066"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1053"/> - <location filename="../../CopyEngine.cpp" line="1065"/> + <location filename="../../CopyEngine.cpp" line="1068"/> + <location filename="../../CopyEngine.cpp" line="1080"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1057"/> + <location filename="../../CopyEngine.cpp" line="1072"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1061"/> + <location filename="../../CopyEngine.cpp" line="1076"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1062"/> + <location filename="../../CopyEngine.cpp" line="1077"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1063"/> + <location filename="../../CopyEngine.cpp" line="1078"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1079"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1067"/> + <location filename="../../CopyEngine.cpp" line="1082"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1068"/> + <location filename="../../CopyEngine.cpp" line="1083"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1069"/> + <location filename="../../CopyEngine.cpp" line="1084"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1170"/> + <location filename="../../CopyEngine.cpp" line="1185"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1170"/> + <location filename="../../CopyEngine.cpp" line="1185"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="412"/> - <location filename="../../CopyEngineFactory.cpp" line="415"/> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> + <location filename="../../CopyEngineFactory.cpp" line="418"/> + <location filename="../../CopyEngineFactory.cpp" line="421"/> + <location filename="../../CopyEngineFactory.cpp" line="426"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="413"/> - <location filename="../../CopyEngineFactory.cpp" line="417"/> - <location filename="../../CopyEngineFactory.cpp" line="421"/> - <location filename="../../CopyEngineFactory.cpp" line="425"/> + <location filename="../../CopyEngineFactory.cpp" line="419"/> + <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="427"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="416"/> + <location filename="../../CopyEngineFactory.cpp" line="422"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="418"/> - <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="424"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="422"/> + <location filename="../../CopyEngineFactory.cpp" line="428"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="426"/> + <location filename="../../CopyEngineFactory.cpp" line="432"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="427"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="428"/> + <location filename="../../CopyEngineFactory.cpp" line="434"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="438"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="485"/> - <location filename="../../CopyEngineFactory.cpp" line="524"/> + <location filename="../../CopyEngineFactory.cpp" line="491"/> + <location filename="../../CopyEngineFactory.cpp" line="530"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="485"/> + <location filename="../../CopyEngineFactory.cpp" line="491"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="524"/> + <location filename="../../CopyEngineFactory.cpp" line="530"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -273,22 +273,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="131"/> + <location filename="../../FileExistsDialog.cpp" line="137"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="141"/> + <location filename="../../FileExistsDialog.cpp" line="147"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="226"/> + <location filename="../../FileExistsDialog.cpp" line="232"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="226"/> + <location filename="../../FileExistsDialog.cpp" line="232"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -296,22 +296,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="105"/> + <location filename="../../FileIsSameDialog.cpp" line="111"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="115"/> + <location filename="../../FileIsSameDialog.cpp" line="121"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="182"/> + <location filename="../../FileIsSameDialog.cpp" line="188"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="182"/> + <location filename="../../FileIsSameDialog.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -417,40 +417,40 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="92"/> - <location filename="../../Filters.cpp" line="130"/> + <location filename="../../Filters.cpp" line="93"/> + <location filename="../../Filters.cpp" line="131"/> <source>Raw text</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="95"/> - <location filename="../../Filters.cpp" line="133"/> + <location filename="../../Filters.cpp" line="96"/> + <location filename="../../Filters.cpp" line="134"/> <source>Simplified regex</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="98"/> - <location filename="../../Filters.cpp" line="136"/> + <location filename="../../Filters.cpp" line="99"/> + <location filename="../../Filters.cpp" line="137"/> <source>Perl's regex</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="106"/> - <location filename="../../Filters.cpp" line="144"/> + <location filename="../../Filters.cpp" line="107"/> + <location filename="../../Filters.cpp" line="145"/> <source>Only on file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="109"/> - <location filename="../../Filters.cpp" line="147"/> + <location filename="../../Filters.cpp" line="110"/> + <location filename="../../Filters.cpp" line="148"/> <source>Only on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="115"/> - <location filename="../../Filters.cpp" line="153"/> - <location filename="../../Filters.cpp" line="215"/> - <location filename="../../Filters.cpp" line="254"/> + <location filename="../../Filters.cpp" line="116"/> + <location filename="../../Filters.cpp" line="154"/> + <location filename="../../Filters.cpp" line="216"/> + <location filename="../../Filters.cpp" line="255"/> <source>Full match</source> <translation type="unfinished"></translation> </message> @@ -458,27 +458,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="51"/> + <location filename="../../FolderExistsDialog.cpp" line="57"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="116"/> + <location filename="../../FolderExistsDialog.cpp" line="122"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="126"/> + <location filename="../../FolderExistsDialog.cpp" line="132"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="187"/> + <location filename="../../FolderExistsDialog.cpp" line="193"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="187"/> + <location filename="../../FolderExistsDialog.cpp" line="193"/> <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="1447"/> - <location filename="../../ListThread.cpp" line="2369"/> + <location filename="../../ListThread.cpp" line="1458"/> + <location filename="../../ListThread.cpp" line="2390"/> <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="1454"/> - <location filename="../../ListThread.cpp" line="2376"/> + <location filename="../../ListThread.cpp" line="1465"/> + <location filename="../../ListThread.cpp" line="2397"/> <source>Unable to save the transfer list: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1470"/> + <location filename="../../ListThread.cpp" line="1481"/> <source>Problem reading file, or file-size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1477"/> + <location filename="../../ListThread.cpp" line="1488"/> <source>Wrong header: "%1"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1486"/> + <location filename="../../ListThread.cpp" line="1497"/> <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="1495"/> + <location filename="../../ListThread.cpp" line="1506"/> <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="1501"/> + <location filename="../../ListThread.cpp" line="1512"/> <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="1557"/> + <location filename="../../ListThread.cpp" line="1575"/> <source>Some errors have been found during the line parsing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1565"/> + <location filename="../../ListThread.cpp" line="1583"/> <source>Unable to open the transfer list: %1</source> <translation type="unfinished"></translation> </message> @@ -556,13 +556,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="232"/> + <location filename="../../MkPath.cpp" line="233"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../MkPath.cpp" line="93"/> - <location filename="../../MkPath.cpp" line="275"/> + <location filename="../../MkPath.cpp" line="276"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> @@ -649,39 +649,39 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="265"/> + <location filename="../../ScanFileOrFolder.cpp" line="274"/> <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="327"/> - <location filename="../../ScanFileOrFolder.cpp" line="393"/> + <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="337"/> - <location filename="../../ScanFileOrFolder.cpp" line="403"/> + <location filename="../../ScanFileOrFolder.cpp" line="348"/> + <location filename="../../ScanFileOrFolder.cpp" line="414"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="441"/> + <location filename="../../ScanFileOrFolder.cpp" line="452"/> <source>This is not a folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="443"/> + <location filename="../../ScanFileOrFolder.cpp" line="454"/> <source>The folder does exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="445"/> + <location filename="../../ScanFileOrFolder.cpp" line="456"/> <source>The folder is not readable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="467"/> <source>Problem with name encoding</source> <translation type="unfinished"></translation> </message> @@ -689,101 +689,101 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="235"/> - <location filename="../../TransferThread.cpp" line="663"/> - <location filename="../../TransferThread.cpp" line="735"/> - <location filename="../../TransferThread.cpp" line="1303"/> + <location filename="../../TransferThread.cpp" line="243"/> + <location filename="../../TransferThread.cpp" line="672"/> + <location filename="../../TransferThread.cpp" line="744"/> + <location filename="../../TransferThread.cpp" line="1314"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="336"/> - <location filename="../../TransferThread.cpp" line="353"/> + <location filename="../../TransferThread.cpp" line="344"/> + <location filename="../../TransferThread.cpp" line="361"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="408"/> - <location filename="../../TransferThread.cpp" line="431"/> + <location filename="../../TransferThread.cpp" line="416"/> + <location filename="../../TransferThread.cpp" line="439"/> <source>Internal error: Already opening</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="572"/> + <location filename="../../TransferThread.cpp" line="581"/> <source>Drive %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="574"/> + <location filename="../../TransferThread.cpp" line="583"/> <source>Unknown folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="578"/> + <location filename="../../TransferThread.cpp" line="587"/> <source>root</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="631"/> + <location filename="../../TransferThread.cpp" line="640"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="641"/> + <location filename="../../TransferThread.cpp" line="650"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="701"/> - <location filename="../../TransferThread.cpp" line="816"/> + <location filename="../../TransferThread.cpp" line="710"/> + <location filename="../../TransferThread.cpp" line="825"/> <source>The source file doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="741"/> - <location filename="../../TransferThread.cpp" line="828"/> + <location filename="../../TransferThread.cpp" line="750"/> + <location filename="../../TransferThread.cpp" line="837"/> <source>Unable to do the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="777"/> + <location filename="../../TransferThread.cpp" line="786"/> <source>The source doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="822"/> + <location filename="../../TransferThread.cpp" line="831"/> <source>Another file exists at same place</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1124"/> + <location filename="../../TransferThread.cpp" line="1133"/> <source>The checksums do not match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1213"/> + <location filename="../../TransferThread.cpp" line="1223"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1227"/> + <location filename="../../TransferThread.cpp" line="1238"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1238"/> + <location filename="../../TransferThread.cpp" line="1249"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1303"/> - <location filename="../../TransferThread.cpp" line="1321"/> - <location filename="../../TransferThread.cpp" line="1336"/> + <location filename="../../TransferThread.cpp" line="1314"/> + <location filename="../../TransferThread.cpp" line="1332"/> + <location filename="../../TransferThread.cpp" line="1347"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="219"/> + <location filename="../../TransferThread.cpp" line="227"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -796,17 +796,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="268"/> + <location filename="../../WriteThread.cpp" line="269"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="671"/> + <location filename="../../WriteThread.cpp" line="672"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="696"/> + <location filename="../../WriteThread.cpp" line="697"/> <source>File truncated during read, possible data change</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 d2a294f..9cb6abe 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/es/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/es/translation.ts @@ -61,84 +61,84 @@ <translation>Utilice el destino "%1" actual?</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="717"/> + <location filename="../../CopyEngine.cpp" line="732"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation>El modo se ha visto obligado previamente. Este es un error interno, por favor repórtelo</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1047"/> - <location filename="../../CopyEngine.cpp" line="1050"/> - <location filename="../../CopyEngine.cpp" line="1055"/> - <location filename="../../CopyEngine.cpp" line="1059"/> + <location filename="../../CopyEngine.cpp" line="1062"/> + <location filename="../../CopyEngine.cpp" line="1065"/> + <location filename="../../CopyEngine.cpp" line="1070"/> + <location filename="../../CopyEngine.cpp" line="1074"/> <source>Ask</source> <translation>Pedir</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1048"/> - <location filename="../../CopyEngine.cpp" line="1052"/> - <location filename="../../CopyEngine.cpp" line="1056"/> - <location filename="../../CopyEngine.cpp" line="1060"/> + <location filename="../../CopyEngine.cpp" line="1063"/> + <location filename="../../CopyEngine.cpp" line="1067"/> + <location filename="../../CopyEngine.cpp" line="1071"/> + <location filename="../../CopyEngine.cpp" line="1075"/> <source>Skip</source> <translation>Omitir</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1051"/> + <location filename="../../CopyEngine.cpp" line="1066"/> <source>Merge</source> <translation>Unir</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1053"/> - <location filename="../../CopyEngine.cpp" line="1065"/> + <location filename="../../CopyEngine.cpp" line="1068"/> + <location filename="../../CopyEngine.cpp" line="1080"/> <source>Rename</source> <translation>Cambiar el nombre</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1057"/> + <location filename="../../CopyEngine.cpp" line="1072"/> <source>Put at the end</source> <translation>Ponga al final</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1061"/> + <location filename="../../CopyEngine.cpp" line="1076"/> <source>Overwrite</source> <translation>Sobrescribir</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1062"/> + <location filename="../../CopyEngine.cpp" line="1077"/> <source>Overwrite if different</source> <translation>Sobrescribir si es diferente</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1063"/> + <location filename="../../CopyEngine.cpp" line="1078"/> <source>Overwrite if newer</source> <translation>Sobrescribir si nuevo</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1079"/> <source>Overwrite if older</source> <translation>Sobrescribir si es mayor</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1067"/> + <location filename="../../CopyEngine.cpp" line="1082"/> <source>Automatic</source> <translation>Automático</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1068"/> + <location filename="../../CopyEngine.cpp" line="1083"/> <source>Sequential</source> <translation>Secuencial</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1069"/> + <location filename="../../CopyEngine.cpp" line="1084"/> <source>Parallel</source> <translation>Paralelo</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1170"/> + <location filename="../../CopyEngine.cpp" line="1185"/> <source>Options error</source> <translation>error Opciones</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1170"/> + <location filename="../../CopyEngine.cpp" line="1185"/> <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> @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="412"/> - <location filename="../../CopyEngineFactory.cpp" line="415"/> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> + <location filename="../../CopyEngineFactory.cpp" line="418"/> + <location filename="../../CopyEngineFactory.cpp" line="421"/> + <location filename="../../CopyEngineFactory.cpp" line="426"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> <source>Ask</source> <translation>Pedir</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="413"/> - <location filename="../../CopyEngineFactory.cpp" line="417"/> - <location filename="../../CopyEngineFactory.cpp" line="421"/> - <location filename="../../CopyEngineFactory.cpp" line="425"/> + <location filename="../../CopyEngineFactory.cpp" line="419"/> + <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="427"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Skip</source> <translation>Omitir</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="416"/> + <location filename="../../CopyEngineFactory.cpp" line="422"/> <source>Merge</source> <translation>Unir</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="418"/> - <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="424"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> <source>Rename</source> <translation>Cambiar el nombre</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="422"/> + <location filename="../../CopyEngineFactory.cpp" line="428"/> <source>Put at the end</source> <translation>Ponga al final</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="426"/> + <location filename="../../CopyEngineFactory.cpp" line="432"/> <source>Overwrite</source> <translation>Sobrescribir</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="427"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> <source>Overwrite if different</source> <translation>Sobrescribir si es diferente</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="428"/> + <location filename="../../CopyEngineFactory.cpp" line="434"/> <source>Overwrite if newer</source> <translation>Sobrescribir si nuevo</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> <source>Overwrite if older</source> <translation>Sobrescribir si es mayor</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="438"/> <source>Automatic</source> <translation>Automático</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Sequential</source> <translation>Secuencial</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Parallel</source> <translation>Paralelo</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="485"/> - <location filename="../../CopyEngineFactory.cpp" line="524"/> + <location filename="../../CopyEngineFactory.cpp" line="491"/> + <location filename="../../CopyEngineFactory.cpp" line="530"/> <source>Options error</source> <translation>error Opciones</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="485"/> + <location filename="../../CopyEngineFactory.cpp" line="491"/> <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="524"/> + <location filename="../../CopyEngineFactory.cpp" line="530"/> <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> @@ -273,22 +273,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="131"/> + <location filename="../../FileExistsDialog.cpp" line="137"/> <source>%1 - copy</source> <translation>%1 - copia</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="141"/> + <location filename="../../FileExistsDialog.cpp" line="147"/> <source>%1 - copy (%2)</source> <translation>%1 - copia (%2)</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="226"/> + <location filename="../../FileExistsDialog.cpp" line="232"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="226"/> + <location filename="../../FileExistsDialog.cpp" line="232"/> <source>Try rename with using special characters</source> <translation>Trate de cambiar el nombre con el uso de caracteres especiales</translation> </message> @@ -296,22 +296,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="105"/> + <location filename="../../FileIsSameDialog.cpp" line="111"/> <source>%1 - copy</source> <translation>%1 - copia</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="115"/> + <location filename="../../FileIsSameDialog.cpp" line="121"/> <source>%1 - copy (%2)</source> <translation>%1 - copia (%2)</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="182"/> + <location filename="../../FileIsSameDialog.cpp" line="188"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="182"/> + <location filename="../../FileIsSameDialog.cpp" line="188"/> <source>Try rename with using special characters</source> <translation>Trate de cambiar el nombre con el uso de caracteres especiales</translation> </message> @@ -417,40 +417,40 @@ <translation>Ninguno = Incluya todos los</translation> </message> <message> - <location filename="../../Filters.cpp" line="92"/> - <location filename="../../Filters.cpp" line="130"/> + <location filename="../../Filters.cpp" line="93"/> + <location filename="../../Filters.cpp" line="131"/> <source>Raw text</source> <translation>texto Fuente</translation> </message> <message> - <location filename="../../Filters.cpp" line="95"/> - <location filename="../../Filters.cpp" line="133"/> + <location filename="../../Filters.cpp" line="96"/> + <location filename="../../Filters.cpp" line="134"/> <source>Simplified regex</source> <translation>Simplificado regex</translation> </message> <message> - <location filename="../../Filters.cpp" line="98"/> - <location filename="../../Filters.cpp" line="136"/> + <location filename="../../Filters.cpp" line="99"/> + <location filename="../../Filters.cpp" line="137"/> <source>Perl's regex</source> <translation>Perl's regex</translation> </message> <message> - <location filename="../../Filters.cpp" line="106"/> - <location filename="../../Filters.cpp" line="144"/> + <location filename="../../Filters.cpp" line="107"/> + <location filename="../../Filters.cpp" line="145"/> <source>Only on file</source> <translation>Sólo en el archivo</translation> </message> <message> - <location filename="../../Filters.cpp" line="109"/> - <location filename="../../Filters.cpp" line="147"/> + <location filename="../../Filters.cpp" line="110"/> + <location filename="../../Filters.cpp" line="148"/> <source>Only on folder</source> <translation>Sólo en la carpeta</translation> </message> <message> - <location filename="../../Filters.cpp" line="115"/> - <location filename="../../Filters.cpp" line="153"/> - <location filename="../../Filters.cpp" line="215"/> - <location filename="../../Filters.cpp" line="254"/> + <location filename="../../Filters.cpp" line="116"/> + <location filename="../../Filters.cpp" line="154"/> + <location filename="../../Filters.cpp" line="216"/> + <location filename="../../Filters.cpp" line="255"/> <source>Full match</source> <translation>Partido completo</translation> </message> @@ -458,27 +458,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="51"/> + <location filename="../../FolderExistsDialog.cpp" line="57"/> <source>Folder already exists</source> <translation>Carpeta ya existe</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="116"/> + <location filename="../../FolderExistsDialog.cpp" line="122"/> <source>%1 - copy</source> <translation>%1 - copia</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="126"/> + <location filename="../../FolderExistsDialog.cpp" line="132"/> <source>%1 - copy (%2)</source> <translation>%1 - copia (%2)</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="187"/> + <location filename="../../FolderExistsDialog.cpp" line="193"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="187"/> + <location filename="../../FolderExistsDialog.cpp" line="193"/> <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="1447"/> - <location filename="../../ListThread.cpp" line="2369"/> + <location filename="../../ListThread.cpp" line="1458"/> + <location filename="../../ListThread.cpp" line="2390"/> <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="1454"/> - <location filename="../../ListThread.cpp" line="2376"/> + <location filename="../../ListThread.cpp" line="1465"/> + <location filename="../../ListThread.cpp" line="2397"/> <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="1470"/> + <location filename="../../ListThread.cpp" line="1481"/> <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="1477"/> + <location filename="../../ListThread.cpp" line="1488"/> <source>Wrong header: "%1"</source> <translation>Encabezado incorrecto: "%1"</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1486"/> + <location filename="../../ListThread.cpp" line="1497"/> <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="1495"/> + <location filename="../../ListThread.cpp" line="1506"/> <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="1501"/> + <location filename="../../ListThread.cpp" line="1512"/> <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="1557"/> + <location filename="../../ListThread.cpp" line="1575"/> <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="1565"/> + <location filename="../../ListThread.cpp" line="1583"/> <source>Unable to open the transfer list: %1</source> <translation>No se puede abrir la lista de transferencias: %1</translation> </message> @@ -536,10 +536,6 @@ <context> <name>MkPath</name> <message> - <source>Unable to get time</source> - <translation type="obsolete">No es posible obtener el tiempo</translation> - </message> - <message> <location filename="../../MkPath.cpp" line="142"/> <source>Unable to create the folder</source> <translation>No se puede crear la carpeta</translation> @@ -560,17 +556,13 @@ <translation>No se puede hacer el movimiento final real de la carpeta</translation> </message> <message> - <location filename="../../MkPath.cpp" line="232"/> + <location filename="../../MkPath.cpp" line="233"/> <source>Unable to move the folder</source> <translation>No se puede mover la carpeta</translation> </message> <message> - <source>Unable to set the access-right</source> - <translation type="obsolete">No se puede establecer el acceso a la derecha</translation> - </message> - <message> <location filename="../../MkPath.cpp" line="93"/> - <location filename="../../MkPath.cpp" line="275"/> + <location filename="../../MkPath.cpp" line="276"/> <source>Unable to remove</source> <translation>No se puede eliminar</translation> </message> @@ -657,43 +649,39 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="265"/> + <location filename="../../ScanFileOrFolder.cpp" line="274"/> <source>Blacklisted folder</source> <translation>Carpeta de la lista negra</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="327"/> - <location filename="../../ScanFileOrFolder.cpp" line="393"/> + <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="337"/> - <location filename="../../ScanFileOrFolder.cpp" line="403"/> + <location filename="../../ScanFileOrFolder.cpp" line="348"/> + <location filename="../../ScanFileOrFolder.cpp" line="414"/> <source>%1 - copy (%2)</source> <translation>%1 - copia (%2)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="441"/> + <location filename="../../ScanFileOrFolder.cpp" line="452"/> <source>This is not a folder</source> <translation>Esto no es una carpeta</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="443"/> + <location filename="../../ScanFileOrFolder.cpp" line="454"/> <source>The folder does exists</source> <translation>La carpeta no existe</translation> </message> <message> - <source>The folder not exists</source> - <translation type="obsolete">La carpeta no existe</translation> - </message> - <message> - <location filename="../../ScanFileOrFolder.cpp" line="445"/> + <location filename="../../ScanFileOrFolder.cpp" line="456"/> <source>The folder is not readable</source> <translation>La carpeta no se puede leer</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="467"/> <source>Problem with name encoding</source> <translation>Problema con codificación de nombres</translation> </message> @@ -701,101 +689,101 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="235"/> - <location filename="../../TransferThread.cpp" line="663"/> - <location filename="../../TransferThread.cpp" line="735"/> - <location filename="../../TransferThread.cpp" line="1303"/> + <location filename="../../TransferThread.cpp" line="243"/> + <location filename="../../TransferThread.cpp" line="672"/> + <location filename="../../TransferThread.cpp" line="744"/> + <location filename="../../TransferThread.cpp" line="1314"/> <source>File not found</source> <translation>Archivo no encontrado</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="336"/> - <location filename="../../TransferThread.cpp" line="353"/> + <location filename="../../TransferThread.cpp" line="344"/> + <location filename="../../TransferThread.cpp" line="361"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="408"/> - <location filename="../../TransferThread.cpp" line="431"/> + <location filename="../../TransferThread.cpp" line="416"/> + <location filename="../../TransferThread.cpp" line="439"/> <source>Internal error: Already opening</source> <translation type="unfinished">Error interno: Ya la apertura</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="572"/> + <location filename="../../TransferThread.cpp" line="581"/> <source>Drive %1</source> <translation type="unfinished">Drive %1</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="574"/> + <location filename="../../TransferThread.cpp" line="583"/> <source>Unknown folder</source> <translation type="unfinished">Desconocido carpeta</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="578"/> + <location filename="../../TransferThread.cpp" line="587"/> <source>root</source> <translation type="unfinished">raíz</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="631"/> + <location filename="../../TransferThread.cpp" line="640"/> <source>%1 - copy</source> <translation type="unfinished">%1 - copia</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="641"/> + <location filename="../../TransferThread.cpp" line="650"/> <source>%1 - copy (%2)</source> <translation type="unfinished">%1 - copia (%2)</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="777"/> + <location filename="../../TransferThread.cpp" line="786"/> <source>The source doesn't exist</source> <translation type="unfinished">La fuente no existe</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1303"/> - <location filename="../../TransferThread.cpp" line="1321"/> - <location filename="../../TransferThread.cpp" line="1336"/> + <location filename="../../TransferThread.cpp" line="1314"/> + <location filename="../../TransferThread.cpp" line="1332"/> + <location filename="../../TransferThread.cpp" line="1347"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="701"/> - <location filename="../../TransferThread.cpp" line="816"/> + <location filename="../../TransferThread.cpp" line="710"/> + <location filename="../../TransferThread.cpp" line="825"/> <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="1124"/> + <location filename="../../TransferThread.cpp" line="1133"/> <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="1227"/> + <location filename="../../TransferThread.cpp" line="1238"/> <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="741"/> - <location filename="../../TransferThread.cpp" line="828"/> + <location filename="../../TransferThread.cpp" line="750"/> + <location filename="../../TransferThread.cpp" line="837"/> <source>Unable to do the folder</source> <translation type="unfinished">Incapaz de hacer la carpeta</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="219"/> + <location filename="../../TransferThread.cpp" line="227"/> <source>Try rename with using special characters</source> <translation>Trate de cambiar el nombre con el uso de caracteres especiales</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="822"/> + <location filename="../../TransferThread.cpp" line="831"/> <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="1213"/> + <location filename="../../TransferThread.cpp" line="1223"/> <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="1238"/> + <location filename="../../TransferThread.cpp" line="1249"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished">Error interno: El buffer no está vacío</translation> </message> @@ -808,17 +796,17 @@ <translation>Error de resolución de ruta (camino vacío)</translation> </message> <message> - <location filename="../../WriteThread.cpp" line="268"/> + <location filename="../../WriteThread.cpp" line="269"/> <source>Internal error, please report it!</source> <translation>Error interno, por favor informe de ello!</translation> </message> <message> - <location filename="../../WriteThread.cpp" line="671"/> + <location filename="../../WriteThread.cpp" line="672"/> <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="696"/> + <location filename="../../WriteThread.cpp" line="697"/> <source>File truncated during read, possible data change</source> <translation>Archivo truncado durante lectura, posible cambio de datos</translation> </message> @@ -1012,10 +1000,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>Use this folder when destination is empty</source> - <translation type="obsolete">Utilice esta carpeta al destino está vacía</translation> - </message> - <message> <location filename="../../copyEngineOptions.ui" line="637"/> <source>Browse</source> <translation>Busque</translation> diff --git a/plugins/CopyEngine/Ultracopier/Languages/fr/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/fr/translation.ts index 8ed7524..13ac433 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/fr/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/fr/translation.ts @@ -61,84 +61,84 @@ <translation>Utiliser la destination actuelle "%1"?</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="717"/> + <location filename="../../CopyEngine.cpp" line="732"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation>Le mode a été forcé. C'est une erreur interne, merci de la repporter</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1047"/> - <location filename="../../CopyEngine.cpp" line="1050"/> - <location filename="../../CopyEngine.cpp" line="1055"/> - <location filename="../../CopyEngine.cpp" line="1059"/> + <location filename="../../CopyEngine.cpp" line="1062"/> + <location filename="../../CopyEngine.cpp" line="1065"/> + <location filename="../../CopyEngine.cpp" line="1070"/> + <location filename="../../CopyEngine.cpp" line="1074"/> <source>Ask</source> <translation>Demander</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1048"/> - <location filename="../../CopyEngine.cpp" line="1052"/> - <location filename="../../CopyEngine.cpp" line="1056"/> - <location filename="../../CopyEngine.cpp" line="1060"/> + <location filename="../../CopyEngine.cpp" line="1063"/> + <location filename="../../CopyEngine.cpp" line="1067"/> + <location filename="../../CopyEngine.cpp" line="1071"/> + <location filename="../../CopyEngine.cpp" line="1075"/> <source>Skip</source> <translation>Passer</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1051"/> + <location filename="../../CopyEngine.cpp" line="1066"/> <source>Merge</source> <translation>Fusionner</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1053"/> - <location filename="../../CopyEngine.cpp" line="1065"/> + <location filename="../../CopyEngine.cpp" line="1068"/> + <location filename="../../CopyEngine.cpp" line="1080"/> <source>Rename</source> <translation>Renommer</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1057"/> + <location filename="../../CopyEngine.cpp" line="1072"/> <source>Put at the end</source> <translation>Mettre à la fin</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1061"/> + <location filename="../../CopyEngine.cpp" line="1076"/> <source>Overwrite</source> <translation>Écraser</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1062"/> + <location filename="../../CopyEngine.cpp" line="1077"/> <source>Overwrite if different</source> <translation>Écraser si différent</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1063"/> + <location filename="../../CopyEngine.cpp" line="1078"/> <source>Overwrite if newer</source> <translation>Écraser si plus récent</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1079"/> <source>Overwrite if older</source> <translation>Écraser si plus vieux</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1067"/> + <location filename="../../CopyEngine.cpp" line="1082"/> <source>Automatic</source> <translation>Automatique</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1068"/> + <location filename="../../CopyEngine.cpp" line="1083"/> <source>Sequential</source> <translation>Séquentiel</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1069"/> + <location filename="../../CopyEngine.cpp" line="1084"/> <source>Parallel</source> <translation>Parallèle</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1170"/> + <location filename="../../CopyEngine.cpp" line="1185"/> <source>Options error</source> <translation>Erreur d'options</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1170"/> + <location filename="../../CopyEngine.cpp" line="1185"/> <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> @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="412"/> - <location filename="../../CopyEngineFactory.cpp" line="415"/> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> + <location filename="../../CopyEngineFactory.cpp" line="418"/> + <location filename="../../CopyEngineFactory.cpp" line="421"/> + <location filename="../../CopyEngineFactory.cpp" line="426"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> <source>Ask</source> <translation>Demander</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="413"/> - <location filename="../../CopyEngineFactory.cpp" line="417"/> - <location filename="../../CopyEngineFactory.cpp" line="421"/> - <location filename="../../CopyEngineFactory.cpp" line="425"/> + <location filename="../../CopyEngineFactory.cpp" line="419"/> + <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="427"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Skip</source> <translation>Passer</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="416"/> + <location filename="../../CopyEngineFactory.cpp" line="422"/> <source>Merge</source> <translation>Fusionner</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="418"/> - <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="424"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> <source>Rename</source> <translation>Renommer</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="422"/> + <location filename="../../CopyEngineFactory.cpp" line="428"/> <source>Put at the end</source> <translation>Mettre à la fin</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="426"/> + <location filename="../../CopyEngineFactory.cpp" line="432"/> <source>Overwrite</source> <translation>Écraser</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="427"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> <source>Overwrite if different</source> <translation>Écraser si différent</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="428"/> + <location filename="../../CopyEngineFactory.cpp" line="434"/> <source>Overwrite if newer</source> <translation>Écraser si plus récent</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> <source>Overwrite if older</source> <translation>Écraser si plus vieux</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="438"/> <source>Automatic</source> <translation>Automatique</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Sequential</source> <translation>Séquentiel</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Parallel</source> <translation>Parallèle</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="485"/> - <location filename="../../CopyEngineFactory.cpp" line="524"/> + <location filename="../../CopyEngineFactory.cpp" line="491"/> + <location filename="../../CopyEngineFactory.cpp" line="530"/> <source>Options error</source> <translation>Erreur d'options</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="485"/> + <location filename="../../CopyEngineFactory.cpp" line="491"/> <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="524"/> + <location filename="../../CopyEngineFactory.cpp" line="530"/> <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> @@ -273,56 +273,48 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="131"/> + <location filename="../../FileExistsDialog.cpp" line="137"/> <source>%1 - copy</source> <translation>%1 - copie</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="141"/> + <location filename="../../FileExistsDialog.cpp" line="147"/> <source>%1 - copy (%2)</source> <translation>%1 - copie (%2)</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="226"/> + <location filename="../../FileExistsDialog.cpp" line="232"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="226"/> + <location filename="../../FileExistsDialog.cpp" line="232"/> <source>Try rename with using special characters</source> <translation>Essaie de renommage avec caratéres interdits</translation> </message> - <message> - <source>Try rename with unauthorized characters</source> - <translation type="obsolete">Essaie de renommage avec caratéres interdits</translation> - </message> </context> <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="105"/> + <location filename="../../FileIsSameDialog.cpp" line="111"/> <source>%1 - copy</source> <translation>%1 - copie</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="115"/> + <location filename="../../FileIsSameDialog.cpp" line="121"/> <source>%1 - copy (%2)</source> <translation>%1 - copie (%2)</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="182"/> + <location filename="../../FileIsSameDialog.cpp" line="188"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="182"/> + <location filename="../../FileIsSameDialog.cpp" line="188"/> <source>Try rename with using special characters</source> <translation>Essaie de renommage avec caratéres interdits</translation> </message> - <message> - <source>Try rename with unauthorized characters</source> - <translation type="obsolete">Essaie de renommage avec caratéres interdits</translation> - </message> </context> <context> <name>FilterRules</name> @@ -425,40 +417,40 @@ <translation>Aucun = tout inclure</translation> </message> <message> - <location filename="../../Filters.cpp" line="92"/> - <location filename="../../Filters.cpp" line="130"/> + <location filename="../../Filters.cpp" line="93"/> + <location filename="../../Filters.cpp" line="131"/> <source>Raw text</source> <translation>Texte brute</translation> </message> <message> - <location filename="../../Filters.cpp" line="95"/> - <location filename="../../Filters.cpp" line="133"/> + <location filename="../../Filters.cpp" line="96"/> + <location filename="../../Filters.cpp" line="134"/> <source>Simplified regex</source> <translation>Regex simplifié</translation> </message> <message> - <location filename="../../Filters.cpp" line="98"/> - <location filename="../../Filters.cpp" line="136"/> + <location filename="../../Filters.cpp" line="99"/> + <location filename="../../Filters.cpp" line="137"/> <source>Perl's regex</source> <translation>Regex perl</translation> </message> <message> - <location filename="../../Filters.cpp" line="106"/> - <location filename="../../Filters.cpp" line="144"/> + <location filename="../../Filters.cpp" line="107"/> + <location filename="../../Filters.cpp" line="145"/> <source>Only on file</source> <translation>Appliquer sur fichier</translation> </message> <message> - <location filename="../../Filters.cpp" line="109"/> - <location filename="../../Filters.cpp" line="147"/> + <location filename="../../Filters.cpp" line="110"/> + <location filename="../../Filters.cpp" line="148"/> <source>Only on folder</source> <translation>Appliquer sur dossier</translation> </message> <message> - <location filename="../../Filters.cpp" line="115"/> - <location filename="../../Filters.cpp" line="153"/> - <location filename="../../Filters.cpp" line="215"/> - <location filename="../../Filters.cpp" line="254"/> + <location filename="../../Filters.cpp" line="116"/> + <location filename="../../Filters.cpp" line="154"/> + <location filename="../../Filters.cpp" line="216"/> + <location filename="../../Filters.cpp" line="255"/> <source>Full match</source> <translation>Correspondance totale</translation> </message> @@ -466,85 +458,77 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="51"/> + <location filename="../../FolderExistsDialog.cpp" line="57"/> <source>Folder already exists</source> <translation>Dossier déjà existant</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="116"/> + <location filename="../../FolderExistsDialog.cpp" line="122"/> <source>%1 - copy</source> <translation>%1 - copie</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="126"/> + <location filename="../../FolderExistsDialog.cpp" line="132"/> <source>%1 - copy (%2)</source> <translation>%1 - copie (%2)</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="187"/> + <location filename="../../FolderExistsDialog.cpp" line="193"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="187"/> + <location filename="../../FolderExistsDialog.cpp" line="193"/> <source>Try rename with using special characters</source> <translation>Essaie de renommage avec caratéres interdits</translation> </message> - <message> - <source>Try rename with unauthorized characters</source> - <translation type="obsolete">Essaie de renommage avec caratéres interdits</translation> - </message> - <message> - <source>Try rename with unauthorized charateres</source> - <translation type="obsolete">Tentative de renommage de des caratéres non autorisés</translation> - </message> </context> <context> <name>ListThread</name> <message> - <location filename="../../ListThread.cpp" line="1447"/> - <location filename="../../ListThread.cpp" line="2369"/> + <location filename="../../ListThread.cpp" line="1458"/> + <location filename="../../ListThread.cpp" line="2390"/> <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="1454"/> - <location filename="../../ListThread.cpp" line="2376"/> + <location filename="../../ListThread.cpp" line="1465"/> + <location filename="../../ListThread.cpp" line="2397"/> <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="1470"/> + <location filename="../../ListThread.cpp" line="1481"/> <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="1477"/> + <location filename="../../ListThread.cpp" line="1488"/> <source>Wrong header: "%1"</source> <translation>Mauvais en-tête: "%1"</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1486"/> + <location filename="../../ListThread.cpp" line="1497"/> <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="1495"/> + <location filename="../../ListThread.cpp" line="1506"/> <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="1501"/> + <location filename="../../ListThread.cpp" line="1512"/> <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="1557"/> + <location filename="../../ListThread.cpp" line="1575"/> <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="1565"/> + <location filename="../../ListThread.cpp" line="1583"/> <source>Unable to open the transfer list: %1</source> <translation>Impossible d'ouvrir la list de transfert: %1</translation> </message> @@ -552,10 +536,6 @@ <context> <name>MkPath</name> <message> - <source>Unable to get time</source> - <translation type="obsolete">Impossible d'obtenir l'heure</translation> - </message> - <message> <location filename="../../MkPath.cpp" line="142"/> <source>Unable to create the folder</source> <translation>Impossible de créer le répertoire</translation> @@ -576,21 +556,13 @@ <translation>Impossible de faire le déplacement final du dossier</translation> </message> <message> - <location filename="../../MkPath.cpp" line="232"/> + <location filename="../../MkPath.cpp" line="233"/> <source>Unable to move the folder</source> <translation>Impossible de déplacer le dossier</translation> </message> <message> - <source>Unable to set time</source> - <translation type="obsolete">Impossible de définir l'heure</translation> - </message> - <message> - <source>Unable to set the access-right</source> - <translation type="obsolete">Impossible de définir les droits d'accés</translation> - </message> - <message> <location filename="../../MkPath.cpp" line="93"/> - <location filename="../../MkPath.cpp" line="275"/> + <location filename="../../MkPath.cpp" line="276"/> <source>Unable to remove</source> <translation>Impossible de supprimer</translation> </message> @@ -682,43 +654,39 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="265"/> + <location filename="../../ScanFileOrFolder.cpp" line="274"/> <source>Blacklisted folder</source> <translation>Dossier banis</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="327"/> - <location filename="../../ScanFileOrFolder.cpp" line="393"/> + <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="337"/> - <location filename="../../ScanFileOrFolder.cpp" line="403"/> + <location filename="../../ScanFileOrFolder.cpp" line="348"/> + <location filename="../../ScanFileOrFolder.cpp" line="414"/> <source>%1 - copy (%2)</source> <translation>%1 - copie (%2)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="441"/> + <location filename="../../ScanFileOrFolder.cpp" line="452"/> <source>This is not a folder</source> <translation>N'est pas un dossier</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="443"/> + <location filename="../../ScanFileOrFolder.cpp" line="454"/> <source>The folder does exists</source> <translation>Le répertoire n'existe pas</translation> </message> <message> - <source>The folder not exists</source> - <translation type="obsolete">Le répertoire n'existe pas</translation> - </message> - <message> - <location filename="../../ScanFileOrFolder.cpp" line="445"/> + <location filename="../../ScanFileOrFolder.cpp" line="456"/> <source>The folder is not readable</source> <translation>Le répertoire n'est pas lisible</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="467"/> <source>Problem with name encoding</source> <translation>Problém d'encodage</translation> </message> @@ -726,105 +694,101 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="235"/> - <location filename="../../TransferThread.cpp" line="663"/> - <location filename="../../TransferThread.cpp" line="735"/> - <location filename="../../TransferThread.cpp" line="1303"/> + <location filename="../../TransferThread.cpp" line="243"/> + <location filename="../../TransferThread.cpp" line="672"/> + <location filename="../../TransferThread.cpp" line="744"/> + <location filename="../../TransferThread.cpp" line="1314"/> <source>File not found</source> <translation>Fichier non trouvé</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="572"/> + <location filename="../../TransferThread.cpp" line="581"/> <source>Drive %1</source> <translation>Lecteur %1</translation> </message> <message> - <source>Try rename with unauthorized characters</source> - <translation type="obsolete">Essaie de renommage avec caratéres interdits</translation> - </message> - <message> - <location filename="../../TransferThread.cpp" line="574"/> + <location filename="../../TransferThread.cpp" line="583"/> <source>Unknown folder</source> <translation>Dossier inconnu</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="578"/> + <location filename="../../TransferThread.cpp" line="587"/> <source>root</source> <translation>racine</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="631"/> + <location filename="../../TransferThread.cpp" line="640"/> <source>%1 - copy</source> <translation>%1 - copie</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="641"/> + <location filename="../../TransferThread.cpp" line="650"/> <source>%1 - copy (%2)</source> <translation>%1 - copie (%2)</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="777"/> + <location filename="../../TransferThread.cpp" line="786"/> <source>The source doesn't exist</source> <translation>La source n'existe pas</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="701"/> - <location filename="../../TransferThread.cpp" line="816"/> + <location filename="../../TransferThread.cpp" line="710"/> + <location filename="../../TransferThread.cpp" line="825"/> <source>The source file doesn't exist</source> <translation>Le fichier source n'existe pas</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1124"/> + <location filename="../../TransferThread.cpp" line="1133"/> <source>The checksums do not match</source> <translation>Les sommes de controle ne correspondent pas</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1227"/> + <location filename="../../TransferThread.cpp" line="1238"/> <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="741"/> - <location filename="../../TransferThread.cpp" line="828"/> + <location filename="../../TransferThread.cpp" line="750"/> + <location filename="../../TransferThread.cpp" line="837"/> <source>Unable to do the folder</source> <translation>Impossible de créer le dossier</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="219"/> + <location filename="../../TransferThread.cpp" line="227"/> <source>Try rename with using special characters</source> <translation>Essaie de renommage avec caratéres interdits</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="336"/> - <location filename="../../TransferThread.cpp" line="353"/> + <location filename="../../TransferThread.cpp" line="344"/> + <location filename="../../TransferThread.cpp" line="361"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation>Mauvaise date de modification ou impossible de l'avoir, vous pouvez désactivé le transfert de celui-ci</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="408"/> - <location filename="../../TransferThread.cpp" line="431"/> + <location filename="../../TransferThread.cpp" line="416"/> + <location filename="../../TransferThread.cpp" line="439"/> <source>Internal error: Already opening</source> <translation>Erreur interne: Déjà ouvert</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="822"/> + <location filename="../../TransferThread.cpp" line="831"/> <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="1213"/> + <location filename="../../TransferThread.cpp" line="1223"/> <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="1238"/> + <location filename="../../TransferThread.cpp" line="1249"/> <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="1303"/> - <location filename="../../TransferThread.cpp" line="1321"/> - <location filename="../../TransferThread.cpp" line="1336"/> + <location filename="../../TransferThread.cpp" line="1314"/> + <location filename="../../TransferThread.cpp" line="1332"/> + <location filename="../../TransferThread.cpp" line="1347"/> <source>Unable to change the date</source> <translation>Impossible de changer la date</translation> </message> @@ -837,17 +801,17 @@ <translation>Erreur de résolution de chemain (chemain vide)</translation> </message> <message> - <location filename="../../WriteThread.cpp" line="268"/> + <location filename="../../WriteThread.cpp" line="269"/> <source>Internal error, please report it!</source> <translation>Erreur interne, merci de la reporter!</translation> </message> <message> - <location filename="../../WriteThread.cpp" line="671"/> + <location filename="../../WriteThread.cpp" line="672"/> <source>Unable to read the source file: </source> <translation>Impossible de lire le fichier source: </translation> </message> <message> - <location filename="../../WriteThread.cpp" line="696"/> + <location filename="../../WriteThread.cpp" line="697"/> <source>File truncated during read, possible data change</source> <translation>Fichier rétréci pendant la lecture, possible changement de données</translation> </message> @@ -1041,10 +1005,6 @@ <translation>Utiliser ce dossier quand la destination n'est pas défini</translation> </message> <message> - <source>Use this folder when destination is empty</source> - <translation type="obsolete">Utiliser ce dossier quand la destination est vide</translation> - </message> - <message> <location filename="../../copyEngineOptions.ui" line="637"/> <source>Browse</source> <translation>Parcourir</translation> @@ -1230,10 +1190,6 @@ <translation>Nom de fichier</translation> </message> <message> - <source>The source and destination is identical</source> - <translation type="obsolete">La source et la destination sont identique</translation> - </message> - <message> <location filename="../../fileIsSameDialog.ui" line="14"/> <source>The source and destination are same</source> <translation>La source et la destination sont identique</translation> diff --git a/plugins/CopyEngine/Ultracopier/Languages/hi/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/hi/translation.ts index 3362659..a00b0cd 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/hi/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/hi/translation.ts @@ -61,84 +61,84 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="717"/> + <location filename="../../CopyEngine.cpp" line="732"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1047"/> - <location filename="../../CopyEngine.cpp" line="1050"/> - <location filename="../../CopyEngine.cpp" line="1055"/> - <location filename="../../CopyEngine.cpp" line="1059"/> + <location filename="../../CopyEngine.cpp" line="1062"/> + <location filename="../../CopyEngine.cpp" line="1065"/> + <location filename="../../CopyEngine.cpp" line="1070"/> + <location filename="../../CopyEngine.cpp" line="1074"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1048"/> - <location filename="../../CopyEngine.cpp" line="1052"/> - <location filename="../../CopyEngine.cpp" line="1056"/> - <location filename="../../CopyEngine.cpp" line="1060"/> + <location filename="../../CopyEngine.cpp" line="1063"/> + <location filename="../../CopyEngine.cpp" line="1067"/> + <location filename="../../CopyEngine.cpp" line="1071"/> + <location filename="../../CopyEngine.cpp" line="1075"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1051"/> + <location filename="../../CopyEngine.cpp" line="1066"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1053"/> - <location filename="../../CopyEngine.cpp" line="1065"/> + <location filename="../../CopyEngine.cpp" line="1068"/> + <location filename="../../CopyEngine.cpp" line="1080"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1057"/> + <location filename="../../CopyEngine.cpp" line="1072"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1061"/> + <location filename="../../CopyEngine.cpp" line="1076"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1062"/> + <location filename="../../CopyEngine.cpp" line="1077"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1063"/> + <location filename="../../CopyEngine.cpp" line="1078"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1079"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1067"/> + <location filename="../../CopyEngine.cpp" line="1082"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1068"/> + <location filename="../../CopyEngine.cpp" line="1083"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1069"/> + <location filename="../../CopyEngine.cpp" line="1084"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1170"/> + <location filename="../../CopyEngine.cpp" line="1185"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1170"/> + <location filename="../../CopyEngine.cpp" line="1185"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="412"/> - <location filename="../../CopyEngineFactory.cpp" line="415"/> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> + <location filename="../../CopyEngineFactory.cpp" line="418"/> + <location filename="../../CopyEngineFactory.cpp" line="421"/> + <location filename="../../CopyEngineFactory.cpp" line="426"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="413"/> - <location filename="../../CopyEngineFactory.cpp" line="417"/> - <location filename="../../CopyEngineFactory.cpp" line="421"/> - <location filename="../../CopyEngineFactory.cpp" line="425"/> + <location filename="../../CopyEngineFactory.cpp" line="419"/> + <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="427"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="416"/> + <location filename="../../CopyEngineFactory.cpp" line="422"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="418"/> - <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="424"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="422"/> + <location filename="../../CopyEngineFactory.cpp" line="428"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="426"/> + <location filename="../../CopyEngineFactory.cpp" line="432"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="427"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="428"/> + <location filename="../../CopyEngineFactory.cpp" line="434"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="438"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="485"/> - <location filename="../../CopyEngineFactory.cpp" line="524"/> + <location filename="../../CopyEngineFactory.cpp" line="491"/> + <location filename="../../CopyEngineFactory.cpp" line="530"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="485"/> + <location filename="../../CopyEngineFactory.cpp" line="491"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="524"/> + <location filename="../../CopyEngineFactory.cpp" line="530"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -273,22 +273,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="131"/> + <location filename="../../FileExistsDialog.cpp" line="137"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="141"/> + <location filename="../../FileExistsDialog.cpp" line="147"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="226"/> + <location filename="../../FileExistsDialog.cpp" line="232"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="226"/> + <location filename="../../FileExistsDialog.cpp" line="232"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -296,22 +296,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="105"/> + <location filename="../../FileIsSameDialog.cpp" line="111"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="115"/> + <location filename="../../FileIsSameDialog.cpp" line="121"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="182"/> + <location filename="../../FileIsSameDialog.cpp" line="188"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="182"/> + <location filename="../../FileIsSameDialog.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -417,40 +417,40 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="92"/> - <location filename="../../Filters.cpp" line="130"/> + <location filename="../../Filters.cpp" line="93"/> + <location filename="../../Filters.cpp" line="131"/> <source>Raw text</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="95"/> - <location filename="../../Filters.cpp" line="133"/> + <location filename="../../Filters.cpp" line="96"/> + <location filename="../../Filters.cpp" line="134"/> <source>Simplified regex</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="98"/> - <location filename="../../Filters.cpp" line="136"/> + <location filename="../../Filters.cpp" line="99"/> + <location filename="../../Filters.cpp" line="137"/> <source>Perl's regex</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="106"/> - <location filename="../../Filters.cpp" line="144"/> + <location filename="../../Filters.cpp" line="107"/> + <location filename="../../Filters.cpp" line="145"/> <source>Only on file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="109"/> - <location filename="../../Filters.cpp" line="147"/> + <location filename="../../Filters.cpp" line="110"/> + <location filename="../../Filters.cpp" line="148"/> <source>Only on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="115"/> - <location filename="../../Filters.cpp" line="153"/> - <location filename="../../Filters.cpp" line="215"/> - <location filename="../../Filters.cpp" line="254"/> + <location filename="../../Filters.cpp" line="116"/> + <location filename="../../Filters.cpp" line="154"/> + <location filename="../../Filters.cpp" line="216"/> + <location filename="../../Filters.cpp" line="255"/> <source>Full match</source> <translation type="unfinished"></translation> </message> @@ -458,27 +458,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="51"/> + <location filename="../../FolderExistsDialog.cpp" line="57"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="116"/> + <location filename="../../FolderExistsDialog.cpp" line="122"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="126"/> + <location filename="../../FolderExistsDialog.cpp" line="132"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="187"/> + <location filename="../../FolderExistsDialog.cpp" line="193"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="187"/> + <location filename="../../FolderExistsDialog.cpp" line="193"/> <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="1447"/> - <location filename="../../ListThread.cpp" line="2369"/> + <location filename="../../ListThread.cpp" line="1458"/> + <location filename="../../ListThread.cpp" line="2390"/> <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="1454"/> - <location filename="../../ListThread.cpp" line="2376"/> + <location filename="../../ListThread.cpp" line="1465"/> + <location filename="../../ListThread.cpp" line="2397"/> <source>Unable to save the transfer list: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1470"/> + <location filename="../../ListThread.cpp" line="1481"/> <source>Problem reading file, or file-size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1477"/> + <location filename="../../ListThread.cpp" line="1488"/> <source>Wrong header: "%1"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1486"/> + <location filename="../../ListThread.cpp" line="1497"/> <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="1495"/> + <location filename="../../ListThread.cpp" line="1506"/> <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="1501"/> + <location filename="../../ListThread.cpp" line="1512"/> <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="1557"/> + <location filename="../../ListThread.cpp" line="1575"/> <source>Some errors have been found during the line parsing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1565"/> + <location filename="../../ListThread.cpp" line="1583"/> <source>Unable to open the transfer list: %1</source> <translation type="unfinished"></translation> </message> @@ -556,13 +556,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="232"/> + <location filename="../../MkPath.cpp" line="233"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../MkPath.cpp" line="93"/> - <location filename="../../MkPath.cpp" line="275"/> + <location filename="../../MkPath.cpp" line="276"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> @@ -649,39 +649,39 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="265"/> + <location filename="../../ScanFileOrFolder.cpp" line="274"/> <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="327"/> - <location filename="../../ScanFileOrFolder.cpp" line="393"/> + <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="337"/> - <location filename="../../ScanFileOrFolder.cpp" line="403"/> + <location filename="../../ScanFileOrFolder.cpp" line="348"/> + <location filename="../../ScanFileOrFolder.cpp" line="414"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="441"/> + <location filename="../../ScanFileOrFolder.cpp" line="452"/> <source>This is not a folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="443"/> + <location filename="../../ScanFileOrFolder.cpp" line="454"/> <source>The folder does exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="445"/> + <location filename="../../ScanFileOrFolder.cpp" line="456"/> <source>The folder is not readable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="467"/> <source>Problem with name encoding</source> <translation type="unfinished"></translation> </message> @@ -689,101 +689,101 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="235"/> - <location filename="../../TransferThread.cpp" line="663"/> - <location filename="../../TransferThread.cpp" line="735"/> - <location filename="../../TransferThread.cpp" line="1303"/> + <location filename="../../TransferThread.cpp" line="243"/> + <location filename="../../TransferThread.cpp" line="672"/> + <location filename="../../TransferThread.cpp" line="744"/> + <location filename="../../TransferThread.cpp" line="1314"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="336"/> - <location filename="../../TransferThread.cpp" line="353"/> + <location filename="../../TransferThread.cpp" line="344"/> + <location filename="../../TransferThread.cpp" line="361"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="408"/> - <location filename="../../TransferThread.cpp" line="431"/> + <location filename="../../TransferThread.cpp" line="416"/> + <location filename="../../TransferThread.cpp" line="439"/> <source>Internal error: Already opening</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="572"/> + <location filename="../../TransferThread.cpp" line="581"/> <source>Drive %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="574"/> + <location filename="../../TransferThread.cpp" line="583"/> <source>Unknown folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="578"/> + <location filename="../../TransferThread.cpp" line="587"/> <source>root</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="631"/> + <location filename="../../TransferThread.cpp" line="640"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="641"/> + <location filename="../../TransferThread.cpp" line="650"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="701"/> - <location filename="../../TransferThread.cpp" line="816"/> + <location filename="../../TransferThread.cpp" line="710"/> + <location filename="../../TransferThread.cpp" line="825"/> <source>The source file doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="741"/> - <location filename="../../TransferThread.cpp" line="828"/> + <location filename="../../TransferThread.cpp" line="750"/> + <location filename="../../TransferThread.cpp" line="837"/> <source>Unable to do the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="777"/> + <location filename="../../TransferThread.cpp" line="786"/> <source>The source doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="822"/> + <location filename="../../TransferThread.cpp" line="831"/> <source>Another file exists at same place</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1124"/> + <location filename="../../TransferThread.cpp" line="1133"/> <source>The checksums do not match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1213"/> + <location filename="../../TransferThread.cpp" line="1223"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1227"/> + <location filename="../../TransferThread.cpp" line="1238"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1238"/> + <location filename="../../TransferThread.cpp" line="1249"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1303"/> - <location filename="../../TransferThread.cpp" line="1321"/> - <location filename="../../TransferThread.cpp" line="1336"/> + <location filename="../../TransferThread.cpp" line="1314"/> + <location filename="../../TransferThread.cpp" line="1332"/> + <location filename="../../TransferThread.cpp" line="1347"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="219"/> + <location filename="../../TransferThread.cpp" line="227"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -796,17 +796,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="268"/> + <location filename="../../WriteThread.cpp" line="269"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="671"/> + <location filename="../../WriteThread.cpp" line="672"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="696"/> + <location filename="../../WriteThread.cpp" line="697"/> <source>File truncated during read, possible data change</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 beff862..eaa968d 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/hu/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/hu/translation.ts @@ -61,84 +61,84 @@ <translation>Használja a jelenlegi célt: "%1"?</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="717"/> + <location filename="../../CopyEngine.cpp" line="732"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation>Ezt a módot már korábban kényszerítették. Belső hiba történt, kérlek jelentsd be</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1047"/> - <location filename="../../CopyEngine.cpp" line="1050"/> - <location filename="../../CopyEngine.cpp" line="1055"/> - <location filename="../../CopyEngine.cpp" line="1059"/> + <location filename="../../CopyEngine.cpp" line="1062"/> + <location filename="../../CopyEngine.cpp" line="1065"/> + <location filename="../../CopyEngine.cpp" line="1070"/> + <location filename="../../CopyEngine.cpp" line="1074"/> <source>Ask</source> <translation>Kérdezzen rá</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1048"/> - <location filename="../../CopyEngine.cpp" line="1052"/> - <location filename="../../CopyEngine.cpp" line="1056"/> - <location filename="../../CopyEngine.cpp" line="1060"/> + <location filename="../../CopyEngine.cpp" line="1063"/> + <location filename="../../CopyEngine.cpp" line="1067"/> + <location filename="../../CopyEngine.cpp" line="1071"/> + <location filename="../../CopyEngine.cpp" line="1075"/> <source>Skip</source> <translation>Kihagy</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1051"/> + <location filename="../../CopyEngine.cpp" line="1066"/> <source>Merge</source> <translation>Összeolvaszt</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1053"/> - <location filename="../../CopyEngine.cpp" line="1065"/> + <location filename="../../CopyEngine.cpp" line="1068"/> + <location filename="../../CopyEngine.cpp" line="1080"/> <source>Rename</source> <translation>Nevezze át</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1057"/> + <location filename="../../CopyEngine.cpp" line="1072"/> <source>Put at the end</source> <translation>Helyezze a végére</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1061"/> + <location filename="../../CopyEngine.cpp" line="1076"/> <source>Overwrite</source> <translation>Felülír</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1062"/> + <location filename="../../CopyEngine.cpp" line="1077"/> <source>Overwrite if different</source> <translation>Felülír, ha különbözik</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1063"/> + <location filename="../../CopyEngine.cpp" line="1078"/> <source>Overwrite if newer</source> <translation>Felülír, ha újabb</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1079"/> <source>Overwrite if older</source> <translation>Felülír, ha régebbi</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1067"/> + <location filename="../../CopyEngine.cpp" line="1082"/> <source>Automatic</source> <translation>Automatikus</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1068"/> + <location filename="../../CopyEngine.cpp" line="1083"/> <source>Sequential</source> <translation>Szekvenciális</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1069"/> + <location filename="../../CopyEngine.cpp" line="1084"/> <source>Parallel</source> <translation>Párhuzamos</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1170"/> + <location filename="../../CopyEngine.cpp" line="1185"/> <source>Options error</source> <translation>Beállítási hiba</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1170"/> + <location filename="../../CopyEngine.cpp" line="1185"/> <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> @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="412"/> - <location filename="../../CopyEngineFactory.cpp" line="415"/> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> + <location filename="../../CopyEngineFactory.cpp" line="418"/> + <location filename="../../CopyEngineFactory.cpp" line="421"/> + <location filename="../../CopyEngineFactory.cpp" line="426"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> <source>Ask</source> <translation>Kérdezzen rá</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="413"/> - <location filename="../../CopyEngineFactory.cpp" line="417"/> - <location filename="../../CopyEngineFactory.cpp" line="421"/> - <location filename="../../CopyEngineFactory.cpp" line="425"/> + <location filename="../../CopyEngineFactory.cpp" line="419"/> + <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="427"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Skip</source> <translation>Kihagy</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="416"/> + <location filename="../../CopyEngineFactory.cpp" line="422"/> <source>Merge</source> <translation>Összeolvaszt</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="418"/> - <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="424"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> <source>Rename</source> <translation>Nevezze át</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="422"/> + <location filename="../../CopyEngineFactory.cpp" line="428"/> <source>Put at the end</source> <translation>Helyezze a végére</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="426"/> + <location filename="../../CopyEngineFactory.cpp" line="432"/> <source>Overwrite</source> <translation>Felülír</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="427"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> <source>Overwrite if different</source> <translation>Felülír, ha különbözik</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="428"/> + <location filename="../../CopyEngineFactory.cpp" line="434"/> <source>Overwrite if newer</source> <translation>Felülír, ha újabb</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> <source>Overwrite if older</source> <translation>Felülír, ha régebbi</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="438"/> <source>Automatic</source> <translation>Automatikus</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Sequential</source> <translation>Szekvenciális</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Parallel</source> <translation>Párhuzamos</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="485"/> - <location filename="../../CopyEngineFactory.cpp" line="524"/> + <location filename="../../CopyEngineFactory.cpp" line="491"/> + <location filename="../../CopyEngineFactory.cpp" line="530"/> <source>Options error</source> <translation>Beállítási hiba</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="485"/> + <location filename="../../CopyEngineFactory.cpp" line="491"/> <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="524"/> + <location filename="../../CopyEngineFactory.cpp" line="530"/> <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> @@ -273,22 +273,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="131"/> + <location filename="../../FileExistsDialog.cpp" line="137"/> <source>%1 - copy</source> <translation>%1 - másolás</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="141"/> + <location filename="../../FileExistsDialog.cpp" line="147"/> <source>%1 - copy (%2)</source> <translation>%1 - másolás (%2)</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="226"/> + <location filename="../../FileExistsDialog.cpp" line="232"/> <source>Error</source> <translation>Hiba</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="226"/> + <location filename="../../FileExistsDialog.cpp" line="232"/> <source>Try rename with using special characters</source> <translation>Átnevezés speciális karakterek használatával</translation> </message> @@ -296,22 +296,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="105"/> + <location filename="../../FileIsSameDialog.cpp" line="111"/> <source>%1 - copy</source> <translation>%1 - másolás</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="115"/> + <location filename="../../FileIsSameDialog.cpp" line="121"/> <source>%1 - copy (%2)</source> <translation>%1 - másolás (%2)</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="182"/> + <location filename="../../FileIsSameDialog.cpp" line="188"/> <source>Error</source> <translation>Hiba</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="182"/> + <location filename="../../FileIsSameDialog.cpp" line="188"/> <source>Try rename with using special characters</source> <translation>Átnevezés speciális karakterek használatával</translation> </message> @@ -417,40 +417,40 @@ <translation>Nincs = Mindet használ</translation> </message> <message> - <location filename="../../Filters.cpp" line="92"/> - <location filename="../../Filters.cpp" line="130"/> + <location filename="../../Filters.cpp" line="93"/> + <location filename="../../Filters.cpp" line="131"/> <source>Raw text</source> <translation>Nyers szöveg</translation> </message> <message> - <location filename="../../Filters.cpp" line="95"/> - <location filename="../../Filters.cpp" line="133"/> + <location filename="../../Filters.cpp" line="96"/> + <location filename="../../Filters.cpp" line="134"/> <source>Simplified regex</source> <translation>Egyszerűsített regex</translation> </message> <message> - <location filename="../../Filters.cpp" line="98"/> - <location filename="../../Filters.cpp" line="136"/> + <location filename="../../Filters.cpp" line="99"/> + <location filename="../../Filters.cpp" line="137"/> <source>Perl's regex</source> <translation>Perl regex</translation> </message> <message> - <location filename="../../Filters.cpp" line="106"/> - <location filename="../../Filters.cpp" line="144"/> + <location filename="../../Filters.cpp" line="107"/> + <location filename="../../Filters.cpp" line="145"/> <source>Only on file</source> <translation>Csak fájlon</translation> </message> <message> - <location filename="../../Filters.cpp" line="109"/> - <location filename="../../Filters.cpp" line="147"/> + <location filename="../../Filters.cpp" line="110"/> + <location filename="../../Filters.cpp" line="148"/> <source>Only on folder</source> <translation>Csak mappán</translation> </message> <message> - <location filename="../../Filters.cpp" line="115"/> - <location filename="../../Filters.cpp" line="153"/> - <location filename="../../Filters.cpp" line="215"/> - <location filename="../../Filters.cpp" line="254"/> + <location filename="../../Filters.cpp" line="116"/> + <location filename="../../Filters.cpp" line="154"/> + <location filename="../../Filters.cpp" line="216"/> + <location filename="../../Filters.cpp" line="255"/> <source>Full match</source> <translation>Teljes egyezés</translation> </message> @@ -458,27 +458,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="51"/> + <location filename="../../FolderExistsDialog.cpp" line="57"/> <source>Folder already exists</source> <translation>Mappa már létezik</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="116"/> + <location filename="../../FolderExistsDialog.cpp" line="122"/> <source>%1 - copy</source> <translation>%1 - másolás</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="126"/> + <location filename="../../FolderExistsDialog.cpp" line="132"/> <source>%1 - copy (%2)</source> <translation>%1 - másolás (%2)</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="187"/> + <location filename="../../FolderExistsDialog.cpp" line="193"/> <source>Error</source> <translation>Hiba</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="187"/> + <location filename="../../FolderExistsDialog.cpp" line="193"/> <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="1447"/> - <location filename="../../ListThread.cpp" line="2369"/> + <location filename="../../ListThread.cpp" line="1458"/> + <location filename="../../ListThread.cpp" line="2390"/> <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="1454"/> - <location filename="../../ListThread.cpp" line="2376"/> + <location filename="../../ListThread.cpp" line="1465"/> + <location filename="../../ListThread.cpp" line="2397"/> <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="1470"/> + <location filename="../../ListThread.cpp" line="1481"/> <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="1477"/> + <location filename="../../ListThread.cpp" line="1488"/> <source>Wrong header: "%1"</source> <translation>Hibás fejléc: "%1"</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1486"/> + <location filename="../../ListThread.cpp" line="1497"/> <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="1495"/> + <location filename="../../ListThread.cpp" line="1506"/> <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="1501"/> + <location filename="../../ListThread.cpp" line="1512"/> <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="1557"/> + <location filename="../../ListThread.cpp" line="1575"/> <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="1565"/> + <location filename="../../ListThread.cpp" line="1583"/> <source>Unable to open the transfer list: %1</source> <translation>Az átviteli lista megnyitása nem lehetséges: %1</translation> </message> @@ -556,17 +556,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="232"/> + <location filename="../../MkPath.cpp" line="233"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <source>Unable to set the access-right</source> - <translation type="obsolete">Jogok beállítása nem lehetséges</translation> - </message> - <message> <location filename="../../MkPath.cpp" line="93"/> - <location filename="../../MkPath.cpp" line="275"/> + <location filename="../../MkPath.cpp" line="276"/> <source>Unable to remove</source> <translation>Eltávolítás nem lehetséges</translation> </message> @@ -653,39 +649,39 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="265"/> + <location filename="../../ScanFileOrFolder.cpp" line="274"/> <source>Blacklisted folder</source> <translation>Feketelistás mappa</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="327"/> - <location filename="../../ScanFileOrFolder.cpp" line="393"/> + <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="337"/> - <location filename="../../ScanFileOrFolder.cpp" line="403"/> + <location filename="../../ScanFileOrFolder.cpp" line="348"/> + <location filename="../../ScanFileOrFolder.cpp" line="414"/> <source>%1 - copy (%2)</source> <translation>%1 - másolás (%2)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="441"/> + <location filename="../../ScanFileOrFolder.cpp" line="452"/> <source>This is not a folder</source> <translation>Ez nem mappa</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="443"/> + <location filename="../../ScanFileOrFolder.cpp" line="454"/> <source>The folder does exists</source> <translation>A mappa létezik</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="445"/> + <location filename="../../ScanFileOrFolder.cpp" line="456"/> <source>The folder is not readable</source> <translation>A mappa nem olvasható</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="467"/> <source>Problem with name encoding</source> <translation>Probléma a névkódolással</translation> </message> @@ -693,101 +689,101 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="235"/> - <location filename="../../TransferThread.cpp" line="663"/> - <location filename="../../TransferThread.cpp" line="735"/> - <location filename="../../TransferThread.cpp" line="1303"/> + <location filename="../../TransferThread.cpp" line="243"/> + <location filename="../../TransferThread.cpp" line="672"/> + <location filename="../../TransferThread.cpp" line="744"/> + <location filename="../../TransferThread.cpp" line="1314"/> <source>File not found</source> <translation>Fájl nem található</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="572"/> + <location filename="../../TransferThread.cpp" line="581"/> <source>Drive %1</source> <translation type="unfinished">%1 meghajtó</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="574"/> + <location filename="../../TransferThread.cpp" line="583"/> <source>Unknown folder</source> <translation type="unfinished">Ismeretlen mappa</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="578"/> + <location filename="../../TransferThread.cpp" line="587"/> <source>root</source> <translation type="unfinished">gyökér</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="631"/> + <location filename="../../TransferThread.cpp" line="640"/> <source>%1 - copy</source> <translation type="unfinished">%1 - másolás</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="641"/> + <location filename="../../TransferThread.cpp" line="650"/> <source>%1 - copy (%2)</source> <translation type="unfinished">%1 - másolás (%2)</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="777"/> + <location filename="../../TransferThread.cpp" line="786"/> <source>The source doesn't exist</source> <translation type="unfinished">A forrás nem létezik</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="741"/> - <location filename="../../TransferThread.cpp" line="828"/> + <location filename="../../TransferThread.cpp" line="750"/> + <location filename="../../TransferThread.cpp" line="837"/> <source>Unable to do the folder</source> <translation type="unfinished">Mappaművelet nem lehetséges</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="219"/> + <location filename="../../TransferThread.cpp" line="227"/> <source>Try rename with using special characters</source> <translation>Átnevezés speciális karakterek használatával</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="336"/> - <location filename="../../TransferThread.cpp" line="353"/> + <location filename="../../TransferThread.cpp" line="344"/> + <location filename="../../TransferThread.cpp" line="361"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="408"/> - <location filename="../../TransferThread.cpp" line="431"/> + <location filename="../../TransferThread.cpp" line="416"/> + <location filename="../../TransferThread.cpp" line="439"/> <source>Internal error: Already opening</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="701"/> - <location filename="../../TransferThread.cpp" line="816"/> + <location filename="../../TransferThread.cpp" line="710"/> + <location filename="../../TransferThread.cpp" line="825"/> <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="822"/> + <location filename="../../TransferThread.cpp" line="831"/> <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="1124"/> + <location filename="../../TransferThread.cpp" line="1133"/> <source>The checksums do not match</source> <translation type="unfinished">A checksumok nem egyeznek meg</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1213"/> + <location filename="../../TransferThread.cpp" line="1223"/> <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="1227"/> + <location filename="../../TransferThread.cpp" line="1238"/> <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="1238"/> + <location filename="../../TransferThread.cpp" line="1249"/> <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="1303"/> - <location filename="../../TransferThread.cpp" line="1321"/> - <location filename="../../TransferThread.cpp" line="1336"/> + <location filename="../../TransferThread.cpp" line="1314"/> + <location filename="../../TransferThread.cpp" line="1332"/> + <location filename="../../TransferThread.cpp" line="1347"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -800,17 +796,17 @@ <translation>Útvonal feloldási hiba (Üres útvonal)</translation> </message> <message> - <location filename="../../WriteThread.cpp" line="268"/> + <location filename="../../WriteThread.cpp" line="269"/> <source>Internal error, please report it!</source> <translation>Belső hiba, kérlek jelentsd!</translation> </message> <message> - <location filename="../../WriteThread.cpp" line="671"/> + <location filename="../../WriteThread.cpp" line="672"/> <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="696"/> + <location filename="../../WriteThread.cpp" line="697"/> <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> @@ -1004,10 +1000,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>Use this folder when destination is empty</source> - <translation type="obsolete">Használja ezt a mappát, ha a cél üres</translation> - </message> - <message> <location filename="../../copyEngineOptions.ui" line="637"/> <source>Browse</source> <translation>Tallózás</translation> diff --git a/plugins/CopyEngine/Ultracopier/Languages/id/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/id/translation.ts index 3362659..a00b0cd 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/id/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/id/translation.ts @@ -61,84 +61,84 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="717"/> + <location filename="../../CopyEngine.cpp" line="732"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1047"/> - <location filename="../../CopyEngine.cpp" line="1050"/> - <location filename="../../CopyEngine.cpp" line="1055"/> - <location filename="../../CopyEngine.cpp" line="1059"/> + <location filename="../../CopyEngine.cpp" line="1062"/> + <location filename="../../CopyEngine.cpp" line="1065"/> + <location filename="../../CopyEngine.cpp" line="1070"/> + <location filename="../../CopyEngine.cpp" line="1074"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1048"/> - <location filename="../../CopyEngine.cpp" line="1052"/> - <location filename="../../CopyEngine.cpp" line="1056"/> - <location filename="../../CopyEngine.cpp" line="1060"/> + <location filename="../../CopyEngine.cpp" line="1063"/> + <location filename="../../CopyEngine.cpp" line="1067"/> + <location filename="../../CopyEngine.cpp" line="1071"/> + <location filename="../../CopyEngine.cpp" line="1075"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1051"/> + <location filename="../../CopyEngine.cpp" line="1066"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1053"/> - <location filename="../../CopyEngine.cpp" line="1065"/> + <location filename="../../CopyEngine.cpp" line="1068"/> + <location filename="../../CopyEngine.cpp" line="1080"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1057"/> + <location filename="../../CopyEngine.cpp" line="1072"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1061"/> + <location filename="../../CopyEngine.cpp" line="1076"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1062"/> + <location filename="../../CopyEngine.cpp" line="1077"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1063"/> + <location filename="../../CopyEngine.cpp" line="1078"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1079"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1067"/> + <location filename="../../CopyEngine.cpp" line="1082"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1068"/> + <location filename="../../CopyEngine.cpp" line="1083"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1069"/> + <location filename="../../CopyEngine.cpp" line="1084"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1170"/> + <location filename="../../CopyEngine.cpp" line="1185"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1170"/> + <location filename="../../CopyEngine.cpp" line="1185"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="412"/> - <location filename="../../CopyEngineFactory.cpp" line="415"/> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> + <location filename="../../CopyEngineFactory.cpp" line="418"/> + <location filename="../../CopyEngineFactory.cpp" line="421"/> + <location filename="../../CopyEngineFactory.cpp" line="426"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="413"/> - <location filename="../../CopyEngineFactory.cpp" line="417"/> - <location filename="../../CopyEngineFactory.cpp" line="421"/> - <location filename="../../CopyEngineFactory.cpp" line="425"/> + <location filename="../../CopyEngineFactory.cpp" line="419"/> + <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="427"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="416"/> + <location filename="../../CopyEngineFactory.cpp" line="422"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="418"/> - <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="424"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="422"/> + <location filename="../../CopyEngineFactory.cpp" line="428"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="426"/> + <location filename="../../CopyEngineFactory.cpp" line="432"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="427"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="428"/> + <location filename="../../CopyEngineFactory.cpp" line="434"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="438"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="485"/> - <location filename="../../CopyEngineFactory.cpp" line="524"/> + <location filename="../../CopyEngineFactory.cpp" line="491"/> + <location filename="../../CopyEngineFactory.cpp" line="530"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="485"/> + <location filename="../../CopyEngineFactory.cpp" line="491"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="524"/> + <location filename="../../CopyEngineFactory.cpp" line="530"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -273,22 +273,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="131"/> + <location filename="../../FileExistsDialog.cpp" line="137"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="141"/> + <location filename="../../FileExistsDialog.cpp" line="147"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="226"/> + <location filename="../../FileExistsDialog.cpp" line="232"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="226"/> + <location filename="../../FileExistsDialog.cpp" line="232"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -296,22 +296,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="105"/> + <location filename="../../FileIsSameDialog.cpp" line="111"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="115"/> + <location filename="../../FileIsSameDialog.cpp" line="121"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="182"/> + <location filename="../../FileIsSameDialog.cpp" line="188"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="182"/> + <location filename="../../FileIsSameDialog.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -417,40 +417,40 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="92"/> - <location filename="../../Filters.cpp" line="130"/> + <location filename="../../Filters.cpp" line="93"/> + <location filename="../../Filters.cpp" line="131"/> <source>Raw text</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="95"/> - <location filename="../../Filters.cpp" line="133"/> + <location filename="../../Filters.cpp" line="96"/> + <location filename="../../Filters.cpp" line="134"/> <source>Simplified regex</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="98"/> - <location filename="../../Filters.cpp" line="136"/> + <location filename="../../Filters.cpp" line="99"/> + <location filename="../../Filters.cpp" line="137"/> <source>Perl's regex</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="106"/> - <location filename="../../Filters.cpp" line="144"/> + <location filename="../../Filters.cpp" line="107"/> + <location filename="../../Filters.cpp" line="145"/> <source>Only on file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="109"/> - <location filename="../../Filters.cpp" line="147"/> + <location filename="../../Filters.cpp" line="110"/> + <location filename="../../Filters.cpp" line="148"/> <source>Only on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="115"/> - <location filename="../../Filters.cpp" line="153"/> - <location filename="../../Filters.cpp" line="215"/> - <location filename="../../Filters.cpp" line="254"/> + <location filename="../../Filters.cpp" line="116"/> + <location filename="../../Filters.cpp" line="154"/> + <location filename="../../Filters.cpp" line="216"/> + <location filename="../../Filters.cpp" line="255"/> <source>Full match</source> <translation type="unfinished"></translation> </message> @@ -458,27 +458,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="51"/> + <location filename="../../FolderExistsDialog.cpp" line="57"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="116"/> + <location filename="../../FolderExistsDialog.cpp" line="122"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="126"/> + <location filename="../../FolderExistsDialog.cpp" line="132"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="187"/> + <location filename="../../FolderExistsDialog.cpp" line="193"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="187"/> + <location filename="../../FolderExistsDialog.cpp" line="193"/> <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="1447"/> - <location filename="../../ListThread.cpp" line="2369"/> + <location filename="../../ListThread.cpp" line="1458"/> + <location filename="../../ListThread.cpp" line="2390"/> <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="1454"/> - <location filename="../../ListThread.cpp" line="2376"/> + <location filename="../../ListThread.cpp" line="1465"/> + <location filename="../../ListThread.cpp" line="2397"/> <source>Unable to save the transfer list: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1470"/> + <location filename="../../ListThread.cpp" line="1481"/> <source>Problem reading file, or file-size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1477"/> + <location filename="../../ListThread.cpp" line="1488"/> <source>Wrong header: "%1"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1486"/> + <location filename="../../ListThread.cpp" line="1497"/> <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="1495"/> + <location filename="../../ListThread.cpp" line="1506"/> <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="1501"/> + <location filename="../../ListThread.cpp" line="1512"/> <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="1557"/> + <location filename="../../ListThread.cpp" line="1575"/> <source>Some errors have been found during the line parsing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1565"/> + <location filename="../../ListThread.cpp" line="1583"/> <source>Unable to open the transfer list: %1</source> <translation type="unfinished"></translation> </message> @@ -556,13 +556,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="232"/> + <location filename="../../MkPath.cpp" line="233"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../MkPath.cpp" line="93"/> - <location filename="../../MkPath.cpp" line="275"/> + <location filename="../../MkPath.cpp" line="276"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> @@ -649,39 +649,39 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="265"/> + <location filename="../../ScanFileOrFolder.cpp" line="274"/> <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="327"/> - <location filename="../../ScanFileOrFolder.cpp" line="393"/> + <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="337"/> - <location filename="../../ScanFileOrFolder.cpp" line="403"/> + <location filename="../../ScanFileOrFolder.cpp" line="348"/> + <location filename="../../ScanFileOrFolder.cpp" line="414"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="441"/> + <location filename="../../ScanFileOrFolder.cpp" line="452"/> <source>This is not a folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="443"/> + <location filename="../../ScanFileOrFolder.cpp" line="454"/> <source>The folder does exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="445"/> + <location filename="../../ScanFileOrFolder.cpp" line="456"/> <source>The folder is not readable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="467"/> <source>Problem with name encoding</source> <translation type="unfinished"></translation> </message> @@ -689,101 +689,101 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="235"/> - <location filename="../../TransferThread.cpp" line="663"/> - <location filename="../../TransferThread.cpp" line="735"/> - <location filename="../../TransferThread.cpp" line="1303"/> + <location filename="../../TransferThread.cpp" line="243"/> + <location filename="../../TransferThread.cpp" line="672"/> + <location filename="../../TransferThread.cpp" line="744"/> + <location filename="../../TransferThread.cpp" line="1314"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="336"/> - <location filename="../../TransferThread.cpp" line="353"/> + <location filename="../../TransferThread.cpp" line="344"/> + <location filename="../../TransferThread.cpp" line="361"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="408"/> - <location filename="../../TransferThread.cpp" line="431"/> + <location filename="../../TransferThread.cpp" line="416"/> + <location filename="../../TransferThread.cpp" line="439"/> <source>Internal error: Already opening</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="572"/> + <location filename="../../TransferThread.cpp" line="581"/> <source>Drive %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="574"/> + <location filename="../../TransferThread.cpp" line="583"/> <source>Unknown folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="578"/> + <location filename="../../TransferThread.cpp" line="587"/> <source>root</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="631"/> + <location filename="../../TransferThread.cpp" line="640"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="641"/> + <location filename="../../TransferThread.cpp" line="650"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="701"/> - <location filename="../../TransferThread.cpp" line="816"/> + <location filename="../../TransferThread.cpp" line="710"/> + <location filename="../../TransferThread.cpp" line="825"/> <source>The source file doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="741"/> - <location filename="../../TransferThread.cpp" line="828"/> + <location filename="../../TransferThread.cpp" line="750"/> + <location filename="../../TransferThread.cpp" line="837"/> <source>Unable to do the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="777"/> + <location filename="../../TransferThread.cpp" line="786"/> <source>The source doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="822"/> + <location filename="../../TransferThread.cpp" line="831"/> <source>Another file exists at same place</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1124"/> + <location filename="../../TransferThread.cpp" line="1133"/> <source>The checksums do not match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1213"/> + <location filename="../../TransferThread.cpp" line="1223"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1227"/> + <location filename="../../TransferThread.cpp" line="1238"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1238"/> + <location filename="../../TransferThread.cpp" line="1249"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1303"/> - <location filename="../../TransferThread.cpp" line="1321"/> - <location filename="../../TransferThread.cpp" line="1336"/> + <location filename="../../TransferThread.cpp" line="1314"/> + <location filename="../../TransferThread.cpp" line="1332"/> + <location filename="../../TransferThread.cpp" line="1347"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="219"/> + <location filename="../../TransferThread.cpp" line="227"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -796,17 +796,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="268"/> + <location filename="../../WriteThread.cpp" line="269"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="671"/> + <location filename="../../WriteThread.cpp" line="672"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="696"/> + <location filename="../../WriteThread.cpp" line="697"/> <source>File truncated during read, possible data change</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 0bbc22f..8a95cd4 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/it/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/it/translation.ts @@ -61,84 +61,84 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="717"/> + <location filename="../../CopyEngine.cpp" line="732"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1047"/> - <location filename="../../CopyEngine.cpp" line="1050"/> - <location filename="../../CopyEngine.cpp" line="1055"/> - <location filename="../../CopyEngine.cpp" line="1059"/> + <location filename="../../CopyEngine.cpp" line="1062"/> + <location filename="../../CopyEngine.cpp" line="1065"/> + <location filename="../../CopyEngine.cpp" line="1070"/> + <location filename="../../CopyEngine.cpp" line="1074"/> <source>Ask</source> <translation>Chiedi</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1048"/> - <location filename="../../CopyEngine.cpp" line="1052"/> - <location filename="../../CopyEngine.cpp" line="1056"/> - <location filename="../../CopyEngine.cpp" line="1060"/> + <location filename="../../CopyEngine.cpp" line="1063"/> + <location filename="../../CopyEngine.cpp" line="1067"/> + <location filename="../../CopyEngine.cpp" line="1071"/> + <location filename="../../CopyEngine.cpp" line="1075"/> <source>Skip</source> <translation>Salta</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1051"/> + <location filename="../../CopyEngine.cpp" line="1066"/> <source>Merge</source> <translation>Unisci</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1053"/> - <location filename="../../CopyEngine.cpp" line="1065"/> + <location filename="../../CopyEngine.cpp" line="1068"/> + <location filename="../../CopyEngine.cpp" line="1080"/> <source>Rename</source> <translation>Rinomina</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1057"/> + <location filename="../../CopyEngine.cpp" line="1072"/> <source>Put at the end</source> <translation>Metti in coda</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1061"/> + <location filename="../../CopyEngine.cpp" line="1076"/> <source>Overwrite</source> <translation>Sovrascrivi</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1062"/> + <location filename="../../CopyEngine.cpp" line="1077"/> <source>Overwrite if different</source> <translation>Sovrascrivi se differente</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1063"/> + <location filename="../../CopyEngine.cpp" line="1078"/> <source>Overwrite if newer</source> <translation>Sovrascrivi se più recente</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1079"/> <source>Overwrite if older</source> <translation>Sovrascrivi se meno recente</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1067"/> + <location filename="../../CopyEngine.cpp" line="1082"/> <source>Automatic</source> <translation>Automatico</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1068"/> + <location filename="../../CopyEngine.cpp" line="1083"/> <source>Sequential</source> <translation>Sequenziale</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1069"/> + <location filename="../../CopyEngine.cpp" line="1084"/> <source>Parallel</source> <translation>Parallelo</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1170"/> + <location filename="../../CopyEngine.cpp" line="1185"/> <source>Options error</source> <translation>Opzioni di errore</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1170"/> + <location filename="../../CopyEngine.cpp" line="1185"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="412"/> - <location filename="../../CopyEngineFactory.cpp" line="415"/> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> + <location filename="../../CopyEngineFactory.cpp" line="418"/> + <location filename="../../CopyEngineFactory.cpp" line="421"/> + <location filename="../../CopyEngineFactory.cpp" line="426"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> <source>Ask</source> <translation>Chiedi</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="413"/> - <location filename="../../CopyEngineFactory.cpp" line="417"/> - <location filename="../../CopyEngineFactory.cpp" line="421"/> - <location filename="../../CopyEngineFactory.cpp" line="425"/> + <location filename="../../CopyEngineFactory.cpp" line="419"/> + <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="427"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Skip</source> <translation>Salta</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="416"/> + <location filename="../../CopyEngineFactory.cpp" line="422"/> <source>Merge</source> <translation>Unisci</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="418"/> - <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="424"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> <source>Rename</source> <translation>Rinomina</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="422"/> + <location filename="../../CopyEngineFactory.cpp" line="428"/> <source>Put at the end</source> <translation>Metti in coda</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="426"/> + <location filename="../../CopyEngineFactory.cpp" line="432"/> <source>Overwrite</source> <translation>Sovrascrivi</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="427"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> <source>Overwrite if different</source> <translation>Sovrascrivi se differente</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="428"/> + <location filename="../../CopyEngineFactory.cpp" line="434"/> <source>Overwrite if newer</source> <translation>Sovrascrivi se più recente</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> <source>Overwrite if older</source> <translation>Sovrascrivi se meno recente</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="438"/> <source>Automatic</source> <translation>Automatico</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Sequential</source> <translation>Sequenziale</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Parallel</source> <translation>Parallelo</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="485"/> - <location filename="../../CopyEngineFactory.cpp" line="524"/> + <location filename="../../CopyEngineFactory.cpp" line="491"/> + <location filename="../../CopyEngineFactory.cpp" line="530"/> <source>Options error</source> <translation>Opzioni di errore</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="485"/> + <location filename="../../CopyEngineFactory.cpp" line="491"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="524"/> + <location filename="../../CopyEngineFactory.cpp" line="530"/> <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> @@ -273,22 +273,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="131"/> + <location filename="../../FileExistsDialog.cpp" line="137"/> <source>%1 - copy</source> <translation>%1 - copia</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="141"/> + <location filename="../../FileExistsDialog.cpp" line="147"/> <source>%1 - copy (%2)</source> <translation>%1 - copia (%2)</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="226"/> + <location filename="../../FileExistsDialog.cpp" line="232"/> <source>Error</source> <translation>Errore</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="226"/> + <location filename="../../FileExistsDialog.cpp" line="232"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -296,22 +296,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="105"/> + <location filename="../../FileIsSameDialog.cpp" line="111"/> <source>%1 - copy</source> <translation>%1 - copia</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="115"/> + <location filename="../../FileIsSameDialog.cpp" line="121"/> <source>%1 - copy (%2)</source> <translation>%1 - copia (%2)</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="182"/> + <location filename="../../FileIsSameDialog.cpp" line="188"/> <source>Error</source> <translation>Errore</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="182"/> + <location filename="../../FileIsSameDialog.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -419,41 +419,41 @@ <translation>Nessuno = Tutti inclusi</translation> </message> <message> - <location filename="../../Filters.cpp" line="92"/> - <location filename="../../Filters.cpp" line="130"/> + <location filename="../../Filters.cpp" line="93"/> + <location filename="../../Filters.cpp" line="131"/> <source>Raw text</source> <translation>Testo raw</translation> </message> <message> - <location filename="../../Filters.cpp" line="95"/> - <location filename="../../Filters.cpp" line="133"/> + <location filename="../../Filters.cpp" line="96"/> + <location filename="../../Filters.cpp" line="134"/> <source>Simplified regex</source> <translation>Regex semplificato</translation> </message> <message> - <location filename="../../Filters.cpp" line="98"/> - <location filename="../../Filters.cpp" line="136"/> + <location filename="../../Filters.cpp" line="99"/> + <location filename="../../Filters.cpp" line="137"/> <source>Perl's regex</source> <translation>Regex in Perl</translation> </message> <message> - <location filename="../../Filters.cpp" line="106"/> - <location filename="../../Filters.cpp" line="144"/> + <location filename="../../Filters.cpp" line="107"/> + <location filename="../../Filters.cpp" line="145"/> <source>Only on file</source> <translation>Solo su file</translation> </message> <message> - <location filename="../../Filters.cpp" line="109"/> - <location filename="../../Filters.cpp" line="147"/> + <location filename="../../Filters.cpp" line="110"/> + <location filename="../../Filters.cpp" line="148"/> <source>Only on folder</source> <translatorcomment>o cartella al singolare?</translatorcomment> <translation>Solo su cartelle</translation> </message> <message> - <location filename="../../Filters.cpp" line="115"/> - <location filename="../../Filters.cpp" line="153"/> - <location filename="../../Filters.cpp" line="215"/> - <location filename="../../Filters.cpp" line="254"/> + <location filename="../../Filters.cpp" line="116"/> + <location filename="../../Filters.cpp" line="154"/> + <location filename="../../Filters.cpp" line="216"/> + <location filename="../../Filters.cpp" line="255"/> <source>Full match</source> <translation>Corrispondenza completa</translation> </message> @@ -461,82 +461,78 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="51"/> + <location filename="../../FolderExistsDialog.cpp" line="57"/> <source>Folder already exists</source> <translation>Cartella già presente</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="116"/> + <location filename="../../FolderExistsDialog.cpp" line="122"/> <source>%1 - copy</source> <translation>%1 - copia</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="126"/> + <location filename="../../FolderExistsDialog.cpp" line="132"/> <source>%1 - copy (%2)</source> <translation>%1 - copia (%2)</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="187"/> + <location filename="../../FolderExistsDialog.cpp" line="193"/> <source>Error</source> <translation>Errore</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="187"/> + <location filename="../../FolderExistsDialog.cpp" line="193"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> - <message> - <source>Try rename with unauthorized charateres</source> - <translation type="obsolete">Provare a rinominare con caratteri non consentiti</translation> - </message> </context> <context> <name>ListThread</name> <message> - <location filename="../../ListThread.cpp" line="1447"/> - <location filename="../../ListThread.cpp" line="2369"/> + <location filename="../../ListThread.cpp" line="1458"/> + <location filename="../../ListThread.cpp" line="2390"/> <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="1454"/> - <location filename="../../ListThread.cpp" line="2376"/> + <location filename="../../ListThread.cpp" line="1465"/> + <location filename="../../ListThread.cpp" line="2397"/> <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="1470"/> + <location filename="../../ListThread.cpp" line="1481"/> <source>Problem reading file, or file-size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1477"/> + <location filename="../../ListThread.cpp" line="1488"/> <source>Wrong header: "%1"</source> <translatorcomment>Header si riferisce all'intestazione?</translatorcomment> <translation>Intestazione sbagliata: "%1"</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1486"/> + <location filename="../../ListThread.cpp" line="1497"/> <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="1495"/> + <location filename="../../ListThread.cpp" line="1506"/> <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="1501"/> + <location filename="../../ListThread.cpp" line="1512"/> <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="1557"/> + <location filename="../../ListThread.cpp" line="1575"/> <source>Some errors have been found during the line parsing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1565"/> + <location filename="../../ListThread.cpp" line="1583"/> <source>Unable to open the transfer list: %1</source> <translation>Impossibile aprire la lista dei trasferimenti: %1</translation> </message> @@ -544,10 +540,6 @@ <context> <name>MkPath</name> <message> - <source>Unable to get time</source> - <translation type="obsolete">Impossibile ottenere l'ora</translation> - </message> - <message> <location filename="../../MkPath.cpp" line="142"/> <source>Unable to create the folder</source> <translation>Impossibile creare la cartella</translation> @@ -568,17 +560,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="232"/> + <location filename="../../MkPath.cpp" line="233"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <source>Unable to set time</source> - <translation type="obsolete">Impossibile impostare l'ora</translation> - </message> - <message> <location filename="../../MkPath.cpp" line="93"/> - <location filename="../../MkPath.cpp" line="275"/> + <location filename="../../MkPath.cpp" line="276"/> <source>Unable to remove</source> <translation>Impossibile eliminare</translation> </message> @@ -671,43 +659,39 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="265"/> + <location filename="../../ScanFileOrFolder.cpp" line="274"/> <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="327"/> - <location filename="../../ScanFileOrFolder.cpp" line="393"/> + <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="337"/> - <location filename="../../ScanFileOrFolder.cpp" line="403"/> + <location filename="../../ScanFileOrFolder.cpp" line="348"/> + <location filename="../../ScanFileOrFolder.cpp" line="414"/> <source>%1 - copy (%2)</source> <translation>%1 - copia (%2)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="441"/> + <location filename="../../ScanFileOrFolder.cpp" line="452"/> <source>This is not a folder</source> <translation>Questa non è una cartella</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="443"/> + <location filename="../../ScanFileOrFolder.cpp" line="454"/> <source>The folder does exists</source> <translation type="unfinished"></translation> </message> <message> - <source>The folder not exists</source> - <translation type="obsolete">La cartella non esiste</translation> - </message> - <message> - <location filename="../../ScanFileOrFolder.cpp" line="445"/> + <location filename="../../ScanFileOrFolder.cpp" line="456"/> <source>The folder is not readable</source> <translation>La cartella non è leggibile</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="467"/> <source>Problem with name encoding</source> <translation>Problema con la codifica del nome</translation> </message> @@ -715,101 +699,101 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="235"/> - <location filename="../../TransferThread.cpp" line="663"/> - <location filename="../../TransferThread.cpp" line="735"/> - <location filename="../../TransferThread.cpp" line="1303"/> + <location filename="../../TransferThread.cpp" line="243"/> + <location filename="../../TransferThread.cpp" line="672"/> + <location filename="../../TransferThread.cpp" line="744"/> + <location filename="../../TransferThread.cpp" line="1314"/> <source>File not found</source> <translation>File non trovato</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="336"/> - <location filename="../../TransferThread.cpp" line="353"/> + <location filename="../../TransferThread.cpp" line="344"/> + <location filename="../../TransferThread.cpp" line="361"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="408"/> - <location filename="../../TransferThread.cpp" line="431"/> + <location filename="../../TransferThread.cpp" line="416"/> + <location filename="../../TransferThread.cpp" line="439"/> <source>Internal error: Already opening</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="572"/> + <location filename="../../TransferThread.cpp" line="581"/> <source>Drive %1</source> <translation type="unfinished">Unità %1</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="574"/> + <location filename="../../TransferThread.cpp" line="583"/> <source>Unknown folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="578"/> + <location filename="../../TransferThread.cpp" line="587"/> <source>root</source> <translation type="unfinished">root</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="631"/> + <location filename="../../TransferThread.cpp" line="640"/> <source>%1 - copy</source> <translation type="unfinished">%1 - copia</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="641"/> + <location filename="../../TransferThread.cpp" line="650"/> <source>%1 - copy (%2)</source> <translation type="unfinished">%1 - copia (%2)</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="701"/> - <location filename="../../TransferThread.cpp" line="816"/> + <location filename="../../TransferThread.cpp" line="710"/> + <location filename="../../TransferThread.cpp" line="825"/> <source>The source file doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="741"/> - <location filename="../../TransferThread.cpp" line="828"/> + <location filename="../../TransferThread.cpp" line="750"/> + <location filename="../../TransferThread.cpp" line="837"/> <source>Unable to do the folder</source> <translation type="unfinished">Impossibile creare la cartella</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="219"/> + <location filename="../../TransferThread.cpp" line="227"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="777"/> + <location filename="../../TransferThread.cpp" line="786"/> <source>The source doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="822"/> + <location filename="../../TransferThread.cpp" line="831"/> <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="1124"/> + <location filename="../../TransferThread.cpp" line="1133"/> <source>The checksums do not match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1213"/> + <location filename="../../TransferThread.cpp" line="1223"/> <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="1227"/> + <location filename="../../TransferThread.cpp" line="1238"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1238"/> + <location filename="../../TransferThread.cpp" line="1249"/> <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="1303"/> - <location filename="../../TransferThread.cpp" line="1321"/> - <location filename="../../TransferThread.cpp" line="1336"/> + <location filename="../../TransferThread.cpp" line="1314"/> + <location filename="../../TransferThread.cpp" line="1332"/> + <location filename="../../TransferThread.cpp" line="1347"/> <source>Unable to change the date</source> <translation type="unfinished">Impossibile cambiare la data</translation> </message> @@ -822,17 +806,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="268"/> + <location filename="../../WriteThread.cpp" line="269"/> <source>Internal error, please report it!</source> <translation>Errore interno, pregasi di segnalarlo!</translation> </message> <message> - <location filename="../../WriteThread.cpp" line="671"/> + <location filename="../../WriteThread.cpp" line="672"/> <source>Unable to read the source file: </source> <translation>Impossibile leggere il file di origine: </translation> </message> <message> - <location filename="../../WriteThread.cpp" line="696"/> + <location filename="../../WriteThread.cpp" line="697"/> <source>File truncated during read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -1026,10 +1010,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>Use this folder when destination is empty</source> - <translation type="obsolete">Usare questa cartella quando la cartella di destinazione è vuota</translation> - </message> - <message> <location filename="../../copyEngineOptions.ui" line="637"/> <source>Browse</source> <translation>Sfoglia</translation> diff --git a/plugins/CopyEngine/Ultracopier/Languages/ja/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/ja/translation.ts index 25bb8d3..5c68ad9 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/ja/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/ja/translation.ts @@ -61,84 +61,84 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="717"/> + <location filename="../../CopyEngine.cpp" line="732"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1047"/> - <location filename="../../CopyEngine.cpp" line="1050"/> - <location filename="../../CopyEngine.cpp" line="1055"/> - <location filename="../../CopyEngine.cpp" line="1059"/> + <location filename="../../CopyEngine.cpp" line="1062"/> + <location filename="../../CopyEngine.cpp" line="1065"/> + <location filename="../../CopyEngine.cpp" line="1070"/> + <location filename="../../CopyEngine.cpp" line="1074"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1048"/> - <location filename="../../CopyEngine.cpp" line="1052"/> - <location filename="../../CopyEngine.cpp" line="1056"/> - <location filename="../../CopyEngine.cpp" line="1060"/> + <location filename="../../CopyEngine.cpp" line="1063"/> + <location filename="../../CopyEngine.cpp" line="1067"/> + <location filename="../../CopyEngine.cpp" line="1071"/> + <location filename="../../CopyEngine.cpp" line="1075"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1051"/> + <location filename="../../CopyEngine.cpp" line="1066"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1053"/> - <location filename="../../CopyEngine.cpp" line="1065"/> + <location filename="../../CopyEngine.cpp" line="1068"/> + <location filename="../../CopyEngine.cpp" line="1080"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1057"/> + <location filename="../../CopyEngine.cpp" line="1072"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1061"/> + <location filename="../../CopyEngine.cpp" line="1076"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1062"/> + <location filename="../../CopyEngine.cpp" line="1077"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1063"/> + <location filename="../../CopyEngine.cpp" line="1078"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1079"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1067"/> + <location filename="../../CopyEngine.cpp" line="1082"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1068"/> + <location filename="../../CopyEngine.cpp" line="1083"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1069"/> + <location filename="../../CopyEngine.cpp" line="1084"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1170"/> + <location filename="../../CopyEngine.cpp" line="1185"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1170"/> + <location filename="../../CopyEngine.cpp" line="1185"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="412"/> - <location filename="../../CopyEngineFactory.cpp" line="415"/> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> + <location filename="../../CopyEngineFactory.cpp" line="418"/> + <location filename="../../CopyEngineFactory.cpp" line="421"/> + <location filename="../../CopyEngineFactory.cpp" line="426"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="413"/> - <location filename="../../CopyEngineFactory.cpp" line="417"/> - <location filename="../../CopyEngineFactory.cpp" line="421"/> - <location filename="../../CopyEngineFactory.cpp" line="425"/> + <location filename="../../CopyEngineFactory.cpp" line="419"/> + <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="427"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="416"/> + <location filename="../../CopyEngineFactory.cpp" line="422"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="418"/> - <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="424"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="422"/> + <location filename="../../CopyEngineFactory.cpp" line="428"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="426"/> + <location filename="../../CopyEngineFactory.cpp" line="432"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="427"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="428"/> + <location filename="../../CopyEngineFactory.cpp" line="434"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="438"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="485"/> - <location filename="../../CopyEngineFactory.cpp" line="524"/> + <location filename="../../CopyEngineFactory.cpp" line="491"/> + <location filename="../../CopyEngineFactory.cpp" line="530"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="485"/> + <location filename="../../CopyEngineFactory.cpp" line="491"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="524"/> + <location filename="../../CopyEngineFactory.cpp" line="530"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -273,22 +273,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="131"/> + <location filename="../../FileExistsDialog.cpp" line="137"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="141"/> + <location filename="../../FileExistsDialog.cpp" line="147"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="226"/> + <location filename="../../FileExistsDialog.cpp" line="232"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="226"/> + <location filename="../../FileExistsDialog.cpp" line="232"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -296,22 +296,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="105"/> + <location filename="../../FileIsSameDialog.cpp" line="111"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="115"/> + <location filename="../../FileIsSameDialog.cpp" line="121"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="182"/> + <location filename="../../FileIsSameDialog.cpp" line="188"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="182"/> + <location filename="../../FileIsSameDialog.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -417,40 +417,40 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="92"/> - <location filename="../../Filters.cpp" line="130"/> + <location filename="../../Filters.cpp" line="93"/> + <location filename="../../Filters.cpp" line="131"/> <source>Raw text</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="95"/> - <location filename="../../Filters.cpp" line="133"/> + <location filename="../../Filters.cpp" line="96"/> + <location filename="../../Filters.cpp" line="134"/> <source>Simplified regex</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="98"/> - <location filename="../../Filters.cpp" line="136"/> + <location filename="../../Filters.cpp" line="99"/> + <location filename="../../Filters.cpp" line="137"/> <source>Perl's regex</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="106"/> - <location filename="../../Filters.cpp" line="144"/> + <location filename="../../Filters.cpp" line="107"/> + <location filename="../../Filters.cpp" line="145"/> <source>Only on file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="109"/> - <location filename="../../Filters.cpp" line="147"/> + <location filename="../../Filters.cpp" line="110"/> + <location filename="../../Filters.cpp" line="148"/> <source>Only on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="115"/> - <location filename="../../Filters.cpp" line="153"/> - <location filename="../../Filters.cpp" line="215"/> - <location filename="../../Filters.cpp" line="254"/> + <location filename="../../Filters.cpp" line="116"/> + <location filename="../../Filters.cpp" line="154"/> + <location filename="../../Filters.cpp" line="216"/> + <location filename="../../Filters.cpp" line="255"/> <source>Full match</source> <translation type="unfinished"></translation> </message> @@ -458,27 +458,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="51"/> + <location filename="../../FolderExistsDialog.cpp" line="57"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="116"/> + <location filename="../../FolderExistsDialog.cpp" line="122"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="126"/> + <location filename="../../FolderExistsDialog.cpp" line="132"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="187"/> + <location filename="../../FolderExistsDialog.cpp" line="193"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="187"/> + <location filename="../../FolderExistsDialog.cpp" line="193"/> <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="1447"/> - <location filename="../../ListThread.cpp" line="2369"/> + <location filename="../../ListThread.cpp" line="1458"/> + <location filename="../../ListThread.cpp" line="2390"/> <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="1454"/> - <location filename="../../ListThread.cpp" line="2376"/> + <location filename="../../ListThread.cpp" line="1465"/> + <location filename="../../ListThread.cpp" line="2397"/> <source>Unable to save the transfer list: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1470"/> + <location filename="../../ListThread.cpp" line="1481"/> <source>Problem reading file, or file-size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1477"/> + <location filename="../../ListThread.cpp" line="1488"/> <source>Wrong header: "%1"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1486"/> + <location filename="../../ListThread.cpp" line="1497"/> <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="1495"/> + <location filename="../../ListThread.cpp" line="1506"/> <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="1501"/> + <location filename="../../ListThread.cpp" line="1512"/> <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="1557"/> + <location filename="../../ListThread.cpp" line="1575"/> <source>Some errors have been found during the line parsing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1565"/> + <location filename="../../ListThread.cpp" line="1583"/> <source>Unable to open the transfer list: %1</source> <translation type="unfinished"></translation> </message> @@ -556,13 +556,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="232"/> + <location filename="../../MkPath.cpp" line="233"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../MkPath.cpp" line="93"/> - <location filename="../../MkPath.cpp" line="275"/> + <location filename="../../MkPath.cpp" line="276"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> @@ -649,39 +649,39 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="265"/> + <location filename="../../ScanFileOrFolder.cpp" line="274"/> <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="327"/> - <location filename="../../ScanFileOrFolder.cpp" line="393"/> + <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="337"/> - <location filename="../../ScanFileOrFolder.cpp" line="403"/> + <location filename="../../ScanFileOrFolder.cpp" line="348"/> + <location filename="../../ScanFileOrFolder.cpp" line="414"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="441"/> + <location filename="../../ScanFileOrFolder.cpp" line="452"/> <source>This is not a folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="443"/> + <location filename="../../ScanFileOrFolder.cpp" line="454"/> <source>The folder does exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="445"/> + <location filename="../../ScanFileOrFolder.cpp" line="456"/> <source>The folder is not readable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="467"/> <source>Problem with name encoding</source> <translation type="unfinished"></translation> </message> @@ -689,101 +689,101 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="235"/> - <location filename="../../TransferThread.cpp" line="663"/> - <location filename="../../TransferThread.cpp" line="735"/> - <location filename="../../TransferThread.cpp" line="1303"/> + <location filename="../../TransferThread.cpp" line="243"/> + <location filename="../../TransferThread.cpp" line="672"/> + <location filename="../../TransferThread.cpp" line="744"/> + <location filename="../../TransferThread.cpp" line="1314"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="336"/> - <location filename="../../TransferThread.cpp" line="353"/> + <location filename="../../TransferThread.cpp" line="344"/> + <location filename="../../TransferThread.cpp" line="361"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="408"/> - <location filename="../../TransferThread.cpp" line="431"/> + <location filename="../../TransferThread.cpp" line="416"/> + <location filename="../../TransferThread.cpp" line="439"/> <source>Internal error: Already opening</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="572"/> + <location filename="../../TransferThread.cpp" line="581"/> <source>Drive %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="574"/> + <location filename="../../TransferThread.cpp" line="583"/> <source>Unknown folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="578"/> + <location filename="../../TransferThread.cpp" line="587"/> <source>root</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="631"/> + <location filename="../../TransferThread.cpp" line="640"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="641"/> + <location filename="../../TransferThread.cpp" line="650"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="701"/> - <location filename="../../TransferThread.cpp" line="816"/> + <location filename="../../TransferThread.cpp" line="710"/> + <location filename="../../TransferThread.cpp" line="825"/> <source>The source file doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="741"/> - <location filename="../../TransferThread.cpp" line="828"/> + <location filename="../../TransferThread.cpp" line="750"/> + <location filename="../../TransferThread.cpp" line="837"/> <source>Unable to do the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="777"/> + <location filename="../../TransferThread.cpp" line="786"/> <source>The source doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="822"/> + <location filename="../../TransferThread.cpp" line="831"/> <source>Another file exists at same place</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1124"/> + <location filename="../../TransferThread.cpp" line="1133"/> <source>The checksums do not match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1213"/> + <location filename="../../TransferThread.cpp" line="1223"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1227"/> + <location filename="../../TransferThread.cpp" line="1238"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1238"/> + <location filename="../../TransferThread.cpp" line="1249"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1303"/> - <location filename="../../TransferThread.cpp" line="1321"/> - <location filename="../../TransferThread.cpp" line="1336"/> + <location filename="../../TransferThread.cpp" line="1314"/> + <location filename="../../TransferThread.cpp" line="1332"/> + <location filename="../../TransferThread.cpp" line="1347"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="219"/> + <location filename="../../TransferThread.cpp" line="227"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -796,17 +796,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="268"/> + <location filename="../../WriteThread.cpp" line="269"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="671"/> + <location filename="../../WriteThread.cpp" line="672"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="696"/> + <location filename="../../WriteThread.cpp" line="697"/> <source>File truncated during read, possible data change</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 deeeead..ea7d584 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/ko/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/ko/translation.ts @@ -61,84 +61,84 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="717"/> + <location filename="../../CopyEngine.cpp" line="732"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1047"/> - <location filename="../../CopyEngine.cpp" line="1050"/> - <location filename="../../CopyEngine.cpp" line="1055"/> - <location filename="../../CopyEngine.cpp" line="1059"/> + <location filename="../../CopyEngine.cpp" line="1062"/> + <location filename="../../CopyEngine.cpp" line="1065"/> + <location filename="../../CopyEngine.cpp" line="1070"/> + <location filename="../../CopyEngine.cpp" line="1074"/> <source>Ask</source> <translation type="unfinished">확인</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1048"/> - <location filename="../../CopyEngine.cpp" line="1052"/> - <location filename="../../CopyEngine.cpp" line="1056"/> - <location filename="../../CopyEngine.cpp" line="1060"/> + <location filename="../../CopyEngine.cpp" line="1063"/> + <location filename="../../CopyEngine.cpp" line="1067"/> + <location filename="../../CopyEngine.cpp" line="1071"/> + <location filename="../../CopyEngine.cpp" line="1075"/> <source>Skip</source> <translation type="unfinished">건너뛰기</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1051"/> + <location filename="../../CopyEngine.cpp" line="1066"/> <source>Merge</source> <translation type="unfinished">합치기</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1053"/> - <location filename="../../CopyEngine.cpp" line="1065"/> + <location filename="../../CopyEngine.cpp" line="1068"/> + <location filename="../../CopyEngine.cpp" line="1080"/> <source>Rename</source> <translation type="unfinished">이름 바꾸기</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1057"/> + <location filename="../../CopyEngine.cpp" line="1072"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1061"/> + <location filename="../../CopyEngine.cpp" line="1076"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1062"/> + <location filename="../../CopyEngine.cpp" line="1077"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1063"/> + <location filename="../../CopyEngine.cpp" line="1078"/> <source>Overwrite if newer</source> <translation type="unfinished">더 최신이면 덮어씌우기</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1079"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1067"/> + <location filename="../../CopyEngine.cpp" line="1082"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1068"/> + <location filename="../../CopyEngine.cpp" line="1083"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1069"/> + <location filename="../../CopyEngine.cpp" line="1084"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1170"/> + <location filename="../../CopyEngine.cpp" line="1185"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1170"/> + <location filename="../../CopyEngine.cpp" line="1185"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="412"/> - <location filename="../../CopyEngineFactory.cpp" line="415"/> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> + <location filename="../../CopyEngineFactory.cpp" line="418"/> + <location filename="../../CopyEngineFactory.cpp" line="421"/> + <location filename="../../CopyEngineFactory.cpp" line="426"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> <source>Ask</source> <translation type="unfinished">확인</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="413"/> - <location filename="../../CopyEngineFactory.cpp" line="417"/> - <location filename="../../CopyEngineFactory.cpp" line="421"/> - <location filename="../../CopyEngineFactory.cpp" line="425"/> + <location filename="../../CopyEngineFactory.cpp" line="419"/> + <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="427"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Skip</source> <translation type="unfinished">건너뛰기</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="416"/> + <location filename="../../CopyEngineFactory.cpp" line="422"/> <source>Merge</source> <translation type="unfinished">합치기</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="418"/> - <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="424"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> <source>Rename</source> <translation type="unfinished">이름 바꾸기</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="422"/> + <location filename="../../CopyEngineFactory.cpp" line="428"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="426"/> + <location filename="../../CopyEngineFactory.cpp" line="432"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="427"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="428"/> + <location filename="../../CopyEngineFactory.cpp" line="434"/> <source>Overwrite if newer</source> <translation type="unfinished">더 최신이면 덮어씌우기</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="438"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="485"/> - <location filename="../../CopyEngineFactory.cpp" line="524"/> + <location filename="../../CopyEngineFactory.cpp" line="491"/> + <location filename="../../CopyEngineFactory.cpp" line="530"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="485"/> + <location filename="../../CopyEngineFactory.cpp" line="491"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="524"/> + <location filename="../../CopyEngineFactory.cpp" line="530"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -273,22 +273,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="131"/> + <location filename="../../FileExistsDialog.cpp" line="137"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="141"/> + <location filename="../../FileExistsDialog.cpp" line="147"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="226"/> + <location filename="../../FileExistsDialog.cpp" line="232"/> <source>Error</source> <translation type="unfinished">오류</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="226"/> + <location filename="../../FileExistsDialog.cpp" line="232"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -296,22 +296,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="105"/> + <location filename="../../FileIsSameDialog.cpp" line="111"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="115"/> + <location filename="../../FileIsSameDialog.cpp" line="121"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="182"/> + <location filename="../../FileIsSameDialog.cpp" line="188"/> <source>Error</source> <translation type="unfinished">오류</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="182"/> + <location filename="../../FileIsSameDialog.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -417,40 +417,40 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="92"/> - <location filename="../../Filters.cpp" line="130"/> + <location filename="../../Filters.cpp" line="93"/> + <location filename="../../Filters.cpp" line="131"/> <source>Raw text</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="95"/> - <location filename="../../Filters.cpp" line="133"/> + <location filename="../../Filters.cpp" line="96"/> + <location filename="../../Filters.cpp" line="134"/> <source>Simplified regex</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="98"/> - <location filename="../../Filters.cpp" line="136"/> + <location filename="../../Filters.cpp" line="99"/> + <location filename="../../Filters.cpp" line="137"/> <source>Perl's regex</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="106"/> - <location filename="../../Filters.cpp" line="144"/> + <location filename="../../Filters.cpp" line="107"/> + <location filename="../../Filters.cpp" line="145"/> <source>Only on file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="109"/> - <location filename="../../Filters.cpp" line="147"/> + <location filename="../../Filters.cpp" line="110"/> + <location filename="../../Filters.cpp" line="148"/> <source>Only on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="115"/> - <location filename="../../Filters.cpp" line="153"/> - <location filename="../../Filters.cpp" line="215"/> - <location filename="../../Filters.cpp" line="254"/> + <location filename="../../Filters.cpp" line="116"/> + <location filename="../../Filters.cpp" line="154"/> + <location filename="../../Filters.cpp" line="216"/> + <location filename="../../Filters.cpp" line="255"/> <source>Full match</source> <translation type="unfinished"></translation> </message> @@ -458,27 +458,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="51"/> + <location filename="../../FolderExistsDialog.cpp" line="57"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="116"/> + <location filename="../../FolderExistsDialog.cpp" line="122"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="126"/> + <location filename="../../FolderExistsDialog.cpp" line="132"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="187"/> + <location filename="../../FolderExistsDialog.cpp" line="193"/> <source>Error</source> <translation type="unfinished">오류</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="187"/> + <location filename="../../FolderExistsDialog.cpp" line="193"/> <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="1447"/> - <location filename="../../ListThread.cpp" line="2369"/> + <location filename="../../ListThread.cpp" line="1458"/> + <location filename="../../ListThread.cpp" line="2390"/> <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="1454"/> - <location filename="../../ListThread.cpp" line="2376"/> + <location filename="../../ListThread.cpp" line="1465"/> + <location filename="../../ListThread.cpp" line="2397"/> <source>Unable to save the transfer list: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1470"/> + <location filename="../../ListThread.cpp" line="1481"/> <source>Problem reading file, or file-size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1477"/> + <location filename="../../ListThread.cpp" line="1488"/> <source>Wrong header: "%1"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1486"/> + <location filename="../../ListThread.cpp" line="1497"/> <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="1495"/> + <location filename="../../ListThread.cpp" line="1506"/> <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="1501"/> + <location filename="../../ListThread.cpp" line="1512"/> <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="1557"/> + <location filename="../../ListThread.cpp" line="1575"/> <source>Some errors have been found during the line parsing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1565"/> + <location filename="../../ListThread.cpp" line="1583"/> <source>Unable to open the transfer list: %1</source> <translation type="unfinished"></translation> </message> @@ -556,13 +556,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="232"/> + <location filename="../../MkPath.cpp" line="233"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../MkPath.cpp" line="93"/> - <location filename="../../MkPath.cpp" line="275"/> + <location filename="../../MkPath.cpp" line="276"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> @@ -649,43 +649,39 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="265"/> + <location filename="../../ScanFileOrFolder.cpp" line="274"/> <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="327"/> - <location filename="../../ScanFileOrFolder.cpp" line="393"/> + <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="337"/> - <location filename="../../ScanFileOrFolder.cpp" line="403"/> + <location filename="../../ScanFileOrFolder.cpp" line="348"/> + <location filename="../../ScanFileOrFolder.cpp" line="414"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="441"/> + <location filename="../../ScanFileOrFolder.cpp" line="452"/> <source>This is not a folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="443"/> + <location filename="../../ScanFileOrFolder.cpp" line="454"/> <source>The folder does exists</source> <translation type="unfinished"></translation> </message> <message> - <source>The folder not exists</source> - <translation type="obsolete">폴더가 존재하지 않습니다</translation> - </message> - <message> - <location filename="../../ScanFileOrFolder.cpp" line="445"/> + <location filename="../../ScanFileOrFolder.cpp" line="456"/> <source>The folder is not readable</source> <translation type="unfinished">폴더를 읽을 수 없습니다</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="467"/> <source>Problem with name encoding</source> <translation type="unfinished"></translation> </message> @@ -693,101 +689,101 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="235"/> - <location filename="../../TransferThread.cpp" line="663"/> - <location filename="../../TransferThread.cpp" line="735"/> - <location filename="../../TransferThread.cpp" line="1303"/> + <location filename="../../TransferThread.cpp" line="243"/> + <location filename="../../TransferThread.cpp" line="672"/> + <location filename="../../TransferThread.cpp" line="744"/> + <location filename="../../TransferThread.cpp" line="1314"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="336"/> - <location filename="../../TransferThread.cpp" line="353"/> + <location filename="../../TransferThread.cpp" line="344"/> + <location filename="../../TransferThread.cpp" line="361"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="408"/> - <location filename="../../TransferThread.cpp" line="431"/> + <location filename="../../TransferThread.cpp" line="416"/> + <location filename="../../TransferThread.cpp" line="439"/> <source>Internal error: Already opening</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="572"/> + <location filename="../../TransferThread.cpp" line="581"/> <source>Drive %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="574"/> + <location filename="../../TransferThread.cpp" line="583"/> <source>Unknown folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="578"/> + <location filename="../../TransferThread.cpp" line="587"/> <source>root</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="631"/> + <location filename="../../TransferThread.cpp" line="640"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="641"/> + <location filename="../../TransferThread.cpp" line="650"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="701"/> - <location filename="../../TransferThread.cpp" line="816"/> + <location filename="../../TransferThread.cpp" line="710"/> + <location filename="../../TransferThread.cpp" line="825"/> <source>The source file doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="741"/> - <location filename="../../TransferThread.cpp" line="828"/> + <location filename="../../TransferThread.cpp" line="750"/> + <location filename="../../TransferThread.cpp" line="837"/> <source>Unable to do the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="777"/> + <location filename="../../TransferThread.cpp" line="786"/> <source>The source doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="822"/> + <location filename="../../TransferThread.cpp" line="831"/> <source>Another file exists at same place</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1124"/> + <location filename="../../TransferThread.cpp" line="1133"/> <source>The checksums do not match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1213"/> + <location filename="../../TransferThread.cpp" line="1223"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1227"/> + <location filename="../../TransferThread.cpp" line="1238"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1238"/> + <location filename="../../TransferThread.cpp" line="1249"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1303"/> - <location filename="../../TransferThread.cpp" line="1321"/> - <location filename="../../TransferThread.cpp" line="1336"/> + <location filename="../../TransferThread.cpp" line="1314"/> + <location filename="../../TransferThread.cpp" line="1332"/> + <location filename="../../TransferThread.cpp" line="1347"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="219"/> + <location filename="../../TransferThread.cpp" line="227"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -800,17 +796,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="268"/> + <location filename="../../WriteThread.cpp" line="269"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="671"/> + <location filename="../../WriteThread.cpp" line="672"/> <source>Unable to read the source file: </source> <translation type="unfinished">원본 파일 읽기 불가:</translation> </message> <message> - <location filename="../../WriteThread.cpp" line="696"/> + <location filename="../../WriteThread.cpp" line="697"/> <source>File truncated during read, possible data change</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 3362659..a00b0cd 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/nl/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/nl/translation.ts @@ -61,84 +61,84 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="717"/> + <location filename="../../CopyEngine.cpp" line="732"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1047"/> - <location filename="../../CopyEngine.cpp" line="1050"/> - <location filename="../../CopyEngine.cpp" line="1055"/> - <location filename="../../CopyEngine.cpp" line="1059"/> + <location filename="../../CopyEngine.cpp" line="1062"/> + <location filename="../../CopyEngine.cpp" line="1065"/> + <location filename="../../CopyEngine.cpp" line="1070"/> + <location filename="../../CopyEngine.cpp" line="1074"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1048"/> - <location filename="../../CopyEngine.cpp" line="1052"/> - <location filename="../../CopyEngine.cpp" line="1056"/> - <location filename="../../CopyEngine.cpp" line="1060"/> + <location filename="../../CopyEngine.cpp" line="1063"/> + <location filename="../../CopyEngine.cpp" line="1067"/> + <location filename="../../CopyEngine.cpp" line="1071"/> + <location filename="../../CopyEngine.cpp" line="1075"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1051"/> + <location filename="../../CopyEngine.cpp" line="1066"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1053"/> - <location filename="../../CopyEngine.cpp" line="1065"/> + <location filename="../../CopyEngine.cpp" line="1068"/> + <location filename="../../CopyEngine.cpp" line="1080"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1057"/> + <location filename="../../CopyEngine.cpp" line="1072"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1061"/> + <location filename="../../CopyEngine.cpp" line="1076"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1062"/> + <location filename="../../CopyEngine.cpp" line="1077"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1063"/> + <location filename="../../CopyEngine.cpp" line="1078"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1079"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1067"/> + <location filename="../../CopyEngine.cpp" line="1082"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1068"/> + <location filename="../../CopyEngine.cpp" line="1083"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1069"/> + <location filename="../../CopyEngine.cpp" line="1084"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1170"/> + <location filename="../../CopyEngine.cpp" line="1185"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1170"/> + <location filename="../../CopyEngine.cpp" line="1185"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="412"/> - <location filename="../../CopyEngineFactory.cpp" line="415"/> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> + <location filename="../../CopyEngineFactory.cpp" line="418"/> + <location filename="../../CopyEngineFactory.cpp" line="421"/> + <location filename="../../CopyEngineFactory.cpp" line="426"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="413"/> - <location filename="../../CopyEngineFactory.cpp" line="417"/> - <location filename="../../CopyEngineFactory.cpp" line="421"/> - <location filename="../../CopyEngineFactory.cpp" line="425"/> + <location filename="../../CopyEngineFactory.cpp" line="419"/> + <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="427"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="416"/> + <location filename="../../CopyEngineFactory.cpp" line="422"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="418"/> - <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="424"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="422"/> + <location filename="../../CopyEngineFactory.cpp" line="428"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="426"/> + <location filename="../../CopyEngineFactory.cpp" line="432"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="427"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="428"/> + <location filename="../../CopyEngineFactory.cpp" line="434"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="438"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="485"/> - <location filename="../../CopyEngineFactory.cpp" line="524"/> + <location filename="../../CopyEngineFactory.cpp" line="491"/> + <location filename="../../CopyEngineFactory.cpp" line="530"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="485"/> + <location filename="../../CopyEngineFactory.cpp" line="491"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="524"/> + <location filename="../../CopyEngineFactory.cpp" line="530"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -273,22 +273,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="131"/> + <location filename="../../FileExistsDialog.cpp" line="137"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="141"/> + <location filename="../../FileExistsDialog.cpp" line="147"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="226"/> + <location filename="../../FileExistsDialog.cpp" line="232"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="226"/> + <location filename="../../FileExistsDialog.cpp" line="232"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -296,22 +296,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="105"/> + <location filename="../../FileIsSameDialog.cpp" line="111"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="115"/> + <location filename="../../FileIsSameDialog.cpp" line="121"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="182"/> + <location filename="../../FileIsSameDialog.cpp" line="188"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="182"/> + <location filename="../../FileIsSameDialog.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -417,40 +417,40 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="92"/> - <location filename="../../Filters.cpp" line="130"/> + <location filename="../../Filters.cpp" line="93"/> + <location filename="../../Filters.cpp" line="131"/> <source>Raw text</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="95"/> - <location filename="../../Filters.cpp" line="133"/> + <location filename="../../Filters.cpp" line="96"/> + <location filename="../../Filters.cpp" line="134"/> <source>Simplified regex</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="98"/> - <location filename="../../Filters.cpp" line="136"/> + <location filename="../../Filters.cpp" line="99"/> + <location filename="../../Filters.cpp" line="137"/> <source>Perl's regex</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="106"/> - <location filename="../../Filters.cpp" line="144"/> + <location filename="../../Filters.cpp" line="107"/> + <location filename="../../Filters.cpp" line="145"/> <source>Only on file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="109"/> - <location filename="../../Filters.cpp" line="147"/> + <location filename="../../Filters.cpp" line="110"/> + <location filename="../../Filters.cpp" line="148"/> <source>Only on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="115"/> - <location filename="../../Filters.cpp" line="153"/> - <location filename="../../Filters.cpp" line="215"/> - <location filename="../../Filters.cpp" line="254"/> + <location filename="../../Filters.cpp" line="116"/> + <location filename="../../Filters.cpp" line="154"/> + <location filename="../../Filters.cpp" line="216"/> + <location filename="../../Filters.cpp" line="255"/> <source>Full match</source> <translation type="unfinished"></translation> </message> @@ -458,27 +458,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="51"/> + <location filename="../../FolderExistsDialog.cpp" line="57"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="116"/> + <location filename="../../FolderExistsDialog.cpp" line="122"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="126"/> + <location filename="../../FolderExistsDialog.cpp" line="132"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="187"/> + <location filename="../../FolderExistsDialog.cpp" line="193"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="187"/> + <location filename="../../FolderExistsDialog.cpp" line="193"/> <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="1447"/> - <location filename="../../ListThread.cpp" line="2369"/> + <location filename="../../ListThread.cpp" line="1458"/> + <location filename="../../ListThread.cpp" line="2390"/> <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="1454"/> - <location filename="../../ListThread.cpp" line="2376"/> + <location filename="../../ListThread.cpp" line="1465"/> + <location filename="../../ListThread.cpp" line="2397"/> <source>Unable to save the transfer list: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1470"/> + <location filename="../../ListThread.cpp" line="1481"/> <source>Problem reading file, or file-size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1477"/> + <location filename="../../ListThread.cpp" line="1488"/> <source>Wrong header: "%1"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1486"/> + <location filename="../../ListThread.cpp" line="1497"/> <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="1495"/> + <location filename="../../ListThread.cpp" line="1506"/> <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="1501"/> + <location filename="../../ListThread.cpp" line="1512"/> <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="1557"/> + <location filename="../../ListThread.cpp" line="1575"/> <source>Some errors have been found during the line parsing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1565"/> + <location filename="../../ListThread.cpp" line="1583"/> <source>Unable to open the transfer list: %1</source> <translation type="unfinished"></translation> </message> @@ -556,13 +556,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="232"/> + <location filename="../../MkPath.cpp" line="233"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../MkPath.cpp" line="93"/> - <location filename="../../MkPath.cpp" line="275"/> + <location filename="../../MkPath.cpp" line="276"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> @@ -649,39 +649,39 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="265"/> + <location filename="../../ScanFileOrFolder.cpp" line="274"/> <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="327"/> - <location filename="../../ScanFileOrFolder.cpp" line="393"/> + <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="337"/> - <location filename="../../ScanFileOrFolder.cpp" line="403"/> + <location filename="../../ScanFileOrFolder.cpp" line="348"/> + <location filename="../../ScanFileOrFolder.cpp" line="414"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="441"/> + <location filename="../../ScanFileOrFolder.cpp" line="452"/> <source>This is not a folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="443"/> + <location filename="../../ScanFileOrFolder.cpp" line="454"/> <source>The folder does exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="445"/> + <location filename="../../ScanFileOrFolder.cpp" line="456"/> <source>The folder is not readable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="467"/> <source>Problem with name encoding</source> <translation type="unfinished"></translation> </message> @@ -689,101 +689,101 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="235"/> - <location filename="../../TransferThread.cpp" line="663"/> - <location filename="../../TransferThread.cpp" line="735"/> - <location filename="../../TransferThread.cpp" line="1303"/> + <location filename="../../TransferThread.cpp" line="243"/> + <location filename="../../TransferThread.cpp" line="672"/> + <location filename="../../TransferThread.cpp" line="744"/> + <location filename="../../TransferThread.cpp" line="1314"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="336"/> - <location filename="../../TransferThread.cpp" line="353"/> + <location filename="../../TransferThread.cpp" line="344"/> + <location filename="../../TransferThread.cpp" line="361"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="408"/> - <location filename="../../TransferThread.cpp" line="431"/> + <location filename="../../TransferThread.cpp" line="416"/> + <location filename="../../TransferThread.cpp" line="439"/> <source>Internal error: Already opening</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="572"/> + <location filename="../../TransferThread.cpp" line="581"/> <source>Drive %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="574"/> + <location filename="../../TransferThread.cpp" line="583"/> <source>Unknown folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="578"/> + <location filename="../../TransferThread.cpp" line="587"/> <source>root</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="631"/> + <location filename="../../TransferThread.cpp" line="640"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="641"/> + <location filename="../../TransferThread.cpp" line="650"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="701"/> - <location filename="../../TransferThread.cpp" line="816"/> + <location filename="../../TransferThread.cpp" line="710"/> + <location filename="../../TransferThread.cpp" line="825"/> <source>The source file doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="741"/> - <location filename="../../TransferThread.cpp" line="828"/> + <location filename="../../TransferThread.cpp" line="750"/> + <location filename="../../TransferThread.cpp" line="837"/> <source>Unable to do the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="777"/> + <location filename="../../TransferThread.cpp" line="786"/> <source>The source doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="822"/> + <location filename="../../TransferThread.cpp" line="831"/> <source>Another file exists at same place</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1124"/> + <location filename="../../TransferThread.cpp" line="1133"/> <source>The checksums do not match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1213"/> + <location filename="../../TransferThread.cpp" line="1223"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1227"/> + <location filename="../../TransferThread.cpp" line="1238"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1238"/> + <location filename="../../TransferThread.cpp" line="1249"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1303"/> - <location filename="../../TransferThread.cpp" line="1321"/> - <location filename="../../TransferThread.cpp" line="1336"/> + <location filename="../../TransferThread.cpp" line="1314"/> + <location filename="../../TransferThread.cpp" line="1332"/> + <location filename="../../TransferThread.cpp" line="1347"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="219"/> + <location filename="../../TransferThread.cpp" line="227"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -796,17 +796,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="268"/> + <location filename="../../WriteThread.cpp" line="269"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="671"/> + <location filename="../../WriteThread.cpp" line="672"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="696"/> + <location filename="../../WriteThread.cpp" line="697"/> <source>File truncated during read, possible data change</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 3362659..a00b0cd 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/no/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/no/translation.ts @@ -61,84 +61,84 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="717"/> + <location filename="../../CopyEngine.cpp" line="732"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1047"/> - <location filename="../../CopyEngine.cpp" line="1050"/> - <location filename="../../CopyEngine.cpp" line="1055"/> - <location filename="../../CopyEngine.cpp" line="1059"/> + <location filename="../../CopyEngine.cpp" line="1062"/> + <location filename="../../CopyEngine.cpp" line="1065"/> + <location filename="../../CopyEngine.cpp" line="1070"/> + <location filename="../../CopyEngine.cpp" line="1074"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1048"/> - <location filename="../../CopyEngine.cpp" line="1052"/> - <location filename="../../CopyEngine.cpp" line="1056"/> - <location filename="../../CopyEngine.cpp" line="1060"/> + <location filename="../../CopyEngine.cpp" line="1063"/> + <location filename="../../CopyEngine.cpp" line="1067"/> + <location filename="../../CopyEngine.cpp" line="1071"/> + <location filename="../../CopyEngine.cpp" line="1075"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1051"/> + <location filename="../../CopyEngine.cpp" line="1066"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1053"/> - <location filename="../../CopyEngine.cpp" line="1065"/> + <location filename="../../CopyEngine.cpp" line="1068"/> + <location filename="../../CopyEngine.cpp" line="1080"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1057"/> + <location filename="../../CopyEngine.cpp" line="1072"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1061"/> + <location filename="../../CopyEngine.cpp" line="1076"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1062"/> + <location filename="../../CopyEngine.cpp" line="1077"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1063"/> + <location filename="../../CopyEngine.cpp" line="1078"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1079"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1067"/> + <location filename="../../CopyEngine.cpp" line="1082"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1068"/> + <location filename="../../CopyEngine.cpp" line="1083"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1069"/> + <location filename="../../CopyEngine.cpp" line="1084"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1170"/> + <location filename="../../CopyEngine.cpp" line="1185"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1170"/> + <location filename="../../CopyEngine.cpp" line="1185"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="412"/> - <location filename="../../CopyEngineFactory.cpp" line="415"/> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> + <location filename="../../CopyEngineFactory.cpp" line="418"/> + <location filename="../../CopyEngineFactory.cpp" line="421"/> + <location filename="../../CopyEngineFactory.cpp" line="426"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="413"/> - <location filename="../../CopyEngineFactory.cpp" line="417"/> - <location filename="../../CopyEngineFactory.cpp" line="421"/> - <location filename="../../CopyEngineFactory.cpp" line="425"/> + <location filename="../../CopyEngineFactory.cpp" line="419"/> + <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="427"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="416"/> + <location filename="../../CopyEngineFactory.cpp" line="422"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="418"/> - <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="424"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="422"/> + <location filename="../../CopyEngineFactory.cpp" line="428"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="426"/> + <location filename="../../CopyEngineFactory.cpp" line="432"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="427"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="428"/> + <location filename="../../CopyEngineFactory.cpp" line="434"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="438"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="485"/> - <location filename="../../CopyEngineFactory.cpp" line="524"/> + <location filename="../../CopyEngineFactory.cpp" line="491"/> + <location filename="../../CopyEngineFactory.cpp" line="530"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="485"/> + <location filename="../../CopyEngineFactory.cpp" line="491"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="524"/> + <location filename="../../CopyEngineFactory.cpp" line="530"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -273,22 +273,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="131"/> + <location filename="../../FileExistsDialog.cpp" line="137"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="141"/> + <location filename="../../FileExistsDialog.cpp" line="147"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="226"/> + <location filename="../../FileExistsDialog.cpp" line="232"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="226"/> + <location filename="../../FileExistsDialog.cpp" line="232"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -296,22 +296,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="105"/> + <location filename="../../FileIsSameDialog.cpp" line="111"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="115"/> + <location filename="../../FileIsSameDialog.cpp" line="121"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="182"/> + <location filename="../../FileIsSameDialog.cpp" line="188"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="182"/> + <location filename="../../FileIsSameDialog.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -417,40 +417,40 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="92"/> - <location filename="../../Filters.cpp" line="130"/> + <location filename="../../Filters.cpp" line="93"/> + <location filename="../../Filters.cpp" line="131"/> <source>Raw text</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="95"/> - <location filename="../../Filters.cpp" line="133"/> + <location filename="../../Filters.cpp" line="96"/> + <location filename="../../Filters.cpp" line="134"/> <source>Simplified regex</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="98"/> - <location filename="../../Filters.cpp" line="136"/> + <location filename="../../Filters.cpp" line="99"/> + <location filename="../../Filters.cpp" line="137"/> <source>Perl's regex</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="106"/> - <location filename="../../Filters.cpp" line="144"/> + <location filename="../../Filters.cpp" line="107"/> + <location filename="../../Filters.cpp" line="145"/> <source>Only on file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="109"/> - <location filename="../../Filters.cpp" line="147"/> + <location filename="../../Filters.cpp" line="110"/> + <location filename="../../Filters.cpp" line="148"/> <source>Only on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="115"/> - <location filename="../../Filters.cpp" line="153"/> - <location filename="../../Filters.cpp" line="215"/> - <location filename="../../Filters.cpp" line="254"/> + <location filename="../../Filters.cpp" line="116"/> + <location filename="../../Filters.cpp" line="154"/> + <location filename="../../Filters.cpp" line="216"/> + <location filename="../../Filters.cpp" line="255"/> <source>Full match</source> <translation type="unfinished"></translation> </message> @@ -458,27 +458,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="51"/> + <location filename="../../FolderExistsDialog.cpp" line="57"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="116"/> + <location filename="../../FolderExistsDialog.cpp" line="122"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="126"/> + <location filename="../../FolderExistsDialog.cpp" line="132"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="187"/> + <location filename="../../FolderExistsDialog.cpp" line="193"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="187"/> + <location filename="../../FolderExistsDialog.cpp" line="193"/> <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="1447"/> - <location filename="../../ListThread.cpp" line="2369"/> + <location filename="../../ListThread.cpp" line="1458"/> + <location filename="../../ListThread.cpp" line="2390"/> <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="1454"/> - <location filename="../../ListThread.cpp" line="2376"/> + <location filename="../../ListThread.cpp" line="1465"/> + <location filename="../../ListThread.cpp" line="2397"/> <source>Unable to save the transfer list: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1470"/> + <location filename="../../ListThread.cpp" line="1481"/> <source>Problem reading file, or file-size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1477"/> + <location filename="../../ListThread.cpp" line="1488"/> <source>Wrong header: "%1"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1486"/> + <location filename="../../ListThread.cpp" line="1497"/> <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="1495"/> + <location filename="../../ListThread.cpp" line="1506"/> <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="1501"/> + <location filename="../../ListThread.cpp" line="1512"/> <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="1557"/> + <location filename="../../ListThread.cpp" line="1575"/> <source>Some errors have been found during the line parsing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1565"/> + <location filename="../../ListThread.cpp" line="1583"/> <source>Unable to open the transfer list: %1</source> <translation type="unfinished"></translation> </message> @@ -556,13 +556,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="232"/> + <location filename="../../MkPath.cpp" line="233"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../MkPath.cpp" line="93"/> - <location filename="../../MkPath.cpp" line="275"/> + <location filename="../../MkPath.cpp" line="276"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> @@ -649,39 +649,39 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="265"/> + <location filename="../../ScanFileOrFolder.cpp" line="274"/> <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="327"/> - <location filename="../../ScanFileOrFolder.cpp" line="393"/> + <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="337"/> - <location filename="../../ScanFileOrFolder.cpp" line="403"/> + <location filename="../../ScanFileOrFolder.cpp" line="348"/> + <location filename="../../ScanFileOrFolder.cpp" line="414"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="441"/> + <location filename="../../ScanFileOrFolder.cpp" line="452"/> <source>This is not a folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="443"/> + <location filename="../../ScanFileOrFolder.cpp" line="454"/> <source>The folder does exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="445"/> + <location filename="../../ScanFileOrFolder.cpp" line="456"/> <source>The folder is not readable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="467"/> <source>Problem with name encoding</source> <translation type="unfinished"></translation> </message> @@ -689,101 +689,101 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="235"/> - <location filename="../../TransferThread.cpp" line="663"/> - <location filename="../../TransferThread.cpp" line="735"/> - <location filename="../../TransferThread.cpp" line="1303"/> + <location filename="../../TransferThread.cpp" line="243"/> + <location filename="../../TransferThread.cpp" line="672"/> + <location filename="../../TransferThread.cpp" line="744"/> + <location filename="../../TransferThread.cpp" line="1314"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="336"/> - <location filename="../../TransferThread.cpp" line="353"/> + <location filename="../../TransferThread.cpp" line="344"/> + <location filename="../../TransferThread.cpp" line="361"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="408"/> - <location filename="../../TransferThread.cpp" line="431"/> + <location filename="../../TransferThread.cpp" line="416"/> + <location filename="../../TransferThread.cpp" line="439"/> <source>Internal error: Already opening</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="572"/> + <location filename="../../TransferThread.cpp" line="581"/> <source>Drive %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="574"/> + <location filename="../../TransferThread.cpp" line="583"/> <source>Unknown folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="578"/> + <location filename="../../TransferThread.cpp" line="587"/> <source>root</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="631"/> + <location filename="../../TransferThread.cpp" line="640"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="641"/> + <location filename="../../TransferThread.cpp" line="650"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="701"/> - <location filename="../../TransferThread.cpp" line="816"/> + <location filename="../../TransferThread.cpp" line="710"/> + <location filename="../../TransferThread.cpp" line="825"/> <source>The source file doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="741"/> - <location filename="../../TransferThread.cpp" line="828"/> + <location filename="../../TransferThread.cpp" line="750"/> + <location filename="../../TransferThread.cpp" line="837"/> <source>Unable to do the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="777"/> + <location filename="../../TransferThread.cpp" line="786"/> <source>The source doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="822"/> + <location filename="../../TransferThread.cpp" line="831"/> <source>Another file exists at same place</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1124"/> + <location filename="../../TransferThread.cpp" line="1133"/> <source>The checksums do not match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1213"/> + <location filename="../../TransferThread.cpp" line="1223"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1227"/> + <location filename="../../TransferThread.cpp" line="1238"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1238"/> + <location filename="../../TransferThread.cpp" line="1249"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1303"/> - <location filename="../../TransferThread.cpp" line="1321"/> - <location filename="../../TransferThread.cpp" line="1336"/> + <location filename="../../TransferThread.cpp" line="1314"/> + <location filename="../../TransferThread.cpp" line="1332"/> + <location filename="../../TransferThread.cpp" line="1347"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="219"/> + <location filename="../../TransferThread.cpp" line="227"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -796,17 +796,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="268"/> + <location filename="../../WriteThread.cpp" line="269"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="671"/> + <location filename="../../WriteThread.cpp" line="672"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="696"/> + <location filename="../../WriteThread.cpp" line="697"/> <source>File truncated during read, possible data change</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 3362659..a00b0cd 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/pl/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/pl/translation.ts @@ -61,84 +61,84 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="717"/> + <location filename="../../CopyEngine.cpp" line="732"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1047"/> - <location filename="../../CopyEngine.cpp" line="1050"/> - <location filename="../../CopyEngine.cpp" line="1055"/> - <location filename="../../CopyEngine.cpp" line="1059"/> + <location filename="../../CopyEngine.cpp" line="1062"/> + <location filename="../../CopyEngine.cpp" line="1065"/> + <location filename="../../CopyEngine.cpp" line="1070"/> + <location filename="../../CopyEngine.cpp" line="1074"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1048"/> - <location filename="../../CopyEngine.cpp" line="1052"/> - <location filename="../../CopyEngine.cpp" line="1056"/> - <location filename="../../CopyEngine.cpp" line="1060"/> + <location filename="../../CopyEngine.cpp" line="1063"/> + <location filename="../../CopyEngine.cpp" line="1067"/> + <location filename="../../CopyEngine.cpp" line="1071"/> + <location filename="../../CopyEngine.cpp" line="1075"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1051"/> + <location filename="../../CopyEngine.cpp" line="1066"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1053"/> - <location filename="../../CopyEngine.cpp" line="1065"/> + <location filename="../../CopyEngine.cpp" line="1068"/> + <location filename="../../CopyEngine.cpp" line="1080"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1057"/> + <location filename="../../CopyEngine.cpp" line="1072"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1061"/> + <location filename="../../CopyEngine.cpp" line="1076"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1062"/> + <location filename="../../CopyEngine.cpp" line="1077"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1063"/> + <location filename="../../CopyEngine.cpp" line="1078"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1079"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1067"/> + <location filename="../../CopyEngine.cpp" line="1082"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1068"/> + <location filename="../../CopyEngine.cpp" line="1083"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1069"/> + <location filename="../../CopyEngine.cpp" line="1084"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1170"/> + <location filename="../../CopyEngine.cpp" line="1185"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1170"/> + <location filename="../../CopyEngine.cpp" line="1185"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="412"/> - <location filename="../../CopyEngineFactory.cpp" line="415"/> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> + <location filename="../../CopyEngineFactory.cpp" line="418"/> + <location filename="../../CopyEngineFactory.cpp" line="421"/> + <location filename="../../CopyEngineFactory.cpp" line="426"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="413"/> - <location filename="../../CopyEngineFactory.cpp" line="417"/> - <location filename="../../CopyEngineFactory.cpp" line="421"/> - <location filename="../../CopyEngineFactory.cpp" line="425"/> + <location filename="../../CopyEngineFactory.cpp" line="419"/> + <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="427"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="416"/> + <location filename="../../CopyEngineFactory.cpp" line="422"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="418"/> - <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="424"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="422"/> + <location filename="../../CopyEngineFactory.cpp" line="428"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="426"/> + <location filename="../../CopyEngineFactory.cpp" line="432"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="427"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="428"/> + <location filename="../../CopyEngineFactory.cpp" line="434"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="438"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="485"/> - <location filename="../../CopyEngineFactory.cpp" line="524"/> + <location filename="../../CopyEngineFactory.cpp" line="491"/> + <location filename="../../CopyEngineFactory.cpp" line="530"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="485"/> + <location filename="../../CopyEngineFactory.cpp" line="491"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="524"/> + <location filename="../../CopyEngineFactory.cpp" line="530"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -273,22 +273,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="131"/> + <location filename="../../FileExistsDialog.cpp" line="137"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="141"/> + <location filename="../../FileExistsDialog.cpp" line="147"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="226"/> + <location filename="../../FileExistsDialog.cpp" line="232"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="226"/> + <location filename="../../FileExistsDialog.cpp" line="232"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -296,22 +296,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="105"/> + <location filename="../../FileIsSameDialog.cpp" line="111"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="115"/> + <location filename="../../FileIsSameDialog.cpp" line="121"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="182"/> + <location filename="../../FileIsSameDialog.cpp" line="188"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="182"/> + <location filename="../../FileIsSameDialog.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -417,40 +417,40 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="92"/> - <location filename="../../Filters.cpp" line="130"/> + <location filename="../../Filters.cpp" line="93"/> + <location filename="../../Filters.cpp" line="131"/> <source>Raw text</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="95"/> - <location filename="../../Filters.cpp" line="133"/> + <location filename="../../Filters.cpp" line="96"/> + <location filename="../../Filters.cpp" line="134"/> <source>Simplified regex</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="98"/> - <location filename="../../Filters.cpp" line="136"/> + <location filename="../../Filters.cpp" line="99"/> + <location filename="../../Filters.cpp" line="137"/> <source>Perl's regex</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="106"/> - <location filename="../../Filters.cpp" line="144"/> + <location filename="../../Filters.cpp" line="107"/> + <location filename="../../Filters.cpp" line="145"/> <source>Only on file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="109"/> - <location filename="../../Filters.cpp" line="147"/> + <location filename="../../Filters.cpp" line="110"/> + <location filename="../../Filters.cpp" line="148"/> <source>Only on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Filters.cpp" line="115"/> - <location filename="../../Filters.cpp" line="153"/> - <location filename="../../Filters.cpp" line="215"/> - <location filename="../../Filters.cpp" line="254"/> + <location filename="../../Filters.cpp" line="116"/> + <location filename="../../Filters.cpp" line="154"/> + <location filename="../../Filters.cpp" line="216"/> + <location filename="../../Filters.cpp" line="255"/> <source>Full match</source> <translation type="unfinished"></translation> </message> @@ -458,27 +458,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="51"/> + <location filename="../../FolderExistsDialog.cpp" line="57"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="116"/> + <location filename="../../FolderExistsDialog.cpp" line="122"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="126"/> + <location filename="../../FolderExistsDialog.cpp" line="132"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="187"/> + <location filename="../../FolderExistsDialog.cpp" line="193"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="187"/> + <location filename="../../FolderExistsDialog.cpp" line="193"/> <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="1447"/> - <location filename="../../ListThread.cpp" line="2369"/> + <location filename="../../ListThread.cpp" line="1458"/> + <location filename="../../ListThread.cpp" line="2390"/> <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="1454"/> - <location filename="../../ListThread.cpp" line="2376"/> + <location filename="../../ListThread.cpp" line="1465"/> + <location filename="../../ListThread.cpp" line="2397"/> <source>Unable to save the transfer list: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1470"/> + <location filename="../../ListThread.cpp" line="1481"/> <source>Problem reading file, or file-size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1477"/> + <location filename="../../ListThread.cpp" line="1488"/> <source>Wrong header: "%1"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1486"/> + <location filename="../../ListThread.cpp" line="1497"/> <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="1495"/> + <location filename="../../ListThread.cpp" line="1506"/> <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="1501"/> + <location filename="../../ListThread.cpp" line="1512"/> <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="1557"/> + <location filename="../../ListThread.cpp" line="1575"/> <source>Some errors have been found during the line parsing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1565"/> + <location filename="../../ListThread.cpp" line="1583"/> <source>Unable to open the transfer list: %1</source> <translation type="unfinished"></translation> </message> @@ -556,13 +556,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="232"/> + <location filename="../../MkPath.cpp" line="233"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../MkPath.cpp" line="93"/> - <location filename="../../MkPath.cpp" line="275"/> + <location filename="../../MkPath.cpp" line="276"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> @@ -649,39 +649,39 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="265"/> + <location filename="../../ScanFileOrFolder.cpp" line="274"/> <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="327"/> - <location filename="../../ScanFileOrFolder.cpp" line="393"/> + <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="337"/> - <location filename="../../ScanFileOrFolder.cpp" line="403"/> + <location filename="../../ScanFileOrFolder.cpp" line="348"/> + <location filename="../../ScanFileOrFolder.cpp" line="414"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="441"/> + <location filename="../../ScanFileOrFolder.cpp" line="452"/> <source>This is not a folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="443"/> + <location filename="../../ScanFileOrFolder.cpp" line="454"/> <source>The folder does exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="445"/> + <location filename="../../ScanFileOrFolder.cpp" line="456"/> <source>The folder is not readable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="467"/> <source>Problem with name encoding</source> <translation type="unfinished"></translation> </message> @@ -689,101 +689,101 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="235"/> - <location filename="../../TransferThread.cpp" line="663"/> - <location filename="../../TransferThread.cpp" line="735"/> - <location filename="../../TransferThread.cpp" line="1303"/> + <location filename="../../TransferThread.cpp" line="243"/> + <location filename="../../TransferThread.cpp" line="672"/> + <location filename="../../TransferThread.cpp" line="744"/> + <location filename="../../TransferThread.cpp" line="1314"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="336"/> - <location filename="../../TransferThread.cpp" line="353"/> + <location filename="../../TransferThread.cpp" line="344"/> + <location filename="../../TransferThread.cpp" line="361"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="408"/> - <location filename="../../TransferThread.cpp" line="431"/> + <location filename="../../TransferThread.cpp" line="416"/> + <location filename="../../TransferThread.cpp" line="439"/> <source>Internal error: Already opening</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="572"/> + <location filename="../../TransferThread.cpp" line="581"/> <source>Drive %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="574"/> + <location filename="../../TransferThread.cpp" line="583"/> <source>Unknown folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="578"/> + <location filename="../../TransferThread.cpp" line="587"/> <source>root</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="631"/> + <location filename="../../TransferThread.cpp" line="640"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="641"/> + <location filename="../../TransferThread.cpp" line="650"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="701"/> - <location filename="../../TransferThread.cpp" line="816"/> + <location filename="../../TransferThread.cpp" line="710"/> + <location filename="../../TransferThread.cpp" line="825"/> <source>The source file doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="741"/> - <location filename="../../TransferThread.cpp" line="828"/> + <location filename="../../TransferThread.cpp" line="750"/> + <location filename="../../TransferThread.cpp" line="837"/> <source>Unable to do the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="777"/> + <location filename="../../TransferThread.cpp" line="786"/> <source>The source doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="822"/> + <location filename="../../TransferThread.cpp" line="831"/> <source>Another file exists at same place</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1124"/> + <location filename="../../TransferThread.cpp" line="1133"/> <source>The checksums do not match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1213"/> + <location filename="../../TransferThread.cpp" line="1223"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1227"/> + <location filename="../../TransferThread.cpp" line="1238"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1238"/> + <location filename="../../TransferThread.cpp" line="1249"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1303"/> - <location filename="../../TransferThread.cpp" line="1321"/> - <location filename="../../TransferThread.cpp" line="1336"/> + <location filename="../../TransferThread.cpp" line="1314"/> + <location filename="../../TransferThread.cpp" line="1332"/> + <location filename="../../TransferThread.cpp" line="1347"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="219"/> + <location filename="../../TransferThread.cpp" line="227"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -796,17 +796,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="268"/> + <location filename="../../WriteThread.cpp" line="269"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="671"/> + <location filename="../../WriteThread.cpp" line="672"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="696"/> + <location filename="../../WriteThread.cpp" line="697"/> <source>File truncated during read, possible data change</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 3362659..a00b0cd 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/pt/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/pt/translation.ts @@ -61,84 +61,84 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="717"/> + <location filename="../../CopyEngine.cpp" line="732"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1047"/> - <location filename="../../CopyEngine.cpp" line="1050"/> - <location filename="../../CopyEngine.cpp" line="1055"/> - <location filename="../../CopyEngine.cpp" line="1059"/> + <location filename="../../CopyEngine.cpp" line="1062"/> + <location filename="../../CopyEngine.cpp" line="1065"/> + <location filename="../../CopyEngine.cpp" line="1070"/> + <location filename="../../CopyEngine.cpp" line="1074"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1048"/> - <location filename="../../CopyEngine.cpp" line="1052"/> - <location filename="../../CopyEngine.cpp" line="1056"/> - <location filename="../../CopyEngine.cpp" line="1060"/> + <location filename="../../CopyEngine.cpp" line="1063"/> + <location filename="../../CopyEngine.cpp" line="1067"/> + <location filename="../../CopyEngine.cpp" line="1071"/> + <location filename="../../CopyEngine.cpp" line="1075"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1051"/> + <location filename="../../CopyEngine.cpp" line="1066"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1053"/> - <location filename="../../CopyEngine.cpp" line="1065"/> + <location filename="../../CopyEngine.cpp" line="1068"/> + <location filename="../../CopyEngine.cpp" line="1080"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1057"/> + <location filename="../../CopyEngine.cpp" line="1072"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1061"/> + <location filename="../../CopyEngine.cpp" line="1076"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1062"/> + <location filename="../../CopyEngine.cpp" line="1077"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1063"/> + <location filename="../../CopyEngine.cpp" line="1078"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1079"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1067"/> + <location filename="../../CopyEngine.cpp" line="1082"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1068"/> + <location filename="../../CopyEngine.cpp" line="1083"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1069"/> + <location filename="../../CopyEngine.cpp" line="1084"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1170"/> + <location filename="../../CopyEngine.cpp" line="1185"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1170"/> + <location filename="../../CopyEngine.cpp" line="1185"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="412"/> - <location filename="../../CopyEngineFactory.cpp" line="415"/> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> + <location filename="../../CopyEngineFactory.cpp" line="418"/> + <location filename="../../CopyEngineFactory.cpp" line="421"/> + <location filename="../../CopyEngineFactory.cpp" line="426"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="413"/> - <location filename="../../CopyEngineFactory.cpp" line="417"/> - <location filename="../../CopyEngineFactory.cpp" line="421"/> - <location filename="../../CopyEngineFactory.cpp" line="425"/> + <location filename="../../CopyEngineFactory.cpp" line="419"/> + <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="427"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="416"/> + <location filename="../../CopyEngineFactory.cpp" line="422"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="418"/> - <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="424"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="422"/> + <location filename="../../CopyEngineFactory.cpp" line="428"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="426"/> + <location filename="../../CopyEngineFactory.cpp" line="432"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="427"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="428"/> + <location filename="../../CopyEngineFactory.cpp" line="434"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="438"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> < |