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 | |
| parent | b3c8bdcc0d1e4b2ab298847a7902b6d60410a5bc (diff) | |
New upstream version 1.4.0.3
Diffstat (limited to 'plugins')
207 files changed, 11299 insertions, 13394 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/Listener/dbus/informations.xml b/plugins/CopyEngine/Rsync/informations.xml index 0b836ed..46cbf7e 100644 --- a/plugins/Listener/dbus/informations.xml +++ b/plugins/CopyEngine/Rsync/informations.xml @@ -1,26 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> <package> - <title xml:lang="en"><![CDATA[Listener for catchcopy in dbus]]></title><!-- english is required --> - <title xml:lang="fr"><![CDATA[Écouteur pour catchcopy en dbus]]></title> + <title xml:lang="en"><![CDATA[Rsync copy engine]]></title><!-- english is required --> <!-- What kind of plugin this is --> - <category>Listener</category> + <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 --> - <website xml:lang="fr"><![CDATA[http://ultracopier-fr.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[Listener for catchcopy in dbus. Allow to receive copy list from plugin/explorer compatible with catchcopy.]]></description> - <description xml:lang="fr"><![CDATA[Écouteur pour catchcopy en dbus. Permet de recevoir un liste de copie venant d'un plugin/explorateur avec catchcopy.]]></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.2.3.6</version> + <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>dbus</name> + <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>
\ No newline at end of file +</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> <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/ru/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/ru/translation.ts index f53fff3..abaf3bb 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/ru/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/ru/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">%1 - копия</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="141"/> + <location filename="../../FileExistsDialog.cpp" line="147"/> <source>%1 - copy (%2)</source> <translation type="unfinished">%1 - копия (%2)</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">%1 - копия</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="115"/> + <location filename="../../FileIsSameDialog.cpp" line="121"/> <source>%1 - copy (%2)</source> <translation type="unfinished">%1 - копия (%2)</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>Ни = Включить все</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>Сырой текст</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>Упрощенная регулярных выражений</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>Только на файл</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>Только на папку</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>Полный матч</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">%1 - копия</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="126"/> + <location filename="../../FolderExistsDialog.cpp" line="132"/> <source>%1 - copy (%2)</source> <translation type="unfinished">%1 - копия (%2)</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>Невозможно сделать, чтобы скопировать или переместить элемент в неправильном форсированном режиме: %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>Невозможно сохранить трансфер: %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> <translation>Неправильный заголовок: "%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>Трансфер в смешанном режиме, но этот экземпляр не в этом режиме</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>Передача списка в режиме копирования, но этот экземпляр не в этом режиме</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>Трансфер в режим перемещения, но этот экземпляр не в этом режиме</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>Не удается открыть трансфер: %1</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">%1 - копия</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">%1 - копия (%2)</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">%1 - копия</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="641"/> + <location filename="../../TransferThread.cpp" line="650"/> <source>%1 - copy (%2)</source> <translation type="unfinished">%1 - копия (%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"></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>Невозможно прочитать исходный файл: </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/th/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/th/translation.ts index 3362659..a00b0cd 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/th/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/th/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/tr/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/tr/translation.ts index 3362659..a00b0cd 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/tr/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/tr/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/zh/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/zh/translation.ts index 25bb8d3..5c68ad9 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/zh/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/zh/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/ListThread.cpp b/plugins/CopyEngine/Ultracopier/ListThread.cpp index 48e06db..4b9cde5 100644 --- a/plugins/CopyEngine/Ultracopier/ListThread.cpp +++ b/plugins/CopyEngine/Ultracopier/ListThread.cpp @@ -1,6 +1,7 @@ #include "ListThread.h" #include <QStorageInfo> #include <QMutexLocker> +#include "../../../cpp11addition.h" ListThread::ListThread(FacilityInterface * facilityInterface) { @@ -78,12 +79,12 @@ void ListThread::transferInodeIsClosed() { numberOfInodeOperation--; #ifdef ULTRACOPIER_PLUGIN_DEBUG_SCHEDULER - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("numberOfInodeOperation: %1").arg(numberOfInodeOperation)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"numberOfInodeOperation: "+std::to_string(numberOfInodeOperation)); #endif TransferThread *temp_transfer_thread=qobject_cast<TransferThread *>(QObject::sender()); if(temp_transfer_thread==NULL) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("transfer thread not located!")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"transfer thread not located!"); return; } bool isFound=false; @@ -92,7 +93,7 @@ void ListThread::transferInodeIsClosed() #endif if(temp_transfer_thread->getStat()!=TransferStat_Idle) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("transfer thread not idle!")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"transfer thread not idle!"); return; } int int_for_internal_loop=0; @@ -101,17 +102,17 @@ void ListThread::transferInodeIsClosed() { if(actionToDoListTransfer.at(int_for_internal_loop).id==temp_transfer_thread->transferId) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[%1] have finish, put at idle; for id: %2").arg(int_for_internal_loop).arg(temp_transfer_thread->transferId)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[%1] have finish, put at idle; for id: %2").arg(int_for_internal_loop).arg(temp_transfer_thread->transferId).toStdString()); Ultracopier::ReturnActionOnCopyList newAction; newAction.type=Ultracopier::RemoveItem; newAction.userAction.moveAt=0; newAction.addAction=actionToDoTransferToItemOfCopyList(actionToDoListTransfer.at(int_for_internal_loop)); newAction.userAction.position=int_for_internal_loop; - actionDone << newAction; + actionDone.push_back(newAction); /// \todo check if item is at the right thread - actionToDoListTransfer.removeAt(int_for_internal_loop); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("actionToDoListTransfer.size(): %1, actionToDoListInode: %2, actionToDoListInode_afterTheTransfer: %3").arg(actionToDoListTransfer.size()).arg(actionToDoListInode.size()).arg(actionToDoListInode_afterTheTransfer.size())); - if(actionToDoListTransfer.isEmpty() && actionToDoListInode.isEmpty() && actionToDoListInode_afterTheTransfer.isEmpty()) + actionToDoListTransfer.erase(actionToDoListTransfer.cbegin()+int_for_internal_loop); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("actionToDoListTransfer.size(): %1, actionToDoListInode: %2, actionToDoListInode_afterTheTransfer: %3").arg(actionToDoListTransfer.size()).arg(actionToDoListInode.size()).arg(actionToDoListInode_afterTheTransfer.size()).toStdString()); + if(actionToDoListTransfer.empty() && actionToDoListInode.empty() && actionToDoListInode_afterTheTransfer.empty()) updateTheStatus(); //add the current size of file, to general size because it's finish @@ -119,7 +120,7 @@ void ListThread::transferInodeIsClosed() if(copiedSize>(qint64)temp_transfer_thread->transferSize) { oversize=copiedSize-temp_transfer_thread->transferSize; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("add oversize of: %1").arg(oversize)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"add oversize of: "+std::to_string(oversize)); bytesToTransfer+=oversize; bytesTransfered+=oversize; } @@ -127,7 +128,7 @@ void ListThread::transferInodeIsClosed() if(temp_transfer_thread->haveStartTime) { - timeToTransfer << QPair<quint64,quint32>(temp_transfer_thread->transferSize,temp_transfer_thread->startTransferTime.elapsed()); + timeToTransfer.push_back(std::pair<uint64_t,uint32_t>(temp_transfer_thread->transferSize,temp_transfer_thread->startTransferTime.elapsed())); temp_transfer_thread->haveStartTime=false; } temp_transfer_thread->transferId=0; @@ -136,10 +137,10 @@ void ListThread::transferInodeIsClosed() countLocalParse++; #endif isFound=true; - if(actionToDoListTransfer.isEmpty()) + if(actionToDoListTransfer.empty()) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"actionToDoListTransfer==0"); - actionToDoListInode << actionToDoListInode_afterTheTransfer; + actionToDoListInode.insert(actionToDoListInode.cbegin(),actionToDoListInode_afterTheTransfer.cbegin(),actionToDoListInode_afterTheTransfer.cend()); actionToDoListInode_afterTheTransfer.clear(); doNewActions_inode_manipulation(); } @@ -151,14 +152,14 @@ void ListThread::transferInodeIsClosed() deleteTransferThread(); else { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("unable to found item into the todo list, id: %1, index: %2").arg(temp_transfer_thread->transferId).arg(int_for_internal_loop)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("unable to found item into the todo list, id: %1, index: %2").arg(temp_transfer_thread->transferId).arg(int_for_internal_loop).toStdString()); temp_transfer_thread->transferId=0; temp_transfer_thread->transferSize=0; } - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("countLocalParse: %1, actionToDoList.size(): %2").arg(countLocalParse).arg(actionToDoListTransfer.size())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("countLocalParse: %1, actionToDoList.size(): %2").arg(countLocalParse).arg(actionToDoListTransfer.size()).toStdString()); #ifdef ULTRACOPIER_PLUGIN_DEBUG if(countLocalParse!=1) - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("countLocalParse != 1")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"countLocalParse != 1"); #endif doNewActions_inode_manipulation(); } @@ -170,29 +171,30 @@ void ListThread::transferPutAtBottom() TransferThread *transfer=qobject_cast<TransferThread *>(QObject::sender()); if(transfer==NULL) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("transfer thread not located!")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"transfer thread not located!"); return; } bool isFound=false; #ifdef ULTRACOPIER_PLUGIN_DEBUG int countLocalParse=0; #endif - int indexAction=0; + unsigned int indexAction=0; while(indexAction<actionToDoListTransfer.size()) { if(actionToDoListTransfer.at(indexAction).id==transfer->transferId) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("Put at the end: %1").arg(transfer->transferId)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"Put at the end: "+std::to_string(transfer->transferId)); //push for interface at the end Ultracopier::ReturnActionOnCopyList newAction; newAction.type=Ultracopier::MoveItem; newAction.addAction.id=transfer->transferId; newAction.userAction.position=actionToDoListTransfer.size()-1; - actionDone << newAction; + actionDone.push_back(newAction); //do the wait stat actionToDoListTransfer[indexAction].isRunning=false; //move at the end - actionToDoListTransfer.move(indexAction,actionToDoListTransfer.size()-1); + actionToDoListTransfer.push_back(actionToDoListTransfer.at(indexAction)); + actionToDoListTransfer.erase(actionToDoListTransfer.cbegin()+indexAction); //reset the thread list stat transfer->transferId=0; transfer->transferSize=0; @@ -206,14 +208,14 @@ void ListThread::transferPutAtBottom() } if(!isFound) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("unable to found item into the todo list, id: %1, index: %2").arg(transfer->transferId)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("unable to found item into the todo list, id: %1, index: %2").arg(transfer->transferId).toStdString()); transfer->transferId=0; transfer->transferSize=0; } - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("countLocalParse: %1").arg(countLocalParse)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"countLocalParse: "+std::to_string(countLocalParse)); #ifdef ULTRACOPIER_PLUGIN_DEBUG if(countLocalParse!=1) - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("countLocalParse != 1")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"countLocalParse != 1"); #endif transfer->skip(); } @@ -272,7 +274,7 @@ void ListThread::setAutoStart(const bool autoStart) /// \brief set rsync void ListThread::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; int index=0; int loop_sub_size_transfer_thread_search=transferThreadList.size(); @@ -281,7 +283,7 @@ void ListThread::setRsync(const bool rsync) transferThreadList.at(index)->setRsync(rsync); index++; } - for(int i=0;i<scanFileOrFolderThreadsPool.size();i++) + for(unsigned int i=0;i<scanFileOrFolderThreadsPool.size();i++) scanFileOrFolderThreadsPool.at(i)->setRsync(rsync); } #endif @@ -290,7 +292,7 @@ void ListThread::setRsync(const bool rsync) void ListThread::setCheckDestinationFolderExists(const bool checkDestinationFolderExists) { this->checkDestinationFolderExists=checkDestinationFolderExists; - for(int i=0;i<scanFileOrFolderThreadsPool.size();i++) + for(unsigned int i=0;i<scanFileOrFolderThreadsPool.size();i++) scanFileOrFolderThreadsPool.at(i)->setCheckDestinationFolderExists(checkDestinationFolderExists && alwaysDoThisActionForFolderExists!=FolderExists_Merge); } @@ -302,7 +304,7 @@ void ListThread::fileTransfer(const QFileInfo &sourceFileInfo,const QFileInfo &d } // -> add thread safe, by Qt::BlockingQueuedConnection -bool ListThread::haveSameSource(const QStringList &sources) +bool ListThread::haveSameSource(const std::vector<std::string> &sources) { if(stopIt) return false; @@ -311,12 +313,12 @@ bool ListThread::haveSameSource(const QStringList &sources) ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"sourceDriveMultiple"); return false; } - if(sourceDrive.isEmpty()) + if(sourceDrive.empty()) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"sourceDrive.isEmpty()"); return true; } - int index=0; + unsigned int index=0; while(index<sources.size()) { if(driveManagement.getDrive(sources.at(index))!=sourceDrive) @@ -331,7 +333,7 @@ bool ListThread::haveSameSource(const QStringList &sources) } // -> add thread safe, by Qt::BlockingQueuedConnection -bool ListThread::haveSameDestination(const QString &destination) +bool ListThread::haveSameDestination(const std::string &destination) { if(stopIt) return false; @@ -340,7 +342,7 @@ bool ListThread::haveSameDestination(const QString &destination) ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"destinationDriveMultiple"); return false; } - if(destinationDrive.isEmpty()) + if(destinationDrive.empty()) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"destinationDrive.isEmpty()"); return true; @@ -355,52 +357,52 @@ bool ListThread::haveSameDestination(const QString &destination) } /// \return empty if multiple or no destination -QString ListThread::getUniqueDestinationFolder() const +std::string ListThread::getUniqueDestinationFolder() const { if(stopIt) - return QString(); + return std::string(); if(destinationFolderMultiple) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"destinationDriveMultiple"); - return QString(); + return std::string(); } return destinationFolder; } ScanFileOrFolder * ListThread::newScanThread(Ultracopier::CopyMode mode) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start with: ")+QString::number(mode)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start with: "+std::to_string(mode)); //create new thread because is auto-detroyed - scanFileOrFolderThreadsPool << new ScanFileOrFolder(mode); - connect(scanFileOrFolderThreadsPool.last(),&ScanFileOrFolder::finishedTheListing, this,&ListThread::scanThreadHaveFinishSlot, Qt::QueuedConnection); - connect(scanFileOrFolderThreadsPool.last(),&ScanFileOrFolder::fileTransfer, this,&ListThread::fileTransfer, Qt::QueuedConnection); + scanFileOrFolderThreadsPool.push_back(new ScanFileOrFolder(mode)); + connect(scanFileOrFolderThreadsPool.back(),&ScanFileOrFolder::finishedTheListing, this,&ListThread::scanThreadHaveFinishSlot, Qt::QueuedConnection); + connect(scanFileOrFolderThreadsPool.back(),&ScanFileOrFolder::fileTransfer, this,&ListThread::fileTransfer, Qt::QueuedConnection); #ifdef ULTRACOPIER_PLUGIN_DEBUG - connect(scanFileOrFolderThreadsPool.last(),&ScanFileOrFolder::debugInformation, this,&ListThread::debugInformation, Qt::QueuedConnection); + connect(scanFileOrFolderThreadsPool.back(),&ScanFileOrFolder::debugInformation, this,&ListThread::debugInformation, Qt::QueuedConnection); #endif - connect(scanFileOrFolderThreadsPool.last(),&ScanFileOrFolder::newFolderListing, this,&ListThread::newFolderListing); - connect(scanFileOrFolderThreadsPool.last(),&ScanFileOrFolder::addToMovePath, this,&ListThread::addToMovePath, Qt::QueuedConnection); - connect(scanFileOrFolderThreadsPool.last(),&ScanFileOrFolder::addToRealMove, this,&ListThread::addToRealMove, Qt::QueuedConnection); - connect(scanFileOrFolderThreadsPool.last(),&ScanFileOrFolder::addToMkPath, this,&ListThread::addToMkPath, Qt::QueuedConnection); + connect(scanFileOrFolderThreadsPool.back(),&ScanFileOrFolder::newFolderListing, this,&ListThread::newFolderListing); + connect(scanFileOrFolderThreadsPool.back(),&ScanFileOrFolder::addToMovePath, this,&ListThread::addToMovePath, Qt::QueuedConnection); + connect(scanFileOrFolderThreadsPool.back(),&ScanFileOrFolder::addToRealMove, this,&ListThread::addToRealMove, Qt::QueuedConnection); + connect(scanFileOrFolderThreadsPool.back(),&ScanFileOrFolder::addToMkPath, this,&ListThread::addToMkPath, Qt::QueuedConnection); #ifdef ULTRACOPIER_PLUGIN_RSYNC - connect(scanFileOrFolderThreadsPool.last(),&ScanFileOrFolder::addToRmForRsync, this,&ListThread::addToRmForRsync, Qt::QueuedConnection); + connect(scanFileOrFolderThreadsPool.back(),&ScanFileOrFolder::addToRmForRsync, this,&ListThread::addToRmForRsync, Qt::QueuedConnection); #endif - connect(scanFileOrFolderThreadsPool.last(),&ScanFileOrFolder::errorOnFolder, this,&ListThread::errorOnFolder, Qt::QueuedConnection); - connect(scanFileOrFolderThreadsPool.last(),&ScanFileOrFolder::folderAlreadyExists, this,&ListThread::folderAlreadyExists, Qt::QueuedConnection); + connect(scanFileOrFolderThreadsPool.back(),&ScanFileOrFolder::errorOnFolder, this,&ListThread::errorOnFolder, Qt::QueuedConnection); + connect(scanFileOrFolderThreadsPool.back(),&ScanFileOrFolder::folderAlreadyExists, this,&ListThread::folderAlreadyExists, Qt::QueuedConnection); - connect(this,&ListThread::send_updateMount, scanFileOrFolderThreadsPool.last(),&ScanFileOrFolder::set_updateMount, Qt::QueuedConnection); + connect(this,&ListThread::send_updateMount, scanFileOrFolderThreadsPool.back(),&ScanFileOrFolder::set_updateMount, Qt::QueuedConnection); - scanFileOrFolderThreadsPool.last()->setFilters(include,exclude); - scanFileOrFolderThreadsPool.last()->setCheckDestinationFolderExists(checkDestinationFolderExists && alwaysDoThisActionForFolderExists!=FolderExists_Merge); - scanFileOrFolderThreadsPool.last()->setMoveTheWholeFolder(moveTheWholeFolder); + scanFileOrFolderThreadsPool.back()->setFilters(include,exclude); + scanFileOrFolderThreadsPool.back()->setCheckDestinationFolderExists(checkDestinationFolderExists && alwaysDoThisActionForFolderExists!=FolderExists_Merge); + scanFileOrFolderThreadsPool.back()->setMoveTheWholeFolder(moveTheWholeFolder); #ifdef ULTRACOPIER_PLUGIN_RSYNC - scanFileOrFolderThreadsPool.last()->setRsync(rsync); + scanFileOrFolderThreadsPool.back()->setRsync(rsync); #endif if(scanFileOrFolderThreadsPool.size()==1) updateTheStatus(); - scanFileOrFolderThreadsPool.last()->setRenamingRules(firstRenamingRule,otherRenamingRule); - return scanFileOrFolderThreadsPool.last(); + scanFileOrFolderThreadsPool.back()->setRenamingRules(firstRenamingRule,otherRenamingRule); + return scanFileOrFolderThreadsPool.back(); } void ListThread::scanThreadHaveFinishSlot() @@ -410,7 +412,7 @@ void ListThread::scanThreadHaveFinishSlot() void ListThread::scanThreadHaveFinish(bool skipFirstRemove) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("listing thread have finish, skipFirstRemove: ")+QString::number(skipFirstRemove)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"listing thread have finish, skipFirstRemove: "+std::to_string(skipFirstRemove)); if(!skipFirstRemove) { ScanFileOrFolder * senderThread = qobject_cast<ScanFileOrFolder *>(QObject::sender()); @@ -418,21 +420,21 @@ void ListThread::scanThreadHaveFinish(bool skipFirstRemove) ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"sender pointer null (plugin copy engine)"); else { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start the next thread, scanFileOrFolderThreadsPool.size(): ")+QString::number(scanFileOrFolderThreadsPool.size())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start the next thread, scanFileOrFolderThreadsPool.size(): "+std::to_string(scanFileOrFolderThreadsPool.size())); delete senderThread; - scanFileOrFolderThreadsPool.removeOne(senderThread); - if(scanFileOrFolderThreadsPool.isEmpty()) + vectorremoveOne(scanFileOrFolderThreadsPool,senderThread); + if(scanFileOrFolderThreadsPool.empty()) updateTheStatus(); } } - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start the next thread, scanFileOrFolderThreadsPool.size(): ")+QString::number(scanFileOrFolderThreadsPool.size())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start the next thread, scanFileOrFolderThreadsPool.size(): "+std::to_string(scanFileOrFolderThreadsPool.size())); if(scanFileOrFolderThreadsPool.size()>0) { //then start the next listing threads - if(scanFileOrFolderThreadsPool.first()->isFinished()) + if(scanFileOrFolderThreadsPool.front()->isFinished()) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"Start listing thread"); - scanFileOrFolderThreadsPool.first()->start(); + scanFileOrFolderThreadsPool.front()->start(); } else ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"The listing thread is already running"); @@ -472,9 +474,9 @@ void ListThread::startGeneralTransfer() } // -> add thread safe, by Qt::BlockingQueuedConnection -bool ListThread::newCopy(const QStringList &sources,const QString &destination) +bool ListThread::newCopy(const std::vector<std::string> &sources,const std::string &destination) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start: ")+sources.join(";")+QStringLiteral(", destination: ")+destination); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start: "+stringimplode(sources,";")+", destination: "+destination); ScanFileOrFolder * scanFileOrFolderThread = newScanThread(Ultracopier::Copy); if(scanFileOrFolderThread==NULL) { @@ -488,7 +490,7 @@ bool ListThread::newCopy(const QStringList &sources,const QString &destination) } // -> add thread safe, by Qt::BlockingQueuedConnection -bool ListThread::newMove(const QStringList &sources,const QString &destination) +bool ListThread::newMove(const std::vector<std::string> &sources,const std::string &destination) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); ScanFileOrFolder * scanFileOrFolderThread = newScanThread(Ultracopier::Move); @@ -503,17 +505,17 @@ bool ListThread::newMove(const QStringList &sources,const QString &destination) return true; } -void ListThread::detectDrivesOfCurrentTransfer(const QStringList &sources,const QString &destination) +void ListThread::detectDrivesOfCurrentTransfer(const std::vector<std::string> &sources,const std::string &destination) { /* code to detect volume/mount point to group by windows */ if(!sourceDriveMultiple) { - int index=0; + unsigned int index=0; while(index<sources.size()) { - const QString &tempDrive=driveManagement.getDrive(sources.at(index)); + const std::string &tempDrive=driveManagement.getDrive(sources.at(index)); //if have not already source, set the source - if(sourceDrive.isEmpty()) + if(sourceDrive.empty()) sourceDrive=tempDrive; //if have previous source and the news source is not the same if(sourceDrive!=tempDrive) @@ -524,12 +526,12 @@ void ListThread::detectDrivesOfCurrentTransfer(const QStringList &sources,const index++; } } - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("source informations, sourceDrive: %1, sourceDriveMultiple: %2").arg(sourceDrive).arg(sourceDriveMultiple)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("source informations, sourceDrive: %1, sourceDriveMultiple: %2").arg(QString::fromStdString(sourceDrive)).arg(sourceDriveMultiple).toStdString()); if(!destinationDriveMultiple) { - const QString &tempDrive=driveManagement.getDrive(destination); + const std::string &tempDrive=driveManagement.getDrive(destination); //if have not already destination, set the destination - if(destinationDrive.isEmpty()) + if(destinationDrive.empty()) destinationDrive=tempDrive; //if have previous destination and the news destination is not the same if(destinationDrive!=tempDrive) @@ -538,13 +540,13 @@ void ListThread::detectDrivesOfCurrentTransfer(const QStringList &sources,const if(!destinationFolderMultiple) { //if have not already destination, set the destination - if(destinationFolder.isEmpty()) + if(destinationFolder.empty()) destinationFolder=destination; //if have previous destination and the news destination is not the same if(destinationFolder!=destination) destinationFolderMultiple=true; } - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("destination informations, destinationDrive: %1, destinationDriveMultiple: %2").arg(destinationDrive).arg(destinationDriveMultiple)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("destination informations, destinationDrive: %1, destinationDriveMultiple: %2").arg(QString::fromStdString(destinationDrive)).arg(destinationDriveMultiple).toStdString()); } void ListThread::setCollisionAction(const FileExistsAction &alwaysDoThisActionForFileExists) @@ -578,7 +580,7 @@ bool ListThread::getReturnBoolToCopyEngine() const return returnBoolToCopyEngine; } -QPair<quint64,quint64> ListThread::getReturnPairQuint64ToCopyEngine() const +std::pair<quint64, quint64> ListThread::getReturnPairQuint64ToCopyEngine() const { return returnPairQuint64ToCopyEngine; } @@ -701,12 +703,12 @@ void ListThread::resume() emit isInPause(false); } -void ListThread::skip(const quint64 &id) +void ListThread::skip(const uint64_t &id) { skipInternal(id); } -bool ListThread::skipInternal(const quint64 &id) +bool ListThread::skipInternal(const uint64_t &id) { int index=0; int loop_sub_size_transfer_thread_search=transferThreadList.size(); @@ -714,7 +716,7 @@ bool ListThread::skipInternal(const quint64 &id) { if(transferThreadList.at(index)->transferId==id) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("skip one transfer: %1").arg(id)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"skip one transfer: "+std::to_string(id)); transferThreadList.at(index)->skip(); return true; } @@ -726,22 +728,22 @@ bool ListThread::skipInternal(const quint64 &id) { if(actionToDoListTransfer.at(int_for_internal_loop).id==id) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[%1] remove at not running, for id: %2").arg(int_for_internal_loop).arg(id)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[%1] remove at not running, for id: %2").arg(int_for_internal_loop).arg(id).toStdString()); Ultracopier::ReturnActionOnCopyList newAction; newAction.type=Ultracopier::RemoveItem; newAction.userAction.moveAt=1; newAction.addAction=actionToDoTransferToItemOfCopyList(actionToDoListTransfer.at(int_for_internal_loop)); newAction.userAction.position=int_for_internal_loop; - actionDone << newAction; - actionToDoListTransfer.removeAt(int_for_internal_loop); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("actionToDoListTransfer.size(): %1, actionToDoListInode: %2, actionToDoListInode_afterTheTransfer: %3").arg(actionToDoListTransfer.size()).arg(actionToDoListInode.size()).arg(actionToDoListInode_afterTheTransfer.size())); - if(actionToDoListTransfer.isEmpty() && actionToDoListInode.isEmpty() && actionToDoListInode_afterTheTransfer.isEmpty()) + actionDone.push_back(newAction); + actionToDoListTransfer.erase(actionToDoListTransfer.cbegin()+int_for_internal_loop); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("actionToDoListTransfer.size(): %1, actionToDoListInode: %2, actionToDoListInode_afterTheTransfer: %3").arg(actionToDoListTransfer.size()).arg(actionToDoListInode.size()).arg(actionToDoListInode_afterTheTransfer.size()).toStdString()); + if(actionToDoListTransfer.empty() && actionToDoListInode.empty() && actionToDoListInode_afterTheTransfer.empty()) updateTheStatus(); return true; } int_for_internal_loop++; } - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("skip transfer not found: %1").arg(id)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"skip transfer not found: "+std::to_string(id)); return false; } @@ -796,7 +798,7 @@ void ListThread::checkIfReadyToCancel() return; delete transferThreadList.at(index);//->deleteLayer(); transferThreadList[index]=NULL; - transferThreadList.removeAt(index); + transferThreadList.erase(transferThreadList.cbegin()+index); loop_size=transferThreadList.size(); index--; } @@ -814,10 +816,10 @@ void ListThread::checkIfReadyToCancel() } //speedLimitation in KB/s -bool ListThread::setSpeedLimitation(const qint64 &speedLimitation) +bool ListThread::setSpeedLimitation(const int64_t &speedLimitation) { #ifdef ULTRACOPIER_PLUGIN_SPEED_SUPPORT - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("maxSpeed in KB/s: ")+QString::number(speedLimitation)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"maxSpeed in KB/s: "+std::to_string(speedLimitation)); if(speedLimitation>1024*1024) { @@ -881,6 +883,7 @@ bool ListThread::setSpeedLimitation(const qint64 &speedLimitation) .arg(multiForBigSpeed) .arg(newInterval) .arg(maxSpeed) + .toStdString() ); clockForTheCopySpeed->setInterval(newInterval); @@ -933,7 +936,7 @@ void ListThread::updateTheStatus() updateTheStatus_action_in_progress=Ultracopier::Copying; else updateTheStatus_action_in_progress=Ultracopier::Idle; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("emit actionInProgess(")+QString::number(updateTheStatus_action_in_progress)+QStringLiteral(")")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"emit actionInProgess("+std::to_string(updateTheStatus_action_in_progress)+")"); emit actionInProgess(updateTheStatus_action_in_progress); } @@ -951,20 +954,20 @@ void ListThread::setAlwaysFileExistsAction(const FileExistsAction &alwaysDoThisA } //mk path to do -quint64 ListThread::addToMkPath(const QFileInfo& source,const QFileInfo& destination, const int& inode) +uint64_t ListThread::addToMkPath(const QFileInfo& source,const QFileInfo& destination, const int& inode) { if(stopIt) return 0; if(inode!=0 && (!keepDate && !doRightTransfer)) return 0; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("source: %1, destination: %2").arg(source.absoluteFilePath()).arg(destination.absoluteFilePath())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("source: %1, destination: %2").arg(source.absoluteFilePath()).arg(destination.absoluteFilePath()).toStdString()); ActionToDoInode temp; temp.type = ActionType_MkPath; temp.id = generateIdNumber(); temp.source = source; temp.destination= destination; temp.isRunning = false; - actionToDoListInode << temp; + actionToDoListInode.push_back(temp); return temp.id; } @@ -973,7 +976,7 @@ void ListThread::addToMovePath(const QFileInfo& source, const QFileInfo &destina { if(stopIt) return; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("source: %1, destination: %2, inodeToRemove: %3").arg(source.absoluteFilePath()).arg(destination.absoluteFilePath()).arg(inodeToRemove)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("source: %1, destination: %2, inodeToRemove: %3").arg(source.absoluteFilePath()).arg(destination.absoluteFilePath()).arg(inodeToRemove).toStdString()); ActionToDoInode temp; temp.type = ActionType_MovePath; temp.id = generateIdNumber(); @@ -981,14 +984,14 @@ void ListThread::addToMovePath(const QFileInfo& source, const QFileInfo &destina temp.source = source; temp.destination= destination; temp.isRunning = false; - actionToDoListInode << temp; + actionToDoListInode.push_back(temp); } void ListThread::addToRealMove(const QFileInfo& source,const QFileInfo& destination) { if(stopIt) return; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("source: %1, destination: %2").arg(source.absoluteFilePath()).arg(destination.absoluteFilePath())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("source: %1, destination: %2").arg(source.absoluteFilePath()).arg(destination.absoluteFilePath()).toStdString()); ActionToDoInode temp; temp.type = ActionType_RealMove; temp.id = generateIdNumber(); @@ -996,32 +999,32 @@ void ListThread::addToRealMove(const QFileInfo& source,const QFileInfo& destinat temp.source = source; temp.destination= destination; temp.isRunning = false; - actionToDoListInode << temp; + actionToDoListInode.push_back(temp); } #ifdef ULTRACOPIER_PLUGIN_RSYNC //rsync rm void ListThread::addToRmForRsync(const QFileInfo& destination) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"inode: "+destination.absoluteFilePath()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"inode: "+destination.absoluteFilePath().toStdString()); ActionToDoInode temp; temp.type = ActionType_RmSync; temp.id = generateIdNumber(); temp.destination= destination; temp.isRunning = false; - actionToDoListInode << temp; + actionToDoListInode.push_back(temp); } #endif //send action done void ListThread::sendActionDone() { - if(!actionDone.isEmpty()) + if(!actionDone.empty()) { emit newActionOnList(actionDone); actionDone.clear(); } - if(!timeToTransfer.isEmpty()) + if(!timeToTransfer.empty()) { emit doneTime(timeToTransfer); timeToTransfer.clear(); @@ -1031,7 +1034,7 @@ void ListThread::sendActionDone() //send progression void ListThread::sendProgression() { - if(actionToDoListTransfer.isEmpty()) + if(actionToDoListTransfer.empty()) return; oversize=0; currentProgression=0; @@ -1060,12 +1063,12 @@ void ListThread::sendProgression() //the current size copied totalSize=temp_transfer_thread->transferSize+localOverSize; - QPair<quint64,quint64> progression=temp_transfer_thread->progression(); + std::pair<uint64_t,uint64_t> progression=temp_transfer_thread->progression(); tempItem.currentRead=progression.first; tempItem.currentWrite=progression.second; tempItem.id=temp_transfer_thread->transferId; tempItem.total=totalSize; - progressionList << tempItem; + progressionList.push_back(tempItem); //add the oversize to the general progression oversize+=localOverSize; @@ -1099,14 +1102,14 @@ void ListThread::syncTransferList_internal() Ultracopier::ReturnActionOnCopyList newAction; newAction.type = Ultracopier::PreOperation; newAction.addAction.id = item.id; - newAction.addAction.sourceFullPath = item.source.absoluteFilePath(); - newAction.addAction.sourceFileName = item.source.fileName(); - newAction.addAction.destinationFullPath = item.destination.absoluteFilePath(); - newAction.addAction.destinationFileName = item.destination.fileName(); + newAction.addAction.sourceFullPath = item.source.absoluteFilePath().toStdString(); + newAction.addAction.sourceFileName = item.source.fileName().toStdString(); + newAction.addAction.destinationFullPath = item.destination.absoluteFilePath().toStdString(); + newAction.addAction.destinationFileName = item.destination.fileName().toStdString(); newAction.addAction.size = item.size; newAction.addAction.mode = item.mode; - actionDone << newAction; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("id: %1, size: %2, name: %3, size2: %4").arg(item.id).arg(item.size).arg(item.source.absoluteFilePath()).arg(newAction.addAction.size)); + actionDone.push_back(newAction); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("id: %1, size: %2, name: %3, size2: %4").arg(item.id).arg(item.size).arg(item.source.absoluteFilePath()).arg(newAction.addAction.size).toStdString()); if(item.isRunning) { for(int_for_internal_loop=0; int_for_internal_loop<loop_sub_size; ++int_for_internal_loop) { @@ -1114,13 +1117,13 @@ void ListThread::syncTransferList_internal() Ultracopier::ReturnActionOnCopyList newAction; newAction.type = Ultracopier::PreOperation; newAction.addAction.id = item.id; - newAction.addAction.sourceFullPath = item.source.absoluteFilePath(); - newAction.addAction.sourceFileName = item.source.fileName(); - newAction.addAction.destinationFullPath = item.destination.absoluteFilePath(); - newAction.addAction.destinationFileName = item.destination.fileName(); + newAction.addAction.sourceFullPath = item.source.absoluteFilePath().toStdString(); + newAction.addAction.sourceFileName = item.source.fileName().toStdString(); + newAction.addAction.destinationFullPath = item.destination.absoluteFilePath().toStdString(); + newAction.addAction.destinationFileName = item.destination.fileName().toStdString(); newAction.addAction.size = item.size; newAction.addAction.mode = item.mode; - actionDone << newAction; + actionDone.push_back(newAction); if(transferThread->getStat()!=TransferStat_PreOperation) { Ultracopier::ReturnActionOnCopyList newAction; @@ -1139,7 +1142,7 @@ void ListThread::syncTransferList_internal() break; } newAction.addAction.id = item.id; - actionDone << newAction; + actionDone.push_back(newAction); } } } @@ -1147,7 +1150,7 @@ void ListThread::syncTransferList_internal() } //add file transfer to do -quint64 ListThread::addToTransfer(const QFileInfo& source,const QFileInfo& destination,const Ultracopier::CopyMode& mode) +uint64_t ListThread::addToTransfer(const QFileInfo& source,const QFileInfo& destination,const Ultracopier::CopyMode& mode) { if(stopIt) return 0; @@ -1156,20 +1159,20 @@ quint64 ListThread::addToTransfer(const QFileInfo& source,const QFileInfo& desti quint64 size=0; if(!source.isSymLink()) size=source.size(); - const QString &drive=driveManagement.getDrive(destination.absoluteFilePath()); - if(drive.isEmpty()) + const std::string &drive=driveManagement.getDrive(destination.absoluteFilePath().toStdString()); + if(drive.empty()) abort(); - if(mode!=Ultracopier::Move || drive!=driveManagement.getDrive(source.absoluteFilePath())) + if(mode!=Ultracopier::Move || drive!=driveManagement.getDrive(source.absoluteFilePath().toStdString())) { - if(requiredSpace.contains(drive)) + if(requiredSpace.find(drive)!=requiredSpace.cend()) { requiredSpace[drive]+=size; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("space needed add: %1, space needed: %2, on: %3").arg(size).arg(requiredSpace.value(drive)).arg(drive)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("space needed add: %1, space needed: %2, on: %3").arg(size).arg(requiredSpace.at(drive)).arg(QString::fromStdString(drive)).toStdString()); } else { requiredSpace[drive]=size; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("set space %1 needed, on: %2").arg(size).arg(drive)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("set space %1 needed, on: %2").arg(size).arg(QString::fromStdString(drive)).toStdString()); } } bytesToTransfer+= size; @@ -1180,13 +1183,13 @@ quint64 ListThread::addToTransfer(const QFileInfo& source,const QFileInfo& desti temp.destination= destination; temp.mode = mode; temp.isRunning = false; - actionToDoListTransfer << temp; + actionToDoListTransfer.push_back(temp); //push the new transfer to interface Ultracopier::ReturnActionOnCopyList newAction; newAction.type = Ultracopier::AddingItem; newAction.addAction=actionToDoTransferToItemOfCopyList(temp); - actionDone << newAction; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("source: %1, destination: %2, add entry: %3, size: %4, size2: %5, isSymLink: %6").arg(source.absoluteFilePath()).arg(destination.absoluteFilePath()).arg(temp.id).arg(temp.size).arg(size).arg(source.isSymLink())); + actionDone.push_back(newAction); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("source: %1, destination: %2, add entry: %3, size: %4, size2: %5, isSymLink: %6").arg(source.absoluteFilePath()).arg(destination.absoluteFilePath()).arg(temp.id).arg(temp.size).arg(size).arg(source.isSymLink()).toStdString()); return temp.id; } @@ -1194,17 +1197,17 @@ Ultracopier::ItemOfCopyList ListThread::actionToDoTransferToItemOfCopyList(const { Ultracopier::ItemOfCopyList itemOfCopyList; itemOfCopyList.id = actionToDoTransfer.id; - itemOfCopyList.sourceFullPath = actionToDoTransfer.source.absoluteFilePath(); - itemOfCopyList.sourceFileName = actionToDoTransfer.source.fileName(); - itemOfCopyList.destinationFullPath = actionToDoTransfer.destination.absoluteFilePath(); - itemOfCopyList.destinationFileName = actionToDoTransfer.destination.fileName(); + itemOfCopyList.sourceFullPath = actionToDoTransfer.source.absoluteFilePath().toStdString(); + itemOfCopyList.sourceFileName = actionToDoTransfer.source.fileName().toStdString(); + itemOfCopyList.destinationFullPath = actionToDoTransfer.destination.absoluteFilePath().toStdString(); + itemOfCopyList.destinationFileName = actionToDoTransfer.destination.fileName().toStdString(); itemOfCopyList.size = actionToDoTransfer.size; itemOfCopyList.mode = actionToDoTransfer.mode; return itemOfCopyList; } //generate id number -quint64 ListThread::generateIdNumber() +uint64_t ListThread::generateIdNumber() { idIncrementNumber++; if(idIncrementNumber>(((quint64)1024*1024)*1024*1024*2)) @@ -1213,14 +1216,14 @@ quint64 ListThread::generateIdNumber() } //warning the first entry is accessible will copy -void ListThread::removeItems(const QList<int> &ids) +void ListThread::removeItems(const std::vector<uint64_t> &ids) { - for(int i=0;i<ids.size();i++) + for(unsigned int i=0;i<ids.size();i++) skipInternal(ids.at(i)); } //put on top -void ListThread::moveItemsOnTop(QList<int> ids) +void ListThread::moveItemsOnTop(std::vector<uint64_t> ids) { if(actionToDoListTransfer.size()<=1) { @@ -1230,21 +1233,22 @@ void ListThread::moveItemsOnTop(QList<int> ids) ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); //do list operation int indexToMove=0; - const int &loop_size=actionToDoListTransfer.size(); - for (int i=0; i<loop_size; ++i) { - if(ids.contains(actionToDoListTransfer.at(i).id)) + for (unsigned int i=0; i<actionToDoListTransfer.size(); ++i) { + if(vectorcontainsAtLeastOne(ids,actionToDoListTransfer.at(i).id)) { - ids.removeOne(actionToDoListTransfer.at(i).id); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("move item ")+QString::number(i)+QStringLiteral(" to ")+QString::number(indexToMove)); + vectorremoveOne(ids,actionToDoListTransfer.at(i).id); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"move item "+std::to_string(i)+" to "+std::to_string(indexToMove)); Ultracopier::ReturnActionOnCopyList newAction; newAction.type=Ultracopier::MoveItem; newAction.addAction.id=actionToDoListTransfer.at(i).id; newAction.userAction.moveAt=indexToMove; newAction.userAction.position=i; - actionDone << newAction; - actionToDoListTransfer.move(i,indexToMove); + actionDone.push_back(newAction); + ActionToDoTransfer temp=actionToDoListTransfer.at(i); + actionToDoListTransfer.erase(actionToDoListTransfer.cbegin()+i); + actionToDoListTransfer.insert(actionToDoListTransfer.cbegin()+indexToMove,temp); indexToMove++; - if(ids.isEmpty()) + if(ids.empty()) return; } } @@ -1253,7 +1257,7 @@ void ListThread::moveItemsOnTop(QList<int> ids) } //move up -void ListThread::moveItemsUp(QList<int> ids) +void ListThread::moveItemsUp(std::vector<uint64_t> ids) { if(actionToDoListTransfer.size()<=1) { @@ -1264,25 +1268,27 @@ void ListThread::moveItemsUp(QList<int> ids) //do list operation int lastGoodPositionReal=0; bool haveGoodPosition=false; - const int &loop_size=actionToDoListTransfer.size(); - for (int i=0; i<loop_size; ++i) { - if(ids.contains(actionToDoListTransfer.at(i).id)) + for (unsigned int i=0; i<actionToDoListTransfer.size(); ++i) { + if(vectorcontainsAtLeastOne(ids,actionToDoListTransfer.at(i).id)) { if(haveGoodPosition) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("move item ")+QString::number(i)+QStringLiteral(" to ")+QString::number(i-1)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"move item "+std::to_string(i)+" to "+std::to_string(i-1)); Ultracopier::ReturnActionOnCopyList newAction; newAction.type=Ultracopier::MoveItem; newAction.addAction.id=actionToDoListTransfer.at(i).id; newAction.userAction.moveAt=lastGoodPositionReal; newAction.userAction.position=i; - actionDone << newAction; - actionToDoListTransfer.swap(i,lastGoodPositionReal); + actionDone.push_back(newAction); + ActionToDoTransfer temp1=actionToDoListTransfer.at(i); + ActionToDoTransfer temp2=actionToDoListTransfer.at(lastGoodPositionReal); + actionToDoListTransfer[i]=temp2; + actionToDoListTransfer[lastGoodPositionReal]=temp1; } else - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("Try move up false, item ")+QString::number(i)); - ids.removeOne(actionToDoListTransfer.at(i).id); - if(ids.isEmpty()) + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"Try move up false, item "+std::to_string(i)); + vectorremoveOne(ids,actionToDoListTransfer.at(i).id); + if(ids.empty()) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"stop with return"); return; @@ -1299,7 +1305,7 @@ void ListThread::moveItemsUp(QList<int> ids) } //move down -void ListThread::moveItemsDown(QList<int> ids) +void ListThread::moveItemsDown(std::vector<uint64_t> ids) { if(actionToDoListTransfer.size()<=1) { @@ -1311,25 +1317,28 @@ void ListThread::moveItemsDown(QList<int> ids) int lastGoodPositionReal=0; bool haveGoodPosition=false; for (int i=actionToDoListTransfer.size()-1; i>=0; --i) { - if(ids.contains(actionToDoListTransfer.at(i).id)) + if(vectorcontainsAtLeastOne(ids,actionToDoListTransfer.at(i).id)) { if(haveGoodPosition) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("move item ")+QString::number(i)+QStringLiteral(" to ")+QString::number(i+1)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"move item "+std::to_string(i)+" to "+std::to_string(i+1)); Ultracopier::ReturnActionOnCopyList newAction; newAction.type=Ultracopier::MoveItem; newAction.addAction.id=actionToDoListTransfer.at(i).id; newAction.userAction.moveAt=lastGoodPositionReal; newAction.userAction.position=i; - actionDone << newAction; - actionToDoListTransfer.swap(i,lastGoodPositionReal); + actionDone.push_back(newAction); + ActionToDoTransfer temp1=actionToDoListTransfer.at(i); + ActionToDoTransfer temp2=actionToDoListTransfer.at(lastGoodPositionReal); + actionToDoListTransfer[i]=temp2; + actionToDoListTransfer[lastGoodPositionReal]=temp1; } else { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("Try move up false, item ")+QString::number(i)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"Try move up false, item "+std::to_string(i)); } - ids.removeOne(actionToDoListTransfer.at(i).id); - if(ids.isEmpty()) + vectorremoveOne(ids,actionToDoListTransfer.at(i).id); + if(ids.empty()) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"stop with return"); return; @@ -1346,7 +1355,7 @@ void ListThread::moveItemsDown(QList<int> ids) } //put on bottom -void ListThread::moveItemsOnBottom(QList<int> ids) +void ListThread::moveItemsOnBottom(std::vector<uint64_t> ids) { if(actionToDoListTransfer.size()<=1) { @@ -1357,20 +1366,22 @@ void ListThread::moveItemsOnBottom(QList<int> ids) //do list operation int lastGoodPositionReal=actionToDoListTransfer.size()-1; for (int i=lastGoodPositionReal; i>=0; --i) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("Check action on item ")+QString::number(i)); - if(ids.contains(actionToDoListTransfer.at(i).id)) + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"Check action on item "+std::to_string(i)); + if(vectorcontainsAtLeastOne(ids,actionToDoListTransfer.at(i).id)) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("move item ")+QString::number(i)+QStringLiteral(" to ")+QString::number(lastGoodPositionReal)); - ids.removeOne(actionToDoListTransfer.at(i).id); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"move item "+std::to_string(i)+" to "+std::to_string(lastGoodPositionReal)); + vectorremoveOne(ids,actionToDoListTransfer.at(i).id); Ultracopier::ReturnActionOnCopyList newAction; newAction.type=Ultracopier::MoveItem; newAction.addAction.id=actionToDoListTransfer.at(i).id; newAction.userAction.moveAt=lastGoodPositionReal; newAction.userAction.position=i; - actionDone << newAction; - actionToDoListTransfer.move(i,lastGoodPositionReal); + actionDone.push_back(newAction); + ActionToDoTransfer temp=actionToDoListTransfer.at(i); + actionToDoListTransfer.erase(actionToDoListTransfer.cbegin()+i); + actionToDoListTransfer.insert(actionToDoListTransfer.cbegin()+lastGoodPositionReal,temp); lastGoodPositionReal--; - if(ids.isEmpty()) + if(ids.empty()) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"stop with return"); return; @@ -1389,17 +1400,17 @@ void ListThread::forceMode(const Ultracopier::CopyMode &mode) setRsync(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"); this->mode=mode; forcedMode=true; } -void ListThread::exportTransferList(const QString &fileName) +void ListThread::exportTransferList(const std::string &fileName) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); - QFile transferFile(fileName); + QFile transferFile(QString::fromStdString(fileName)); if(transferFile.open(QIODevice::WriteOnly|QIODevice::Truncate)) { transferFile.write(QStringLiteral("Ultracopier;Transfer-list;").toUtf8()); @@ -1443,38 +1454,38 @@ void ListThread::exportTransferList(const QString &fileName) } if(haveError) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("Unable do to move or copy item into wrong forced mode: %1").arg(transferFile.errorString())); - emit errorTransferList(tr("Unable do to move or copy item into wrong forced mode: %1").arg(transferFile.errorString())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("Unable do to move or copy item into wrong forced mode: %1").arg(transferFile.errorString()).toStdString()); + emit errorTransferList(tr("Unable do to move or copy item into wrong forced mode: %1").arg(transferFile.errorString()).toStdString()); } transferFile.close(); } else { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("Unable to save the transfer list: %1").arg(transferFile.errorString())); - emit errorTransferList(tr("Unable to save the transfer list: %1").arg(transferFile.errorString())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("Unable to save the transfer list: %1").arg(transferFile.errorString()).toStdString()); + emit errorTransferList(tr("Unable to save the transfer list: %1").arg(transferFile.errorString()).toStdString()); return; } } -void ListThread::importTransferList(const QString &fileName) +void ListThread::importTransferList(const std::string &fileName) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); - QFile transferFile(fileName); + QFile transferFile(QString::fromStdString(fileName)); if(transferFile.open(QIODevice::ReadOnly)) { - QString content; + std::string content; QByteArray data=transferFile.readLine(64); if(data.size()<=0) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("Problem reading file, or file-size is 0")); - emit errorTransferList(tr("Problem reading file, or file-size is 0")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Problem reading file, or file-size is 0"); + emit errorTransferList(tr("Problem reading file, or file-size is 0").toStdString()); return; } - content=QString::fromUtf8(data); + content=QString::fromUtf8(data).toStdString(); if(content!="Ultracopier;Transfer-list;Transfer;Ultracopier\n" && content!="Ultracopier;Transfer-list;Copy;Ultracopier\n" && content!="Ultracopier;Transfer-list;Move;Ultracopier\n") { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("Wrong header: \"%1\"").arg(content)); - emit errorTransferList(tr("Wrong header: \"%1\"").arg(content)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Wrong header: "+content); + emit errorTransferList(tr("Wrong header: \"%1\"").arg(QString::fromStdString(content)).toStdString()); return; } bool transferListMixedMode=false; @@ -1482,8 +1493,8 @@ void ListThread::importTransferList(const QString &fileName) { if(forcedMode) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("The transfer list is in mixed mode, but this instance is not")); - emit errorTransferList(tr("The transfer list is in mixed mode, but this instance is not in this mode")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"The transfer list is in mixed mode, but this instance is not"); + emit errorTransferList(tr("The transfer list is in mixed mode, but this instance is not in this mode").toStdString()); return; } else @@ -1491,14 +1502,14 @@ void ListThread::importTransferList(const QString &fileName) } if(content=="Ultracopier;Transfer-list;Copy;Ultracopier\n" && (forcedMode && mode==Ultracopier::Move)) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("The transfer list is in copy mode, but this instance is not: forcedMode: %1, mode: %2").arg(forcedMode).arg(mode)); - emit errorTransferList(tr("The transfer list is in copy mode, but this instance is not in this mode")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("The transfer list is in copy mode, but this instance is not: forcedMode: %1, mode: %2").arg(forcedMode).arg(mode).toStdString()); + emit errorTransferList(tr("The transfer list is in copy mode, but this instance is not in this mode").toStdString()); return; } if(content=="Ultracopier;Transfer-list;Move;Ultracopier\n" && (forcedMode && mode==Ultracopier::Copy)) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("The transfer list is in move mode, but this instance is not: forcedMode: %1, mode: %2").arg(forcedMode).arg(mode)); - emit errorTransferList(tr("The transfer list is in move mode, but this instance is not in this mode")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("The transfer list is in move mode, but this instance is not: forcedMode: %1, mode: %2").arg(forcedMode).arg(mode).toStdString()); + emit errorTransferList(tr("The transfer list is in move mode, but this instance is not in this mode").toStdString()); return; } @@ -1511,42 +1522,49 @@ void ListThread::importTransferList(const QString &fileName) emit actionInProgess(updateTheStatus_action_in_progress); bool errorFound=false; - QRegularExpression correctLine; + std::regex correctLine; if(transferListMixedMode) - correctLine=QRegularExpression(QStringLiteral("^(Copy|Move);[^;]+;[^;]+[\n\r]*$")); + correctLine=std::regex("^(Copy|Move);[^;]+;[^;]+[\n\r]*$"); else - correctLine=QRegularExpression(QStringLiteral("^[^;]+;[^;]+[\n\r]*$")); - QStringList args; + correctLine=std::regex("^[^;]+;[^;]+[\n\r]*$"); + std::vector<std::string> args; Ultracopier::CopyMode tempMode; do { data=transferFile.readLine(65535*2); if(data.size()>0) { - content=QString::fromUtf8(data); + content=std::string(data.constData(),data.size()); //do the import here - if(content.contains(correctLine)) + if(std::regex_match(content,correctLine)) { - content.remove(QStringLiteral("\n")); - args=content.split(QStringLiteral(";")); + stringreplaceAll(content,"\n",""); + args=stringsplit(content,';'); if(forcedMode) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("New data to import in forced mode: %2,%3").arg(args.at(0)).arg(args.at(1))); - addToTransfer(QFileInfo(args.at(0)),QFileInfo(args.at(1)),mode); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("New data to import in forced mode: %2,%3") + .arg(QString::fromStdString(args.at(0))) + .arg(QString::fromStdString(args.at(1))) + .toStdString()); + addToTransfer(QFileInfo(QString::fromStdString(args.at(0))),QFileInfo(QString::fromStdString(args.at(1))),mode); } else { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("New data to import: %1,%2,%3").arg(args.at(0)).arg(args.at(1)).arg(args.at(2))); - if(args.at(0)==QStringLiteral("Copy")) + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("New data to import: %1,%2,%3") + .arg(QString::fromStdString(args.at(0))) + .arg(QString::fromStdString(args.at(1))) + .arg(QString::fromStdString(args.at(2))) + .toStdString()); + if(args.at(0)=="Copy") tempMode=Ultracopier::Copy; else tempMode=Ultracopier::Move; - addToTransfer(QFileInfo(args.at(1)),QFileInfo(args.at(2)),tempMode); + addToTransfer(QFileInfo(QString::fromStdString(args.at(1))),QFileInfo(QString::fromStdString(args.at(2))),tempMode); } } else { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("Wrong line syntax: %1").arg(content)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Wrong line syntax: "+content); errorFound=true; } } @@ -1554,15 +1572,15 @@ void ListThread::importTransferList(const QString &fileName) while(data.size()>0); transferFile.close(); if(errorFound) - emit warningTransferList(tr("Some errors have been found during the line parsing")); + emit warningTransferList(tr("Some errors have been found during the line parsing").toStdString()); updateTheStatus();//->sendActionDone(); into this autoStartAndCheckSpace(); } else { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("Unable to open the transfer list: %1").arg(transferFile.errorString())); - emit errorTransferList(tr("Unable to open the transfer list: %1").arg(transferFile.errorString())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("Unable to open the transfer list: %1").arg(transferFile.errorString()).toStdString()); + emit errorTransferList(tr("Unable to open the transfer list: %1").arg(transferFile.errorString()).toStdString()); return; } } @@ -1587,15 +1605,14 @@ bool ListThread::needMoreSpace() const { if(!checkDiskSpace) return false; - QList<Diskspace> diskspace_list; - QHashIterator<QString,quint64> i(requiredSpace); - while (i.hasNext()) { - i.next(); + std::vector<Diskspace> diskspace_list; + for( auto& spaceDrive : requiredSpace ) { + const QString &drive=QString::fromStdString(spaceDrive.first); #ifdef Q_OS_WIN32 - if(i.key()!="A:\\" && i.key()!="A:/" && i.key()!="A:" && i.key()!="A" && i.key()!="a:\\" && i.key()!="a:/" && i.key()!="a:" && i.key()!="a") + if(spaceDrive.first!="A:\\" && spaceDrive.first!="A:/" && spaceDrive.first!="A:" && spaceDrive.first!="A" && spaceDrive.first!="a:\\" && spaceDrive.first!="a:/" && spaceDrive.first!="a:" && spaceDrive.first!="a") { #endif - QStorageInfo storageInfo(i.key()); + QStorageInfo storageInfo(drive); storageInfo.refresh(); const qint64 &availableSpace=storageInfo.bytesAvailable(); #ifdef ULTRACOPIER_PLUGIN_DEBUG @@ -1607,40 +1624,40 @@ bool ListThread::needMoreSpace() const (availableSpace==0 && storageInfo.bytesTotal()==0) ) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("availableSpace: %1, space needed: %2, on: %3, bytesFree: %4").arg(availableSpace).arg(i.value()).arg(i.key()).arg(bytesFree)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("availableSpace: %1, space needed: %2, on: %3, bytesFree: %4").arg(availableSpace).arg(spaceDrive.second).arg(drive).arg(bytesFree).toStdString()); } - else if(i.value()>(quint64)availableSpace) + else if(spaceDrive.second>(quint64)availableSpace) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("availableSpace: %1, space needed: %2, on: %3, bytesFree: %4").arg(availableSpace).arg(i.value()).arg(i.key()).arg(bytesFree)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("availableSpace: %1, space needed: %2, on: %3, bytesFree: %4").arg(availableSpace).arg(spaceDrive.second).arg(drive).arg(bytesFree).toStdString()); #ifdef Q_OS_WIN32 - //if(i.key().contains(QRegularExpression("^[a-zA-Z]:[\\\\/]"))) - if(i.key().contains(QRegularExpression("^[a-zA-Z]:"))) + //if(drive.contains(QRegularExpression("^[a-zA-Z]:[\\\\/]"))) + if(drive.contains(QRegularExpression("^[a-zA-Z]:"))) #endif { Diskspace diskspace; - diskspace.drive=i.key(); + diskspace.drive=spaceDrive.first; diskspace.freeSpace=availableSpace; - diskspace.requiredSpace=i.value(); - diskspace_list << diskspace; + diskspace.requiredSpace=spaceDrive.second; + diskspace_list.push_back(diskspace); } #ifdef Q_OS_WIN32 else - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("not local drive")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"not local drive"); #endif } #ifdef Q_OS_WIN32 } #endif } - if(!diskspace_list.isEmpty()) + if(!diskspace_list.empty()) emit missingDiskSpace(diskspace_list); - return ! diskspace_list.isEmpty(); + return ! diskspace_list.empty(); } //do new actions void ListThread::doNewActions_start_transfer() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("actionToDoListTransfer.size(): %1, numberOfTranferRuning: %2").arg(actionToDoListTransfer.size()).arg(getNumberOfTranferRuning())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("actionToDoListTransfer.size(): %1, numberOfTranferRuning: %2").arg(actionToDoListTransfer.size()).arg(getNumberOfTranferRuning()).toStdString()); if(stopIt || putInPause) return; int numberOfTranferRuning=getNumberOfTranferRuning(); @@ -1682,7 +1699,7 @@ void ListThread::doNewActions_start_transfer() } int_for_loop++; } - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("numberOfTranferRuning: ")+QString::number(numberOfTranferRuning)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"numberOfTranferRuning: "+std::to_string(numberOfTranferRuning)); } /** \brief lunch the pre-op or inode op @@ -1694,7 +1711,7 @@ void ListThread::doNewActions_start_transfer() void ListThread::doNewActions_inode_manipulation() { #ifdef ULTRACOPIER_PLUGIN_DEBUG_SCHEDULER - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("actionToDoList.size(): %1").arg(actionToDoListTransfer.size())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"actionToDoList.size(): "+std::to_string(actionToDoListTransfer.size())); #endif if(stopIt) checkIfReadyToCancel(); @@ -1746,11 +1763,11 @@ void ListThread::doNewActions_inode_manipulation() currentTransferThread=transferThreadList.at(int_for_transfer_thread_search); if(currentTransferThread->getStat()==TransferStat_Idle && currentTransferThread->transferId==0) // /!\ important! { - QString drive=driveManagement.getDrive(actionToDoListTransfer.at(int_for_internal_loop).destination.absoluteFilePath()); - if(requiredSpace.contains(drive) && (actionToDoListTransfer.at(int_for_internal_loop).mode!=Ultracopier::Move || drive!=driveManagement.getDrive(actionToDoListTransfer.at(int_for_internal_loop).source.absoluteFilePath()))) + std::string drive=driveManagement.getDrive(actionToDoListTransfer.at(int_for_internal_loop).destination.absoluteFilePath().toStdString()); + if(requiredSpace.find(drive)!=requiredSpace.cend() && (actionToDoListTransfer.at(int_for_internal_loop).mode!=Ultracopier::Move || drive!=driveManagement.getDrive(actionToDoListTransfer.at(int_for_internal_loop).source.absoluteFilePath().toStdString()))) { requiredSpace[drive]-=actionToDoListTransfer.at(int_for_internal_loop).size; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("space needed removed: %1, space needed: %2, on: %3").arg(actionToDoListTransfer.at(int_for_internal_loop).size).arg(requiredSpace.value(drive)).arg(drive)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("space needed removed: %1, space needed: %2, on: %3").arg(actionToDoListTransfer.at(int_for_internal_loop).size).arg(requiredSpace.at(drive)).arg(QString::fromStdString(drive)).toStdString()); } currentTransferThread->transferId=currentActionToDoTransfer.id; currentTransferThread->transferSize=currentActionToDoTransfer.size; @@ -1761,28 +1778,28 @@ void ListThread::doNewActions_inode_manipulation() currentActionToDoTransfer.mode )) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[%1] id: %2 is idle, but seam busy at set name: %3").arg(int_for_loop).arg(currentTransferThread->transferId).arg(currentActionToDoTransfer.destination.absoluteFilePath())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[%1] id: %2 is idle, but seam busy at set name: %3").arg(int_for_loop).arg(currentTransferThread->transferId).arg(currentActionToDoTransfer.destination.absoluteFilePath()).toStdString()); break; } currentActionToDoTransfer.isRunning=true; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[%1] id: %2 is idle, use it for %3").arg(int_for_loop).arg(currentTransferThread->transferId).arg(currentActionToDoTransfer.destination.absoluteFilePath())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[%1] id: %2 is idle, use it for %3").arg(int_for_loop).arg(currentTransferThread->transferId).arg(currentActionToDoTransfer.destination.absoluteFilePath()).toStdString()); /// \note wrong position? Else write why it's here Ultracopier::ReturnActionOnCopyList newAction; newAction.type = Ultracopier::PreOperation; newAction.addAction.id = currentActionToDoTransfer.id; - newAction.addAction.sourceFullPath = currentActionToDoTransfer.source.absoluteFilePath(); - newAction.addAction.sourceFileName = currentActionToDoTransfer.source.fileName(); - newAction.addAction.destinationFullPath = currentActionToDoTransfer.destination.absoluteFilePath(); - newAction.addAction.destinationFileName = currentActionToDoTransfer.destination.fileName(); + newAction.addAction.sourceFullPath = currentActionToDoTransfer.source.absoluteFilePath().toStdString(); + newAction.addAction.sourceFileName = currentActionToDoTransfer.source.fileName().toStdString(); + newAction.addAction.destinationFullPath = currentActionToDoTransfer.destination.absoluteFilePath().toStdString(); + newAction.addAction.destinationFileName = currentActionToDoTransfer.destination.fileName().toStdString(); newAction.addAction.size = currentActionToDoTransfer.size; newAction.addAction.mode = currentActionToDoTransfer.mode; - actionDone << newAction; + actionDone.push_back(newAction); int_for_transfer_thread_search++; numberOfInodeOperation++; #ifdef ULTRACOPIER_PLUGIN_DEBUG_SCHEDULER - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("numberOfInodeOperation: %1").arg(numberOfInodeOperation)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"numberOfInodeOperation: "+std::to_string(numberOfInodeOperation)); #endif break; } @@ -1797,7 +1814,7 @@ void ListThread::doNewActions_inode_manipulation() break; } #ifdef ULTRACOPIER_PLUGIN_DEBUG_SCHEDULER - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("numberOfInodeOperation: %1").arg(numberOfInodeOperation)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"numberOfInodeOperation: "+std::to_string(numberOfInodeOperation)); #endif if(numberOfInodeOperation>=inodeThreads) break; @@ -1820,7 +1837,7 @@ void ListThread::doNewActions_inode_manipulation() //error checking if(actionToDoListInode_count>inodeThreads) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("The index have been detected as out of max range: %1>%2").arg(actionToDoListInode_count).arg(inodeThreads)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("The index have been detected as out of max range: %1>%2").arg(actionToDoListInode_count).arg(inodeThreads).toStdString()); return; } } @@ -1832,7 +1849,7 @@ void ListThread::restartTransferIfItCan() TransferThread *transfer=qobject_cast<TransferThread *>(QObject::sender()); if(transfer==NULL) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("transfer thread not located!")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"transfer thread not located!"); return; } int numberOfTranferRuning=getNumberOfTranferRuning(); @@ -1844,7 +1861,7 @@ void ListThread::restartTransferIfItCan() /// \brief update the transfer stat void ListThread::newTransferStat(const TransferStat &stat,const quint64 &id) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("TransferStat: %1").arg(stat)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"TransferStat: "+std::to_string(stat)); Ultracopier::ReturnActionOnCopyList newAction; switch(stat) { @@ -1872,7 +1889,7 @@ void ListThread::newTransferStat(const TransferStat &stat,const quint64 &id) break; } newAction.addAction.id = id; - actionDone << newAction; + actionDone.push_back(newAction); } void ListThread::set_osBufferLimit(const unsigned int &osBufferLimit) @@ -1887,12 +1904,12 @@ void ListThread::set_osBufferLimit(const unsigned int &osBufferLimit) } } -void ListThread::set_setFilters(const QList<Filters_rules> &include,const QList<Filters_rules> &exclude) +void ListThread::set_setFilters(const std::vector<Filters_rules> &include,const std::vector<Filters_rules> &exclude) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("include.size(): %1, exclude.size(): %2").arg(include.size()).arg(exclude.size())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("include.size(): %1, exclude.size(): %2").arg(include.size()).arg(exclude.size()).toStdString()); this->include=include; this->exclude=exclude; - int index=0; + unsigned int index=0; while(index<scanFileOrFolderThreadsPool.size()) { scanFileOrFolderThreadsPool.at(index)->setFilters(include,exclude); @@ -1900,7 +1917,7 @@ void ListThread::set_setFilters(const QList<Filters_rules> &include,const QList< } } -void ListThread::set_sendNewRenamingRules(const QString &firstRenamingRule,const QString &otherRenamingRule) +void ListThread::set_sendNewRenamingRules(const std::string &firstRenamingRule,const std::string &otherRenamingRule) { this->firstRenamingRule=firstRenamingRule; this->otherRenamingRule=otherRenamingRule; @@ -1924,15 +1941,15 @@ void ListThread::mkPathFirstFolderFinish() if(actionToDoListInode.at(int_for_loop).type==ActionType_MkPath) { //to send to the log - emit mkPath(actionToDoListInode.at(int_for_loop).destination.absoluteFilePath()); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("stop mkpath: %1").arg(actionToDoListInode.at(int_for_loop).destination.absoluteFilePath())); - actionToDoListInode.removeAt(int_for_loop); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("actionToDoListTransfer.size(): %1, actionToDoListInode: %2, actionToDoListInode_afterTheTransfer: %3").arg(actionToDoListTransfer.size()).arg(actionToDoListInode.size()).arg(actionToDoListInode_afterTheTransfer.size())); - if(actionToDoListTransfer.isEmpty() && actionToDoListInode.isEmpty() && actionToDoListInode_afterTheTransfer.isEmpty()) + emit mkPath(actionToDoListInode.at(int_for_loop).destination.absoluteFilePath().toStdString()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("stop mkpath: %1").arg(actionToDoListInode.at(int_for_loop).destination.absoluteFilePath()).toStdString()); + actionToDoListInode.erase(actionToDoListInode.cbegin()+int_for_loop); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("actionToDoListTransfer.size(): %1, actionToDoListInode: %2, actionToDoListInode_afterTheTransfer: %3").arg(actionToDoListTransfer.size()).arg(actionToDoListInode.size()).arg(actionToDoListInode_afterTheTransfer.size()).toStdString()); + if(actionToDoListTransfer.empty() && actionToDoListInode.empty() && actionToDoListInode_afterTheTransfer.empty()) updateTheStatus(); numberOfInodeOperation--; #ifdef ULTRACOPIER_PLUGIN_DEBUG_SCHEDULER - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("numberOfInodeOperation: %1").arg(numberOfInodeOperation)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"numberOfInodeOperation: "+std::to_string(numberOfInodeOperation)); #endif doNewActions_inode_manipulation(); return; @@ -1946,19 +1963,19 @@ void ListThread::mkPathFirstFolderFinish() //to send to the log #ifdef ULTRACOPIER_PLUGIN_RSYNC if(actionToDoListInode.at(int_for_loop).type!=ActionType_RmSync) - emit mkPath(actionToDoListInode.at(int_for_loop).destination.absoluteFilePath()); + emit mkPath(actionToDoListInode.at(int_for_loop).destination.absoluteFilePath().toStdString()); #else - emit mkPath(actionToDoListInode.at(int_for_loop).destination.absoluteFilePath()); + emit mkPath(actionToDoListInode.at(int_for_loop).destination.absoluteFilePath().toStdString()); #endif - emit rmPath(actionToDoListInode.at(int_for_loop).source.absoluteFilePath()); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("stop mkpath: %1").arg(actionToDoListInode.at(int_for_loop).destination.absoluteFilePath())); - actionToDoListInode.removeAt(int_for_loop); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("actionToDoListTransfer.size(): %1, actionToDoListInode: %2, actionToDoListInode_afterTheTransfer: %3").arg(actionToDoListTransfer.size()).arg(actionToDoListInode.size()).arg(actionToDoListInode_afterTheTransfer.size())); - if(actionToDoListTransfer.isEmpty() && actionToDoListInode.isEmpty() && actionToDoListInode_afterTheTransfer.isEmpty()) + emit rmPath(actionToDoListInode.at(int_for_loop).source.absoluteFilePath().toStdString()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("stop mkpath: %1").arg(actionToDoListInode.at(int_for_loop).destination.absoluteFilePath()).toStdString()); + actionToDoListInode.erase(actionToDoListInode.cbegin()+int_for_loop); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("actionToDoListTransfer.size(): %1, actionToDoListInode: %2, actionToDoListInode_afterTheTransfer: %3").arg(actionToDoListTransfer.size()).arg(actionToDoListInode.size()).arg(actionToDoListInode_afterTheTransfer.size()).toStdString()); + if(actionToDoListTransfer.empty() && actionToDoListInode.empty() && actionToDoListInode_afterTheTransfer.empty()) updateTheStatus(); numberOfInodeOperation--; #ifdef ULTRACOPIER_PLUGIN_DEBUG_SCHEDULER - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("numberOfInodeOperation: %1").arg(numberOfInodeOperation)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"numberOfInodeOperation: "+std::to_string(numberOfInodeOperation)); #endif doNewActions_inode_manipulation(); return; @@ -1974,7 +1991,7 @@ void ListThread::mkPathFirstFolderFinish() void ListThread::timedUpdateDebugDialog() { - QStringList newList; + std::vector<std::string> newList; int index=0; int loop_sub_size_transfer_thread_search=transferThreadList.size(); while(index<loop_sub_size_transfer_thread_search) @@ -2007,25 +2024,29 @@ void ListThread::timedUpdateDebugDialog() stat=QStringLiteral("??? (%1)").arg(transferThreadList.at(index)->getStat()); break; } - newList << QStringLiteral("%1) (%3,%4) %2") + newList.push_back(QStringLiteral("%1) (%3,%4) %2") .arg(index) .arg(stat) .arg(transferThreadList.at(index)->readingLetter()) - .arg(transferThreadList.at(index)->writingLetter()); + .arg(transferThreadList.at(index)->writingLetter()) + .toStdString() + ); index++; } - QStringList newList2; + std::vector<std::string> newList2; index=0; const int &loop_size=actionToDoListTransfer.size(); while(index<loop_size) { - newList2 << QStringLiteral("%1 %2 %3") + newList2.push_back(QStringLiteral("%1 %2 %3") .arg(actionToDoListTransfer.at(index).source.absoluteFilePath()) .arg(actionToDoListTransfer.at(index).size) - .arg(actionToDoListTransfer.at(index).destination.absoluteFilePath()); + .arg(actionToDoListTransfer.at(index).destination.absoluteFilePath()) + .toStdString() + ); if(index>((inodeThreads+ULTRACOPIER_PLUGIN_MAXPARALLELTRANFER)*2+1)) { - newList2 << QStringLiteral("..."); + newList2.push_back("..."); break; } index++; @@ -2042,7 +2063,7 @@ void ListThread::fileAlreadyExists(const QFileInfo &source,const QFileInfo &dest } /// \note Can be call without queue because all call will be serialized -void ListThread::errorOnFile(const QFileInfo &fileInfo, const QString &errorString, const ErrorType &errorType) +void ListThread::errorOnFile(const QFileInfo &fileInfo, const std::string &errorString, const ErrorType &errorType) { TransferThread * transferThread=qobject_cast<TransferThread *>(sender()); if(transferThread==NULL) @@ -2055,7 +2076,7 @@ void ListThread::errorOnFile(const QFileInfo &fileInfo, const QString &errorStri errorLogEntry.destination=transferThread->getDestinationInode(); errorLogEntry.mode=transferThread->getMode(); errorLogEntry.error=errorString; - errorLog << errorLogEntry; + errorLog.push_back(errorLogEntry); emit errorToRetry(transferThread->getSourcePath(),transferThread->getDestinationPath(),errorString); emit send_errorOnFile(fileInfo,errorString,transferThread,errorType); } @@ -2068,7 +2089,7 @@ void ListThread::folderAlreadyExists(const QFileInfo &source,const QFileInfo &de /// \note Can be call without queue because all call will be serialized /// \todo all this part -void ListThread::errorOnFolder(const QFileInfo &fileInfo,const QString &errorString,const ErrorType &errorType) +void ListThread::errorOnFolder(const QFileInfo &fileInfo,const std::string &errorString,const ErrorType &errorType) { emit send_errorOnFolder(fileInfo,errorString,qobject_cast<ScanFileOrFolder *>(sender()),errorType); } @@ -2083,7 +2104,7 @@ void ListThread::run() exec(); } -void ListThread::getNeedPutAtBottom(const QFileInfo &fileInfo, const QString &errorString, TransferThread *thread, const ErrorType &errorType) +void ListThread::getNeedPutAtBottom(const QFileInfo &fileInfo, const std::string &errorString, TransferThread *thread, const ErrorType &errorType) { if(actionToDoListTransfer.empty()) { @@ -2115,25 +2136,25 @@ void ListThread::createTransferThread() { if(stopIt) return; - if(transferThreadList.size()>=inodeThreads) + if(transferThreadList.size()>=(unsigned int)inodeThreads) return; - transferThreadList << new TransferThread(); - TransferThread * last=transferThreadList.last(); + transferThreadList.push_back(new TransferThread()); + TransferThread * last=transferThreadList.back(); last->transferId=0; last->transferSize=0; last->setRightTransfer(doRightTransfer); last->setKeepDate(keepDate); #ifdef ULTRACOPIER_PLUGIN_SPEED_SUPPORT if(!last->setBlockSize(blockSizeAfterSpeedLimitation)) - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("unable to set the block size: ")+QString::number(blockSizeAfterSpeedLimitation)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"unable to set the block size: "+std::to_string(blockSizeAfterSpeedLimitation)); #else if(!last->setBlockSize(blockSize)) - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("unable to set the block size: ")+QString::number(blockSize)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"unable to set the block size: "+std::to_string(blockSize)); #endif if(!last->setSequentialBuffer(sequentialBuffer)) - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("unable to set the sequentialBuffer: ")+QString::number(sequentialBuffer)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"unable to set the sequentialBuffer: "+std::to_string(sequentialBuffer)); if(!last->setBlockSize(parallelBuffer)) - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("unable to set the parallelBuffer: ")+QString::number(parallelBuffer)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"unable to set the parallelBuffer: "+std::to_string(parallelBuffer)); last->setAlwaysFileExistsAction(alwaysDoThisActionForFileExists); #ifdef ULTRACOPIER_PLUGIN_SPEED_SUPPORT last->setMultiForBigSpeed(multiForBigSpeed); @@ -2180,9 +2201,9 @@ void ListThread::createTransferThread() #ifdef ULTRACOPIER_PLUGIN_DEBUG last->setId(transferThreadList.size()-1); #endif - if(transferThreadList.size()>=inodeThreads) + if(transferThreadList.size()>=(unsigned int)inodeThreads) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("create the last of the ")+QString::number(inodeThreads)+QStringLiteral(" transferThread")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"create the last of the "+std::to_string(inodeThreads)+" transferThread"); return; } if(stopIt) @@ -2204,25 +2225,25 @@ void ListThread::deleteTransferThread() transferThreadList.at(index)->stop(); delete transferThreadList.at(index);//->deleteLayer(); transferThreadList[index]=NULL; - transferThreadList.removeAt(index); + transferThreadList.erase(transferThreadList.cbegin()+index); loop_size--; } else index++; } if(loop_size==inodeThreads) - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("inodeThreads is lowered to the right value: ")+QString::number(inodeThreads)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"inodeThreads is lowered to the right value: "+std::to_string(inodeThreads)); } } void ListThread::setTransferAlgorithm(const TransferAlgorithm &transferAlgorithm) { if(transferAlgorithm==TransferAlgorithm_Sequential) - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("transferAlgorithm==TransferAlgorithm_Sequential")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"transferAlgorithm==TransferAlgorithm_Sequential"); else if(transferAlgorithm==TransferAlgorithm_Automatic) - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("transferAlgorithm==TransferAlgorithm_Automatic")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"transferAlgorithm==TransferAlgorithm_Automatic"); else - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("transferAlgorithm==TransferAlgorithm_Parallel")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"transferAlgorithm==TransferAlgorithm_Parallel"); emit send_setTransferAlgorithm(transferAlgorithm); } @@ -2230,10 +2251,10 @@ void ListThread::setParallelBuffer(int parallelBuffer) { if(parallelBuffer<1 || parallelBuffer>ULTRACOPIER_PLUGIN_MAX_PARALLEL_NUMBER_OF_BLOCK) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("wrong number of block: ")+QString::number(parallelBuffer)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"wrong number of block: "+std::to_string(parallelBuffer)); return; } - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("in number of block: ")+QString::number(parallelBuffer)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"in number of block: "+std::to_string(parallelBuffer)); this->parallelBuffer=parallelBuffer; emit send_parallelBuffer(parallelBuffer); } @@ -2242,23 +2263,23 @@ void ListThread::setSequentialBuffer(int sequentialBuffer) { if(sequentialBuffer<1 || sequentialBuffer>ULTRACOPIER_PLUGIN_MAX_SEQUENTIAL_NUMBER_OF_BLOCK) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("wrong number of block: ")+QString::number(sequentialBuffer)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"wrong number of block: "+std::to_string(sequentialBuffer)); return; } - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("in number of block: ")+QString::number(sequentialBuffer)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"in number of block: "+std::to_string(sequentialBuffer)); this->sequentialBuffer=sequentialBuffer; emit send_sequentialBuffer(sequentialBuffer); } void ListThread::setParallelizeIfSmallerThan(const unsigned int ¶llelizeIfSmallerThan) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("parallelizeIfSmallerThan in Bytes: ")+QString::number(parallelizeIfSmallerThan)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"parallelizeIfSmallerThan in Bytes: "+std::to_string(parallelizeIfSmallerThan)); this->parallelizeIfSmallerThan=parallelizeIfSmallerThan; } void ListThread::setMoveTheWholeFolder(const bool &moveTheWholeFolder) { - for(int i=0;i<scanFileOrFolderThreadsPool.size();i++) + for(unsigned int i=0;i<scanFileOrFolderThreadsPool.size();i++) scanFileOrFolderThreadsPool.at(i)->setMoveTheWholeFolder(moveTheWholeFolder); this->moveTheWholeFolder=moveTheWholeFolder; } @@ -2284,10 +2305,10 @@ void ListThread::setInodeThreads(const int &inodeThreads) { if(inodeThreads<1 || inodeThreads>32) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("inodeThreads is out of ranges: ")+QString::number(inodeThreads)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"inodeThreads is out of ranges: "+std::to_string(inodeThreads)); return; } - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("inodeThreads: ")+QString::number(inodeThreads)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"inodeThreads: "+std::to_string(inodeThreads)); this->inodeThreads=inodeThreads; createTransferThread(); deleteTransferThread(); @@ -2295,7 +2316,7 @@ void ListThread::setInodeThreads(const int &inodeThreads) void ListThread::setRenameTheOriginalDestination(const bool &renameTheOriginalDestination) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("renameTheOriginalDestination: ")+QString::number(renameTheOriginalDestination)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"renameTheOriginalDestination: "+std::to_string(renameTheOriginalDestination)); this->renameTheOriginalDestination=renameTheOriginalDestination; int index=0; int loop_sub_size_transfer_thread_search=transferThreadList.size(); @@ -2314,14 +2335,14 @@ void ListThread::setCheckDiskSpace(const bool &checkDiskSpace) void ListThread::setCopyListOrder(const bool &order) { this->copyListOrder=order; - for(int i=0;i<scanFileOrFolderThreadsPool.size();i++) + for(unsigned int i=0;i<scanFileOrFolderThreadsPool.size();i++) scanFileOrFolderThreadsPool.at(i)->setCopyListOrder(this->copyListOrder); } -void ListThread::exportErrorIntoTransferList(const QString &fileName) +void ListThread::exportErrorIntoTransferList(const std::string &fileName) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); - QFile transferFile(fileName); + QFile transferFile(QString::fromStdString(fileName)); if(transferFile.open(QIODevice::WriteOnly|QIODevice::Truncate)) { transferFile.write(QStringLiteral("Ultracopier;Transfer-list;").toUtf8()); @@ -2365,15 +2386,15 @@ void ListThread::exportErrorIntoTransferList(const QString &fileName) } if(haveError) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("Unable do to move or copy item into wrong forced mode: %1").arg(transferFile.errorString())); - emit errorTransferList(tr("Unable do to move or copy item into wrong forced mode: %1").arg(transferFile.errorString())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable do to move or copy item into wrong forced mode: "+transferFile.errorString().toStdString()); + emit errorTransferList(tr("Unable do to move or copy item into wrong forced mode: %1").arg(transferFile.errorString()).toStdString()); } transferFile.close(); } else { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("Unable to save the transfer list: %1").arg(transferFile.errorString())); - emit errorTransferList(tr("Unable to save the transfer list: %1").arg(transferFile.errorString())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to save the transfer list: "+transferFile.errorString().toStdString()); + emit errorTransferList(tr("Unable to save the transfer list: %1").arg(transferFile.errorString()).toStdString()); return; } } diff --git a/plugins/CopyEngine/Ultracopier/ListThread.h b/plugins/CopyEngine/Ultracopier/ListThread.h index a778604..48e7142 100644 --- a/plugins/CopyEngine/Ultracopier/ListThread.h +++ b/plugins/CopyEngine/Ultracopier/ListThread.h @@ -8,8 +8,9 @@ #include <QThread> #include <QObject> -#include <QList> -#include <QStringList> +#include <string> +#include <vector> +#include <unordered_map> #include <QFileInfo> #include <QSemaphore> #include <QTextStream> @@ -35,24 +36,24 @@ 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); /// \return empty if multiple or no destination - QString getUniqueDestinationFolder() const; + std::string getUniqueDestinationFolder() const; //external soft like file browser have send copy/move list to do /** \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 * \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 to set drives detected * specific to this copy engine */ /// \brief to set the collision action @@ -63,41 +64,41 @@ public: /// \brief to store one action to do struct ActionToDoTransfer { - quint64 id; - qint64 size;///< Used to set: used in case of transfer or remainingInode for drop folder + uint64_t id; + uint64_t size;///< Used to set: used in case of transfer or remainingInode for drop folder QFileInfo source;///< Used to set: source for transfer, folder to create, folder to drop QFileInfo destination; Ultracopier::CopyMode mode; bool isRunning;///< store if the action si running //TransferThread * transfer; // -> see transferThreadList }; - QList<ActionToDoTransfer> actionToDoListTransfer; + std::vector<ActionToDoTransfer> actionToDoListTransfer; /// \brief to store one action to do struct ActionToDoInode { ActionType type;///< \see ActionType - quint64 id; - qint64 size;///< Used to set: used in case of transfer or remainingInode for drop folder + uint64_t id; + int64_t size;///< Used to set: used in case of transfer or remainingInode for drop folder QFileInfo source;///< Keep to copy the right/date, to remove (for move) QFileInfo destination;///< Used to set: folder to create, folder to drop bool isRunning;///< store if the action si running }; - QList<ActionToDoInode> actionToDoListInode; - QList<ActionToDoInode> actionToDoListInode_afterTheTransfer; + std::vector<ActionToDoInode> actionToDoListInode; + std::vector<ActionToDoInode> actionToDoListInode_afterTheTransfer; int numberOfInodeOperation; struct ErrorLogEntry { QFileInfo source; QFileInfo destination; - QString error; + std::string error; Ultracopier::CopyMode mode; }; - QList<ErrorLogEntry> errorLog; + std::vector<ErrorLogEntry> errorLog; //dir operation thread queue MkPath mkPathQueue; //to get the return value from copyEngine bool getReturnBoolToCopyEngine() const; - QPair<quint64,quint64> getReturnPairQuint64ToCopyEngine() const; + std::pair<quint64,quint64> getReturnPairQuint64ToCopyEngine() const; Ultracopier::ItemOfCopyList getReturnItemOfCopyListToCopyEngine() const; void set_doChecksum(bool doChecksum); @@ -114,41 +115,41 @@ 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 skip as interanl one transfer entry * \param id id of the file to remove */ - bool skipInternal(const quint64 &id); + bool skipInternal(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(QList<int> ids); + void moveItemsOnTop(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(QList<int> ids); + void moveItemsUp(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(QList<int> ids); + void moveItemsDown(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(QList<int> ids); + void moveItemsOnBottom(std::vector<uint64_t> ids); /** \brief give the forced mode, to export/import transfer list */ void forceMode(const Ultracopier::CopyMode &mode); /// \brief export the transfer list into a file - void exportTransferList(const QString &fileName); + void exportTransferList(const std::string &fileName); /// \brief import the transfer list into a file - void importTransferList(const QString &fileName); + void importTransferList(const std::string &fileName); /// \brief set the folder local collision void setFolderCollision(const FolderExistsAction &alwaysDoThisActionForFolderExists); /** \brief to set the speed limitation * -1 if not able, 0 if disabled */ - bool setSpeedLimitation(const qint64 &speedLimitation); + bool setSpeedLimitation(const int64_t &speedLimitation); /// \brief set the copy info and options before runing void setRightTransfer(const bool doRightTransfer); /// \brief set keep date @@ -176,14 +177,14 @@ public slots: void doNewActions_inode_manipulation(); /// \brief restart transfer if it can void restartTransferIfItCan(); - void getNeedPutAtBottom(const QFileInfo &fileInfo, const QString &errorString, TransferThread *thread,const ErrorType &errorType); + void getNeedPutAtBottom(const QFileInfo &fileInfo, const std::string &errorString, TransferThread *thread,const ErrorType &errorType); /// \brief update the transfer stat void newTransferStat(const TransferStat &stat,const quint64 &id); void set_osBufferLimit(const unsigned int &osBufferLimit); - void set_setFilters(const QList<Filters_rules> &include,const QList<Filters_rules> &exclude); - void set_sendNewRenamingRules(const QString &firstRenamingRule,const QString &otherRenamingRule); + void set_setFilters(const std::vector<Filters_rules> &include,const std::vector<Filters_rules> &exclude); + void set_sendNewRenamingRules(const std::string &firstRenamingRule,const std::string &otherRenamingRule); void set_updateMount(); //send action done @@ -202,32 +203,32 @@ public slots: void setRenameTheOriginalDestination(const bool &renameTheOriginalDestination); void setCheckDiskSpace(const bool &checkDiskSpace); void setCopyListOrder(const bool &order); - void exportErrorIntoTransferList(const QString &fileName); + void exportErrorIntoTransferList(const std::string &fileName); private: QSemaphore mkpathTransfer; - QString sourceDrive; + std::string sourceDrive; bool sourceDriveMultiple; - QString destinationDrive; - QString destinationFolder; + std::string destinationDrive; + std::string destinationFolder; bool destinationDriveMultiple; bool destinationFolderMultiple; DriveManagement driveManagement; bool stopIt; - QList<ScanFileOrFolder *> scanFileOrFolderThreadsPool; + std::vector<ScanFileOrFolder *> scanFileOrFolderThreadsPool; int numberOfTransferIntoToDoList; - QList<TransferThread *> transferThreadList; + std::vector<TransferThread *> transferThreadList; ScanFileOrFolder * newScanThread(Ultracopier::CopyMode mode); - quint64 bytesToTransfer; - quint64 bytesTransfered; + uint64_t bytesToTransfer; + uint64_t bytesTransfered; bool autoStart; #ifdef ULTRACOPIER_PLUGIN_RSYNC bool rsync; #endif bool putInPause; - QList<Ultracopier::ReturnActionOnCopyList> actionDone;///< to action to send to the interface - quint64 idIncrementNumber;///< to store the last id returned - qint64 actualRealByteTransfered; + std::vector<Ultracopier::ReturnActionOnCopyList> actionDone;///< to action to send to the interface + uint64_t idIncrementNumber;///< to store the last id returned + int64_t actualRealByteTransfered; int maxSpeed;///< in KB/s, assume as 0KB/s as default like every where FolderExistsAction alwaysDoThisActionForFolderExists; bool checkDestinationFolderExists; @@ -246,15 +247,15 @@ private: bool renameTheOriginalDestination; bool checkDiskSpace; bool copyListOrder; - QHash<QString,quint64> requiredSpace; - QList<QPair<quint64,quint32> > timeToTransfer; + std::unordered_map<std::string,uint64_t> requiredSpace; + std::vector<std::pair<uint64_t,uint32_t> > timeToTransfer; unsigned int putAtBottom; unsigned int osBufferLimit; - QList<Filters_rules> include,exclude; + std::vector<Filters_rules> include,exclude; Ultracopier::CopyMode mode; bool forcedMode; - QString firstRenamingRule; - QString otherRenamingRule; + std::string firstRenamingRule; + std::string otherRenamingRule; #ifdef ULTRACOPIER_PLUGIN_SPEED_SUPPORT int multiForBigSpeed; #endif @@ -267,34 +268,34 @@ private: inline static Ultracopier::ItemOfCopyList actionToDoTransferToItemOfCopyList(const ActionToDoTransfer &actionToDoTransfer); //add file transfer to do - quint64 addToTransfer(const QFileInfo& source,const QFileInfo& destination,const Ultracopier::CopyMode& mode); + uint64_t addToTransfer(const QFileInfo& source,const QFileInfo& destination,const Ultracopier::CopyMode& mode); //generate id number - quint64 generateIdNumber(); + uint64_t generateIdNumber(); //warning the first entry is accessible will copy - bool removeSingleItem(const quint64 &id); + bool removeSingleItem(const uint64_t &id); //put on top - bool moveOnTopItem(const quint64 &id); + bool moveOnTopItem(const uint64_t &id); //move up - bool moveUpItem(const quint64 &id); + bool moveUpItem(const uint64_t &id); //move down - bool moveDownItem(const quint64 &id); + bool moveDownItem(const uint64_t &id); //put on bottom - bool moveOnBottomItem(const quint64 &id); + bool moveOnBottomItem(const uint64_t &id); //general transfer void startGeneralTransfer(); //debug windows if needed #ifdef ULTRACOPIER_PLUGIN_DEBUG_WINDOW QTimer timerUpdateDebugDialog; #endif - void detectDrivesOfCurrentTransfer(const QStringList &sources,const QString &destination); + void detectDrivesOfCurrentTransfer(const std::vector<std::string> &sources,const std::string &destination); FacilityInterface * facilityInterface; QSemaphore waitConstructor,waitCancel; int actionToDoListTransfer_count,actionToDoListInode_count; bool doTransfer,doInode; - qint64 oversize;//used as temp variable - qint64 currentProgression; - qint64 copiedSize,totalSize,localOverSize; - QList<Ultracopier::ProgressionItem> progressionList; + int64_t oversize;//used as temp variable + int64_t currentProgression; + int64_t copiedSize,totalSize,localOverSize; + std::vector<Ultracopier::ProgressionItem> progressionList; //memory variable for transfer thread creation bool doRightTransfer; bool keepDate; @@ -302,12 +303,12 @@ private: #ifdef ULTRACOPIER_PLUGIN_SPEED_SUPPORT int blockSizeAfterSpeedLimitation;//in Bytes #endif - QStringList drives; + std::vector<std::string> drives; FileExistsAction alwaysDoThisActionForFileExists; //to return value to the copyEngine bool returnBoolToCopyEngine; - QPair<quint64,quint64> returnPairQuint64ToCopyEngine; - QList<Ultracopier::ItemOfCopyList> returnListItemOfCopyListToCopyEngine; + std::pair<quint64,quint64> returnPairQuint64ToCopyEngine; + std::vector<Ultracopier::ItemOfCopyList> returnListItemOfCopyListToCopyEngine; Ultracopier::ItemOfCopyList returnItemOfCopyListToCopyEngine; Ultracopier::ProgressionItem tempItem; @@ -335,18 +336,18 @@ private slots: /// \note Can be call without queue because all call will be serialized void fileAlreadyExists(const QFileInfo &source,const QFileInfo &destination,const bool &isSame); /// \note Can be call without queue because all call will be serialized - void errorOnFile(const QFileInfo &fileInfo,const QString &errorString, const ErrorType &errorType); + void errorOnFile(const QFileInfo &fileInfo,const std::string &errorString, const ErrorType &errorType); /// \note Can be call without queue because all call will be serialized void folderAlreadyExists(const QFileInfo &source,const QFileInfo &destination,const bool &isSame); /// \note Can be call without queue because all call will be serialized - void errorOnFolder(const QFileInfo &fileInfo, const QString &errorString, const ErrorType &errorType); + void errorOnFolder(const QFileInfo &fileInfo, const std::string &errorString, const ErrorType &errorType); //to run the thread void run(); /// \to create transfer thread void createTransferThread(); void deleteTransferThread(); //mk path to do - quint64 addToMkPath(const QFileInfo& source, const QFileInfo& destination, const int &inode); + uint64_t addToMkPath(const QFileInfo& source, const QFileInfo& destination, const int &inode); //add rm path to do void addToMovePath(const QFileInfo& source,const QFileInfo& destination, const int& inodeToRemove); //add to real move @@ -363,69 +364,69 @@ signals: //send information about the copy void actionInProgess(const Ultracopier::EngineActionInProgress &) const; //should update interface information on this event - void newActionOnList(const QList<Ultracopier::ReturnActionOnCopyList> &) const;///very important, need be temporized to group the modification to do and not flood the interface + void newActionOnList(const std::vector<Ultracopier::ReturnActionOnCopyList> &) const;///very important, need be temporized to group the modification to do and not flood the interface void syncReady() const; - void doneTime(const QList<QPair<quint64,quint32> >&) const; + void doneTime(const std::vector<std::pair<uint64_t,uint32_t> >&) const; /** \brief to get the progression for a specific file * \param id the id of the transfer, id send during population the transfer list * first = current transfered byte, second = byte to transfer */ - void pushFileProgression(const QList<Ultracopier::ProgressionItem> &progressionList) const; + void pushFileProgression(const std::vector<Ultracopier::ProgressionItem> &progressionList) const; //get information about the copy /** \brief to get the general progression * first = current transfered byte, second = byte to transfer */ - void pushGeneralProgression(const quint64 &,const quint64 &) const; + void pushGeneralProgression(const uint64_t &,const uint64_t &) const; - void newFolderListing(const QString &path) const; + void newFolderListing(const std::string &path) const; void isInPause(const bool &) const; //when can be deleted void canBeDeleted() const; - void haveNeedPutAtBottom(bool needPutAtBottom,const QFileInfo &fileInfo,const QString &errorString,TransferThread * thread,const ErrorType &errorType) const; + void haveNeedPutAtBottom(bool needPutAtBottom,const QFileInfo &fileInfo,const std::string &errorString,TransferThread * thread,const ErrorType &errorType) const; //send error occurred - void error(const QString &path,const quint64 &size,const QDateTime &mtime,const QString &error) const; - void errorToRetry(const QString &source,const QString &destination,const QString &error) const; + void error(const std::string &path,const uint64_t &size,const uint64_t &mtime,const std::string &error) const; + void errorToRetry(const std::string &source,const std::string &destination,const std::string &error) const; //for the extra logging - void rmPath(const QString &path) const; - void mkPath(const QString &path) const; + void rmPath(const std::string &path) const; + void mkPath(const std::string &path) const; /// \brief To debug source #ifdef ULTRACOPIER_PLUGIN_DEBUG - 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 #ifdef ULTRACOPIER_PLUGIN_DEBUG_WINDOW - void updateTheDebugInfo(const QStringList &,const QStringList&,const int &) const; + void updateTheDebugInfo(const std::vector<std::string> &,const std::vector<std::string>&,const int &) const; #endif //other signal /// \note Can be call without queue because all call will be serialized void send_fileAlreadyExists(const QFileInfo &source,const QFileInfo &destination,const bool &isSame,TransferThread * thread) const; /// \note Can be call without queue because all call will be serialized - void send_errorOnFile(const QFileInfo &fileInfo,const QString &errorString,TransferThread * thread, const ErrorType &errorType) const; + void send_errorOnFile(const QFileInfo &fileInfo,const std::string &errorString,TransferThread * thread, const ErrorType &errorType) const; /// \note Can be call without queue because all call will be serialized void send_folderAlreadyExists(const QFileInfo &source,const QFileInfo &destination,const bool &isSame,ScanFileOrFolder * thread) const; /// \note Can be call without queue because all call will be serialized - void send_errorOnFolder(const QFileInfo &fileInfo,const QString &errorString,ScanFileOrFolder * thread, const ErrorType &errorType) const; + void send_errorOnFolder(const QFileInfo &fileInfo,const std::string &errorString,ScanFileOrFolder * thread, const ErrorType &errorType) const; //send the progression void send_syncTransferList() const; //mkpath error event - void mkPathErrorOnFolder(const QFileInfo &fileInfo,const QString &errorString,const ErrorType &errorType) const; + void mkPathErrorOnFolder(const QFileInfo &fileInfo,const std::string &errorString,const ErrorType &errorType) const; //to close void tryCancel() const; //to ask new transfer thread void askNewTransferThread() const; - void warningTransferList(const QString &warning) const; - void errorTransferList(const QString &error) const; - void send_sendNewRenamingRules(const QString &firstRenamingRule,const QString &otherRenamingRule) const; - void send_realBytesTransfered(const quint64 &) const; + void warningTransferList(const std::string &warning) const; + void errorTransferList(const std::string &error) const; + void send_sendNewRenamingRules(const std::string &firstRenamingRule,const std::string &otherRenamingRule) const; + void send_realBytesTransfered(const uint64_t &) const; void send_setTransferAlgorithm(TransferAlgorithm transferAlgorithm) const; void send_parallelBuffer(const int ¶llelBuffer) const; void send_sequentialBuffer(const int &sequentialBuffer) const; void send_parallelizeIfSmallerThan(const int ¶llelizeIfSmallerThan) const; void send_updateMount(); - void missingDiskSpace(QList<Diskspace> list) const; + void missingDiskSpace(std::vector<Diskspace> list) const; }; #endif // LISTTHREAD_H diff --git a/plugins/CopyEngine/Ultracopier/ListThread_InodeAction.cpp b/plugins/CopyEngine/Ultracopier/ListThread_InodeAction.cpp index b47fbdf..12421f2 100644 --- a/plugins/CopyEngine/Ultracopier/ListThread_InodeAction.cpp +++ b/plugins/CopyEngine/Ultracopier/ListThread_InodeAction.cpp @@ -9,7 +9,7 @@ ActionToDoInode& currentActionToDoInode=actionToDoListInode[int_for_internal_loo switch(currentActionToDoInode.type) { case ActionType_RealMove: - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("launch real move, source: %1, destination: %2").arg(currentActionToDoInode.source.absoluteFilePath()).arg(currentActionToDoInode.destination.absoluteFilePath())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("launch real move, source: %1, destination: %2").arg(currentActionToDoInode.source.absoluteFilePath()).arg(currentActionToDoInode.destination.absoluteFilePath()).toStdString()); mkPathQueue.addPath(currentActionToDoInode.source.absoluteFilePath(),currentActionToDoInode.destination.absoluteFilePath(),currentActionToDoInode.type); currentActionToDoInode.isRunning=true; numberOfInodeOperation++; @@ -17,7 +17,7 @@ switch(currentActionToDoInode.type) return; break; case ActionType_MkPath: - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("launch mkpath, source: %1, destination: %2").arg(currentActionToDoInode.source.absoluteFilePath()).arg(currentActionToDoInode.destination.absoluteFilePath())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("launch mkpath, source: %1, destination: %2").arg(currentActionToDoInode.source.absoluteFilePath()).arg(currentActionToDoInode.destination.absoluteFilePath()).toStdString()); mkPathQueue.addPath(currentActionToDoInode.source.absoluteFilePath(),currentActionToDoInode.destination.absoluteFilePath(),currentActionToDoInode.type); currentActionToDoInode.isRunning=true; numberOfInodeOperation++; @@ -26,7 +26,7 @@ switch(currentActionToDoInode.type) break; #ifdef ULTRACOPIER_PLUGIN_RSYNC case ActionType_RmSync: - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QString("launch rmsync, destination: %1").arg(currentActionToDoInode.destination.absoluteFilePath())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QString("launch rmsync, destination: %1").arg(currentActionToDoInode.destination.absoluteFilePath()).toStdString()); mkPathQueue.addPath(currentActionToDoInode.destination.absoluteFilePath(),currentActionToDoInode.destination.absoluteFilePath(),currentActionToDoInode.type); currentActionToDoInode.isRunning=true; numberOfInodeOperation++; @@ -36,9 +36,9 @@ switch(currentActionToDoInode.type) #endif case ActionType_MovePath: //then empty (no file), can try remove it - if(currentActionToDoInode.size==0 || actionToDoListTransfer.isEmpty())//don't put afterTheTransfer because actionToDoListInode_afterTheTransfer -> already afterTheTransfer + if(currentActionToDoInode.size==0 || actionToDoListTransfer.empty())//don't put afterTheTransfer because actionToDoListInode_afterTheTransfer -> already afterTheTransfer { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("launch rmpath: %1").arg(currentActionToDoInode.source.absoluteFilePath())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("launch rmpath: %1").arg(currentActionToDoInode.source.absoluteFilePath()).toStdString()); mkPathQueue.addPath(currentActionToDoInode.source.absoluteFilePath(),currentActionToDoInode.destination.absoluteFilePath(),currentActionToDoInode.type); currentActionToDoInode.isRunning=true; numberOfInodeOperation++; @@ -48,8 +48,8 @@ switch(currentActionToDoInode.type) else //have do the destination, put the remove to after { currentActionToDoInode.size=0; - actionToDoListInode_afterTheTransfer << currentActionToDoInode; - actionToDoListInode.removeAt(int_for_internal_loop); + actionToDoListInode_afterTheTransfer.push_back(currentActionToDoInode); + actionToDoListInode.erase(actionToDoListInode.cbegin()+int_for_internal_loop); int_for_internal_loop--; actionToDoListInode_count--; if(numberOfInodeOperation>=inodeThreads) @@ -57,7 +57,7 @@ switch(currentActionToDoInode.type) } break; default: - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("Wrong type at inode action")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Wrong type at inode action"); return; } diff --git a/plugins/CopyEngine/Ultracopier/MkPath.cpp b/plugins/CopyEngine/Ultracopier/MkPath.cpp index 15c423f..52d67af 100644 --- a/plugins/CopyEngine/Ultracopier/MkPath.cpp +++ b/plugins/CopyEngine/Ultracopier/MkPath.cpp @@ -9,7 +9,7 @@ #endif #endif -QString MkPath::text_slash=QLatin1Literal("/"); +std::string MkPath::text_slash="/"; MkPath::MkPath() { @@ -22,7 +22,7 @@ MkPath::MkPath() start(); #ifdef Q_OS_WIN32 #ifndef ULTRACOPIER_PLUGIN_SET_TIME_UNIX_WAY - regRead=QRegularExpression(QStringLiteral("^[a-z]:")); + regRead=std::regex("^[a-z]:"); #endif #endif } @@ -36,7 +36,7 @@ MkPath::~MkPath() void MkPath::addPath(const QFileInfo& source, const QFileInfo& destination, const ActionType &actionType) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("source: %1, destination: %2").arg(source.absoluteFilePath()).arg(destination.absoluteFilePath())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("source: %1, destination: %2").arg(source.absoluteFilePath()).arg(destination.absoluteFilePath()).toStdString()); if(stopIt) return; emit internalStartAddPath(source,destination,actionType); @@ -67,7 +67,7 @@ void MkPath::internalDoThisPath() { if(waitAction || pathList.isEmpty()) return; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("source: %1, destination: %2, move: %3").arg(pathList.first().source.absoluteFilePath()).arg(pathList.first().destination.absoluteFilePath()).arg(pathList.first().actionType)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("source: %1, destination: %2, move: %3").arg(pathList.first().source.absoluteFilePath()).arg(pathList.first().destination.absoluteFilePath()).arg(pathList.first().actionType).toStdString()); #ifdef ULTRACOPIER_PLUGIN_RSYNC if(pathList.first().actionType==ActionType_RmSync) { @@ -79,8 +79,8 @@ void MkPath::internalDoThisPath() if(stopIt) return; waitAction=true; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to remove the inode: "+pathList.first().destination.absoluteFilePath()+", error: "+removedFile.errorString()); - emit errorOnFolder(pathList.first().destination,removedFile.errorString()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to remove the inode: "+pathList.first().destination.absoluteFilePath().toStdString()+", error: "+removedFile.errorString().toStdString()); + emit errorOnFolder(pathList.first().destination,removedFile.errorString().toStdString()); return; } } @@ -89,8 +89,8 @@ void MkPath::internalDoThisPath() if(stopIt) return; waitAction=true; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to remove the inode: "+pathList.first().destination.absoluteFilePath()); - emit errorOnFolder(pathList.first().destination,tr("Unable to remove")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to remove the inode: "+pathList.first().destination.absoluteFilePath().toStdString()); + emit errorOnFolder(pathList.first().destination,tr("Unable to remove").toStdString()); return; } pathList.removeFirst(); @@ -104,12 +104,12 @@ void MkPath::internalDoThisPath() { if(!pathList.first().source.exists()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"the sources not exists: "+pathList.first().source.absoluteFilePath()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"the sources not exists: "+pathList.first().source.absoluteFilePath().toStdString()); doTheDateTransfer=false; } else if(maxTime>=pathList.first().source.lastModified()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"the sources is older to copy the time: "+pathList.first().source.absoluteFilePath()+": "+maxTime.toString("dd.MM.yyyy hh:mm:ss.zzz")+">="+pathList.first().source.lastModified().toString("dd.MM.yyyy hh:mm:ss.zzz")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"the sources is older to copy the time: "+pathList.first().source.absoluteFilePath().toStdString()+": "+maxTime.toString("dd.MM.yyyy hh:mm:ss.zzz").toStdString()+">="+pathList.first().source.lastModified().toString("dd.MM.yyyy hh:mm:ss.zzz").toStdString()); doTheDateTransfer=false; } else @@ -138,8 +138,8 @@ void MkPath::internalDoThisPath() if(stopIt) return; waitAction=true; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to make the folder: "+pathList.first().destination.absoluteFilePath()); - emit errorOnFolder(pathList.first().destination,tr("Unable to create the folder")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to make the folder: "+pathList.first().destination.absoluteFilePath().toStdString()); + emit errorOnFolder(pathList.first().destination,tr("Unable to create the folder").toStdString()); return; } } @@ -151,36 +151,36 @@ void MkPath::internalDoThisPath() if(stopIt) return; waitAction=true; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"The source folder don't exists: "+pathList.first().source.absoluteFilePath()); - emit errorOnFolder(pathList.first().destination,tr("The source folder don't exists")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"The source folder don't exists: "+pathList.first().source.absoluteFilePath().toStdString()); + emit errorOnFolder(pathList.first().destination,tr("The source folder don't exists").toStdString()); return; } if(!pathList.first().source.isDir())//it's really an error? { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"The source is not a folder: "+pathList.first().source.absoluteFilePath()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"The source is not a folder: "+pathList.first().source.absoluteFilePath().toStdString()); /*if(stopIt) return; waitAction=true; emit errorOnFolder(pathList.first().destination,tr("The source is not a folder")); return;*/ } - if(pathList.first().destination.absoluteFilePath().startsWith(pathList.first().source.absoluteFilePath()+text_slash)) + if(pathList.first().destination.absoluteFilePath().startsWith(pathList.first().source.absoluteFilePath()+QString::fromStdString(text_slash))) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"move into it self: "+pathList.first().destination.absoluteFilePath()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"move into it self: "+pathList.first().destination.absoluteFilePath().toStdString()); int random=rand(); - QFileInfo tempFolder=pathList.first().source.absolutePath()+text_slash+QString::number(random); + QFileInfo tempFolder=pathList.first().source.absolutePath()+QString::fromStdString(text_slash)+QString::number(random); while(tempFolder.exists()) { random=rand(); - tempFolder=pathList.first().source.absolutePath()+text_slash+QString::number(random); + tempFolder=pathList.first().source.absolutePath()+QString::fromStdString(text_slash)+QString::number(random); } if(!dir.rename(pathList.first().source.absoluteFilePath(),tempFolder.absoluteFilePath())) { if(stopIt) return; waitAction=true; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to temporary rename the folder: "+pathList.first().destination.absoluteFilePath()); - emit errorOnFolder(pathList.first().destination,tr("Unable to temporary rename the folder")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to temporary rename the folder: "+pathList.first().destination.absoluteFilePath().toStdString()); + emit errorOnFolder(pathList.first().destination,tr("Unable to temporary rename the folder").toStdString()); return; } /* http://doc.qt.io/qt-5/qdir.html#rename @@ -202,8 +202,8 @@ void MkPath::internalDoThisPath() if(stopIt) return; waitAction=true; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to do the final real move the folder: "+pathList.first().destination.absoluteFilePath()); - emit errorOnFolder(pathList.first().destination,tr("Unable to do the final real move the folder")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to do the final real move the folder: "+pathList.first().destination.absoluteFilePath().toStdString()); + emit errorOnFolder(pathList.first().destination,tr("Unable to do the final real move the folder").toStdString()); return; } } @@ -228,8 +228,9 @@ void MkPath::internalDoThisPath() if(stopIt) return; waitAction=true; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to make the folder: from: "+pathList.first().source.absoluteFilePath()+", soruce exists: "+QString::number(QDir(pathList.first().source.absoluteFilePath()).exists())+", to: "+pathList.first().destination.absoluteFilePath()+", destination exist: "+QString::number(QDir(pathList.first().destination.absoluteFilePath()).exists())); - emit errorOnFolder(pathList.first().destination,tr("Unable to move the folder")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to make the folder: from: "+pathList.first().source.absoluteFilePath().toStdString()+", soruce exists: "+std::to_string(QDir(pathList.first().source.absoluteFilePath()).exists())+", to: "+pathList.first().destination.absoluteFilePath().toStdString() + +", destination exist: "+std::to_string(QDir(pathList.first().destination.absoluteFilePath()).exists())); + emit errorOnFolder(pathList.first().destination,tr("Unable to move the folder").toStdString()); return; } } @@ -238,11 +239,11 @@ void MkPath::internalDoThisPath() if(!writeFileDateTime(pathList.first().destination)) { if(!pathList.first().destination.exists()) - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to set destination folder time (not exists): "+pathList.first().destination.absoluteFilePath()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to set destination folder time (not exists): "+pathList.first().destination.absoluteFilePath().toStdString()); else if(!pathList.first().destination.isDir()) - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to set destination folder time (not a dir): "+pathList.first().destination.absoluteFilePath()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to set destination folder time (not a dir): "+pathList.first().destination.absoluteFilePath().toStdString()); else - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to set destination folder time: "+pathList.first().destination.absoluteFilePath()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to set destination folder time: "+pathList.first().destination.absoluteFilePath().toStdString()); /*if(stopIt) return; waitAction=true; @@ -256,7 +257,7 @@ void MkPath::internalDoThisPath() QFile destination(pathList.first().destination.absoluteFilePath()); if(!destination.setPermissions(source.permissions())) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to set the right: "+pathList.first().destination.absoluteFilePath()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to set the right: "+pathList.first().destination.absoluteFilePath().toStdString()); /*if(stopIt) return; waitAction=true; @@ -271,8 +272,8 @@ void MkPath::internalDoThisPath() if(stopIt) return; waitAction=true; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to remove the source folder: "+pathList.first().destination.absoluteFilePath()); - emit errorOnFolder(pathList.first().source,tr("Unable to remove")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to remove the source folder: "+pathList.first().destination.absoluteFilePath().toStdString()); + emit errorOnFolder(pathList.first().source,tr("Unable to remove").toStdString()); return; } } @@ -283,7 +284,7 @@ void MkPath::internalDoThisPath() void MkPath::internalAddPath(const QFileInfo& source, const QFileInfo& destination, const ActionType &actionType) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("source: %1, destination: %2").arg(source.absoluteFilePath()).arg(destination.absoluteFilePath())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("source: %1, destination: %2").arg(source.absoluteFilePath()).arg(destination.absoluteFilePath()).toStdString()); Item tempPath; tempPath.source=source; tempPath.destination=destination; @@ -351,24 +352,24 @@ bool MkPath::rmpath(const QDir &dir QFile file(fileInfo.absoluteFilePath()); if(!file.remove()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"unable to remove a file: "+fileInfo.absoluteFilePath()+", due to: "+file.errorString()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"unable to remove a file: "+fileInfo.absoluteFilePath().toStdString()+", due to: "+file.errorString().toStdString()); allHaveWork=false; } } else { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"found a file: "+fileInfo.fileName()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"found a file: "+fileInfo.fileName().toStdString()); allHaveWork=false; } } } else { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"found a file: "+fileInfo.fileName()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"found a file: "+fileInfo.fileName().toStdString()); allHaveWork=false; } #else - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"found a file: "+fileInfo.fileName()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"found a file: "+fileInfo.fileName().toStdString()); allHaveWork=false; #endif } @@ -383,14 +384,14 @@ bool MkPath::rmpath(const QDir &dir return false; allHaveWork=dir.rmdir(dir.absolutePath()); if(!allHaveWork) - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"unable to remove the folder: "+dir.absolutePath()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"unable to remove the folder: "+dir.absolutePath().toStdString()); return allHaveWork; } //fonction to edit the file date time bool MkPath::readFileDateTime(const QFileInfo &source) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"readFileDateTime("+source.absoluteFilePath()+")"); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"readFileDateTime("+source.absoluteFilePath().toStdString()+")"); /** Why not do it with Qt? Because it not support setModificationTime(), and get the time with Qt, that's mean use local time where in C is UTC time */ #ifdef Q_OS_UNIX #ifdef Q_OS_LINUX @@ -433,14 +434,14 @@ bool MkPath::readFileDateTime(const QFileInfo &source) return true; #else wchar_t filePath[65535]; - if(source.absoluteFilePath().contains(regRead)) + if(std::regex_match(source.absoluteFilePath().toStdString(),regRead)) filePath[QDir::toNativeSeparators(QStringLiteral("\\\\?\\")+source.absoluteFilePath()).toWCharArray(filePath)]=L'\0'; else filePath[QDir::toNativeSeparators(source.absoluteFilePath()).toWCharArray(filePath)]=L'\0'; HANDLE hFileSouce = CreateFileW(filePath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_READONLY | FILE_FLAG_BACKUP_SEMANTICS, NULL); if(hFileSouce == INVALID_HANDLE_VALUE) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"open failed to read: "+QString::fromWCharArray(filePath)+", error: "+QString::number(GetLastError())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"open failed to read: "+QString::fromWCharArray(filePath).toStdString()+", error: "+std::to_string(GetLastError())); return false; } FILETIME ftCreate, ftAccess, ftWrite; @@ -468,7 +469,7 @@ bool MkPath::readFileDateTime(const QFileInfo &source) bool MkPath::writeFileDateTime(const QFileInfo &destination) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"writeFileDateTime("+destination.absoluteFilePath()+")"); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"writeFileDateTime("+destination.absoluteFilePath().toStdString()+")"); /** Why not do it with Qt? Because it not support setModificationTime(), and get the time with Qt, that's mean use local time where in C is UTC time */ #ifdef Q_OS_UNIX #ifdef Q_OS_LINUX @@ -482,14 +483,14 @@ bool MkPath::writeFileDateTime(const QFileInfo &destination) return utime(destination.toLatin1().data(),&butime)==0; #else wchar_t filePath[65535]; - if(destination.absoluteFilePath().contains(regRead)) + if(std::regex_match(destination.absoluteFilePath().toStdString(),regRead)) filePath[QDir::toNativeSeparators(QStringLiteral("\\\\?\\")+destination.absoluteFilePath()).toWCharArray(filePath)]=L'\0'; else filePath[QDir::toNativeSeparators(destination.absoluteFilePath()).toWCharArray(filePath)]=L'\0'; HANDLE hFileDestination = CreateFileW(filePath, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL); if(hFileDestination == INVALID_HANDLE_VALUE) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"open failed to write: "+QString::fromWCharArray(filePath)+", error: "+QString::number(GetLastError())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"open failed to write: "+QString::fromWCharArray(filePath).toStdString()+", error: "+std::to_string(GetLastError())); return false; } FILETIME ftCreate, ftAccess, ftWrite; diff --git a/plugins/CopyEngine/Ultracopier/MkPath.h b/plugins/CopyEngine/Ultracopier/MkPath.h index 9182462..2bbebcc 100644 --- a/plugins/CopyEngine/Ultracopier/MkPath.h +++ b/plugins/CopyEngine/Ultracopier/MkPath.h @@ -8,9 +8,9 @@ #include <QThread> #include <QFileInfo> -#include <QString> +#include <string> #include <QSemaphore> -#include <QStringList> +#include <vector> #include <QDir> #include <QDateTime> @@ -44,13 +44,13 @@ public: void setRightTransfer(const bool doRightTransfer); void setKeepDate(const bool keepDate); signals: - void errorOnFolder(const QFileInfo &,const QString &,const ErrorType &errorType=ErrorType_FolderWithRety) const; + void errorOnFolder(const QFileInfo &,const std::string &,const ErrorType &errorType=ErrorType_FolderWithRety) const; void firstFolderFinish(); void internalStartAddPath(const QFileInfo& source,const QFileInfo& destination, const ActionType &actionType) const; void internalStartDoThisPath() const; void internalStartSkip() const; void internalStartRetry() const; - 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; public slots: /// \brief skip after creation error void skip(); @@ -81,16 +81,16 @@ private: #ifdef ULTRACOPIER_PLUGIN_SET_TIME_UNIX_WAY utimbuf butime; #else - quint32 ftCreateL, ftAccessL, ftWriteL; - quint32 ftCreateH, ftAccessH, ftWriteH; - QRegularExpression regRead; + uint64_t ftCreateL, ftAccessL, ftWriteL; + uint64_t ftCreateH, ftAccessH, ftWriteH; + std::regex regRead; #endif #endif #endif //fonction to edit the file date time bool readFileDateTime(const QFileInfo &source); bool writeFileDateTime(const QFileInfo &destination); - static QString text_slash; + static std::string text_slash; private slots: void internalDoThisPath(); void internalAddPath(const QFileInfo& source, const QFileInfo& destination,const ActionType &actionType); diff --git a/plugins/CopyEngine/Ultracopier/ReadThread.cpp b/plugins/CopyEngine/Ultracopier/ReadThread.cpp index 37c83f4..e843d9b 100644 --- a/plugins/CopyEngine/Ultracopier/ReadThread.cpp +++ b/plugins/CopyEngine/Ultracopier/ReadThread.cpp @@ -51,29 +51,29 @@ void ReadThread::open(const QFileInfo &file, const Ultracopier::CopyMode &mode) { if(!isRunning()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] the thread not running to open destination: ")+file.absoluteFilePath()); - errorString_internal=tr("Internal error, please report it!"); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] the thread not running to open destination: "+file.absoluteFilePath().toStdString()); + errorString_internal=tr("Internal error, please report it!").toStdString(); emit error(); } - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] open source: ")+file.absoluteFilePath()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] open source: "+file.absoluteFilePath().toStdString()); if(this->file.isOpen()) { if(file.absoluteFilePath()==this->file.fileName()) - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] Try reopen already opened same file: ")+file.absoluteFilePath()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] Try reopen already opened same file: "+file.absoluteFilePath().toStdString()); else - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("[")+QString::number(id)+QStringLiteral("] previous file is already open: ")+file.absoluteFilePath()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"["+std::to_string(id)+"] previous file is already open: "+file.absoluteFilePath().toStdString()); emit internalStartClose(); isOpen.acquire(); isOpen.release(); } if(isInReadLoop) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("[")+QString::number(id)+QStringLiteral("] previous file is already readding: ")+file.absoluteFilePath()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"["+std::to_string(id)+"] previous file is already readding: "+file.absoluteFilePath().toStdString()); return; } if(tryStartRead) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("[")+QString::number(id)+QStringLiteral("] previous file is already try read: ")+file.absoluteFilePath()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"["+std::to_string(id)+"] previous file is already try read: "+file.absoluteFilePath().toStdString()); return; } stopIt=false; @@ -84,14 +84,14 @@ void ReadThread::open(const QFileInfo &file, const Ultracopier::CopyMode &mode) emit internalStartOpen(); } -QString ReadThread::errorString() const +std::string ReadThread::errorString() const { return errorString_internal; } void ReadThread::stop() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] stop()")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] stop()"); stopIt=true; pauseMutex.release(); pauseMutex.release(); @@ -104,7 +104,7 @@ void ReadThread::stop() void ReadThread::pause() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] try put read thread in pause")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] try put read thread in pause"); if(stopIt) return; pauseMutex.tryAcquire(pauseMutex.available()); @@ -115,7 +115,7 @@ void ReadThread::resume() { if(putInPause) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start"); putInPause=false; stopIt=false; } @@ -123,21 +123,21 @@ void ReadThread::resume() return; if(!file.isOpen()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] file is not open")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] file is not open"); return; } pauseMutex.release(); } -bool ReadThread::seek(const qint64 &position) +bool ReadThread::seek(const int64_t &position) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start with: ")+QString::number(position)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start with: "+std::to_string(position)); if(position>file.size()) return false; return file.seek(position); } -qint64 ReadThread::size() const +int64_t ReadThread::size() const { return file.size(); } @@ -166,7 +166,7 @@ void ReadThread::checkSum() #endif if(putInPause) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,QStringLiteral("[")+QString::number(id)+QStringLiteral("] read put in pause")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"["+std::to_string(id)+"] read put in pause"); if(stopIt) return; pauseMutex.acquire(); @@ -181,16 +181,16 @@ void ReadThread::checkSum() //can be smaller than min block size to do correct speed limitation if(blockArray.size()>ULTRACOPIER_PLUGIN_MAX_BLOCK_SIZE*1024) { - errorString_internal=tr("Internal error reading the source file:block size out of range"); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("Internal error reading the source file:block size out of range")); + errorString_internal=tr("Internal error reading the source file:block size out of range").toStdString(); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] Internal error reading the source file:block size out of range"); emit error(); isInReadLoop=false; return; } if(file.error()!=QFile::NoError) { - errorString_internal=tr("Unable to read the source file: ")+file.errorString()+QStringLiteral(" (")+QString::number(file.error())+QStringLiteral(")"); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("file.error()!=QFile::NoError: %1, error: %2").arg(QString::number(file.error())).arg(errorString_internal)); + errorString_internal=tr("Unable to read the source file: ").toStdString()+file.errorString().toStdString()+" ("+std::to_string(file.error())+")"; + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] "+QStringLiteral("file.error()!=QFile::NoError: %1, error: ").arg(QString::number(file.error())).toStdString()+errorString_internal); emit error(); isInReadLoop=false; return; @@ -230,8 +230,8 @@ void ReadThread::checkSum() while(sizeReaden>0 && !stopIt); if(lastGoodPosition>file.size()) { - errorString_internal=tr("File truncated during the read, possible data change"); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("Source truncated during the read: %1 (%2)").arg(file.errorString()).arg(QString::number(file.error()))); + errorString_internal=tr("File truncated during the read, possible data change").toStdString(); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] "+QStringLiteral("Source truncated during the read: %1 (%2)").arg(file.errorString()).arg(QString::number(file.error())).toStdString()); emit error(); isInReadLoop=false; return; @@ -243,7 +243,7 @@ void ReadThread::checkSum() return; } emit checksumFinish(hash.result()); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] stop the read")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] stop the read"); } bool ReadThread::internalOpenSlot() @@ -253,7 +253,7 @@ bool ReadThread::internalOpenSlot() bool ReadThread::internalOpen(bool resetLastGoodPosition) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] internalOpen source: ")+file.fileName()+QStringLiteral(", open in write because move: ")+QString::number(mode==Ultracopier::Move)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] internalOpen source: "+file.fileName().toStdString()+", open in write because move: "+std::to_string(mode==Ultracopier::Move)); if(stopIt) { emit closed(); @@ -265,7 +265,7 @@ bool ReadThread::internalOpen(bool resetLastGoodPosition) #endif if(file.isOpen()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] this file is already open: ")+file.fileName()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] this file is already open: "+file.fileName().toStdString()); #ifdef ULTRACOPIER_PLUGIN_DEBUG stat=Idle; #endif @@ -293,15 +293,15 @@ bool ReadThread::internalOpen(bool resetLastGoodPosition) return false; } size_at_open=file.size(); - mtime_at_open=QFileInfo(file).lastModified(); + mtime_at_open=QFileInfo(file).lastModified().toMSecsSinceEpoch()/1000; putInPause=false; if(resetLastGoodPosition) lastGoodPosition=0; if(!seek(lastGoodPosition)) { file.close(); - errorString_internal=file.errorString(); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("Unable to seek after open: %1, error: %2").arg(file.fileName()).arg(errorString_internal)); + errorString_internal=file.errorString().toStdString(); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] "+QStringLiteral("Unable to seek after open: %1, error: %2").arg(file.fileName()).toStdString()+errorString_internal); emit error(); #ifdef ULTRACOPIER_PLUGIN_DEBUG stat=Idle; @@ -317,8 +317,8 @@ bool ReadThread::internalOpen(bool resetLastGoodPosition) } else { - errorString_internal=file.errorString(); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("Unable to open: %1, error: %2").arg(file.fileName()).arg(errorString_internal)); + errorString_internal=file.errorString().toStdString(); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] "+QStringLiteral("Unable to open: %1, error: ").arg(file.fileName()).toStdString()+errorString_internal); emit error(); #ifdef ULTRACOPIER_PLUGIN_DEBUG stat=Idle; @@ -341,7 +341,7 @@ void ReadThread::internalRead() } else { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] stopIt == true, then quit")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] stopIt == true, then quit"); isInReadLoop=false; internalClose(); return; @@ -353,7 +353,7 @@ void ReadThread::internalRead() int sizeReaden=0; if(!file.isOpen()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] is not open!")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] is not open!"); isInReadLoop=false; return; } @@ -361,14 +361,14 @@ void ReadThread::internalRead() #ifdef ULTRACOPIER_PLUGIN_SPEED_SUPPORT numberOfBlockCopied=0; #endif - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start the copy")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start the copy"); emit readIsStarted(); #ifdef ULTRACOPIER_PLUGIN_DEBUG stat=Idle; #endif if(stopIt) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] stopIt == true, then quit")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] stopIt == true, then quit"); isInReadLoop=false; internalClose(); return; @@ -378,10 +378,10 @@ void ReadThread::internalRead() //read one block if(putInPause) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,QStringLiteral("[")+QString::number(id)+QStringLiteral("] read put in pause")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"["+std::to_string(id)+"] read put in pause"); if(stopIt) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] stopIt == true, then quit")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] stopIt == true, then quit"); isInReadLoop=false; internalClose(); return; @@ -389,7 +389,7 @@ void ReadThread::internalRead() pauseMutex.acquire(); if(stopIt) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] stopIt == true, then quit")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] stopIt == true, then quit"); isInReadLoop=false; internalClose(); return; @@ -405,8 +405,8 @@ void ReadThread::internalRead() if(file.error()!=QFile::NoError) { - errorString_internal=tr("Unable to read the source file: ")+file.errorString()+QStringLiteral(" (")+QString::number(file.error())+QStringLiteral(")"); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("file.error()!=QFile::NoError: %1, error: %2").arg(QString::number(file.error())).arg(errorString_internal)); + errorString_internal=tr("Unable to read the source file: ").toStdString()+file.errorString().toStdString()+" ("+std::to_string(file.error())+")"; + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] "+QStringLiteral("file.error()!=QFile::NoError: %1, error: ").arg(QString::number(file.error())).toStdString()+errorString_internal); isInReadLoop=false; emit error(); return; @@ -421,7 +421,7 @@ void ReadThread::internalRead() { if(!stopIt) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] stopped because the write is stopped: ")+QString::number(lastGoodPosition)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] stopped because the write is stopped: "+std::to_string(lastGoodPosition)); stopIt=true; } } @@ -432,7 +432,7 @@ void ReadThread::internalRead() if(stopIt) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] stopIt == true, then quit")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] stopIt == true, then quit"); isInReadLoop=false; internalClose();//need re-open the destination and then the source return; @@ -453,8 +453,8 @@ void ReadThread::internalRead() while(sizeReaden>0 && !stopIt); if(lastGoodPosition>file.size()) { - errorString_internal=tr("File truncated during the read, possible data change"); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("Source truncated during the read: %1 (%2)").arg(file.errorString()).arg(QString::number(file.error()))); + errorString_internal=tr("File truncated during the read, possible data change").toStdString(); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] "+QStringLiteral("Source truncated during the read: %1 (%2)").arg(file.errorString()).arg(QString::number(file.error())).toStdString()); isInReadLoop=false; emit error(); return; @@ -466,19 +466,19 @@ void ReadThread::internalRead() return; } emit readIsStopped();//will product by signal connection writeThread->endIsDetected(); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] stop the read")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] stop the read"); } void ReadThread::startRead() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start"); if(tryStartRead) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] already in try start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] already in try start"); return; } if(isInReadLoop) - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] double event dropped")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] double event dropped"); else { tryStartRead=true; @@ -527,7 +527,7 @@ bool ReadThread::setBlockSize(const int blockSize) } else { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("block size out of range: ")+QString::number(blockSize)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"block size out of range: "+std::to_string(blockSize)); return false; } } @@ -582,7 +582,7 @@ void ReadThread::startCheckSum() emit internalStartChecksum(); } -qint64 ReadThread::getLastGoodPosition() const +int64_t ReadThread::getLastGoodPosition() const { /*if(lastGoodPosition>file.size()) { @@ -596,10 +596,10 @@ qint64 ReadThread::getLastGoodPosition() const //reopen after an error void ReadThread::reopen() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start"); if(isInReadLoop) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] try reopen where read is not finish")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] try reopen where read is not finish"); return; } stopIt=true; @@ -608,16 +608,16 @@ void ReadThread::reopen() bool ReadThread::internalReopen() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start"); stopIt=false; if(file.isOpen()) { file.close(); isOpen.release(); } - if(size_at_open!=file.size() && mtime_at_open!=QFileInfo(file).lastModified()) + if(size_at_open!=file.size() && mtime_at_open!=(uint64_t)QFileInfo(file).lastModified().toMSecsSinceEpoch()/1000) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] source file have changed since the last open, restart all")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] source file have changed since the last open, restart all"); //fix this function like the close function if(internalOpen(true)) { @@ -656,7 +656,7 @@ void ReadThread::setId(int id) void ReadThread::seekToZeroAndWait() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start"); stopIt=true; seekToZero=true; emit checkIfIsWait(); @@ -664,7 +664,7 @@ void ReadThread::seekToZeroAndWait() void ReadThread::isInWait() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start"); if(seekToZero) { stopIt=false; diff --git a/plugins/CopyEngine/Ultracopier/ReadThread.h b/plugins/CopyEngine/Ultracopier/ReadThread.h index f00ae79..f817e35 100644 --- a/plugins/CopyEngine/Ultracopier/ReadThread.h +++ b/plugins/CopyEngine/Ultracopier/ReadThread.h @@ -31,7 +31,7 @@ public: /// \brief open with the name and copy mode void open(const QFileInfo &file, const Ultracopier::CopyMode &mode); /// \brief return the error string - QString errorString() const; + std::string errorString() const; //QByteArray read(qint64 position,qint64 maxSize); /// \brief stop the copy void stop(); @@ -40,9 +40,9 @@ public: /// \brief resume the copy void resume(); /// \brief get the size of the source file - qint64 size() const; + int64_t size() const; /// \brief get the last good position - qint64 getLastGoodPosition() const; + int64_t getLastGoodPosition() const; /// \brief start the reading of the source file void startRead(); #ifdef ULTRACOPIER_PLUGIN_SPEED_SUPPORT @@ -107,14 +107,14 @@ signals: void internalStartRead() const; void internalStartClose() const; /// \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; private: - QString errorString_internal; + std::string errorString_internal; AvancedQFile file; volatile bool stopIt; Ultracopier::CopyMode mode; - qint64 lastGoodPosition; + int64_t lastGoodPosition; volatile int blockSize;//in Bytes #ifdef ULTRACOPIER_PLUGIN_SPEED_SUPPORT QSemaphore waitNewClockForSpeed; @@ -129,11 +129,11 @@ private: volatile bool isInReadLoop; volatile bool seekToZero; volatile bool tryStartRead; - qint64 size_at_open; - QDateTime mtime_at_open; + int64_t size_at_open; + uint64_t mtime_at_open; bool fakeMode; //internal function - bool seek(const qint64 &position);/// \todo search if is use full + bool seek(const int64_t &position);/// \todo search if is use full private slots: bool internalOpen(bool resetLastGoodPosition=true); bool internalOpenSlot(); diff --git a/plugins/CopyEngine/Ultracopier/RenamingRules.cpp b/plugins/CopyEngine/Ultracopier/RenamingRules.cpp index 848d7fb..4ae23b8 100644 --- a/plugins/CopyEngine/Ultracopier/RenamingRules.cpp +++ b/plugins/CopyEngine/Ultracopier/RenamingRules.cpp @@ -9,7 +9,7 @@ RenamingRules::RenamingRules(QWidget *parent) : { ui->setupUi(this); connectUI(); - setRenamingRules(QStringLiteral(""),QStringLiteral("")); + setRenamingRules("",""); } RenamingRules::~RenamingRules() @@ -23,22 +23,22 @@ void RenamingRules::on_buttonBox_clicked(QAbstractButton *button) reject(); if(ui->buttonBox->buttonRole(button)==QDialogButtonBox::ResetRole) { - setRenamingRules(QStringLiteral(""),QStringLiteral("")); + setRenamingRules("",""); emit sendNewRenamingRules(firstRenamingRule,otherRenamingRule); } } -void RenamingRules::setRenamingRules(QString firstRenamingRule,QString otherRenamingRule) +void RenamingRules::setRenamingRules(std::string firstRenamingRule,std::string otherRenamingRule) { disconnectUI(); this->firstRenamingRule=firstRenamingRule; this->otherRenamingRule=otherRenamingRule; - if(!firstRenamingRule.isEmpty()) - ui->firstRenamingRule->setText(firstRenamingRule); + if(!firstRenamingRule.empty()) + ui->firstRenamingRule->setText(QString::fromStdString(firstRenamingRule)); else ui->firstRenamingRule->setText(tr("%1 - copy").arg(QStringLiteral("%name%"))); - if(!otherRenamingRule.isEmpty()) - ui->otherRenamingRule->setText(otherRenamingRule); + if(!otherRenamingRule.empty()) + ui->otherRenamingRule->setText(QString::fromStdString(otherRenamingRule)); else ui->otherRenamingRule->setText(tr("%1 - copy (%2)").arg(QStringLiteral("%name%")).arg(QStringLiteral("%number%"))); connectUI(); @@ -61,9 +61,9 @@ void RenamingRules::firstRenamingRule_haveChanged() QString newValue=ui->firstRenamingRule->text(); if(newValue==tr("%1 - copy").arg(QStringLiteral("%name%"))) newValue=QStringLiteral(""); - if(newValue==firstRenamingRule) + if(newValue.toStdString()==firstRenamingRule) return; - firstRenamingRule=newValue; + firstRenamingRule=newValue.toStdString(); emit sendNewRenamingRules(firstRenamingRule,otherRenamingRule); } @@ -72,9 +72,9 @@ void RenamingRules::otherRenamingRule_haveChanged() QString newValue=ui->otherRenamingRule->text(); if(newValue==tr("%1 - copy (%2)").arg(QStringLiteral("%name%")).arg(QStringLiteral("%number%"))) newValue=QStringLiteral(""); - if(newValue==otherRenamingRule) + if(newValue.toStdString()==otherRenamingRule) return; - otherRenamingRule=newValue; + otherRenamingRule=newValue.toStdString(); emit sendNewRenamingRules(firstRenamingRule,otherRenamingRule); } diff --git a/plugins/CopyEngine/Ultracopier/RenamingRules.h b/plugins/CopyEngine/Ultracopier/RenamingRules.h index c802cef..b2e9d02 100644 --- a/plugins/CopyEngine/Ultracopier/RenamingRules.h +++ b/plugins/CopyEngine/Ultracopier/RenamingRules.h @@ -15,20 +15,20 @@ class RenamingRules : public QDialog public: explicit RenamingRules(QWidget *parent = 0); ~RenamingRules(); - void setRenamingRules(QString firstRenamingRule,QString otherRenamingRule); + void setRenamingRules(std::string firstRenamingRule, std::string otherRenamingRule); void newLanguageLoaded(); private: Ui::RenamingRules *ui; void connectUI(); void disconnectUI(); - QString firstRenamingRule; - QString otherRenamingRule; + std::string firstRenamingRule; + std::string otherRenamingRule; private slots: void on_buttonBox_clicked(QAbstractButton *button); void firstRenamingRule_haveChanged(); void otherRenamingRule_haveChanged(); signals: - void sendNewRenamingRules(QString firstRenamingRule,QString otherRenamingRule) const; + void sendNewRenamingRules(std::string firstRenamingRule,std::string otherRenamingRule) const; }; #endif // RENAMINGRULES_H diff --git a/plugins/CopyEngine/Ultracopier/ScanFileOrFolder.cpp b/plugins/CopyEngine/Ultracopier/ScanFileOrFolder.cpp index 9c35050..736f589 100644 --- a/plugins/CopyEngine/Ultracopier/ScanFileOrFolder.cpp +++ b/plugins/CopyEngine/Ultracopier/ScanFileOrFolder.cpp @@ -2,6 +2,8 @@ #include "TransferThread.h" #include <QtGlobal> #include <QDateTime> +#include <regex> +#include "../../../cpp11addition.h" #ifdef Q_OS_WIN32 #ifndef NOMINMAX @@ -10,9 +12,9 @@ #include <windows.h> #endif -QString ScanFileOrFolder::text_slash=QLatin1Literal("/"); -QString ScanFileOrFolder::text_antislash=QLatin1Literal("\\"); -QString ScanFileOrFolder::text_dot=QLatin1Literal("."); +std::string ScanFileOrFolder::text_slash="/"; +std::string ScanFileOrFolder::text_antislash="\\"; +std::string ScanFileOrFolder::text_dot="."; ScanFileOrFolder::ScanFileOrFolder(const Ultracopier::CopyMode &mode) { @@ -23,7 +25,7 @@ ScanFileOrFolder::ScanFileOrFolder(const Ultracopier::CopyMode &mode) stopped = true; stopIt = false; this->mode = mode; - folder_isolation = QRegularExpression(QStringLiteral("^(.*/)?([^/]+)/$")); + folder_isolation = std::regex("^(.*/)?([^/]+)/$"); setObjectName(QStringLiteral("ScanFileOrFolder")); #ifdef Q_OS_WIN32 QString userName; @@ -32,7 +34,7 @@ ScanFileOrFolder::ScanFileOrFolder(const Ultracopier::CopyMode &mode) if(GetUserNameW(userNameW,&size)) { userName=QString::fromWCharArray(userNameW,size-1); - blackList << QFileInfo(QStringLiteral("C:/Users/%1/AppData/Roaming/").arg(userName)).absoluteFilePath(); + blackList.push_back(QFileInfo(QStringLiteral("C:/Users/%1/AppData/Roaming/").arg(userName)).absoluteFilePath().toStdString()); } delete userNameW; #endif @@ -50,71 +52,77 @@ bool ScanFileOrFolder::isFinished() const return stopped; } -void ScanFileOrFolder::addToList(const QStringList& sources,const QString& destination) +void ScanFileOrFolder::addToList(const std::vector<std::string>& sources,const std::string& destination) { stopIt=false; this->sources=parseWildcardSources(sources); this->destination=destination; - QFileInfo destinationInfo(this->destination); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("check symblink: %1").arg(destinationInfo.absoluteFilePath())); + QFileInfo destinationInfo(QString::fromStdString(this->destination)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"check symblink: "+destinationInfo.absoluteFilePath().toStdString()); while(destinationInfo.isSymLink()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("resolv destination to: %1").arg(destinationInfo.symLinkTarget())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"resolv destination to: "+destinationInfo.symLinkTarget().toStdString()); if(QFileInfo(destinationInfo.symLinkTarget()).isAbsolute()) - this->destination=destinationInfo.symLinkTarget(); + this->destination=destinationInfo.symLinkTarget().toStdString(); else - this->destination=destinationInfo.absolutePath()+text_slash+destinationInfo.symLinkTarget(); - destinationInfo.setFile(this->destination); + this->destination=destinationInfo.absolutePath().toStdString()+text_slash+destinationInfo.symLinkTarget().toStdString(); + destinationInfo.setFile(QString::fromStdString(this->destination)); } - if(sources.size()>1 || QFileInfo(destination).isDir()) + if(sources.size()>1 || QFileInfo(QString::fromStdString(destination)).isDir()) /* Disabled because the separator transformation product bug * if(!destination.endsWith(QDir::separator())) this->destination+=QDir::separator();*/ - if(!destination.endsWith(text_slash) && !destination.endsWith(text_antislash)) + if(!stringEndsWith(destination,'/') && !stringEndsWith(destination,'\\')) this->destination+=text_slash;//put unix separator because it's transformed into that's under windows too - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"addToList("+sources.join(";")+","+this->destination+")"); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"addToList("+stringimplode(sources,";")+","+this->destination+")"); } -QStringList ScanFileOrFolder::parseWildcardSources(const QStringList &sources) const +std::vector<std::string> ScanFileOrFolder::parseWildcardSources(const std::vector<std::string> &sources) const { - QRegularExpression splitFolder(QStringLiteral("[/\\\\]")); - QStringList returnList; - int index=0; - while(index<sources.size()) + std::regex splitFolder("[/\\\\]"); + std::vector<std::string> returnList; + unsigned int index=0; + while(index<(unsigned int)sources.size()) { - if(sources.at(index).contains(QStringLiteral("*"))) + if(sources.at(index).find("*") != std::string::npos) { - QStringList toParse=sources.at(index).split(splitFolder); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("before wildcard parse: %1, toParse: %2, is valid: %3").arg(sources.at(index)).arg(toParse.join(", ")).arg(splitFolder.isValid())); - QList<QStringList> recomposedSource; - recomposedSource << (QStringList() << QStringLiteral("")); + std::vector<std::string> toParse=stringregexsplit(sources.at(index),splitFolder); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"before wildcard parse: "+sources.at(index)+", toParse: "+stringimplode(toParse,", ")); + std::vector<std::vector<std::string> > recomposedSource; + { + std::vector<std::string> t; + t.push_back(""); + recomposedSource.push_back(t); + } while(toParse.size()>0) { - if(toParse.first().contains('*')) + if(toParse.front().find("*") != std::string::npos) { - QString toParseFirst=toParse.first(); - if(toParseFirst.isEmpty()) + std::string toParseFirst=toParse.front(); + if(toParseFirst.empty()) toParseFirst=text_slash; - QList<QStringList> newRecomposedSource; - QRegularExpression toResolv=QRegularExpression(toParseFirst.replace('*',QStringLiteral("[^/\\\\]*"))); - int index_recomposedSource=0; + std::vector<std::vector<std::string> > newRecomposedSource; + stringreplaceAll(toParseFirst,"*","[^/\\\\]*"); + std::regex toResolv=std::regex(toParseFirst); + unsigned int index_recomposedSource=0; while(index_recomposedSource<recomposedSource.size())//parse each url part { - QFileInfo info(recomposedSource.at(index_recomposedSource).join(text_slash)); + QFileInfo info(QString::fromStdString(stringimplode(recomposedSource.at(index_recomposedSource),text_slash))); if(info.isDir() && !info.isSymLink()) { QDir folder(info.absoluteFilePath()); QFileInfoList fileFile=folder.entryInfoList(QDir::AllEntries|QDir::NoDotAndDotDot|QDir::Hidden|QDir::System);//QStringList() << toResolv - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("list the folder: %1, with the wildcard: %2").arg(info.absoluteFilePath()).arg(toResolv.pattern())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"list the folder: "+info.absoluteFilePath().toStdString()+", with the wildcard: "+toParseFirst); int index_fileList=0; while(index_fileList<fileFile.size()) { - if(fileFile.at(index_fileList).fileName().contains(toResolv)) + const std::string &fileName=fileFile.at(index_fileList).fileName().toStdString(); + if(std::regex_match(fileName,toResolv)) { - QStringList tempList=recomposedSource.at(index_recomposedSource); - tempList << fileFile.at(index_fileList).fileName(); - newRecomposedSource << tempList; + std::vector<std::string> tempList=recomposedSource.at(index_recomposedSource); + tempList.push_back(fileName); + newRecomposedSource.push_back(tempList); } index_fileList++; } @@ -125,34 +133,34 @@ QStringList ScanFileOrFolder::parseWildcardSources(const QStringList &sources) c } else { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("add toParse: %1").arg(toParse.join(text_slash))); - int index_recomposedSource=0; + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"add toParse: "+stringimplode(toParse,text_slash)); + unsigned int index_recomposedSource=0; while(index_recomposedSource<recomposedSource.size()) { - recomposedSource[index_recomposedSource] << toParse.first(); - if(!QFileInfo(recomposedSource.at(index_recomposedSource).join(text_slash)).exists()) - recomposedSource.removeAt(index_recomposedSource); + recomposedSource[index_recomposedSource].push_back(toParse.front()); + if(!QFileInfo(QString::fromStdString(stringimplode(recomposedSource.at(index_recomposedSource),text_slash))).exists()) + recomposedSource.erase(recomposedSource.cbegin()+index_recomposedSource); else index_recomposedSource++; } } - toParse.removeFirst(); + toParse.erase(toParse.cbegin()); } - int index_recomposedSource=0; + unsigned int index_recomposedSource=0; while(index_recomposedSource<recomposedSource.size()) { - returnList<<recomposedSource.at(index_recomposedSource).join(text_slash); + returnList.push_back(stringimplode(recomposedSource.at(index_recomposedSource),text_slash)); index_recomposedSource++; } } else - returnList << sources.at(index); + returnList.push_back(sources.at(index)); index++; } return returnList; } -void ScanFileOrFolder::setFilters(const QList<Filters_rules> &include, const QList<Filters_rules> &exclude) +void ScanFileOrFolder::setFilters(const std::vector<Filters_rules> &include, const std::vector<Filters_rules> &exclude) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); QMutexLocker lock(&filtersMutex); @@ -160,11 +168,11 @@ void ScanFileOrFolder::setFilters(const QList<Filters_rules> &include, const QLi this->exclude_send=exclude; reloadTheNewFilters=true; haveFilters=include_send.size()>0 || exclude_send.size()>0; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("haveFilters: %1, include_send.size(): %2, exclude_send.size(): %3").arg(haveFilters).arg(include_send.size()).arg(exclude_send.size())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"haveFilters: "+std::to_string(haveFilters)+", include_send.size(): "+std::to_string(include_send.size())+", exclude_send.size(): "+std::to_string(exclude_send.size())); } //set action if Folder are same or exists -void ScanFileOrFolder::setFolderExistsAction(const FolderExistsAction &action, const QString &newName) +void ScanFileOrFolder::setFolderExistsAction(const FolderExistsAction &action, const std::string &newName) { this->newName=newName; folderExistsAction=action; @@ -187,8 +195,8 @@ void ScanFileOrFolder::stop() void ScanFileOrFolder::run() { stopped=false; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start the listing with destination: "+destination+", mode: "+QString::number(mode)); - destination=resolvDestination(destination).absoluteFilePath(); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start the listing with destination: "+destination+", mode: "+std::to_string(mode)); + destination=resolvDestination(QString::fromStdString(destination)).absoluteFilePath().toStdString(); if(stopIt) { stopped=true; @@ -199,16 +207,16 @@ void ScanFileOrFolder::run() stopped=true; return; } - int sourceIndex=0; + unsigned int sourceIndex=0; while(sourceIndex<sources.size()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"size source to list: "+QString::number(sourceIndex)+text_slash+QString::number(sources.size())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"size source to list: "+std::to_string(sourceIndex)+text_slash+std::to_string(sources.size())); if(stopIt) { stopped=true; return; } - QFileInfo source=sources.at(sourceIndex); + QFileInfo source=QString::fromStdString(sources.at(sourceIndex)); if(source.isDir() && !source.isSymLink()) { /* Bad way; when you copy c:\source\folder into d:\destination, you wait it create the folder d:\destination\folder @@ -216,26 +224,27 @@ void ScanFileOrFolder::run() listFolder(source.absoluteFilePath()+text_slash,destination);//put unix separator because it's transformed into that's under windows too */ //put unix separator because it's transformed into that's under windows too - QString tempString=QFileInfo(destination).absoluteFilePath(); - if(!tempString.endsWith(text_slash) && !tempString.endsWith(text_antislash)) + std::string tempString=QFileInfo(QString::fromStdString(destination)).absoluteFilePath().toStdString(); + if(!stringEndsWith(tempString,text_slash) && !stringEndsWith(tempString,text_antislash)) tempString+=text_slash; tempString+=TransferThread::resolvedName(source); - if(moveTheWholeFolder && mode==Ultracopier::Move && !QFileInfo(tempString).exists() && driveManagement.isSameDrive(source.absoluteFilePath(),tempString)) + if(moveTheWholeFolder && mode==Ultracopier::Move && !QFileInfo(QString::fromStdString(tempString)).exists() && + driveManagement.isSameDrive(source.absoluteFilePath().toStdString(),tempString)) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("tempString: %1 move and not exists").arg(tempString)); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("do real move: %1 to %2").arg(source.absoluteFilePath()).arg(tempString)); - emit addToRealMove(source.absoluteFilePath(),tempString); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"tempString: move and not exists: "+tempString); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"do real move: "+source.absoluteFilePath().toStdString()+" to "+tempString); + emit addToRealMove(source.absoluteFilePath(),QString::fromStdString(tempString)); } else { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("tempString: %1 normal listing, blacklist size: %2").arg(tempString).arg(blackList.size())); - listFolder(source.absoluteFilePath(),tempString); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"tempString: "+tempString+" normal listing, blacklist size: "+std::to_string(blackList.size())); + listFolder(source.absoluteFilePath(),QString::fromStdString(tempString)); } } else { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("source: %1 is file or symblink").arg(source.absoluteFilePath())); - emit fileTransfer(source,destination+text_slash+source.fileName(),mode); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"source: "+source.absoluteFilePath().toStdString()+" is file or symblink"); + emit fileTransfer(source,QString::fromStdString(destination+text_slash)+source.fileName(),mode); } sourceIndex++; } @@ -250,21 +259,21 @@ QFileInfo ScanFileOrFolder::resolvDestination(const QFileInfo &destination) QFileInfo newDestination=destination; while(newDestination.isSymLink()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("resolv destination to: %1").arg(newDestination.symLinkTarget())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"resolv destination to: "+newDestination.symLinkTarget().toStdString()); if(QFileInfo(newDestination.symLinkTarget()).isAbsolute()) newDestination.setFile(newDestination.symLinkTarget()); else - newDestination.setFile(newDestination.absolutePath()+text_slash+newDestination.symLinkTarget()); + newDestination.setFile(newDestination.absolutePath()+QString::fromStdString(text_slash)+newDestination.symLinkTarget()); } do { fileErrorAction=FileError_NotSet; if(isBlackListed(destination)) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("isBlackListed: %1").arg(destination.absoluteFilePath())); - emit errorOnFolder(destination,tr("Blacklisted folder"),ErrorType_Folder); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"isBlackListed: "+destination.absoluteFilePath().toStdString()); + emit errorOnFolder(destination,tr("Blacklisted folder").toStdString(),ErrorType_Folder); waitOneAction.acquire(); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"actionNum: "+QString::number(fileErrorAction)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"actionNum: "+std::to_string(fileErrorAction)); } } while(fileErrorAction==FileError_Retry || fileErrorAction==FileError_PutToEndOfTheList); return newDestination; @@ -276,13 +285,13 @@ bool ScanFileOrFolder::isBlackListed(const QFileInfo &destination) int size=blackList.size(); while(index<size) { - if(destination.absoluteFilePath().startsWith(blackList.at(index))) + if(stringStartWith(destination.absoluteFilePath().toStdString(),blackList.at(index))) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("%1 start with: %2").arg(destination.absoluteFilePath()).arg(blackList.at(index))); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,destination.absoluteFilePath().toStdString()+" start with: "+blackList.at(index)); return true; } else - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("%1 not start with: %2").arg(destination.absoluteFilePath()).arg(blackList.at(index))); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,destination.absoluteFilePath().toStdString()+" not start with: "+blackList.at(index)); index++; } return false; @@ -290,7 +299,9 @@ bool ScanFileOrFolder::isBlackListed(const QFileInfo &destination) void ScanFileOrFolder::listFolder(QFileInfo source,QFileInfo destination) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("source: %1 (%2), destination: %3 (%4)").arg(source.absoluteFilePath()).arg(source.isSymLink()).arg(destination.absoluteFilePath()).arg(destination.isSymLink())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"source: "+source.absoluteFilePath().toStdString()+ + " ("+std::to_string(source.isSymLink())+"), destination: "+destination.absoluteFilePath().toStdString()+ + " ("+std::to_string(destination.isSymLink())+")"); if(stopIt) return; destination=resolvDestination(destination); @@ -303,7 +314,7 @@ void ScanFileOrFolder::listFolder(QFileInfo source,QFileInfo destination) { emit folderAlreadyExists(source,destination,true); waitOneAction.acquire(); - QString destinationSuffixPath; + std::string destinationSuffixPath; switch(folderExistsAction) { case FolderExists_Merge: @@ -312,41 +323,41 @@ void ScanFileOrFolder::listFolder(QFileInfo source,QFileInfo destination) return; break; case FolderExists_Rename: - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"destination before rename: "+destination.absoluteFilePath()); - if(newName.isEmpty()) + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"destination before rename: "+destination.absoluteFilePath().toStdString()); + if(newName.empty()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"pattern: "+folder_isolation.pattern()); + //ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"pattern: "+folder_isolation.str()); //resolv the new name - destinationSuffixPath=destination.baseName(); + destinationSuffixPath=destination.baseName().toStdString(); int num=1; do { if(num==1) { - if(firstRenamingRule.isEmpty()) - destinationSuffixPath=tr("%1 - copy").arg(destination.baseName()); + if(firstRenamingRule.empty()) + destinationSuffixPath=tr("%1 - copy").arg(destination.baseName()).toStdString(); else { destinationSuffixPath=firstRenamingRule; - destinationSuffixPath.replace(QStringLiteral("%name%"),destination.baseName()); + stringreplaceAll(destinationSuffixPath,"%name%",destination.baseName().toStdString()); } } else { - if(otherRenamingRule.isEmpty()) - destinationSuffixPath=tr("%1 - copy (%2)").arg(destination.baseName()).arg(num); + if(otherRenamingRule.empty()) + destinationSuffixPath=tr("%1 - copy (%2)").arg(destination.baseName()).arg(num).toStdString(); else { destinationSuffixPath=otherRenamingRule; - destinationSuffixPath.replace(QStringLiteral("%name%"),destination.baseName()); - destinationSuffixPath.replace(QStringLiteral("%number%"),QString::number(num)); + stringreplaceAll(destinationSuffixPath,"%name%",destination.baseName().toStdString()); + stringreplaceAll(destinationSuffixPath,"%number%",std::to_string(num)); } } num++; if(destination.completeSuffix().isEmpty()) - destination.setFile(destination.absolutePath()+text_slash+destinationSuffixPath); + destination.setFile(destination.absolutePath()+QString::fromStdString(text_slash)+QString::fromStdString(destinationSuffixPath)); else - destination.setFile(destination.absolutePath()+text_slash+destinationSuffixPath+text_dot+destination.completeSuffix()); + destination.setFile(destination.absolutePath()+QString::fromStdString(text_slash)+QString::fromStdString(destinationSuffixPath)+QString::fromStdString(text_dot)+destination.completeSuffix()); } while(destination.exists()); } @@ -355,8 +366,8 @@ void ScanFileOrFolder::listFolder(QFileInfo source,QFileInfo destination) ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"use new name: "+newName); destinationSuffixPath = newName; } - destination.setFile(destination.absolutePath()+text_slash+destinationSuffixPath); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"destination after rename: "+destination.absoluteFilePath()); + destination.setFile(destination.absolutePath()+QString::fromStdString(text_slash+destinationSuffixPath)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"destination after rename: "+destination.absoluteFilePath().toStdString()); break; default: return; @@ -370,7 +381,7 @@ void ScanFileOrFolder::listFolder(QFileInfo source,QFileInfo destination) { emit folderAlreadyExists(source,destination,false); waitOneAction.acquire(); - QString destinationSuffixPath; + std::string destinationSuffixPath; switch(folderExistsAction) { case FolderExists_Merge: @@ -379,8 +390,8 @@ void ScanFileOrFolder::listFolder(QFileInfo source,QFileInfo destination) return; break; case FolderExists_Rename: - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"destination before rename: "+destination.absoluteFilePath()); - if(newName.isEmpty()) + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"destination before rename: "+destination.absoluteFilePath().toStdString()); + if(newName.empty()) { //resolv the new name QFileInfo destinationInfo; @@ -389,26 +400,26 @@ void ScanFileOrFolder::listFolder(QFileInfo source,QFileInfo destination) { if(num==1) { - if(firstRenamingRule.isEmpty()) - destinationSuffixPath=tr("%1 - copy").arg(destination.baseName()); + if(firstRenamingRule.empty()) + destinationSuffixPath=tr("%1 - copy").arg(destination.baseName()).toStdString(); else { destinationSuffixPath=firstRenamingRule; - destinationSuffixPath.replace(QStringLiteral("%name%"),destination.baseName()); + stringreplaceAll(destinationSuffixPath,"%name%",destination.baseName().toStdString()); } } else { - if(otherRenamingRule.isEmpty()) - destinationSuffixPath=tr("%1 - copy (%2)").arg(destination.baseName()).arg(num); + if(otherRenamingRule.empty()) + destinationSuffixPath=tr("%1 - copy (%2)").arg(destination.baseName()).arg(num).toStdString(); else { destinationSuffixPath=otherRenamingRule; - destinationSuffixPath.replace(QStringLiteral("%name%"),destination.baseName()); - destinationSuffixPath.replace(QStringLiteral("%number%"),QString::number(num)); + stringreplaceAll(destinationSuffixPath,"%name%",destination.baseName().toStdString()); + stringreplaceAll(destinationSuffixPath,"%number%",std::to_string(num)); } } - destinationInfo.setFile(destinationInfo.absolutePath()+text_slash+destinationSuffixPath); + destinationInfo.setFile(destinationInfo.absolutePath()+QString::fromStdString(text_slash)+QString::fromStdString(destinationSuffixPath)); num++; } while(destinationInfo.exists()); @@ -419,10 +430,10 @@ void ScanFileOrFolder::listFolder(QFileInfo source,QFileInfo destination) destinationSuffixPath = newName; } if(destination.completeSuffix().isEmpty()) - destination.setFile(destination.absolutePath()+text_slash+destinationSuffixPath); + destination.setFile(destination.absolutePath()+QString::fromStdString(text_slash)+QString::fromStdString(destinationSuffixPath)); else - destination.setFile(destination.absolutePath()+text_slash+destinationSuffixPath+QStringLiteral(".")+destination.completeSuffix()); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"destination after rename: "+destination.absoluteFilePath()); + destination.setFile(destination.absolutePath()+QString::fromStdString(text_slash)+QString::fromStdString(destinationSuffixPath)+QStringLiteral(".")+destination.completeSuffix()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"destination after rename: "+destination.absoluteFilePath().toStdString()); break; default: return; @@ -438,13 +449,13 @@ void ScanFileOrFolder::listFolder(QFileInfo source,QFileInfo destination) if(!source.isReadable() || !source.isExecutable() || !source.exists() || !source.isDir()) { if(!source.isDir()) - emit errorOnFolder(source,tr("This is not a folder")); + emit errorOnFolder(source,tr("This is not a folder").toStdString()); else if(!source.exists()) - emit errorOnFolder(source,tr("The folder does exists")); + emit errorOnFolder(source,tr("The folder does exists").toStdString()); else - emit errorOnFolder(source,tr("The folder is not readable")); + emit errorOnFolder(source,tr("The folder is not readable").toStdString()); waitOneAction.acquire(); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"actionNum: "+QString::number(fileErrorAction)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"actionNum: "+std::to_string(fileErrorAction)); } } while(fileErrorAction==FileError_Retry); do @@ -453,9 +464,9 @@ void ScanFileOrFolder::listFolder(QFileInfo source,QFileInfo destination) fileErrorAction=FileError_NotSet; if(!tempDir.isReadable() || !tempDir.exists()) { - emit errorOnFolder(source,tr("Problem with name encoding")); + emit errorOnFolder(source,tr("Problem with name encoding").toStdString()); waitOneAction.acquire(); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"actionNum: "+QString::number(fileErrorAction)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"actionNum: "+std::to_string(fileErrorAction)); } } while(fileErrorAction==FileError_Retry); if(stopIt) @@ -469,7 +480,7 @@ void ScanFileOrFolder::listFolder(QFileInfo source,QFileInfo destination) if(stopIt) return; int sizeEntryList=entryList.size(); - emit newFolderListing(source.absoluteFilePath()); + emit newFolderListing(source.absoluteFilePath().toStdString()); if(mode!=Ultracopier::Move) emit addToMkPath(source,destination,sizeEntryList); for (int index=0;index<sizeEntryList;++index) @@ -487,16 +498,16 @@ void ScanFileOrFolder::listFolder(QFileInfo source,QFileInfo destination) this->include=this->include_send; this->exclude=this->exclude_send; } - QString fileName=fileInfo.fileName(); + std::string fileName=fileInfo.fileName().toStdString(); if(fileInfo.isDir() && !fileInfo.isSymLink()) { bool excluded=false,included=(include.size()==0); - int filters_index=0; + unsigned int filters_index=0; while(filters_index<exclude.size()) { if(exclude.at(filters_index).apply_on==ApplyOn_folder || exclude.at(filters_index).apply_on==ApplyOn_fileAndFolder) { - if(fileName.contains(exclude.at(filters_index).regex)) + if(std::regex_match(fileName,exclude.at(filters_index).regex)) { excluded=true; break; @@ -513,7 +524,7 @@ void ScanFileOrFolder::listFolder(QFileInfo source,QFileInfo destination) { if(include.at(filters_index).apply_on==ApplyOn_folder || include.at(filters_index).apply_on==ApplyOn_fileAndFolder) { - if(fileName.contains(include.at(filters_index).regex)) + if(std::regex_match(fileName,include.at(filters_index).regex)) { included=true; break; @@ -524,18 +535,18 @@ void ScanFileOrFolder::listFolder(QFileInfo source,QFileInfo destination) if(!included) {} else - listFolder(fileInfo,destination.absoluteFilePath()+text_slash+fileInfo.fileName()); + listFolder(fileInfo,destination.absoluteFilePath()+QString::fromStdString(text_slash)+fileInfo.fileName()); } } else { bool excluded=false,included=(include.size()==0); - int filters_index=0; + unsigned int filters_index=0; while(filters_index<exclude.size()) { if(exclude.at(filters_index).apply_on==ApplyOn_file || exclude.at(filters_index).apply_on==ApplyOn_fileAndFolder) { - if(fileName.contains(exclude.at(filters_index).regex)) + if(std::regex_match(fileName,exclude.at(filters_index).regex)) { excluded=true; break; @@ -552,7 +563,7 @@ void ScanFileOrFolder::listFolder(QFileInfo source,QFileInfo destination) { if(include.at(filters_index).apply_on==ApplyOn_file || include.at(filters_index).apply_on==ApplyOn_fileAndFolder) { - if(fileName.contains(include.at(filters_index).regex)) + if(std::regex_match(fileName,include.at(filters_index).regex)) { included=true; break; @@ -564,7 +575,7 @@ void ScanFileOrFolder::listFolder(QFileInfo source,QFileInfo destination) {} else #ifndef ULTRACOPIER_PLUGIN_RSYNC - emit fileTransfer(fileInfo,destination.absoluteFilePath()+text_slash+fileInfo.fileName(),mode); + emit fileTransfer(fileInfo,destination.absoluteFilePath()+QString::fromStdString(text_slash)+fileInfo.fileName(),mode); #else { bool sendToTransfer=false; @@ -585,10 +596,10 @@ void ScanFileOrFolder::listFolder(QFileInfo source,QFileInfo destination) { if(fileInfo.isDir() && !fileInfo.isSymLink())//possible wait time here //listFolder(source,destination,suffixPath+fileInfo.fileName()+QDir::separator()); - listFolder(fileInfo,destination.absoluteFilePath()+text_slash+fileInfo.fileName());//put unix separator because it's transformed into that's under windows too + listFolder(fileInfo,destination.absoluteFilePath()+QString::fromStdString(text_slash)+fileInfo.fileName());//put unix separator because it's transformed into that's under windows too else #ifndef ULTRACOPIER_PLUGIN_RSYNC - emit fileTransfer(fileInfo,destination.absoluteFilePath()+text_slash+fileInfo.fileName(),mode); + emit fileTransfer(fileInfo,destination.absoluteFilePath()+QString::fromStdString(text_slash)+fileInfo.fileName(),mode); #else { bool sendToTransfer=false; @@ -635,7 +646,7 @@ void ScanFileOrFolder::listFolder(QFileInfo source,QFileInfo destination) #endif if(mode==Ultracopier::Move) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"source: "+source.absoluteFilePath()+", sizeEntryList: "+QString::number(sizeEntryList)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"source: "+source.absoluteFilePath().toStdString()+", sizeEntryList: "+std::to_string(sizeEntryList)); emit addToMovePath(source,destination,sizeEntryList); } } @@ -646,7 +657,7 @@ void ScanFileOrFolder::setCheckDestinationFolderExists(const bool checkDestinati this->checkDestinationExists=checkDestinationFolderExists; } -void ScanFileOrFolder::setRenamingRules(const QString &firstRenamingRule, const QString &otherRenamingRule) +void ScanFileOrFolder::setRenamingRules(const std::string &firstRenamingRule, const std::string &otherRenamingRule) { this->firstRenamingRule=firstRenamingRule; this->otherRenamingRule=otherRenamingRule; @@ -666,7 +677,7 @@ void ScanFileOrFolder::setCopyListOrder(const bool &order) /// \brief set rsync void ScanFileOrFolder::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; } #endif diff --git a/plugins/CopyEngine/Ultracopier/ScanFileOrFolder.h b/plugins/CopyEngine/Ultracopier/ScanFileOrFolder.h index e9e59ce..0c625e9 100644 --- a/plugins/CopyEngine/Ultracopier/ScanFileOrFolder.h +++ b/plugins/CopyEngine/Ultracopier/ScanFileOrFolder.h @@ -4,15 +4,15 @@ \licence GPL3, see the file COPYING */ #include <QThread> -#include <QStringList> -#include <QString> -#include <QList> #include <QFileInfo> #include <QDir> #include <QSemaphore> #include <QEventLoop> #include <QCoreApplication> #include <QMutexLocker> +#include <regex> +#include <string> +#include <vector> #include "Environment.h" #include "DriveManagement.h" @@ -32,12 +32,12 @@ public: /// \brief to get if is finished bool isFinished() const; /// \brief set action if Folder are same or exists - void setFolderExistsAction(const FolderExistsAction &action,const QString &newName=""); + void setFolderExistsAction(const FolderExistsAction &action, const std::string &newName=""); /// \brief set action if error void setFolderErrorAction(const FileErrorAction &action); /// \brief set if need check if the destination exists void setCheckDestinationFolderExists(const bool checkDestinationFolderExists); - void setRenamingRules(const QString &firstRenamingRule,const QString &otherRenamingRule); + void setRenamingRules(const std::string &firstRenamingRule,const std::string &otherRenamingRule); void setMoveTheWholeFolder(const bool &moveTheWholeFolder); #ifdef ULTRACOPIER_PLUGIN_RSYNC void setRsync(const bool rsync); @@ -45,12 +45,12 @@ public: signals: void fileTransfer(const QFileInfo &source,const QFileInfo &destination,const Ultracopier::CopyMode &mode) const; /// \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; void folderAlreadyExists(const QFileInfo &source,const QFileInfo &destination,const bool &isSame) const; - void errorOnFolder(const QFileInfo &fileInfo,const QString &errorString,const ErrorType &errorType=ErrorType_FolderWithRety) const; + void errorOnFolder(const QFileInfo &fileInfo,const std::string &errorString,const ErrorType &errorType=ErrorType_FolderWithRety) const; void finishedTheListing() const; - void newFolderListing(const QString &path) const; + void newFolderListing(const std::string &path) const; void addToMkPath(const QFileInfo& source,const QFileInfo& destination, const int& inode) const; void addToMovePath(const QFileInfo& source,const QFileInfo& destination, const int& inodeToRemove) const; void addToRealMove(const QFileInfo& source,const QFileInfo& destination) const; @@ -58,8 +58,8 @@ signals: void addToRmForRsync(const QFileInfo& destination) const; #endif public slots: - void addToList(const QStringList& sources,const QString& destination); - void setFilters(const QList<Filters_rules> &include,const QList<Filters_rules> &exclude); + void addToList(const std::vector<std::string>& sources,const std::string& destination); + void setFilters(const std::vector<Filters_rules> &include,const std::vector<Filters_rules> &exclude); void setCopyListOrder(const bool &order); void set_updateMount(); protected: @@ -67,8 +67,8 @@ protected: private: DriveManagement driveManagement; bool moveTheWholeFolder; - QStringList sources; - QString destination; + std::vector<std::string> sources; + std::string destination; volatile bool stopIt; void listFolder(QFileInfo source, QFileInfo destination); bool isBlackListed(const QFileInfo &destination); @@ -78,31 +78,31 @@ private: FolderExistsAction folderExistsAction; FileErrorAction fileErrorAction; volatile bool checkDestinationExists; - QString newName; + std::string newName; bool copyListOrder; - QRegularExpression folder_isolation; + std::regex folder_isolation; #ifdef ULTRACOPIER_PLUGIN_RSYNC bool rsync; #endif Ultracopier::CopyMode mode; - QList<Filters_rules> include,exclude; - QList<Filters_rules> include_send,exclude_send; + std::vector<Filters_rules> include,exclude; + std::vector<Filters_rules> include_send,exclude_send; bool reloadTheNewFilters; bool haveFilters; QMutex filtersMutex; - QString firstRenamingRule; - QString otherRenamingRule; - QStringList blackList; + std::string firstRenamingRule; + std::string otherRenamingRule; + std::vector<std::string> blackList; /** Parse the multiple wildcard source, it allow resolv multiple wildcard with Qt into their path * The string: /toto/f*a/yy*a/toto.mp3 * Will give: /toto/f1a/yy*a/toto.mp3, /toto/f2a/yy*a/toto.mp3 * Will give: /toto/f2a/yy1a/toto.mp3, /toto/f2a/yy2a/toto.mp3 */ - QStringList parseWildcardSources(const QStringList &sources) const; + std::vector<std::string> parseWildcardSources(const std::vector<std::string> &sources) const; - static QString text_slash; - static QString text_antislash; - static QString text_dot; + static std::string text_slash; + static std::string text_antislash; + static std::string text_dot; }; #endif // SCANFILEORFOLDER_H diff --git a/plugins/CopyEngine/Ultracopier/StructEnumDefinition_CopyEngine.h b/plugins/CopyEngine/Ultracopier/StructEnumDefinition_CopyEngine.h index 0b23c29..036803c 100644 --- a/plugins/CopyEngine/Ultracopier/StructEnumDefinition_CopyEngine.h +++ b/plugins/CopyEngine/Ultracopier/StructEnumDefinition_CopyEngine.h @@ -3,8 +3,8 @@ \author alpha_one_x86 \licence GPL3, see the file COPYING */ -#include <QString> -#include <QRegularExpression> +#include <string> +#include <regex> #ifndef STRUCTDEF_COPYENGINE_H #define STRUCTDEF_COPYENGINE_H @@ -95,11 +95,11 @@ enum ApplyOn /** to store into different way the filter rules to be exported */ struct Filters_rules { - QString search_text; + std::string search_text; SearchType search_type; ApplyOn apply_on; bool need_match_all; - QRegularExpression regex; + std::regex regex; }; /// \brief get action type @@ -116,9 +116,9 @@ enum ActionType struct Diskspace { - QString drive; - quint64 requiredSpace; - quint64 freeSpace; + std::string drive; + uint64_t requiredSpace; + uint64_t freeSpace; }; #endif // STRUCTDEF_COPYENGINE_H diff --git a/plugins/CopyEngine/Ultracopier/TransferThread.cpp b/plugins/CopyEngine/Ultracopier/TransferThread.cpp index 1ae0a9d..786a8e9 100644 --- a/plugins/CopyEngine/Ultracopier/TransferThread.cpp +++ b/plugins/CopyEngine/Ultracopier/TransferThread.cpp @@ -15,6 +15,14 @@ #endif #endif +#ifdef Q_OS_WIN32 +#define CURRENTSEPARATOR "\\" +#else +#define CURRENTSEPARATOR "/" +#endif + +#include "../../../cpp11addition.h" + TransferThread::TransferThread() : haveStartTime (false), transfer_stat (TransferStat_Idle), @@ -37,10 +45,10 @@ TransferThread::TransferThread() : readThread.setWriteThread(&writeThread); source.setCaching(false); destination.setCaching(false); - renameRegex=QRegularExpression(QStringLiteral("^(.*)(\\.[a-z0-9]+)$")); + renameRegex=std::regex("^(.*)(\\.[a-z0-9]+)$"); #ifdef Q_OS_WIN32 #ifndef ULTRACOPIER_PLUGIN_SET_TIME_UNIX_WAY - regRead=QRegularExpression(QStringLiteral("^[a-z]:")); + regRead=std::regex("^[a-z]:"); #endif #endif @@ -63,7 +71,7 @@ TransferThread::~TransferThread() void TransferThread::run() { - //ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start: ")+QString::number((qint64)QThread::currentThreadId()))); + //ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+QStringLiteral("] start: ")+QString::number((qint64)QThread::currentThreadId()))); transfer_stat = TransferStat_Idle; stopIt = false; fileExistsAction = FileExists_NotSet; @@ -118,47 +126,47 @@ void TransferThread::internalStartTheTransfer() if(mode!=Ultracopier::Move) { /// \bug can pass here because in case of direct move on same media, it return to idle stat directly - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("[")+QString::number(id)+QStringLiteral("] can't start transfert at idle")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"["+std::to_string(id)+("] can't start transfert at idle")); } return; } if(transfer_stat==TransferStat_PostOperation) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("[")+QString::number(id)+QStringLiteral("] can't start transfert at PostOperation")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"["+std::to_string(id)+("] can't start transfert at PostOperation")); return; } if(transfer_stat==TransferStat_Transfer) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("[")+QString::number(id)+QStringLiteral("] can't start transfert at Transfer")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"["+std::to_string(id)+("] can't start transfert at Transfer")); return; } if(canStartTransfer) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("[")+QString::number(id)+QStringLiteral("] canStartTransfer is already set to true")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"["+std::to_string(id)+("] canStartTransfer is already set to true")); return; } - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] check how start the transfer")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+("] check how start the transfer")); canStartTransfer=true; if(readIsReadyVariable && writeIsReadyVariable) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start directly the transfer")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+("] start directly the transfer")); ifCanStartTransfer(); } else - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start the transfer as delayed")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+("] start the transfer as delayed")); } -bool TransferThread::setFiles(const QFileInfo& source,const qint64 &size,const QFileInfo& destination,const Ultracopier::CopyMode &mode) +bool TransferThread::setFiles(const QFileInfo& source, const int64_t &size, const QFileInfo& destination, const Ultracopier::CopyMode &mode) { if(transfer_stat!=TransferStat_Idle) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("[")+QString::number(id)+QStringLiteral("] already used, source: ")+source.absoluteFilePath()+QStringLiteral(", destination: ")+destination.absoluteFilePath()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"["+std::to_string(id)+("] already used, source: ")+source.absoluteFilePath().toStdString()+", destination: "+destination.absoluteFilePath().toStdString()); return false; } //to prevent multiple file alocation into ListThread::doNewActions_inode_manipulation() transfer_stat = TransferStat_PreOperation; //emit pushStat(stat,transferId); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start, source: ")+source.absoluteFilePath()+QStringLiteral(", destination: ")+destination.absoluteFilePath()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start, source: "+source.absoluteFilePath().toStdString()+", destination: "+destination.absoluteFilePath().toStdString()); this->source = source; this->destination = destination; this->mode = mode; @@ -185,10 +193,10 @@ void TransferThread::setFileExistsAction(const FileExistsAction &action) { if(transfer_stat!=TransferStat_PreOperation) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("[")+QString::number(id)+QStringLiteral("] already used, source: ")+source.absoluteFilePath()+QStringLiteral(", destination: ")+destination.absoluteFilePath()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"["+std::to_string(id)+("] already used, source: ")+source.absoluteFilePath().toStdString()+(", destination: ")+destination.absoluteFilePath().toStdString()); return; } - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] action: ")+QString::number(action)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+("] action: ")+std::to_string(action)); if(action!=FileExists_Rename) fileExistsAction = action; else @@ -206,54 +214,54 @@ void TransferThread::setFileExistsAction(const FileExistsAction &action) emit internalStartPreOperation(); } -void TransferThread::setFileRename(const QString &nameForRename) +void TransferThread::setFileRename(const std::string &nameForRename) { if(transfer_stat!=TransferStat_PreOperation) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("[")+QString::number(id)+QStringLiteral("] already used, source: ")+source.absoluteFilePath()+QStringLiteral(", destination: ")+destination.absoluteFilePath()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"["+std::to_string(id)+("] already used, source: ")+source.absoluteFilePath().toStdString()+(", destination: ")+destination.absoluteFilePath().toStdString()); return; } - if(nameForRename.contains(QRegularExpression(QStringLiteral("[/\\\\\\*]")))) + if(QString::fromStdString(nameForRename).contains(QRegularExpression(QStringLiteral("[/\\\\\\*]")))) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("[")+QString::number(id)+QStringLiteral("] can't use this kind of name, internal error")); - emit errorOnFile(destination,tr("Try rename with using special characters")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"["+std::to_string(id)+("] can't use this kind of name, internal error")); + emit errorOnFile(destination,tr("Try rename with using special characters").toStdString()); return; } - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] nameForRename: ")+nameForRename); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] nameForRename: "+nameForRename); if(!renameTheOriginalDestination) - destination.setFile(destination.absolutePath()+QDir::separator()+nameForRename); + destination.setFile(destination.absolutePath()+CURRENTSEPARATOR+QString::fromStdString(nameForRename)); else { QString tempDestination=destination.absoluteFilePath(); QFile destinationFile(tempDestination); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("rename %1: to: %2").arg(destination.absoluteFilePath()).arg(destination.absolutePath()+QDir::separator()+nameForRename)); - if(!destinationFile.rename(destination.absolutePath()+QDir::separator()+nameForRename)) + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"["+std::to_string(id)+"] "+QStringLiteral("rename %1: to: %2").arg(destination.absoluteFilePath()).arg(destination.absolutePath()+CURRENTSEPARATOR+QString::fromStdString(nameForRename)).toStdString()); + if(!destinationFile.rename(destination.absolutePath()+CURRENTSEPARATOR+QString::fromStdString(nameForRename))) { if(!destinationFile.exists()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("source not exists %1: destination: %2, error: %3").arg(destinationFile.fileName()).arg(destinationFile.fileName()).arg(destinationFile.errorString())); - emit errorOnFile(destinationFile,tr("File not found")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] "+QStringLiteral("source not exists %1: destination: %2, error: %3").arg(destinationFile.fileName()).arg(destinationFile.fileName()).arg(destinationFile.errorString()).toStdString()); + emit errorOnFile(destinationFile,tr("File not found").toStdString()); return; } else - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("unable to do real move %1: %2, error: %3").arg(destinationFile.fileName()).arg(destinationFile.fileName()).arg(destinationFile.errorString())); - emit errorOnFile(destinationFile,destinationFile.errorString()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] "+QStringLiteral("unable to do real move %1: %2, error: %3").arg(destinationFile.fileName()).arg(destinationFile.fileName()).arg(destinationFile.errorString()).toStdString()); + emit errorOnFile(destinationFile,destinationFile.errorString().toStdString()); return; } if(source.absoluteFilePath()==destination.absoluteFilePath()) - source.setFile(destination.absolutePath()+QDir::separator()+nameForRename); + source.setFile(destination.absolutePath()+CURRENTSEPARATOR+QString::fromStdString(nameForRename)); destination.setFile(tempDestination); destination.refresh(); } fileExistsAction = FileExists_NotSet; resetExtraVariable(); emit internalStartPreOperation(); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("destination is: %1").arg(destination.absoluteFilePath())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] destination is: "+destination.absoluteFilePath().toStdString()); } void TransferThread::setAlwaysFileExistsAction(const FileExistsAction &action) { - //ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] action to do always: ")+QString::number(action))); + //ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+QStringLiteral("] action to do always: ")+QString::number(action))); alwaysDoFileExistsAction=action; } @@ -283,39 +291,39 @@ void TransferThread::preOperation() { if(transfer_stat!=TransferStat_PreOperation) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("[")+QString::number(id)+QStringLiteral("] already used, source: ")+source.absoluteFilePath()+QStringLiteral(", destination: ")+destination.absoluteFilePath()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"["+std::to_string(id)+("] already used, source: ")+source.absoluteFilePath().toStdString()+", destination: "+destination.absoluteFilePath().toStdString()); return; } haveStartTime=true; startTransferTime.restart(); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start: source: ")+source.absoluteFilePath()+QStringLiteral(", destination: ")+destination.absoluteFilePath()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start: source: "+source.absoluteFilePath().toStdString()+", destination: "+destination.absoluteFilePath().toStdString()); needRemove=false; if(isSame()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] is same ")+source.absoluteFilePath()+QStringLiteral(" than ")+destination.absoluteFilePath()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] is same "+source.absoluteFilePath().toStdString()+" than "+destination.absoluteFilePath().toStdString()); return; } - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] after is same")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] after is same"); /*Why this code? if(readError) { readError=false; return; }*/ - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] before destination exists")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] before destination exists"); if(destinationExists()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] destination exists: ")+destination.absoluteFilePath()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] destination exists: "+destination.absoluteFilePath().toStdString()); return; } - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] after destination exists")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] after destination exists"); /*Why this code? if(readError) { readError=false; return; }*/ - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] before keep date")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] before keep date"); #ifdef Q_OS_WIN32 doTheDateTransfer=!source.isSymLink(); #else @@ -329,11 +337,11 @@ void TransferThread::preOperation() doTheDateTransfer=false; else { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("the sources is older to copy the time: ")+source.absoluteFilePath()+QStringLiteral(": ")+minTime.toString(QStringLiteral("dd.MM.yyyy hh:mm:ss.zzz"))+QStringLiteral(">=")+source.lastModified().toString(QStringLiteral("dd.MM.yyyy hh:mm:ss.zzz"))); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"the sources is older to copy the time: "+source.absoluteFilePath().toStdString()+": "+minTime.toString(QStringLiteral("dd.MM.yyyy hh:mm:ss.zzz")).toStdString()+">="+source.lastModified().toString(QStringLiteral("dd.MM.yyyy hh:mm:ss.zzz")).toStdString()); doTheDateTransfer=false; if(keepDate) { - emit errorOnFile(source,tr("Wrong modification date or unable to get it, you can disable time transfer to do it")); + emit errorOnFile(source,tr("Wrong modification date or unable to get it, you can disable time transfer to do it").toStdString()); return; } } @@ -342,15 +350,15 @@ void TransferThread::preOperation() { doTheDateTransfer=readFileDateTime(source); #ifdef Q_OS_MAC - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] read the source time: ")+QString::number(butime.modtime)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] read the source time: "+std::to_string(butime.modtime)); #endif if(!doTheDateTransfer) { //will have the real error at source open - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] unable to read the source time: ")+source.absoluteFilePath()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] unable to read the source time: "+source.absoluteFilePath().toStdString()); if(keepDate) { - emit errorOnFile(source,tr("Wrong modification date or unable to get it, you can disable time transfer to do it")); + emit errorOnFile(source,tr("Wrong modification date or unable to get it, you can disable time transfer to do it").toStdString()); return; } } @@ -358,7 +366,7 @@ void TransferThread::preOperation() } if(canBeMovedDirectly()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("need moved directly: %1 to %2").arg(source.absoluteFilePath()).arg(destination.absoluteFilePath())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] "+QStringLiteral("need moved directly: %1 to %2").arg(source.absoluteFilePath()).arg(destination.absoluteFilePath()).toStdString()); canBeMovedDirectlyVariable=true; readThread.fakeOpen(); writeThread.fakeOpen(); @@ -366,7 +374,7 @@ void TransferThread::preOperation() } if(canBeCopiedDirectly()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("need copied directly: %1 to %2").arg(source.absoluteFilePath()).arg(destination.absoluteFilePath())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] "+QStringLiteral("need copied directly: %1 to %2").arg(source.absoluteFilePath()).arg(destination.absoluteFilePath()).toStdString()); canBeCopiedDirectlyVariable=true; readThread.fakeOpen(); writeThread.fakeOpen(); @@ -377,14 +385,14 @@ void TransferThread::preOperation() void TransferThread::tryOpen() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start source and destination: ")+source.absoluteFilePath()+QStringLiteral(" and ")+destination.absoluteFilePath()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start source and destination: "+source.absoluteFilePath().toStdString()+" and "+destination.absoluteFilePath().toStdString()); TransferAlgorithm transferAlgorithm=this->transferAlgorithm; if(transferAlgorithm==TransferAlgorithm_Automatic) { #ifdef Q_OS_LINUX - if(driveManagement.isSameDrive(destination.absoluteFilePath(),source.absoluteFilePath())) + if(driveManagement.isSameDrive(destination.absoluteFilePath().toStdString(),source.absoluteFilePath().toStdString())) { - const QByteArray &type=driveManagement.getDriveType(driveManagement.getDrive(source.absoluteFilePath())); + const QByteArray &type=driveManagement.getDriveType(driveManagement.getDrive(source.absoluteFilePath().toStdString())); if(type=="nfs" || type=="smb") transferAlgorithm=TransferAlgorithm_Parallel; else @@ -404,8 +412,8 @@ void TransferThread::tryOpen() } else { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("readIsOpeningVariable is true when try open")); - emit errorOnFile(source,tr("Internal error: Already opening")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] readIsOpeningVariable is true when try open"); + emit errorOnFile(source,tr("Internal error: Already opening").toStdString()); readError=true; return; } @@ -415,9 +423,9 @@ void TransferThread::tryOpen() if(!writeIsOpeningVariable) { if(transferAlgorithm==TransferAlgorithm_Sequential) - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] transferAlgorithm==TransferAlgorithm_Sequential")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] transferAlgorithm==TransferAlgorithm_Sequential"); else - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] transferAlgorithm==TransferAlgorithm_Parallel")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] transferAlgorithm==TransferAlgorithm_Parallel"); writeError=false; if(transferAlgorithm==TransferAlgorithm_Sequential) writeThread.open(destination.absoluteFilePath(),size,osBuffer && (!osBufferLimited || (osBufferLimited && size<osBufferLimit)),sequentialBuffer,true); @@ -427,8 +435,8 @@ void TransferThread::tryOpen() } else { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("writeIsOpeningVariable is true when try open")); - emit errorOnFile(destination,tr("Internal error: Already opening")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] "+"writeIsOpeningVariable is true when try open"); + emit errorOnFile(destination,tr("Internal error: Already opening").toStdString()); writeError=true; return; } @@ -443,15 +451,15 @@ bool TransferThread::isSame() { #ifdef ULTRACOPIER_PLUGIN_DEBUG if(!source.exists()) - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start source: ")+source.absoluteFilePath()+QStringLiteral(" not exists")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start source: "+source.absoluteFilePath().toStdString()+" not exists"); if(!source.isSymLink()) - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start source: ")+source.absoluteFilePath()+QStringLiteral(" isSymLink")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start source: "+source.absoluteFilePath().toStdString()+" isSymLink"); if(!destination.isSymLink()) - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start source: ")+destination.absoluteFilePath()+QStringLiteral(" isSymLink")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start source: "+destination.absoluteFilePath().toStdString()+" isSymLink"); #endif if(fileExistsAction==FileExists_NotSet && alwaysDoFileExistsAction==FileExists_Skip) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] is same but skip")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] is same but skip"); transfer_stat=TransferStat_Idle; emit postOperationStopped(); //quit @@ -468,11 +476,12 @@ bool TransferThread::isSame() bool TransferThread::destinationExists() { //check if destination exists - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("overwrite: %1, alwaysDoFileExistsAction: %2, readError: %3, writeError: %4") + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] "+QStringLiteral("overwrite: %1, alwaysDoFileExistsAction: %2, readError: %3, writeError: %4") .arg(fileExistsAction) .arg(alwaysDoFileExistsAction) .arg(readError) .arg(writeError) + .toStdString() ); if(alwaysDoFileExistsAction==FileExists_Overwrite || readError || writeError #ifdef ULTRACOPIER_PLUGIN_RSYNC @@ -481,10 +490,10 @@ bool TransferThread::destinationExists() ) return false; bool destinationExists; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] time to first FS access")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] time to first FS access"); destination.refresh(); destinationExists=destination.exists(); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] finish first FS access")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] finish first FS access"); if(destinationExists) { if(fileExistsAction==FileExists_NotSet && alwaysDoFileExistsAction==FileExists_Skip) @@ -550,7 +559,7 @@ bool TransferThread::destinationExists() return false; } -QString TransferThread::resolvedName(const QFileInfo &inode) +std::string TransferThread::resolvedName(const QFileInfo &inode) { QString fileName=inode.fileName(); if(fileName.isEmpty()) @@ -577,17 +586,17 @@ QString TransferThread::resolvedName(const QFileInfo &inode) if(fileName.isEmpty()) fileName=tr("root"); #endif - return fileName; + return fileName.toStdString(); } -QString TransferThread::getSourcePath() const +std::string TransferThread::getSourcePath() const { - return source.absoluteFilePath(); + return source.absoluteFilePath().toStdString(); } -QString TransferThread::getDestinationPath() const +std::string TransferThread::getDestinationPath() const { - return destination.absoluteFilePath(); + return destination.absoluteFilePath().toStdString(); } QFileInfo TransferThread::getSourceInode() const @@ -611,15 +620,15 @@ bool TransferThread::checkAlwaysRename() if(alwaysDoFileExistsAction==FileExists_Rename) { QFileInfo newDestination=destination; - QString fileName=resolvedName(newDestination); - QString suffix=QStringLiteral(""); - QString newFileName; + std::string fileName=resolvedName(newDestination); + std::string suffix; + std::string newFileName; //resolv the suffix - if(fileName.contains(renameRegex)) + if(std::regex_match(fileName,renameRegex)) { suffix=fileName; - suffix.replace(renameRegex,QStringLiteral("\\2")); - fileName.replace(renameRegex,QStringLiteral("\\1")); + suffix=std::regex_replace(suffix,renameRegex,"$2"); + fileName=std::regex_replace(fileName,renameRegex,"$1"); } //resolv the new name int num=1; @@ -627,26 +636,26 @@ bool TransferThread::checkAlwaysRename() { if(num==1) { - if(firstRenamingRule.isEmpty()) - newFileName=tr("%1 - copy").arg(fileName); + if(firstRenamingRule.empty()) + newFileName=tr("%1 - copy").arg(QString::fromStdString(fileName)).toStdString(); else { newFileName=firstRenamingRule; - newFileName.replace(QStringLiteral("%name%"),fileName); + stringreplaceAll(newFileName,"%name%",fileName); } } else { - if(otherRenamingRule.isEmpty()) - newFileName=tr("%1 - copy (%2)").arg(fileName).arg(num); + if(otherRenamingRule.empty()) + newFileName=tr("%1 - copy (%2)").arg(QString::fromStdString(fileName)).arg(num).toStdString(); else { newFileName=otherRenamingRule; - newFileName.replace(QStringLiteral("%name%"),fileName); - newFileName.replace(QStringLiteral("%number%"),QString::number(num)); + stringreplaceAll(newFileName,"%name%",fileName); + stringreplaceAll(newFileName,"%number%",std::to_string(num)); } } - newDestination.setFile(newDestination.absolutePath()+QDir::separator()+newFileName+suffix); + newDestination.setFile(newDestination.absolutePath()+CURRENTSEPARATOR+QString::fromStdString(newFileName+suffix)); num++; } while(newDestination.exists()); @@ -659,15 +668,15 @@ bool TransferThread::checkAlwaysRename() { if(!destinationFile.exists()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("source not exists %1: destination: %2, error: %3").arg(destinationFile.fileName()).arg(destinationFile.fileName()).arg(destinationFile.errorString())); - emit errorOnFile(destinationFile,tr("File not found")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] "+QStringLiteral("source not exists %1: destination: %2, error: %3").arg(destinationFile.fileName()).arg(destinationFile.fileName()).arg(destinationFile.errorString()).toStdString()); + emit errorOnFile(destinationFile,tr("File not found").toStdString()); readError=true; return true; } else - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("unable to do real move %1: %2, error: %3").arg(destinationFile.fileName()).arg(destinationFile.fileName()).arg(destinationFile.errorString())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] "+QStringLiteral("unable to do real move %1: %2, error: %3").arg(destinationFile.fileName()).arg(destinationFile.fileName()).arg(destinationFile.errorString()).toStdString()); readError=true; - emit errorOnFile(destinationFile,destinationFile.errorString()); + emit errorOnFile(destinationFile,destinationFile.errorString().toStdString()); return true; } } @@ -678,7 +687,7 @@ bool TransferThread::checkAlwaysRename() void TransferThread::tryMoveDirectly() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("need moved directly: %1 to %2").arg(source.absoluteFilePath()).arg(destination.absoluteFilePath())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] "+QStringLiteral("need moved directly: %1 to %2").arg(source.absoluteFilePath()).arg(destination.absoluteFilePath()).toStdString()); sended_state_readStopped = false; sended_state_writeStopped = false; @@ -696,16 +705,16 @@ void TransferThread::tryMoveDirectly() { if(!sourceFile.exists() && !source.isSymLink()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+destinationFile.fileName()+QStringLiteral(", source not exists")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] "+destinationFile.fileName().toStdString()+", source not exists"); readError=true; - emit errorOnFile(destination,tr("The source file doesn't exist")); + emit errorOnFile(destination,tr("The source file doesn't exist").toStdString()); return; } else if(!destinationFile.remove()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+destinationFile.fileName()+QStringLiteral(", error: ")+destinationFile.errorString()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] "+destinationFile.fileName().toStdString()+", error: "+destinationFile.errorString().toStdString()); readError=true; - emit errorOnFile(destination,destinationFile.errorString()); + emit errorOnFile(destination,destinationFile.errorString().toStdString()); return; } } @@ -731,19 +740,19 @@ void TransferThread::tryMoveDirectly() readError=true; if(!sourceFile.exists() && !source.isSymLink()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("source not exists %1: destination: %2, error: %3").arg(sourceFile.fileName()).arg(destinationFile.fileName()).arg(sourceFile.errorString())); - emit errorOnFile(sourceFile,tr("File not found")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] "+QStringLiteral("source not exists %1: destination: %2, error: %3").arg(sourceFile.fileName()).arg(destinationFile.fileName()).arg(sourceFile.errorString()).toStdString()); + emit errorOnFile(sourceFile,tr("File not found").toStdString()); return; } else if(!dir.exists()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("destination folder not exists %1: %2, error: %3").arg(sourceFile.fileName()).arg(destinationFile.fileName()).arg(sourceFile.errorString())); - emit errorOnFile(destination.absolutePath(),tr("Unable to do the folder")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] "+QStringLiteral("destination folder not exists %1: %2, error: %3").arg(sourceFile.fileName()).arg(destinationFile.fileName()).arg(sourceFile.errorString()).toStdString()); + emit errorOnFile(destination.absolutePath(),tr("Unable to do the folder").toStdString()); return; } else - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("unable to do real move %1: %2, error: %3").arg(sourceFile.fileName()).arg(destinationFile.fileName()).arg(sourceFile.errorString())); - emit errorOnFile(sourceFile,sourceFile.errorString()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] "+QStringLiteral("unable to do real move %1: %2, error: %3").arg(sourceFile.fileName()).arg(destinationFile.fileName()).arg(sourceFile.errorString()).toStdString()); + emit errorOnFile(sourceFile,sourceFile.errorString().toStdString()); return; } readThread.fakeReadIsStarted(); @@ -754,7 +763,7 @@ void TransferThread::tryMoveDirectly() void TransferThread::tryCopyDirectly() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("need copied directly: %1 to %2").arg(source.absoluteFilePath()).arg(destination.absoluteFilePath())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] "+QStringLiteral("need copied directly: %1 to %2").arg(source.absoluteFilePath()).arg(destination.absoluteFilePath()).toStdString()); sended_state_readStopped = false; sended_state_writeStopped = false; @@ -772,16 +781,16 @@ void TransferThread::tryCopyDirectly() { if(!sourceFile.exists() && !source.isSymLink()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+destinationFile.fileName()+QStringLiteral(", source not exists")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] "+destinationFile.fileName().toStdString()+", source not exists"); readError=true; - emit errorOnFile(destination,tr("The source doesn't exist")); + emit errorOnFile(destination,tr("The source doesn't exist").toStdString()); return; } else if(!destinationFile.remove()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+destinationFile.fileName()+QStringLiteral(", error: ")+destinationFile.errorString()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] "+destinationFile.fileName().toStdString()+", error: "+destinationFile.errorString().toStdString()); readError=true; - emit errorOnFile(destination,destinationFile.errorString()); + emit errorOnFile(destination,destinationFile.errorString().toStdString()); return; } } @@ -812,25 +821,25 @@ void TransferThread::tryCopyDirectly() readError=true; if(!sourceFile.exists() && !source.isSymLink()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("source not exists %1 -> %4: %2, error: %3").arg(sourceFile.fileName()).arg(destinationFile.fileName()).arg(sourceFile.errorString()).arg(sourceFile.symLinkTarget())); - emit errorOnFile(sourceFile,tr("The source file doesn't exist")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] "+QStringLiteral("source not exists %1 -> %4: %2, error: %3").arg(sourceFile.fileName()).arg(destinationFile.fileName()).arg(sourceFile.errorString()).arg(sourceFile.symLinkTarget()).toStdString()); + emit errorOnFile(sourceFile,tr("The source file doesn't exist").toStdString()); return; } else if(destinationFile.exists() || destination.isSymLink()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("destination already exists %1 -> %4: %2, error: %3").arg(sourceFile.fileName()).arg(destinationFile.fileName()).arg(sourceFile.errorString()).arg(sourceFile.symLinkTarget())); - emit errorOnFile(sourceFile,tr("Another file exists at same place")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] "+QStringLiteral("destination already exists %1 -> %4: %2, error: %3").arg(sourceFile.fileName()).arg(destinationFile.fileName()).arg(sourceFile.errorString()).arg(sourceFile.symLinkTarget()).toStdString()); + emit errorOnFile(sourceFile,tr("Another file exists at same place").toStdString()); return; } else if(!dir.exists()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("destination folder not exists %1 -> %4: %2, error: %3").arg(sourceFile.fileName()).arg(destinationFile.fileName()).arg(sourceFile.errorString()).arg(sourceFile.symLinkTarget())); - emit errorOnFile(sourceFile,tr("Unable to do the folder")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] "+QStringLiteral("destination folder not exists %1 -> %4: %2, error: %3").arg(sourceFile.fileName()).arg(destinationFile.fileName()).arg(sourceFile.errorString()).arg(sourceFile.symLinkTarget()).toStdString()); + emit errorOnFile(sourceFile,tr("Unable to do the folder").toStdString()); return; } else - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("unable to do sym link copy %1 -> %4: %2, error: %3").arg(sourceFile.fileName()).arg(destinationFile.fileName()).arg(sourceFile.errorString()).arg(sourceFile.symLinkTarget())); - emit errorOnFile(sourceFile,sourceFile.errorString()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] "+QStringLiteral("unable to do sym link copy %1 -> %4: %2, error: %3").arg(sourceFile.fileName()).arg(destinationFile.fileName()).arg(sourceFile.errorString()).arg(sourceFile.symLinkTarget()).toStdString()); + emit errorOnFile(sourceFile,sourceFile.errorString().toStdString()); return; } readThread.fakeReadIsStarted(); @@ -843,10 +852,10 @@ bool TransferThread::canBeMovedDirectly() const { if(mode!=Ultracopier::Move) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("mode!=Ultracopier::Move")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] mode!=Ultracopier::Move"); return false; } - return source.isSymLink() || driveManagement.isSameDrive(destination.absoluteFilePath(),source.absoluteFilePath()); + return source.isSymLink() || driveManagement.isSameDrive(destination.absoluteFilePath().toStdString(),source.absoluteFilePath().toStdString()); } bool TransferThread::canBeCopiedDirectly() const @@ -858,10 +867,10 @@ void TransferThread::readIsReady() { if(readIsReadyVariable) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] double event dropped")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] double event dropped"); return; } - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start"); readIsReadyVariable=true; readIsOpenVariable=true; readIsClosedVariable=false; @@ -871,13 +880,13 @@ void TransferThread::readIsReady() void TransferThread::ifCanStartTransfer() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] readIsReadyVariable: ")+QString::number(readIsReadyVariable)+QStringLiteral(", writeIsReadyVariable: ")+QString::number(writeIsReadyVariable)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] readIsReadyVariable: "+std::to_string(readIsReadyVariable)+", writeIsReadyVariable: "+std::to_string(writeIsReadyVariable)); if(readIsReadyVariable && writeIsReadyVariable) { transfer_stat=TransferStat_WaitForTheTransfer; sended_state_readStopped = false; sended_state_writeStopped = false; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] stat=WaitForTheTransfer")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] stat=WaitForTheTransfer"); if(!sended_state_preOperationStopped) { sended_state_preOperationStopped=true; @@ -885,7 +894,7 @@ void TransferThread::ifCanStartTransfer() } if(canStartTransfer) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] stat=Transfer, ")+QStringLiteral("canBeMovedDirectlyVariable: %1, canBeCopiedDirectlyVariable: %2").arg(canBeMovedDirectlyVariable).arg(canBeCopiedDirectlyVariable)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] stat=Transfer, "+QStringLiteral("canBeMovedDirectlyVariable: %1, canBeCopiedDirectlyVariable: %2").arg(canBeMovedDirectlyVariable).arg(canBeCopiedDirectlyVariable).toStdString()); transfer_stat=TransferStat_Transfer; if(canBeMovedDirectlyVariable) tryMoveDirectly(); @@ -907,10 +916,10 @@ void TransferThread::writeIsReady() { if(writeIsReadyVariable) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] double event dropped")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] double event dropped"); return; } - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start"); writeIsReadyVariable=true; writeIsOpenVariable=true; writeIsClosedVariable=false; @@ -955,7 +964,7 @@ void TransferThread::pause() //from transfer_stat!=TransferStat_Idle because it resume at wrong order if(transfer_stat!=TransferStat_Transfer && transfer_stat!=TransferStat_PostTransfer && transfer_stat!=TransferStat_Checksum) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] wrong stat to put in pause")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] wrong stat to put in pause"); return; } haveStartTime=false; @@ -970,7 +979,7 @@ void TransferThread::resume() //from transfer_stat!=TransferStat_Idle because it resume at wrong order if(transfer_stat!=TransferStat_Transfer && transfer_stat!=TransferStat_PostTransfer && transfer_stat!=TransferStat_Checksum) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] wrong stat to put in pause")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] wrong stat to put in pause"); return; } readThread.resume(); @@ -984,34 +993,34 @@ void TransferThread::stop() haveStartTime=false; if(transfer_stat==TransferStat_Idle) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("transfer_stat==TransferStat_Idle")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"transfer_stat==TransferStat_Idle"); return; } if(remainSourceOpen()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("remainSourceOpen()")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"remainSourceOpen()"); readThread.stop(); } if(remainDestinationOpen()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("remainDestinationOpen()")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"remainDestinationOpen()"); writeThread.stop(); } if(!remainFileOpen()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("transfer_stat==TransferStat_Idle")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"transfer_stat==TransferStat_Idle"); if(needRemove && source.absoluteFilePath()!=destination.absoluteFilePath()) { if(source.exists()) QFile(destination.absoluteFilePath()).remove(); else - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("[")+QString::number(id)+QStringLiteral("] try destroy the destination when the source don't exists")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"["+std::to_string(id)+("] try destroy the destination when the source don't exists")); } transfer_stat=TransferStat_PostOperation; emit internalStartPostOperation(); } else - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("transfer_stat==%1 && remainFileOpen()").arg(transfer_stat)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("transfer_stat==%1 && remainFileOpen()").arg(transfer_stat).toStdString()); } bool TransferThread::remainFileOpen() const @@ -1033,10 +1042,10 @@ void TransferThread::readIsFinish() { if(readIsFinishVariable) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("[")+QString::number(id)+QStringLiteral("] double event dropped")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"["+std::to_string(id)+("] double event dropped")); return; } - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start"); readIsFinishVariable=true; canStartTransfer=false; //check here if need start checksuming or not @@ -1055,7 +1064,7 @@ void TransferThread::readIsFinish() if(!needSkip || (canBeCopiedDirectlyVariable || canBeMovedDirectlyVariable))//if skip, stop call, then readIsClosed() already call readThread.postOperation(); else - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] in skip, don't start postOperation")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] in skip, don't start postOperation"); } emit pushStat(transfer_stat,transferId); } @@ -1064,10 +1073,10 @@ void TransferThread::writeIsFinish() { if(writeIsFinishVariable) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("[")+QString::number(id)+QStringLiteral("] double event dropped")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"["+std::to_string(id)+"] double event dropped"); return; } - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start"); writeIsFinishVariable=true; //check here if need start checksuming or not if(real_doChecksum) @@ -1081,7 +1090,7 @@ void TransferThread::writeIsFinish() if(!needSkip || (canBeCopiedDirectlyVariable || canBeMovedDirectlyVariable))//if skip, stop call, then writeIsClosed() already call writeThread.postOperation(); else - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] in skip, don't start postOperation")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] in skip, don't start postOperation"); } } @@ -1101,17 +1110,17 @@ void TransferThread::compareChecksum() { if(sourceChecksum.size()==0) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] the checksum of source is missing")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] the checksum of source is missing"); return; } if(destinationChecksum.size()==0) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] the checksum of destination is missing")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] the checksum of destination is missing"); return; } if(sourceChecksum==destinationChecksum) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] the checksum match")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] the checksum match"); readThread.postOperation(); writeThread.postOperation(); transfer_stat=TransferStat_PostTransfer; @@ -1119,9 +1128,9 @@ void TransferThread::compareChecksum() } else { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("[")+QString::number(id)+QStringLiteral("] the checksum not match")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"["+std::to_string(id)+("] the checksum not match")); //emit error here, and wait to resume - emit errorOnFile(destination,tr("The checksums do not match")); + emit errorOnFile(destination,tr("The checksums do not match").toStdString()); } } @@ -1129,10 +1138,10 @@ void TransferThread::readIsClosed() { if(readIsClosedVariable) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("[")+QString::number(id)+QStringLiteral("] double event dropped")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"["+std::to_string(id)+("] double event dropped")); return; } - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start"); readIsClosedVariable=true; readIsOpeningVariable=false; checkIfAllIsClosedAndDoOperations(); @@ -1142,10 +1151,10 @@ void TransferThread::writeIsClosed() { if(writeIsClosedVariable) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("[")+QString::number(id)+QStringLiteral("] double event dropped")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"["+std::to_string(id)+"] double event dropped"); return; } - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start"); writeIsClosedVariable=true; writeIsOpeningVariable=false; if(stopIt && needRemove && source.absoluteFilePath()!=destination.absoluteFilePath()) @@ -1153,7 +1162,7 @@ void TransferThread::writeIsClosed() if(source.exists()) QFile(destination.absoluteFilePath()).remove(); else - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("[")+QString::number(id)+QStringLiteral("] try destroy the destination when the source don't exists")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"["+std::to_string(id)+("] try destroy the destination when the source don't exists")); } checkIfAllIsClosedAndDoOperations(); } @@ -1163,12 +1172,12 @@ bool TransferThread::checkIfAllIsClosedAndDoOperations() { if((readError || writeError) && !needSkip && !stopIt) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] resolve error before progress")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] resolve error before progress"); return false; } if(!remainFileOpen()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] emit internalStartPostOperation() to do the real post operation")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] emit internalStartPostOperation() to do the real post operation"); transfer_stat=TransferStat_PostOperation; //emit pushStat(stat,transferId); emit internalStartPostOperation(); @@ -1176,11 +1185,12 @@ bool TransferThread::checkIfAllIsClosedAndDoOperations() } else { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("wait self close: readIsReadyVariable: %1, readIsClosedVariable: %2, writeIsReadyVariable: %3, writeIsClosedVariable: %4") + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] "+QStringLiteral("wait self close: readIsReadyVariable: %1, readIsClosedVariable: %2, writeIsReadyVariable: %3, writeIsClosedVariable: %4") .arg(readIsReadyVariable) .arg(readIsClosedVariable) .arg(writeIsReadyVariable) .arg(writeIsClosedVariable) + .toStdString() ); return false; } @@ -1192,14 +1202,14 @@ void TransferThread::postOperation() { if(transfer_stat!=TransferStat_PostOperation) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("[")+QString::number(id)+QStringLiteral("] need be in transfer, source: ")+source.absoluteFilePath()+QStringLiteral(", destination: ")+destination.absoluteFilePath()+QStringLiteral(", stat:")+QString::number(transfer_stat)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"["+std::to_string(id)+"] need be in transfer, source: "+source.absoluteFilePath().toStdString()+", destination: "+destination.absoluteFilePath().toStdString()+", stat:"+std::to_string(transfer_stat)); return; } - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start"); //all except closing if((readError || writeError) && !needSkip && !stopIt)//normally useless by checkIfAllIsFinish() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] resume after error")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] resume after error"); return; } @@ -1209,8 +1219,8 @@ void TransferThread::postOperation() { if(writeIsOpenVariable && !writeIsClosedVariable) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("[")+QString::number(id)+QStringLiteral("] can't pass in post operation if write is not closed")); - emit errorOnFile(destination,tr("Internal error: The destination is not closed")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"["+std::to_string(id)+("] can't pass in post operation if write is not closed")); + emit errorOnFile(destination,tr("Internal error: The destination is not closed").toStdString()); needSkip=false; if(deletePartiallyTransferredFiles) needRemove=true; @@ -1220,11 +1230,12 @@ void TransferThread::postOperation() if(readThread.getLastGoodPosition()!=writeThread.getLastGoodPosition()) { writeThread.flushBuffer(); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("[")+QString::number(id)+QStringLiteral("] readThread.getLastGoodPosition(%1)!=writeThread.getLastGoodPosition(%2)") + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"["+std::to_string(id)+QString("] readThread.getLastGoodPosition(%1)!=writeThread.getLastGoodPosition(%2)") .arg(readThread.getLastGoodPosition()) .arg(writeThread.getLastGoodPosition()) + .toStdString() ); - emit errorOnFile(destination,tr("Internal error: The size transfered doesn't match")); + emit errorOnFile(destination,tr("Internal error: The size transfered doesn't match").toStdString()); needSkip=false; if(deletePartiallyTransferredFiles) needRemove=true; @@ -1234,8 +1245,8 @@ void TransferThread::postOperation() if(!writeThread.bufferIsEmpty()) { writeThread.flushBuffer(); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("[")+QString::number(id)+QStringLiteral("] buffer is not empty")); - emit errorOnFile(destination,tr("Internal error: The buffer is not empty")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"["+std::to_string(id)+("] buffer is not empty")); + emit errorOnFile(destination,tr("Internal error: The buffer is not empty").toStdString()); needSkip=false; if(deletePartiallyTransferredFiles) needRemove=true; @@ -1256,12 +1267,12 @@ void TransferThread::postOperation() if(!sourceFile.remove()) { needSkip=false; - emit errorOnFile(source,sourceFile.errorString()); + emit errorOnFile(source,sourceFile.errorString().toStdString()); return; } } else - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("[")+QString::number(id)+QStringLiteral("] try remove source but destination not exists!")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"["+std::to_string(id)+("] try remove source but destination not exists!")); } } else//do difference skip a file and skip this error case @@ -1276,14 +1287,14 @@ void TransferThread::postOperation() } } else - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] try remove destination but not exists!")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] try remove destination but not exists!"); } source.setFile(QStringLiteral("")); destination.setFile(QStringLiteral("")); //don't need remove because have correctly finish (it's not in: have started) needRemove=false; needSkip=false; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] emit postOperationStopped()")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] emit postOperationStopped()"); transfer_stat=TransferStat_Idle; emit postOperationStopped(); } @@ -1299,8 +1310,8 @@ bool TransferThread::doFilePostOperation() if(!stopIt) if(/*true when the destination have been remove but not the symlink:*/!source.isSymLink()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("Unable to change the date: File not found")); - emit errorOnFile(destination,tr("Unable to change the date")+QStringLiteral(": ")+tr("File not found")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] Unable to change the date: File not found"); + emit errorOnFile(destination,tr("Unable to change the date").toStdString()+": "+tr("File not found").toStdString()); return false; } } @@ -1311,14 +1322,14 @@ bool TransferThread::doFilePostOperation() if(!writeFileDateTime(destination)) { if(!destination.isFile()) - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("Unable to change the date (is not a file)")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] Unable to change the date (is not a file)"); else - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("Unable to change the date")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] Unable to change the date"); /* error with virtual folder under windows */ #ifndef Q_OS_WIN32 if(keepDate) { - emit errorOnFile(destination,tr("Unable to change the date")); + emit errorOnFile(destination,tr("Unable to change the date").toStdString()); return false; } #endif @@ -1327,13 +1338,13 @@ bool TransferThread::doFilePostOperation() { #ifndef Q_OS_WIN32 destination.refresh(); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] read the destination time: ")+destination.lastModified().toString()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] read the destination time: "+destination.lastModified().toString().toStdString()); if(destination.lastModified()<minTime) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] read the destination time lower than min time: ")+destination.lastModified().toString()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] read the destination time lower than min time: "+destination.lastModified().toString().toStdString()); if(keepDate) { - emit errorOnFile(destination,tr("Unable to change the date")); + emit errorOnFile(destination,tr("Unable to change the date").toStdString()); return false; } } @@ -1348,13 +1359,13 @@ bool TransferThread::doFilePostOperation() { if(sourceFile.error()!=QFile::NoError) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("Unable to get the source file permission")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] Unable to get the source file permission"); //emit errorOnFile(destination,tr("Unable to get the source file permission")); //return false; } else { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("Unable to set the destination file permission")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] Unable to set the destination file permission"); //emit errorOnFile(destination,tr("Unable to set the destination file permission")); //return false; } @@ -1375,10 +1386,10 @@ void TransferThread::getWriteError() { if(writeError) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] already in write error!")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] already in write error!"); return; } - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start"); fileContentError = true; writeError = true; writeIsReadyVariable = false; @@ -1393,10 +1404,10 @@ void TransferThread::getReadError() { if(readError) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] already in read error!")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] already in read error!"); return; } - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start"); fileContentError = true; readError = true; //writeIsReadyVariable = false;//wrong because write can be ready here @@ -1414,10 +1425,10 @@ void TransferThread::retryAfterError() { if(transferId==0) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("[")+QString::number(id)+QStringLiteral("] seam have bug, source: ")+source.absoluteFilePath()+QStringLiteral(", destination: ")+destination.absoluteFilePath()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"["+std::to_string(id)+("] seam have bug, source: ")+source.absoluteFilePath().toStdString()+", destination: "+destination.absoluteFilePath().toStdString()); return; } - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] restart all, source: ")+source.absoluteFilePath()+QStringLiteral(", destination: ")+destination.absoluteFilePath()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] restart all, source: "+source.absoluteFilePath().toStdString()+", destination: "+destination.absoluteFilePath().toStdString()); readError=false; //writeError=false; emit internalStartPreOperation(); @@ -1426,7 +1437,7 @@ void TransferThread::retryAfterError() //opening error if(transfer_stat==TransferStat_PreOperation) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] is not idle, source: ")+source.absoluteFilePath()+QStringLiteral(", destination: ")+destination.absoluteFilePath()+QStringLiteral(", stat: ")+QString::number(transfer_stat)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] is not idle, source: "+source.absoluteFilePath().toStdString()+", destination: "+destination.absoluteFilePath().toStdString()+", stat: "+std::to_string(transfer_stat)); readError=false; //writeError=false; emit internalStartPreOperation(); @@ -1436,7 +1447,7 @@ void TransferThread::retryAfterError() //data streaming error if(transfer_stat!=TransferStat_PostOperation && transfer_stat!=TransferStat_Transfer && transfer_stat!=TransferStat_PostTransfer && transfer_stat!=TransferStat_Checksum) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("[")+QString::number(id)+QStringLiteral("] is not in right stat, source: ")+source.absoluteFilePath()+QStringLiteral(", destination: ")+destination.absoluteFilePath()+QStringLiteral(", stat: ")+QString::number(transfer_stat)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"["+std::to_string(id)+("] is not in right stat, source: ")+source.absoluteFilePath().toStdString()+", destination: "+destination.absoluteFilePath().toStdString()+", stat: "+std::to_string(transfer_stat)); return; } if(transfer_stat==TransferStat_PostOperation) @@ -1456,13 +1467,13 @@ void TransferThread::retryAfterError() } if(canBeMovedDirectlyVariable) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] retry the system move")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] retry the system move"); tryMoveDirectly(); return; } if(canBeCopiedDirectlyVariable) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] retry the copy directly")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] retry the copy directly"); tryCopyDirectly(); return; } @@ -1470,17 +1481,17 @@ void TransferThread::retryAfterError() { if(writeError) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start and resume the write error")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start and resume the write error"); writeThread.reopen(); } else if(readError) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start and resume the read error")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start and resume the read error"); readThread.reopen(); } else //only checksum difference { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] retry all the transfer")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] retry all the transfer"); canStartTransfer=true; ifCanStartTransfer(); } @@ -1489,7 +1500,7 @@ void TransferThread::retryAfterError() //can have error on source and destination at the same time if(writeError) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start and resume the write error: ")+QString::number(readError)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start and resume the write error: "+std::to_string(readError)); if(readError) readThread.reopen(); else @@ -1501,18 +1512,18 @@ void TransferThread::retryAfterError() } if(readError) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start and resume the read error")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start and resume the read error"); readThread.reopen(); } if(!writeError && !readError) - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] unknow error resume")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] unknow error resume"); } void TransferThread::writeThreadIsReopened() { if(writeError_destination_reopened) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] double event dropped")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] double event dropped"); return; } writeError_destination_reopened=true; @@ -1529,7 +1540,7 @@ void TransferThread::readThreadIsSeekToZeroAndWait() { if(writeError_source_seeked) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] double event dropped")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] double event dropped"); return; } writeError_source_seeked=true; @@ -1558,7 +1569,7 @@ useless because already do at open event void TransferThread::readThreadResumeAfterError() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start"); readError=false; writeIsReady(); readIsReady(); @@ -1573,12 +1584,12 @@ void TransferThread::readIsStopped() if(!sended_state_readStopped) { sended_state_readStopped=true; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] emit readIsStopped()")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] emit readIsStopped()"); emit readStopped(); } else { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] drop dual read stopped")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] drop dual read stopped"); return; } readIsFinish(); @@ -1586,16 +1597,16 @@ void TransferThread::readIsStopped() void TransferThread::writeIsStopped() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start"); if(!sended_state_writeStopped) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] emit writeStopped()")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] emit writeStopped()"); sended_state_writeStopped=true; emit writeStopped(); } else { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] double event dropped")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] double event dropped"); return; } writeIsFinish(); @@ -1613,7 +1624,7 @@ bool TransferThread::setParallelBuffer(const int ¶llelBuffer) { if(parallelBuffer<1 || parallelBuffer>ULTRACOPIER_PLUGIN_MAX_PARALLEL_NUMBER_OF_BLOCK) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] wrong parallelBuffer: ")+QString::number(parallelBuffer)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] wrong parallelBuffer: "+std::to_string(parallelBuffer)); return false; } else @@ -1627,7 +1638,7 @@ bool TransferThread::setSequentialBuffer(const int &sequentialBuffer) { if(sequentialBuffer<1 || sequentialBuffer>ULTRACOPIER_PLUGIN_MAX_SEQUENTIAL_NUMBER_OF_BLOCK) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] wrong sequentialBuffer: ")+QString::number(sequentialBuffer)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] wrong sequentialBuffer: "+std::to_string(sequentialBuffer)); return false; } else @@ -1641,20 +1652,20 @@ void TransferThread::setTransferAlgorithm(const TransferAlgorithm &transferAlgor { this->transferAlgorithm=transferAlgorithm; if(transferAlgorithm==TransferAlgorithm_Sequential) - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("]transferAlgorithm==TransferAlgorithm_Sequential")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] transferAlgorithm==TransferAlgorithm_Sequential"); else if(transferAlgorithm==TransferAlgorithm_Automatic) - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("]transferAlgorithm==TransferAlgorithm_Automatic")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] transferAlgorithm==TransferAlgorithm_Automatic"); else - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("]transferAlgorithm==TransferAlgorithm_Parallel")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] transferAlgorithm==TransferAlgorithm_Parallel"); } //fonction to edit the file date time bool TransferThread::readFileDateTime(const QFileInfo &source) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] readFileDateTime(")+source.absoluteFilePath()+QStringLiteral(")")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] readFileDateTime("+source.absoluteFilePath().toStdString()+")"); if(source.lastModified()<minTime) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] the sources is older to copy the time: ")+source.absoluteFilePath()+QStringLiteral(": ")+source.lastModified().toString()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] the sources is older to copy the time: "+source.absoluteFilePath().toStdString()+": "+source.lastModified().toString().toStdString()); return false; } /** Why not do it with Qt? Because it not support setModificationTime(), and get the time with Qt, that's mean use local time where in C is UTC time */ @@ -1676,7 +1687,6 @@ bool TransferThread::readFileDateTime(const QFileInfo &source) time_t actime=source.lastRead().toTime_t(); time_t modtime=source.lastModified().toTime_t(); //this function avalaible on unix and mingw - utimbuf butime; butime.actime=actime; butime.modtime=modtime; Q_UNUSED(ctime); @@ -1698,21 +1708,21 @@ bool TransferThread::readFileDateTime(const QFileInfo &source) return true; #else wchar_t filePath[65535]; - if(source.absoluteFilePath().contains(regRead)) + if(std::regex_match(source.absoluteFilePath().toStdString(),regRead)) filePath[QDir::toNativeSeparators(QStringLiteral("\\\\?\\")+source.absoluteFilePath()).toWCharArray(filePath)]=L'\0'; else filePath[QDir::toNativeSeparators(source.absoluteFilePath()).toWCharArray(filePath)]=L'\0'; HANDLE hFileSouce = CreateFileW(filePath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_READONLY, NULL); if(hFileSouce == INVALID_HANDLE_VALUE) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] open failed to read: ")+QString::fromWCharArray(filePath)+QStringLiteral(", error: ")+QString::number(GetLastError())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] open failed to read: "+QString::fromWCharArray(filePath).toStdString()+", error: "+std::to_string(GetLastError())); return false; } FILETIME ftCreate, ftAccess, ftWrite; if(!GetFileTime(hFileSouce, &ftCreate, &ftAccess, &ftWrite)) { CloseHandle(hFileSouce); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] unable to get the file time")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] unable to get the file time"); return false; } this->ftCreateL=ftCreate.dwLowDateTime; @@ -1733,7 +1743,7 @@ bool TransferThread::readFileDateTime(const QFileInfo &source) bool TransferThread::writeFileDateTime(const QFileInfo &destination) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] writeFileDateTime(")+destination.absoluteFilePath()+QStringLiteral(")")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] writeFileDateTime("+destination.absoluteFilePath().toStdString()+")"); /** Why not do it with Qt? Because it not support setModificationTime(), and get the time with Qt, that's mean use local time where in C is UTC time */ #ifdef Q_OS_UNIX #ifdef Q_OS_LINUX @@ -1747,14 +1757,14 @@ bool TransferThread::writeFileDateTime(const QFileInfo &destination) return utime(destination.toLatin1().data(),&butime)==0; #else wchar_t filePath[65535]; - if(destination.absoluteFilePath().contains(regRead)) + if(std::regex_match(destination.absoluteFilePath().toStdString(),regRead)) filePath[QDir::toNativeSeparators(QStringLiteral("\\\\?\\")+destination.absoluteFilePath()).toWCharArray(filePath)]=L'\0'; else filePath[QDir::toNativeSeparators(destination.absoluteFilePath()).toWCharArray(filePath)]=L'\0'; HANDLE hFileDestination = CreateFileW(filePath, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); if(hFileDestination == INVALID_HANDLE_VALUE) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] open failed to write: ")+QString::fromWCharArray(filePath)+QStringLiteral(", error: ")+QString::number(GetLastError())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] open failed to write: "+QString::fromWCharArray(filePath).toStdString()+", error: "+std::to_string(GetLastError())); return false; } FILETIME ftCreate, ftAccess, ftWrite; @@ -1767,7 +1777,7 @@ bool TransferThread::writeFileDateTime(const QFileInfo &destination) if(!SetFileTime(hFileDestination, &ftCreate, &ftAccess, &ftWrite)) { CloseHandle(hFileDestination); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] unable to set the file time")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] unable to set the file time"); return false; } CloseHandle(hFileDestination); @@ -1783,9 +1793,9 @@ bool TransferThread::writeFileDateTime(const QFileInfo &destination) //skip the copy void TransferThread::skip() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start with stat: ")+QString::number(transfer_stat)); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] readIsOpeningVariable: ")+QString::number(readIsOpeningVariable)+QStringLiteral(", readIsOpenVariable: ")+QString::number(readIsOpenVariable)+QStringLiteral(", readIsReadyVariable: ")+QString::number(readIsReadyVariable)+QStringLiteral(", readIsFinishVariable: ")+QString::number(readIsFinishVariable)+QStringLiteral(", readIsClosedVariable: ")+QString::number(readIsClosedVariable)); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] writeIsOpeningVariable: ")+QString::number(writeIsOpeningVariable)+QStringLiteral(", writeIsOpenVariable: ")+QString::number(writeIsOpenVariable)+QStringLiteral(", writeIsReadyVariable: ")+QString::number(writeIsReadyVariable)+QStringLiteral(", writeIsFinishVariable: ")+QString::number(writeIsFinishVariable)+QStringLiteral(", writeIsClosedVariable: ")+QString::number(writeIsClosedVariable)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start with stat: "+std::to_string(transfer_stat)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] readIsOpeningVariable: "+std::to_string(readIsOpeningVariable)+", readIsOpenVariable: "+std::to_string(readIsOpenVariable)+", readIsReadyVariable: "+std::to_string(readIsReadyVariable)+", readIsFinishVariable: "+std::to_string(readIsFinishVariable)+", readIsClosedVariable: "+std::to_string(readIsClosedVariable)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] writeIsOpeningVariable: "+std::to_string(writeIsOpeningVariable)+", writeIsOpenVariable: "+std::to_string(writeIsOpenVariable)+", writeIsReadyVariable: "+std::to_string(writeIsReadyVariable)+", writeIsFinishVariable: "+std::to_string(writeIsFinishVariable)+", writeIsClosedVariable: "+std::to_string(writeIsClosedVariable)); switch(transfer_stat) { case TransferStat_WaitForTheTransfer: @@ -1793,7 +1803,7 @@ void TransferThread::skip() case TransferStat_PreOperation: if(needSkip) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] skip already in progress")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] skip already in progress"); return; } needSkip=true; @@ -1815,14 +1825,14 @@ void TransferThread::skip() case TransferStat_PostTransfer: if(needSkip) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] skip already in progress")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] skip already in progress"); return; } //needRemove=true;never put that's here, can product destruction of the file needSkip=true; if(canBeMovedDirectlyVariable || canBeCopiedDirectlyVariable) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] Do the direct FS fake close, canBeMovedDirectlyVariable: ")+QString::number(canBeMovedDirectlyVariable)+QStringLiteral(", canBeCopiedDirectlyVariable: ")+QString::number(canBeCopiedDirectlyVariable)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] Do the direct FS fake close, canBeMovedDirectlyVariable: "+std::to_string(canBeMovedDirectlyVariable)+", canBeCopiedDirectlyVariable: "+std::to_string(canBeCopiedDirectlyVariable)); readThread.fakeReadIsStarted(); writeThread.fakeWriteIsStarted(); readThread.fakeReadIsStopped(); @@ -1846,7 +1856,7 @@ void TransferThread::skip() case TransferStat_Checksum: if(needSkip) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] skip already in progress")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] skip already in progress"); return; } //needRemove=true;never put that's here, can product destruction of the file @@ -1867,7 +1877,7 @@ void TransferThread::skip() case TransferStat_PostOperation: if(needSkip) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] skip already in progress")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] skip already in progress"); return; } //needRemove=true;never put that's here, can product destruction of the file @@ -1876,13 +1886,13 @@ void TransferThread::skip() emit internalStartPostOperation(); break; default: - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] can skip in this state: ")+QString::number(transfer_stat)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] can skip in this state: "+std::to_string(transfer_stat)); return; } } //return info about the copied size -qint64 TransferThread::copiedSize() +int64_t TransferThread::copiedSize() { switch(transfer_stat) { @@ -1925,7 +1935,7 @@ void TransferThread::setId(int id) writeThread.setId(id); } -QChar TransferThread::readingLetter() const +char TransferThread::readingLetter() const { switch(readThread.stat) { @@ -1949,7 +1959,7 @@ QChar TransferThread::readingLetter() const } } -QChar TransferThread::writingLetter() const +char TransferThread::writingLetter() const { switch(writeThread.stat) { @@ -2010,7 +2020,7 @@ void TransferThread::set_osBufferLimited(bool osBufferLimited) } //not copied size, because that's count to the checksum, ... -quint64 TransferThread::realByteTransfered() const +uint64_t TransferThread::realByteTransfered() const { switch(transfer_stat) { @@ -2027,16 +2037,16 @@ quint64 TransferThread::realByteTransfered() const } //first is read, second is write -QPair<quint64,quint64> TransferThread::progression() const +std::pair<uint64_t, uint64_t> TransferThread::progression() const { - QPair<quint64,quint64> returnVar; + std::pair<uint64_t,uint64_t> returnVar; switch(transfer_stat) { case TransferStat_Transfer: returnVar.first=readThread.getLastGoodPosition(); returnVar.second=writeThread.getLastGoodPosition(); /*if(returnVar.first<returnVar.second) - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] read is smaller than write"));*/ + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+QStringLiteral("] read is smaller than write"));*/ break; case TransferStat_Checksum: returnVar.first=readThread.getLastGoodPosition(); @@ -2046,7 +2056,7 @@ QPair<quint64,quint64> TransferThread::progression() const returnVar.first=transferSize; returnVar.second=writeThread.getLastGoodPosition(); /*if(returnVar.first<returnVar.second) - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] read is smaller than write"));*/ + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+QStringLiteral("] read is smaller than write"));*/ break; case TransferStat_PostOperation: returnVar.first=transferSize; @@ -2059,7 +2069,7 @@ QPair<quint64,quint64> TransferThread::progression() const return returnVar; } -void TransferThread::setRenamingRules(const QString &firstRenamingRule,const QString &otherRenamingRule) +void TransferThread::setRenamingRules(const std::string &firstRenamingRule, const std::string &otherRenamingRule) { this->firstRenamingRule=firstRenamingRule; this->otherRenamingRule=otherRenamingRule; diff --git a/plugins/CopyEngine/Ultracopier/TransferThread.h b/plugins/CopyEngine/Ultracopier/TransferThread.h index 051375e..e1a3b3f 100644 --- a/plugins/CopyEngine/Ultracopier/TransferThread.h +++ b/plugins/CopyEngine/Ultracopier/TransferThread.h @@ -8,12 +8,12 @@ #include <QThread> #include <QFileInfo> -#include <QString> -#include <QList> -#include <QStringList> +#include <regex> +#include <vector> +#include <string> #include <QDateTime> #include <QDir> -#include <QPair> +#include <utility> #ifdef Q_OS_UNIX #include <utime.h> @@ -50,16 +50,16 @@ public: /// \brief to set the id void setId(int id); /// \brief get the reading letter - QChar readingLetter() const; + char readingLetter() const; /// \brief get the writing letter - QChar writingLetter() const; + char writingLetter() const; #endif /// \brief to have semaphore, and try create just one by one void setMkpathTransfer(QSemaphore *mkpathTransfer); /// \brief to store the transfer id - quint64 transferId; + uint64_t transferId; /// \brief to store the transfer size - quint64 transferSize; + uint64_t transferSize; bool haveStartTime; QTime startTransferTime; @@ -70,11 +70,11 @@ public: void set_osBufferLimited(bool osBufferLimited); //not copied size, because that's count to the checksum, ... - quint64 realByteTransfered() const; - QPair<quint64,quint64> progression() const; - static QString resolvedName(const QFileInfo &inode); - QString getSourcePath() const; - QString getDestinationPath() const; + uint64_t realByteTransfered() const; + std::pair<uint64_t, uint64_t> progression() const; + static std::string resolvedName(const QFileInfo &inode); + std::string getSourcePath() const; + std::string getDestinationPath() const; QFileInfo getSourceInode() const; QFileInfo getDestinationInode() const; Ultracopier::CopyMode getMode() const; @@ -90,27 +90,27 @@ signals: void postOperationStopped() const; //get dialog void fileAlreadyExists(const QFileInfo &info,const QFileInfo &info2,const bool &isSame) const; - void errorOnFile(const QFileInfo &info,const QString &string,const ErrorType &errorType=ErrorType_Normal) const; + void errorOnFile(const QFileInfo &info,const std::string &string,const ErrorType &errorType=ErrorType_Normal) const; //internal signal void internalStartPostOperation() const; void internalStartPreOperation() const; void internalStartResumeAfterErrorAndSeek() const; /// \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; void tryPutAtBottom() const; //force into the right thread void internalTryStartTheTransfer() const; /// \brief update the transfer stat - void pushStat(const TransferStat &stat,const quint64 &pos) const; + void pushStat(const TransferStat &stat,const uint64_t &pos) const; public slots: /// \brief to start the transfer of data void startTheTransfer(); /// \brief to set files to transfer - bool setFiles(const QFileInfo& source,const qint64 &size,const QFileInfo& destination,const Ultracopier::CopyMode &mode); + bool setFiles(const QFileInfo& source,const int64_t &size,const QFileInfo& destination,const Ultracopier::CopyMode &mode); /// \brief to set file exists action to do void setFileExistsAction(const FileExistsAction &action); /// \brief to set the new name of the destination - void setFileRename(const QString &nameForRename); + void setFileRename(const std::string &nameForRename); /// \brief to start the transfer of data void setAlwaysFileExistsAction(const FileExistsAction &action); /// \brief set the copy info and options before runing @@ -134,7 +134,7 @@ public slots: /// \brief retry after error void retryAfterError(); /// \brief return info about the copied size - qint64 copiedSize(); + int64_t copiedSize(); /// \brief put the current file at bottom void putAtBottom(); @@ -143,7 +143,7 @@ public slots: #endif void set_osBufferLimit(const unsigned int &osBufferLimit); - void setRenamingRules(const QString &firstRenamingRule,const QString &otherRenamingRule); + void setRenamingRules(const std::string &firstRenamingRule,const std::string &otherRenamingRule); #ifdef ULTRACOPIER_PLUGIN_SPEED_SUPPORT //speed limitation void timeOfTheBlockCopyFinished(); @@ -216,7 +216,7 @@ private: bool retry; QFileInfo source; QFileInfo destination; - qint64 size; + int64_t size; FileExistsAction fileExistsAction; FileExistsAction alwaysDoFileExistsAction; bool needSkip,needRemove; @@ -230,8 +230,8 @@ private: bool osBuffer; bool osBufferLimited; unsigned int osBufferLimit; - QString firstRenamingRule; - QString otherRenamingRule; + std::string firstRenamingRule; + std::string otherRenamingRule; //error management bool writeError,writeError_source_seeked,writeError_destination_reopened; bool readError; @@ -241,7 +241,7 @@ private: int parallelBuffer; int sequentialBuffer; int parallelizeIfSmallerThan; - QRegularExpression renameRegex; + std::regex renameRegex; TransferAlgorithm transferAlgorithm; #ifdef Q_OS_UNIX utimbuf butime; @@ -250,9 +250,9 @@ private: #ifdef ULTRACOPIER_PLUGIN_SET_TIME_UNIX_WAY utimbuf butime; #else - quint32 ftCreateL, ftAccessL, ftWriteL; - quint32 ftCreateH, ftAccessH, ftWriteH; - QRegularExpression regRead; + uint32_t ftCreateL, ftAccessL, ftWriteL; + uint32_t ftCreateH, ftAccessH, ftWriteH; + std::regex regRead; #endif #endif #endif diff --git a/plugins/CopyEngine/Ultracopier/WriteThread.cpp b/plugins/CopyEngine/Ultracopier/WriteThread.cpp index 42b3551..9993961 100644 --- a/plugins/CopyEngine/Ultracopier/WriteThread.cpp +++ b/plugins/CopyEngine/Ultracopier/WriteThread.cpp @@ -63,26 +63,26 @@ void WriteThread::run() bool WriteThread::internalOpen() { //do a bug - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] internalOpen destination: ")+file.fileName()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] internalOpen destination: "+file.fileName().toStdString()); if(stopIt) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] close because stopIt is at true")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] close because stopIt is at true"); emit closed(); return false; } if(file.isOpen()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] already open! destination: ")+file.fileName()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] already open! destination: "+file.fileName().toStdString()); return false; } if(file.fileName().isEmpty()) { - errorString_internal=tr("Path resolution error (Empty path)"); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("Unable to open: %1, error: %2").arg(file.fileName()).arg(errorString_internal)); + errorString_internal=tr("Path resolution error (Empty path)").toStdString(); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] "+QStringLiteral("Unable to open: %1, error: %2").arg(file.fileName()).arg(QString::fromStdString(errorString_internal)).toStdString()); emit error(); return false; } - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] before the mutex")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] before the mutex"); //set to LISTBLOCKSIZE if(sequential) { @@ -98,7 +98,7 @@ bool WriteThread::internalOpen() if(writeFull.available()>numberOfBlock) writeFull.acquire(writeFull.available()-numberOfBlock); } - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] after the mutex")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] after the mutex"); stopIt=false; endDetected=false; #ifdef ULTRACOPIER_PLUGIN_DEBUG @@ -111,17 +111,18 @@ bool WriteThread::internalOpen() mkpathTransfer->acquire(); if(!destinationFolder.exists(destinationInfo.absolutePath())) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("Try create the path: %1") - .arg(destinationInfo.absolutePath())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] Try create the path: "+ + destinationInfo.absolutePath().toStdString()); if(!destinationFolder.mkpath(destinationInfo.absolutePath())) { if(!destinationFolder.exists(destinationInfo.absolutePath())) { /// \todo do real folder error here errorString_internal="mkpath error on destination"; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("Unable create the folder: %1, error: %2") + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] "+QStringLiteral("Unable create the folder: %1, error: %2") .arg(destinationInfo.absolutePath()) - .arg(errorString_internal)); + .arg(QString::fromStdString(errorString_internal)) + .toStdString()); emit error(); #ifdef ULTRACOPIER_PLUGIN_DEBUG stat=Idle; @@ -133,10 +134,10 @@ bool WriteThread::internalOpen() } mkpathTransfer->release(); } - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] after the mkpath")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] after the mkpath"); if(stopIt) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] close because stopIt is at true")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] close because stopIt is at true"); emit closed(); return false; } @@ -151,7 +152,7 @@ bool WriteThread::internalOpen() writeFileList.insert(file.fileName(),this); if(writeFileList.count(file.fileName())>1) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] in waiting because same file is found")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] in waiting because same file is found"); return false; } } @@ -159,12 +160,12 @@ bool WriteThread::internalOpen() bool fileWasExists=file.exists(); if(file.open(flags)) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] after the open")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] after the open"); { QMutexLocker lock_mutex(&accessList); if(!theBlockList.isEmpty()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("General file corruption detected")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] General file corruption detected"); stopIt=true; file.close(); resumeNotStarted(); @@ -173,10 +174,10 @@ bool WriteThread::internalOpen() } } pauseMutex.tryAcquire(pauseMutex.available()); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] after the pause mutex")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] after the pause mutex"); if(stopIt) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] close because stopIt is at true")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] close because stopIt is at true"); file.close(); resumeNotStarted(); file.setFileName(QStringLiteral("")); @@ -188,8 +189,8 @@ bool WriteThread::internalOpen() file.close(); resumeNotStarted(); file.setFileName(QStringLiteral("")); - errorString_internal=file.errorString(); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("Unable to seek after open: %1, error: %2").arg(file.fileName()).arg(errorString_internal)); + errorString_internal=file.errorString().toStdString(); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] "+QStringLiteral("Unable to seek after open: %1, error: %2").arg(file.fileName()).arg(QString::fromStdString(errorString_internal)).toStdString()); emit error(); #ifdef ULTRACOPIER_PLUGIN_DEBUG stat=Idle; @@ -198,7 +199,7 @@ bool WriteThread::internalOpen() } if(stopIt) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] close because stopIt is at true")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] close because stopIt is at true"); file.close(); resumeNotStarted(); file.setFileName(QStringLiteral("")); @@ -210,8 +211,8 @@ bool WriteThread::internalOpen() file.close(); resumeNotStarted(); file.setFileName(QStringLiteral("")); - errorString_internal=file.errorString(); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("Unable to resize to %1 after open: %2, error: %3").arg(startSize).arg(file.fileName()).arg(errorString_internal)); + errorString_internal=file.errorString().toStdString(); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] "+QStringLiteral("Unable to resize to %1 after open: %2, error: %3").arg(startSize).arg(file.fileName()).arg(QString::fromStdString(errorString_internal)).toStdString()); emit error(); #ifdef ULTRACOPIER_PLUGIN_DEBUG stat=Idle; @@ -220,7 +221,7 @@ bool WriteThread::internalOpen() } if(stopIt) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] close because stopIt is at true")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] close because stopIt is at true"); file.close(); resumeNotStarted(); file.setFileName(QStringLiteral("")); @@ -228,7 +229,7 @@ bool WriteThread::internalOpen() return false; } isOpen.acquire(); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] emit opened()")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] emit opened()"); emit opened(); #ifdef ULTRACOPIER_PLUGIN_DEBUG stat=Idle; @@ -241,17 +242,17 @@ bool WriteThread::internalOpen() { if(!fileWasExists && file.exists()) if(!file.remove()) - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] file created but can't be removed")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] file created but can't be removed"); if(stopIt) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] close because stopIt is at true")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] close because stopIt is at true"); resumeNotStarted(); file.setFileName(QStringLiteral("")); emit closed(); return false; } - errorString_internal=file.errorString(); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("Unable to open: %1, error: %2").arg(file.fileName()).arg(errorString_internal)); + errorString_internal=file.errorString().toStdString(); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] "+QStringLiteral("Unable to open: %1, error: %2").arg(file.fileName()).arg(QString::fromStdString(errorString_internal)).toStdString()); emit error(); #ifdef ULTRACOPIER_PLUGIN_DEBUG stat=Idle; @@ -260,33 +261,33 @@ bool WriteThread::internalOpen() } } -void WriteThread::open(const QFileInfo &file,const quint64 &startSize,const bool &buffer,const int &numberOfBlock,const bool &sequential) +void WriteThread::open(const QFileInfo &file,const uint64_t &startSize,const bool &buffer,const int &numberOfBlock,const bool &sequential) { if(!isRunning()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] the thread not running to open destination: ")+file.absoluteFilePath()+QStringLiteral(", numberOfBlock: ")+QString::number(numberOfBlock)); - errorString_internal=tr("Internal error, please report it!"); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] the thread not running to open destination: "+file.absoluteFilePath().toStdString()+", numberOfBlock: "+std::to_string(numberOfBlock)); + errorString_internal=tr("Internal error, please report it!").toStdString(); emit error(); return; } if(this->file.isOpen()) { if(file.absoluteFilePath()==this->file.fileName()) - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] Try reopen already opened same file: ")+file.absoluteFilePath()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] Try reopen already opened same file: "+file.absoluteFilePath().toStdString()); else - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("[")+QString::number(id)+QStringLiteral("] previous file is already open: ")+file.absoluteFilePath()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"["+std::to_string(id)+"] previous file is already open: "+file.absoluteFilePath().toStdString()); emit internalStartClose(); isOpen.acquire(); isOpen.release(); } if(numberOfBlock<1 || (numberOfBlock>ULTRACOPIER_PLUGIN_MAX_PARALLEL_NUMBER_OF_BLOCK && numberOfBlock>ULTRACOPIER_PLUGIN_MAX_SEQUENTIAL_NUMBER_OF_BLOCK)) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] numberOfBlock wrong, set to default")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] numberOfBlock wrong, set to default"); this->numberOfBlock=ULTRACOPIER_PLUGIN_DEFAULT_PARALLEL_NUMBER_OF_BLOCK; } else this->numberOfBlock=numberOfBlock; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("open destination: %1, sequential: %2").arg(file.absoluteFilePath()).arg(sequential)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] "+QStringLiteral("open destination: %1, sequential: %2").arg(file.absoluteFilePath()).arg(sequential).toStdString()); stopIt=false; fakeMode=false; lastGoodPosition=0; @@ -306,23 +307,23 @@ void WriteThread::endIsDetected() { if(endDetected) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] double event dropped")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] double event dropped"); return; } endDetected=true; pauseMutex.release(); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start"); emit internalStartEndOfFile(); } -QString WriteThread::errorString() const +std::string WriteThread::errorString() const { return errorString_internal; } void WriteThread::stop() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] stop()")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] stop()"); needRemoveTheFile=true; stopIt=true; if(isOpen.available()>0) @@ -342,7 +343,7 @@ void WriteThread::stop() void WriteThread::flushBuffer() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start"); writeFull.release(); writeFull.acquire(); pauseMutex.release(); @@ -350,7 +351,7 @@ void WriteThread::flushBuffer() QMutexLocker lock_mutex(&accessList); theBlockList.clear(); } - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] stop")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] stop"); } /// \brief buffer is empty @@ -370,15 +371,15 @@ void WriteThread::internalEndOfFile() { if(sequential) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start the write")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start the write"); emit internalStartWrite(); } else - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] buffer is not empty!")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] buffer is not empty!"); } else { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] writeIsStopped")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] writeIsStopped"); emit writeIsStopped(); } } @@ -416,7 +417,7 @@ void WriteThread::resumeNotStarted() QMutexLocker lock_mutex(&writeFileListMutex); #ifdef ULTRACOPIER_PLUGIN_DEBUG if(!writeFileList.contains(file.fileName())) - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("[")+QString::number(id)+QStringLiteral("] file: \"")+file.fileName()+QStringLiteral("\" for similar inode is not located into the list of ")+writeFileList.size()+QStringLiteral(" items!")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"["+std::to_string(id)+"] file: \""+file.fileName().toStdString()+"\" for similar inode is not located into the list of "+std::to_string(writeFileList.size())+" items!"); #endif writeFileList.remove(file.fileName(),this); if(writeFileList.contains(file.fileName())) @@ -430,7 +431,7 @@ void WriteThread::resumeNotStarted() void WriteThread::pause() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] try put read thread in pause")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] try put read thread in pause"); pauseMutex.tryAcquire(pauseMutex.available()); putInPause=true; return; @@ -440,7 +441,7 @@ void WriteThread::resume() { if(putInPause) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start"); putInPause=false; stopIt=false; } @@ -448,7 +449,7 @@ void WriteThread::resume() return; if(!file.isOpen()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] file is not open")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] file is not open"); return; } pauseMutex.release(); @@ -456,7 +457,7 @@ void WriteThread::resume() void WriteThread::reemitStartOpen() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] start"); emit internalStartOpen(); } @@ -464,11 +465,11 @@ void WriteThread::postOperation() { if(postOperationRequested) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("[")+QString::number(id)+QStringLiteral("] double event dropped")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"["+std::to_string(id)+"] double event dropped"); return; } postOperationRequested=true; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start"); emit internalStartClose(); } @@ -479,7 +480,7 @@ void WriteThread::internalCloseSlot() void WriteThread::internalClose(bool emitSignal) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] close for file: ")+file.fileName()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] close for file: "+file.fileName().toStdString()); /// \note never send signal here, because it's called by the destructor #ifdef ULTRACOPIER_PLUGIN_DEBUG stat=Close; @@ -496,8 +497,8 @@ void WriteThread::internalClose(bool emitSignal) { if(emitSignal) { - errorString_internal=file.errorString(); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("Unable to seek after open: %1, error: %2").arg(file.fileName()).arg(errorString_internal)); + errorString_internal=file.errorString().toStdString(); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] "+QStringLiteral("Unable to seek after open: %1, error: %2").arg(file.fileName()).arg(QString::fromStdString(errorString_internal)).toStdString()); emit error(); } else @@ -511,7 +512,7 @@ void WriteThread::internalClose(bool emitSignal) { if(!file.remove()) if(emitSignal) - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] unable to remove the destination file")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] unable to remove the destination file"); } } //here and not after, because the transferThread don't need try close if not open @@ -544,7 +545,7 @@ void WriteThread::internalClose(bool emitSignal) void WriteThread::internalReopen() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start"); QString tempFile=file.fileName(); internalClose(false); flushBuffer(); @@ -557,7 +558,7 @@ void WriteThread::internalReopen() void WriteThread::reopen() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start"); stopIt=true; endDetected=false; emit internalStartReopen(); @@ -610,20 +611,20 @@ bool WriteThread::setBlockSize(const int blockSize) } else { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("block size out of range: ")+QString::number(blockSize)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"block size out of range: "+std::to_string(blockSize)); return false; } } /// \brief get the last good position -qint64 WriteThread::getLastGoodPosition() const +int64_t WriteThread::getLastGoodPosition() const { return lastGoodPosition; } void WriteThread::flushAndSeekToZero() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("flushAndSeekToZero: ")+QString::number(blockSize)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"flushAndSeekToZero: "+std::to_string(blockSize)); stopIt=true; emit internalStartFlushAndSeekToZero(); } @@ -640,8 +641,8 @@ void WriteThread::checkSum() #endif if(!file.seek(0)) { - errorString_internal=file.errorString(); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("Unable to seek after open: %1, error: %2").arg(file.fileName()).arg(errorString_internal)); + errorString_internal=file.errorString().toStdString(); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] "+QStringLiteral("Unable to seek after open: %1, error: %2").arg(file.fileName()).arg(QString::fromStdString(errorString_internal)).toStdString()); emit error(); return; } @@ -650,7 +651,7 @@ void WriteThread::checkSum() { if(putInPause) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,QStringLiteral("[")+QString::number(id)+QStringLiteral("] write put in pause")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"["+std::to_string(id)+"] write put in pause"); if(stopIt) return; pauseMutex.acquire(); @@ -668,8 +669,8 @@ void WriteThread::checkSum() if(file.error()!=QFile::NoError) { - errorString_internal=tr("Unable to read the source file: ")+file.errorString()+QStringLiteral(" (")+QString::number(file.error())+QStringLiteral(")"); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("file.error()!=QFile::NoError: %1, error: %2").arg(QString::number(file.error())).arg(errorString_internal)); + errorString_internal=tr("Unable to read the source file: ").toStdString()+file.errorString().toStdString()+" ("+std::to_string(file.error())+")"; + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] "+QStringLiteral("file.error()!=QFile::NoError: %1, error: %2").arg(QString::number(file.error())).arg(QString::fromStdString(errorString_internal)).toStdString()); emit error(); return; } @@ -693,8 +694,8 @@ void WriteThread::checkSum() while(sizeReaden>0 && !stopIt); if(lastGoodPosition>(quint64)file.size()) { - errorString_internal=tr("File truncated during read, possible data change"); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("Source truncated during the read: %1 (%2)").arg(file.errorString()).arg(QString::number(file.error()))); + errorString_internal=tr("File truncated during read, possible data change").toStdString(); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] "+QStringLiteral("Source truncated during the read: %1 (%2)").arg(file.errorString()).arg(QString::number(file.error())).toStdString()); emit error(); return; } @@ -706,7 +707,7 @@ void WriteThread::checkSum() return; } emit checksumFinish(hash.result()); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] stop the read")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] stop the read"); } void WriteThread::internalFlushAndSeekToZero() @@ -714,8 +715,8 @@ void WriteThread::internalFlushAndSeekToZero() flushBuffer(); if(!file.seek(0)) { - errorString_internal=file.errorString(); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("Unable to seek after open: %1, error: %2").arg(file.fileName()).arg(errorString_internal)); + errorString_internal=file.errorString().toStdString(); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] "+QStringLiteral("Unable to seek after open: %1, error: %2").arg(file.fileName()).arg(QString::fromStdString(errorString_internal)).toStdString()); emit error(); return; } @@ -814,7 +815,7 @@ void WriteThread::internalWrite() { if(putInPause) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,QStringLiteral("[")+QString::number(id)+QStringLiteral("] write put in pause")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"["+std::to_string(id)+"] write put in pause"); if(stopIt) return; pauseMutex.acquire(); @@ -823,7 +824,7 @@ void WriteThread::internalWrite() } if(stopIt) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] stopIt")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] stopIt"); return; } if(stopIt) @@ -899,7 +900,7 @@ void WriteThread::internalWrite() writeFull.release(); return; } - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] End detected of the file")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] End detected of the file"); return; } #ifdef ULTRACOPIER_PLUGIN_SPEED_SUPPORT @@ -941,23 +942,23 @@ void WriteThread::internalWrite() //mutex for stream this data if(lastGoodPosition==0) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[")+QString::number(id)+QStringLiteral("] emit writeIsStarted()")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] emit writeIsStarted()"); emit writeIsStarted(); } if(stopIt) return; if(file.error()!=QFile::NoError) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("Error in writing: %1 (%2)").arg(file.errorString()).arg(file.error())); - errorString_internal=QStringLiteral("Error in writing: %1 (%2)").arg(file.errorString()).arg(file.error()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] "+QStringLiteral("Error in writing: %1 (%2)").arg(file.errorString()).arg(file.error()).toStdString()); + errorString_internal=QStringLiteral("Error in writing: %1 (%2)").arg(file.errorString()).arg(file.error()).toStdString(); stopIt=true; emit error(); return; } if(bytesWriten!=blockArray.size()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("[")+QString::number(id)+QStringLiteral("] ")+QStringLiteral("Error in writing, bytesWriten: %1, blockArray.size(): %2").arg(bytesWriten).arg(blockArray.size())); - errorString_internal=QStringLiteral("Error in writing, bytesWriten: %1, blockArray.size(): %2").arg(bytesWriten).arg(blockArray.size()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] "+QStringLiteral("Error in writing, bytesWriten: %1, blockArray.size(): %2").arg(bytesWriten).arg(blockArray.size()).toStdString()); + errorString_internal=QStringLiteral("Error in writing, bytesWriten: %1, blockArray.size(): %2").arg(bytesWriten).arg(blockArray.size()).toStdString(); stopIt=true; emit error(); return; diff --git a/plugins/CopyEngine/Ultracopier/WriteThread.h b/plugins/CopyEngine/Ultracopier/WriteThread.h index e540552..cadd022 100644 --- a/plugins/CopyEngine/Ultracopier/WriteThread.h +++ b/plugins/CopyEngine/Ultracopier/WriteThread.h @@ -30,9 +30,9 @@ protected: void run(); public: /// \brief open the destination to open it - void open(const QFileInfo &file,const quint64 &startSize,const bool &buffer,const int &numberOfBlock,const bool &sequential); + void open(const QFileInfo &file,const uint64_t &startSize,const bool &buffer,const int &numberOfBlock,const bool &sequential); /// \brief to return the error string - QString errorString() const; + std::string errorString() const; /// \brief to stop all void stop(); /// \brief to write data @@ -63,7 +63,7 @@ public: /// \brief set block size in KB bool setBlockSize(const int blockSize); /// \brief get the last good position - qint64 getLastGoodPosition() const; + int64_t getLastGoodPosition() const; /// \brief buffer is empty bool bufferIsEmpty(); #ifdef ULTRACOPIER_PLUGIN_SPEED_SUPPORT @@ -109,9 +109,9 @@ signals: void internalStartEndOfFile() const; void internalStartFlushAndSeekToZero() const; /// \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; private: - QString errorString_internal; + std::string errorString_internal; AvancedQFile file; volatile bool stopIt; volatile bool postOperationRequested; @@ -132,12 +132,12 @@ private: QSemaphore pauseMutex; volatile bool putInPause; QList<QByteArray> theBlockList; ///< Store the block list - quint64 lastGoodPosition; + uint64_t lastGoodPosition; QByteArray blockArray; ///< temp data for block writing, the data - qint64 bytesWriten; ///< temp data for block writing, the bytes writen + int64_t bytesWriten; ///< temp data for block writing, the bytes writen int id; volatile bool endDetected; - quint64 startSize; + uint64_t startSize; QSemaphore *mkpathTransfer; bool fakeMode; bool buffer; diff --git a/plugins/CopyEngine/Ultracopier/documentation.dox b/plugins/CopyEngine/Ultracopier/documentation.dox index 727969f..5a0fbf6 100644 --- a/plugins/CopyEngine/Ultracopier/documentation.dox +++ b/plugins/CopyEngine/Ultracopier/documentation.dox @@ -20,7 +20,7 @@ \section mainpage_downloads Downloads - You can found link on <a href="http://ultracopier.first-world.info/">Ultracopier (Supercopier/Teracopy)</a> project page, via git, snapshot sources, ... + You can find the link on <a href="http://ultracopier.first-world.info/">Ultracopier</a> project page, via git, snapshot sources, ... \section mainpage_algorithm Algorithm diff --git a/plugins/CopyEngine/Ultracopier/informations.xml b/plugins/CopyEngine/Ultracopier/informations.xml index 1a1d769..61e04e0 100644 --- a/plugins/CopyEngine/Ultracopier/informations.xml +++ b/plugins/CopyEngine/Ultracopier/informations.xml @@ -17,7 +17,7 @@ <description xml:lang="en"><![CDATA[Copy engine of Ultracopier, do in Qt for all platform, and copy by stream]]></description> <description xml:lang="fr"><![CDATA[Moteur de copie d'ultracopier, fait en Qt pour toutes les plateformes, et copie par stream]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>1.2.3.6</version> + <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>Ultracopier</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/ar/informations.xml b/plugins/Languages/ar/informations.xml index 24ea31a..555ecf1 100644 --- a/plugins/Languages/ar/informations.xml +++ b/plugins/Languages/ar/informations.xml @@ -12,7 +12,7 @@ <!-- Detailed description --> <description xml:lang="en"><![CDATA[Translation of Ultracopier to arabic. For more details see the web site.]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>1.2.3.6</version> + <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>ar</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/ar/translation.ts b/plugins/Languages/ar/translation.ts index b02bb87..d364f81 100644 --- a/plugins/Languages/ar/translation.ts +++ b/plugins/Languages/ar/translation.ts @@ -1,86 +1,86 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>CliParser</name> <message> - <location filename="../../../CliParser.cpp" line="25"/> - <location filename="../../../CliParser.cpp" line="71"/> - <location filename="../../../CliParser.cpp" line="84"/> - <location filename="../../../CliParser.cpp" line="94"/> - <location filename="../../../CliParser.cpp" line="179"/> + <location filename="../../../CliParser.cpp" line="26"/> + <location filename="../../../CliParser.cpp" line="72"/> + <location filename="../../../CliParser.cpp" line="85"/> + <location filename="../../../CliParser.cpp" line="95"/> + <location filename="../../../CliParser.cpp" line="180"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="25"/> + <location filename="../../../CliParser.cpp" line="26"/> <source>Ultracopier is already running, right click on its system tray icon (near the clock) to use it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="71"/> + <location filename="../../../CliParser.cpp" line="72"/> <source>Problem reading file, or file size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="159"/> - <location filename="../../../CliParser.cpp" line="170"/> + <location filename="../../../CliParser.cpp" line="160"/> + <location filename="../../../CliParser.cpp" line="171"/> <source>The arguments possible are:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="161"/> - <location filename="../../../CliParser.cpp" line="172"/> + <location filename="../../../CliParser.cpp" line="162"/> + <location filename="../../../CliParser.cpp" line="173"/> <source>To display the options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="162"/> - <location filename="../../../CliParser.cpp" line="173"/> + <location filename="../../../CliParser.cpp" line="163"/> + <location filename="../../../CliParser.cpp" line="174"/> <source>To quit the other instances (if running)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="164"/> - <location filename="../../../CliParser.cpp" line="175"/> + <location filename="../../../CliParser.cpp" line="165"/> + <location filename="../../../CliParser.cpp" line="176"/> <source>To copy sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="165"/> - <location filename="../../../CliParser.cpp" line="176"/> + <location filename="../../../CliParser.cpp" line="166"/> + <location filename="../../../CliParser.cpp" line="177"/> <source>To move sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="169"/> + <location filename="../../../CliParser.cpp" line="170"/> <source>Command not valid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="84"/> + <location filename="../../../CliParser.cpp" line="85"/> <source>This file is not supported transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="94"/> + <location filename="../../../CliParser.cpp" line="95"/> <source>Unable to open the transfer list file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="160"/> - <location filename="../../../CliParser.cpp" line="171"/> + <location filename="../../../CliParser.cpp" line="161"/> + <location filename="../../../CliParser.cpp" line="172"/> <source>To display this help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="163"/> - <location filename="../../../CliParser.cpp" line="174"/> + <location filename="../../../CliParser.cpp" line="164"/> + <location filename="../../../CliParser.cpp" line="175"/> <source>Open transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="181"/> + <location filename="../../../CliParser.cpp" line="182"/> <source>Help</source> <translation type="unfinished"></translation> </message> @@ -88,30 +88,30 @@ <context> <name>CopyEngineManager</name> <message> - <location filename="../../../CopyEngineManager.cpp" line="229"/> - <location filename="../../../CopyEngineManager.cpp" line="234"/> - <location filename="../../../CopyEngineManager.cpp" line="257"/> - <location filename="../../../CopyEngineManager.cpp" line="271"/> + <location filename="../../../CopyEngineManager.cpp" line="231"/> + <location filename="../../../CopyEngineManager.cpp" line="236"/> + <location filename="../../../CopyEngineManager.cpp" line="259"/> + <location filename="../../../CopyEngineManager.cpp" line="273"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="229"/> + <location filename="../../../CopyEngineManager.cpp" line="231"/> <source>Cannot find any copy engine with move support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="257"/> + <location filename="../../../CopyEngineManager.cpp" line="259"/> <source>This copy engine does not support move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="234"/> + <location filename="../../../CopyEngineManager.cpp" line="236"/> <source>Cannot find any compatible engine!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="271"/> + <location filename="../../../CopyEngineManager.cpp" line="273"/> <source>Cannot find any engine with this name: %1</source> <translation type="unfinished"></translation> </message> @@ -119,12 +119,12 @@ <context> <name>CopyListener</name> <message> - <location filename="../../../CopyListener.cpp" line="158"/> + <location filename="../../../CopyListener.cpp" line="159"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyListener.cpp" line="158"/> + <location filename="../../../CopyListener.cpp" line="159"/> <source>Error during the reception of the copy/move list %1</source> <translation type="unfinished"></translation> @@ -133,70 +133,70 @@ <context> <name>Core</name> <message> - <location filename="../../../Core.cpp" line="45"/> - <location filename="../../../Core.cpp" line="116"/> - <location filename="../../../Core.cpp" line="142"/> - <location filename="../../../Core.cpp" line="157"/> - <location filename="../../../Core.cpp" line="177"/> - <location filename="../../../Core.cpp" line="191"/> - <location filename="../../../Core.cpp" line="200"/> - <location filename="../../../Core.cpp" line="209"/> - <location filename="../../../Core.cpp" line="216"/> - <location filename="../../../Core.cpp" line="250"/> - <location filename="../../../Core.cpp" line="387"/> - <location filename="../../../Core.cpp" line="392"/> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="117"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> + <location filename="../../../Core.cpp" line="217"/> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> + <location filename="../../../Core.cpp" line="393"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="45"/> - <location filename="../../../Core.cpp" line="142"/> - <location filename="../../../Core.cpp" line="157"/> - <location filename="../../../Core.cpp" line="177"/> - <location filename="../../../Core.cpp" line="191"/> - <location filename="../../../Core.cpp" line="200"/> - <location filename="../../../Core.cpp" line="209"/> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> <source>Unable to get a copy engine instance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="93"/> + <location filename="../../../Core.cpp" line="94"/> <source>Group window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="93"/> + <location filename="../../../Core.cpp" line="94"/> <source>Do you want group the transfer with another actual running transfer?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="116"/> + <location filename="../../../Core.cpp" line="117"/> <source>Unable to get a engine instance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="216"/> + <location filename="../../../Core.cpp" line="217"/> <source>The argument for the mode is not valid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="1133"/> + <location filename="../../../Core.cpp" line="1136"/> <source>Do you want to copy? If no, it will be moved.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="250"/> - <location filename="../../../Core.cpp" line="387"/> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> <source>Unable to load the interface, copy aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="392"/> + <location filename="../../../Core.cpp" line="393"/> <source>Unable to load the copy engine, copy aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="1133"/> + <location filename="../../../Core.cpp" line="1136"/> <source>Transfer mode</source> <translation type="unfinished"></translation> </message> @@ -204,12 +204,12 @@ <context> <name>EventDispatcher</name> <message> - <location filename="../../../EventDispatcher.cpp" line="155"/> + <location filename="../../../EventDispatcher.cpp" line="152"/> <source>Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../EventDispatcher.cpp" line="155"/> + <location filename="../../../EventDispatcher.cpp" line="152"/> <source>Give the key of this software, more information on <a href="http://ultracopier.first-world.info/">ultracopier.first-world.info</a></source> <translation type="unfinished"></translation> </message> @@ -217,257 +217,257 @@ <context> <name>FacilityEngine</name> <message> - <location filename="../../../FacilityEngine.cpp" line="43"/> + <location filename="../../../FacilityEngine.cpp" line="53"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="45"/> + <location filename="../../../FacilityEngine.cpp" line="55"/> <source>Copy</source> <extracomment>a copy</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="49"/> + <location filename="../../../FacilityEngine.cpp" line="59"/> <source>Move</source> <extracomment>a move</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="51"/> + <location filename="../../../FacilityEngine.cpp" line="61"/> <source>Pause</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="52"/> + <location filename="../../../FacilityEngine.cpp" line="62"/> <source>Resume</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="53"/> - <location filename="../../../FacilityEngine.cpp" line="67"/> + <location filename="../../../FacilityEngine.cpp" line="63"/> + <location filename="../../../FacilityEngine.cpp" line="77"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="54"/> + <location filename="../../../FacilityEngine.cpp" line="64"/> <source>Unlimited</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="27"/> + <location filename="../../../FacilityEngine.cpp" line="37"/> <source>s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="28"/> + <location filename="../../../FacilityEngine.cpp" line="38"/> <source>Too big</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="29"/> + <location filename="../../../FacilityEngine.cpp" line="39"/> <source>B</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="30"/> + <location filename="../../../FacilityEngine.cpp" line="40"/> <source>KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="31"/> + <location filename="../../../FacilityEngine.cpp" line="41"/> <source>MB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="32"/> + <location filename="../../../FacilityEngine.cpp" line="42"/> <source>GB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="33"/> + <location filename="../../../FacilityEngine.cpp" line="43"/> <source>TB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="34"/> + <location filename="../../../FacilityEngine.cpp" line="44"/> <source>PB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="35"/> + <location filename="../../../FacilityEngine.cpp" line="45"/> <source>EB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="36"/> + <location filename="../../../FacilityEngine.cpp" line="46"/> <source>ZB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="37"/> + <location filename="../../../FacilityEngine.cpp" line="47"/> <source>YB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="38"/> + <location filename="../../../FacilityEngine.cpp" line="48"/> <source>Less than %10 seconds</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="39"/> + <location filename="../../../FacilityEngine.cpp" line="49"/> <source>About %10 seconds remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="40"/> + <location filename="../../../FacilityEngine.cpp" line="50"/> <source>About %1 minutes remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="41"/> + <location filename="../../../FacilityEngine.cpp" line="51"/> <source>About %1 hours remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="47"/> + <location filename="../../../FacilityEngine.cpp" line="57"/> <source>Transfer</source> <extracomment>a transfer</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="50"/> + <location filename="../../../FacilityEngine.cpp" line="60"/> <source>Start</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="55"/> + <location filename="../../../FacilityEngine.cpp" line="65"/> <source>Source</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="56"/> + <location filename="../../../FacilityEngine.cpp" line="66"/> <source>Size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="57"/> + <location filename="../../../FacilityEngine.cpp" line="67"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="58"/> + <location filename="../../../FacilityEngine.cpp" line="68"/> <source>Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="59"/> + <location filename="../../../FacilityEngine.cpp" line="69"/> <source>Target</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="60"/> - <location filename="../../../FacilityEngine.cpp" line="64"/> + <location filename="../../../FacilityEngine.cpp" line="70"/> + <location filename="../../../FacilityEngine.cpp" line="74"/> <source>Time remaining:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="61"/> + <location filename="../../../FacilityEngine.cpp" line="71"/> <source>Listing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="62"/> + <location filename="../../../FacilityEngine.cpp" line="72"/> <source>Copying</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="63"/> + <location filename="../../../FacilityEngine.cpp" line="73"/> <source>Listing and copying</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="66"/> + <location filename="../../../FacilityEngine.cpp" line="76"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="68"/> + <location filename="../../../FacilityEngine.cpp" line="78"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="69"/> + <location filename="../../../FacilityEngine.cpp" line="79"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="70"/> + <location filename="../../../FacilityEngine.cpp" line="80"/> <source>Overwrite if the last modification dates are different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="71"/> + <location filename="../../../FacilityEngine.cpp" line="81"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="72"/> + <location filename="../../../FacilityEngine.cpp" line="82"/> <source>Put to the end of the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="73"/> + <location filename="../../../FacilityEngine.cpp" line="83"/> <source>Select source directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="74"/> + <location filename="../../../FacilityEngine.cpp" line="84"/> <source>Select destination directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="75"/> + <location filename="../../../FacilityEngine.cpp" line="85"/> <source>Internal error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="76"/> + <location filename="../../../FacilityEngine.cpp" line="86"/> <source>Select one or more files to open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="77"/> + <location filename="../../../FacilityEngine.cpp" line="87"/> <source>All files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="78"/> + <location filename="../../../FacilityEngine.cpp" line="88"/> <source>Save transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="79"/> + <location filename="../../../FacilityEngine.cpp" line="89"/> <source>Open transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="80"/> + <location filename="../../../FacilityEngine.cpp" line="90"/> <source>Transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="81"/> + <location filename="../../../FacilityEngine.cpp" line="91"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="82"/> + <location filename="../../../FacilityEngine.cpp" line="92"/> <source>Not supported on this platform</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="83"/> + <location filename="../../../FacilityEngine.cpp" line="93"/> <source>Completed in %1</source> <translation type="unfinished"></translation> </message> @@ -475,7 +475,7 @@ <context> <name>HelpDialog</name> <message> - <location filename="../../../HelpDialog.cpp" line="37"/> + <location filename="../../../HelpDialog.cpp" line="34"/> <source>About Ultracopier</source> <translation type="unfinished"></translation> </message> @@ -513,49 +513,42 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="35"/> - <source>About Supercopier</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../HelpDialog.cpp" line="80"/> + <location filename="../../../HelpDialog.cpp" line="73"/> <source>For http://portableapps.com/</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="83"/> + <location filename="../../../HelpDialog.cpp" line="76"/> <source>Portable and all in one version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="85"/> + <location filename="../../../HelpDialog.cpp" line="78"/> <source>Portable version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="90"/> + <location filename="../../../HelpDialog.cpp" line="83"/> <source>All in one version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="92"/> + <location filename="../../../HelpDialog.cpp" line="85"/> <source>Normal version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="110"/> - <location filename="../../../HelpDialog.cpp" line="112"/> - <location filename="../../../HelpDialog.cpp" line="123"/> + <location filename="../../../HelpDialog.cpp" line="102"/> <source>http://ultracopier.first-world.info/</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="120"/> + <location filename="../../../HelpDialog.cpp" line="109"/> <source>http://ultracopier.first-world.info/shop.html</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="125"/> + <location filename="../../../HelpDialog.cpp" line="111"/> <source>http://ultracopier.first-world.info/download.html</source> <translation type="unfinished"></translation> </message> @@ -569,12 +562,12 @@ This version is compiled as version: %1.</source> <context> <name>LocalListener</name> <message> - <location filename="../../../LocalListener.cpp" line="146"/> + <location filename="../../../LocalListener.cpp" line="160"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../LocalListener.cpp" line="146"/> + <location filename="../../../LocalListener.cpp" line="160"/> <source>Timeout while recomposing data from connected clients</source> <translation type="unfinished"></translation> </message> @@ -582,20 +575,20 @@ This version is compiled as version: %1.</source> <context> <name>LogThread</name> <message> - <location filename="../../../LogThread.cpp" line="106"/> - <location filename="../../../LogThread.cpp" line="115"/> - <location filename="../../../LogThread.cpp" line="125"/> + <location filename="../../../LogThread.cpp" line="107"/> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../LogThread.cpp" line="106"/> + <location filename="../../../LogThread.cpp" line="107"/> <source>Log file already open, error: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../LogThread.cpp" line="115"/> - <location filename="../../../LogThread.cpp" line="125"/> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> <source>Unable to open the log file, error: %1</source> <translation type="unfinished"></translation> </message> @@ -637,21 +630,6 @@ This version is compiled as version: %1.</source> <source>The replacement of default copy/move system should be not supported by the file manager.<br />Ask to the developer to support it.<br />You need do the copy/move manually.</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../../OSSpecific.cpp" line="32"/> - <source>Consider Supercopier as deprecated, prefer Ultracopier</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OSSpecific.cpp" line="35"/> - <source>This version use 100% of you graphic card/GPU (you computer can be noisy, or slow/buggy during the games) at exchange of free access to Ultimate version. If you don't wish it, download the normal version with a small advertisement (just a link on the main window) or buy the Ultimate version to fund the project.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OSSpecific.cpp" line="36"/> - <source>http://ultracopier.first-world.info/download.html</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>OptionDialog</name> @@ -674,7 +652,7 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="66"/> <location filename="../../../OptionDialog.ui" line="322"/> - <location filename="../../../OptionDialog.cpp" line="354"/> + <location filename="../../../OptionDialog.cpp" line="286"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> @@ -717,21 +695,21 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="71"/> <location filename="../../../OptionDialog.ui" line="335"/> - <location filename="../../../OptionDialog.cpp" line="355"/> + <location filename="../../../OptionDialog.cpp" line="287"/> <source>Listener</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="76"/> <location filename="../../../OptionDialog.ui" line="340"/> - <location filename="../../../OptionDialog.cpp" line="356"/> + <location filename="../../../OptionDialog.cpp" line="288"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="84"/> <location filename="../../../OptionDialog.ui" line="345"/> - <location filename="../../../OptionDialog.cpp" line="357"/> + <location filename="../../../OptionDialog.cpp" line="289"/> <source>Session loader</source> <translation type="unfinished"></translation> </message> @@ -863,95 +841,75 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="260"/> - <location filename="../../../OptionDialog.cpp" line="274"/> + <location filename="../../../OptionDialog.cpp" line="190"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="260"/> + <location filename="../../../OptionDialog.cpp" line="190"/> <source>Load the theme?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="274"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load the language?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="362"/> + <location filename="../../../OptionDialog.cpp" line="294"/> <source>Do nothing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="363"/> + <location filename="../../../OptionDialog.cpp" line="295"/> <source>Ask source as folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="364"/> + <location filename="../../../OptionDialog.cpp" line="296"/> <source>Ask sources as files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="365"/> + <location filename="../../../OptionDialog.cpp" line="297"/> <source>Never</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="366"/> + <location filename="../../../OptionDialog.cpp" line="298"/> <source>When source is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="367"/> + <location filename="../../../OptionDialog.cpp" line="299"/> <source>When destination is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="368"/> + <location filename="../../../OptionDialog.cpp" line="300"/> <source>When source and destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="369"/> + <location filename="../../../OptionDialog.cpp" line="301"/> <source>When source or destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="370"/> + <location filename="../../../OptionDialog.cpp" line="302"/> <source>Always</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="384"/> - <location filename="../../../OptionDialog.cpp" line="385"/> - <location filename="../../../OptionDialog.cpp" line="386"/> + <location filename="../../../OptionDialog.cpp" line="316"/> + <location filename="../../../OptionDialog.cpp" line="317"/> + <location filename="../../../OptionDialog.cpp" line="318"/> <source>The variables are %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="478"/> - <source>Allow the application</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="478"/> - <source>This Ultimate free version is only if %1 is allowed by your antivirus. Else you can get the normal free version</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="483"/> - <source>Enable the OpenCL</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="483"/> - <source>This Ultimate version is only if the OpenCL is installed with your graphic card drivers. Else you can get the normal free version</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="1591"/> + <location filename="../../../OptionDialog.cpp" line="948"/> <source>Save logs as: </source> <translation type="unfinished"></translation> </message> @@ -980,10 +938,10 @@ This version is compiled as version: %1.</source> <context> <name>OptionEngine</name> <message> - <location filename="../../../OptionEngine.cpp" line="161"/> - <location filename="../../../OptionEngine.cpp" line="165"/> - <location filename="../../../OptionEngine.cpp" line="202"/> - <location filename="../../../OptionEngine.cpp" line="206"/> + <location filename="../../../OptionEngine.cpp" line="162"/> + <location filename="../../../OptionEngine.cpp" line="169"/> + <location filename="../../../OptionEngine.cpp" line="211"/> + <location filename="../../../OptionEngine.cpp" line="215"/> <source>The variable was not found: %1 %2</source> <translation type="unfinished"></translation> </message> @@ -1026,42 +984,42 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="38"/> + <location filename="../../../PluginInformation.cpp" line="39"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="41"/> + <location filename="../../../PluginInformation.cpp" line="42"/> <source>Languages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="44"/> + <location filename="../../../PluginInformation.cpp" line="45"/> <source>Listener</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="47"/> + <location filename="../../../PluginInformation.cpp" line="48"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="50"/> + <location filename="../../../PluginInformation.cpp" line="51"/> <source>Session loader</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="53"/> + <location filename="../../../PluginInformation.cpp" line="54"/> <source>Themes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="57"/> + <location filename="../../../PluginInformation.cpp" line="58"/> <source>Unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="67"/> + <location filename="../../../PluginInformation.cpp" line="68"/> <source>Information about %1</source> <translation type="unfinished"></translation> </message> @@ -1079,140 +1037,140 @@ This version is compiled as version: %1.</source> <context> <name>PluginsManager</name> <message> - <location filename="../../../PluginsManager.cpp" line="221"/> + <location filename="../../../PluginsManager.cpp" line="224"/> <source>informations.xml is not accessible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="487"/> + <location filename="../../../PluginsManager.cpp" line="494"/> <source>Dependencies part is wrong</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="508"/> + <location filename="../../../PluginsManager.cpp" line="515"/> <source>Dependencies %1 are not satisfied, for plugin: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="665"/> + <location filename="../../../PluginsManager.cpp" line="672"/> <source>Remove %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="676"/> + <location filename="../../../PluginsManager.cpp" line="683"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="700"/> + <location filename="../../../PluginsManager.cpp" line="683"/> + <source>Error while the removing plugin, please check the rights on the folder: +%1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="707"/> <source>Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="253"/> + <location filename="../../../PluginsManager.cpp" line="256"/> <source>%1, parse error at line %2, column %3: %4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="227"/> + <location filename="../../../PluginsManager.cpp" line="230"/> <source>informations.xml not found for the plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="261"/> + <location filename="../../../PluginsManager.cpp" line="264"/> <source>"package" root tag not found for the xml file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="337"/> + <location filename="../../../PluginsManager.cpp" line="340"/> <source>Duplicated plugin found, already loaded!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="395"/> + <location filename="../../../PluginsManager.cpp" line="401"/> <source>English text missing in the informations.xml for the tag: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="403"/> + <location filename="../../../PluginsManager.cpp" line="409"/> <source>Tag not found: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="665"/> + <location filename="../../../PluginsManager.cpp" line="672"/> <source>Are you sure about removing "%1" in version %2?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="676"/> - <source>Error while the removing plugin, please check the rights on the folder: -%1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../PluginsManager.cpp" line="700"/> + <location filename="../../../PluginsManager.cpp" line="707"/> <source>Previous import is in progress...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="703"/> + <location filename="../../../PluginsManager.cpp" line="710"/> <source>Open Ultracopier plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="703"/> + <location filename="../../../PluginsManager.cpp" line="710"/> <source>Ultracopier plugin (*.urc)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="720"/> - <location filename="../../../PluginsManager.cpp" line="745"/> - <location filename="../../../PluginsManager.cpp" line="813"/> - <location filename="../../../PluginsManager.cpp" line="826"/> - <location filename="../../../PluginsManager.cpp" line="845"/> - <location filename="../../../PluginsManager.cpp" line="851"/> - <location filename="../../../PluginsManager.cpp" line="857"/> - <location filename="../../../PluginsManager.cpp" line="863"/> - <location filename="../../../PluginsManager.cpp" line="869"/> + <location filename="../../../PluginsManager.cpp" line="727"/> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="820"/> + <location filename="../../../PluginsManager.cpp" line="833"/> + <location filename="../../../PluginsManager.cpp" line="852"/> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="870"/> <location filename="../../../PluginsManager.cpp" line="876"/> + <location filename="../../../PluginsManager.cpp" line="883"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="720"/> + <location filename="../../../PluginsManager.cpp" line="727"/> <source>Unable to open the plugin: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="745"/> - <location filename="../../../PluginsManager.cpp" line="863"/> - <location filename="../../../PluginsManager.cpp" line="876"/> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="870"/> + <location filename="../../../PluginsManager.cpp" line="883"/> <source>Unable to load the plugin content, please check it: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="813"/> + <location filename="../../../PluginsManager.cpp" line="820"/> <source>Unable to create a folder to install the plugin: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="826"/> + <location filename="../../../PluginsManager.cpp" line="833"/> <source>Unable to create a file to install the plugin: %1 since:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="845"/> + <location filename="../../../PluginsManager.cpp" line="852"/> <source>Folder with same name is present, skip the plugin installation: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="851"/> - <location filename="../../../PluginsManager.cpp" line="857"/> - <location filename="../../../PluginsManager.cpp" line="869"/> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="876"/> <source>Unable to load the plugin content, please check it</source> <translation type="unfinished"></translation> </message> @@ -1265,119 +1223,34 @@ since:%2</source> <context> <name>SystrayIcon</name> <message> - <location filename="../../../SystrayIcon.cpp" line="163"/> + <location filename="../../../SystrayIcon.cpp" line="155"/> <source>No copy listener found. Do the copy manually by right click one the system tray icon.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="169"/> + <location filename="../../../SystrayIcon.cpp" line="161"/> <source>Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="187"/> + <location filename="../../../SystrayIcon.cpp" line="179"/> <source>Searching information...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="200"/> + <location filename="../../../SystrayIcon.cpp" line="192"/> <source>Do not replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="205"/> + <location filename="../../../SystrayIcon.cpp" line="197"/> <source>Semi replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="210"/> + <location filename="../../../SystrayIcon.cpp" line="202"/> <source>Replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="377"/> - <source>Warning</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="377"/> - <source>The action on the systray icon is unknown!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="425"/> - <source>&About/Debug report</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="427"/> - <source>&About</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="430"/> - <source>&Save bug report</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="432"/> - <source>&Quit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="433"/> - <source>&Options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="485"/> - <source>A&dd copy/moving</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="471"/> - <source>New version: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="471"/> - <source>Click here to go on download page</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="511"/> - <source>&Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="525"/> - <location filename="../../../SystrayIcon.cpp" line="539"/> - <source>&Transfer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="529"/> - <location filename="../../../SystrayIcon.cpp" line="543"/> - <source>&Move</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="560"/> - <location filename="../../../SystrayIcon.cpp" line="577"/> - <source>Add &copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="566"/> - <location filename="../../../SystrayIcon.cpp" line="583"/> - <source>Add &transfer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="570"/> - <location filename="../../../SystrayIcon.cpp" line="587"/> - <source>Add &move</source> - <translation type="unfinished"></translation> - </message> </context> </TS> diff --git a/plugins/Languages/de/informations.xml b/plugins/Languages/de/informations.xml index ff73225..c036053 100644 --- a/plugins/Languages/de/informations.xml +++ b/plugins/Languages/de/informations.xml @@ -12,7 +12,7 @@ <!-- Detailed description --> <description xml:lang="en"><![CDATA[Translation of Ultracopier to german. For more details see the web site.]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>1.2.3.6</version> + <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>de</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/de/translation.ts b/plugins/Languages/de/translation.ts index eeee697..7e64330 100644 --- a/plugins/Languages/de/translation.ts +++ b/plugins/Languages/de/translation.ts @@ -1,87 +1,87 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0" language="de" sourcelanguage="en"> +<TS version="2.1" language="de" sourcelanguage="en"> <context> <name>CliParser</name> <message> - <location filename="../../../CliParser.cpp" line="25"/> - <location filename="../../../CliParser.cpp" line="71"/> - <location filename="../../../CliParser.cpp" line="84"/> - <location filename="../../../CliParser.cpp" line="94"/> - <location filename="../../../CliParser.cpp" line="179"/> + <location filename="../../../CliParser.cpp" line="26"/> + <location filename="../../../CliParser.cpp" line="72"/> + <location filename="../../../CliParser.cpp" line="85"/> + <location filename="../../../CliParser.cpp" line="95"/> + <location filename="../../../CliParser.cpp" line="180"/> <source>Warning</source> <translation>Warnung</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="25"/> + <location filename="../../../CliParser.cpp" line="26"/> <source>Ultracopier is already running, right click on its system tray icon (near the clock) to use it</source> <translation>Ultracopier wird bereits ausgeführt. Klicken Sie mit der rechten Maustase auf das Icon im Infobereich der Taskleiste</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="71"/> + <location filename="../../../CliParser.cpp" line="72"/> <source>Problem reading file, or file size is 0</source> <translation>Lesefehler, oder Dateigröße=0</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="159"/> - <location filename="../../../CliParser.cpp" line="170"/> + <location filename="../../../CliParser.cpp" line="160"/> + <location filename="../../../CliParser.cpp" line="171"/> <source>The arguments possible are:</source> <translation>Mögliche Werte sind:</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="161"/> - <location filename="../../../CliParser.cpp" line="172"/> + <location filename="../../../CliParser.cpp" line="162"/> + <location filename="../../../CliParser.cpp" line="173"/> <source>To display the options</source> <translation>Optionen anzeigen</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="164"/> - <location filename="../../../CliParser.cpp" line="175"/> + <location filename="../../../CliParser.cpp" line="165"/> + <location filename="../../../CliParser.cpp" line="176"/> <source>To copy sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> - <translation>Zum Kopieren von Quelle nach Ziel, getrennt durch Leerzeichen. Bei Ziel=? fragt Supercopier nach</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="165"/> - <location filename="../../../CliParser.cpp" line="176"/> + <location filename="../../../CliParser.cpp" line="166"/> + <location filename="../../../CliParser.cpp" line="177"/> <source>To move sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> - <translation>Zum Verschieben von Quelle nach Ziel, getrennt durch Leerzeichen. Bei Ziel=? fragt Supercopier nach</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="169"/> + <location filename="../../../CliParser.cpp" line="170"/> <source>Command not valid</source> <translation>Ungültiger Befehl</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="84"/> + <location filename="../../../CliParser.cpp" line="85"/> <source>This file is not supported transfer list</source> <translatorcomment>The original english text does not make sense.</translatorcomment> <translation>Diese Datei wird nicht unterstützt Transferliste</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="94"/> + <location filename="../../../CliParser.cpp" line="95"/> <source>Unable to open the transfer list file</source> <translation>Die Transferlistendatei kann nicht geöffnet werden</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="160"/> - <location filename="../../../CliParser.cpp" line="171"/> + <location filename="../../../CliParser.cpp" line="161"/> + <location filename="../../../CliParser.cpp" line="172"/> <source>To display this help</source> <translation>Um diese Hilfe anzuzeigen</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="162"/> - <location filename="../../../CliParser.cpp" line="173"/> + <location filename="../../../CliParser.cpp" line="163"/> + <location filename="../../../CliParser.cpp" line="174"/> <source>To quit the other instances (if running)</source> <translation>Um andere Instanzen zu beenden (falls laufend)</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="163"/> - <location filename="../../../CliParser.cpp" line="174"/> + <location filename="../../../CliParser.cpp" line="164"/> + <location filename="../../../CliParser.cpp" line="175"/> <source>Open transfer list</source> <translation>Transferliste öffnen</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="181"/> + <location filename="../../../CliParser.cpp" line="182"/> <source>Help</source> <translation>Hilfe</translation> </message> @@ -89,39 +89,30 @@ <context> <name>CopyEngineManager</name> <message> - <location filename="../../../CopyEngineManager.cpp" line="229"/> - <location filename="../../../CopyEngineManager.cpp" line="234"/> - <location filename="../../../CopyEngineManager.cpp" line="257"/> - <location filename="../../../CopyEngineManager.cpp" line="271"/> + <location filename="../../../CopyEngineManager.cpp" line="231"/> + <location filename="../../../CopyEngineManager.cpp" line="236"/> + <location filename="../../../CopyEngineManager.cpp" line="259"/> + <location filename="../../../CopyEngineManager.cpp" line="273"/> <source>Warning</source> <translation>Warnung</translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="229"/> + <location filename="../../../CopyEngineManager.cpp" line="231"/> <source>Cannot find any copy engine with move support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="257"/> + <location filename="../../../CopyEngineManager.cpp" line="259"/> <source>This copy engine does not support move</source> <translation type="unfinished"></translation> </message> <message> - <source>Cannot find any copy engine with motions support</source> - <translatorcomment>Motions? Do you mean "move"?</translatorcomment> - <translation type="obsolete">Finde keine Kopier-Engine mit Motions-Unterstützung</translation> - </message> - <message> - <location filename="../../../CopyEngineManager.cpp" line="234"/> + <location filename="../../../CopyEngineManager.cpp" line="236"/> <source>Cannot find any compatible engine!</source> <translation>Finde keine kompatible Engine!</translation> </message> <message> - <source>This copy engine does not support motions</source> - <translation type="obsolete">Diese Kopier-Engine unterstützt keine Motions</translation> - </message> - <message> - <location filename="../../../CopyEngineManager.cpp" line="271"/> + <location filename="../../../CopyEngineManager.cpp" line="273"/> <source>Cannot find any engine with this name: %1</source> <translation>Finde keine Engine mit diesem Namen: %1</translation> </message> @@ -129,12 +120,12 @@ <context> <name>CopyListener</name> <message> - <location filename="../../../CopyListener.cpp" line="158"/> + <location filename="../../../CopyListener.cpp" line="159"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../../../CopyListener.cpp" line="158"/> + <location filename="../../../CopyListener.cpp" line="159"/> <source>Error during the reception of the copy/move list %1</source> <translation>Fehler während Empfang der Kopier/Verschieben-Liste @@ -144,70 +135,70 @@ <context> <name>Core</name> <message> - <location filename="../../../Core.cpp" line="45"/> - <location filename="../../../Core.cpp" line="116"/> - <location filename="../../../Core.cpp" line="142"/> - <location filename="../../../Core.cpp" line="157"/> - <location filename="../../../Core.cpp" line="177"/> - <location filename="../../../Core.cpp" line="191"/> - <location filename="../../../Core.cpp" line="200"/> - <location filename="../../../Core.cpp" line="209"/> - <location filename="../../../Core.cpp" line="216"/> - <location filename="../../../Core.cpp" line="250"/> - <location filename="../../../Core.cpp" line="387"/> - <location filename="../../../Core.cpp" line="392"/> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="117"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> + <location filename="../../../Core.cpp" line="217"/> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> + <location filename="../../../Core.cpp" line="393"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../../../Core.cpp" line="45"/> - <location filename="../../../Core.cpp" line="142"/> - <location filename="../../../Core.cpp" line="157"/> - <location filename="../../../Core.cpp" line="177"/> - <location filename="../../../Core.cpp" line="191"/> - <location filename="../../../Core.cpp" line="200"/> - <location filename="../../../Core.cpp" line="209"/> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> <source>Unable to get a copy engine instance</source> <translation>Bekomme keine Instanz der Kopier-Engine</translation> </message> <message> - <location filename="../../../Core.cpp" line="93"/> + <location filename="../../../Core.cpp" line="94"/> <source>Group window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="93"/> + <location filename="../../../Core.cpp" line="94"/> <source>Do you want group the transfer with another actual running transfer?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="116"/> + <location filename="../../../Core.cpp" line="117"/> <source>Unable to get a engine instance</source> <translation>Bekomme keine Instanz der Engine</translation> </message> <message> - <location filename="../../../Core.cpp" line="216"/> + <location filename="../../../Core.cpp" line="217"/> <source>The argument for the mode is not valid</source> <translation>Die Parameter sind in diesem Modus ungültig</translation> </message> <message> - <location filename="../../../Core.cpp" line="1133"/> + <location filename="../../../Core.cpp" line="1136"/> <source>Do you want to copy? If no, it will be moved.</source> <translation>Möchten Sie kopieren? Wenn nicht, wird verschoben.</translation> </message> <message> - <location filename="../../../Core.cpp" line="250"/> - <location filename="../../../Core.cpp" line="387"/> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> <source>Unable to load the interface, copy aborted</source> <translation>Konnte Oberfläche nicht laden. Kopiervorgang abgebrochen</translation> </message> <message> - <location filename="../../../Core.cpp" line="392"/> + <location filename="../../../Core.cpp" line="393"/> <source>Unable to load the copy engine, copy aborted</source> <translation>Konnte Kopier-Engine nicht laden. Kopiervorgang abgebrochen</translation> </message> <message> - <location filename="../../../Core.cpp" line="1133"/> + <location filename="../../../Core.cpp" line="1136"/> <source>Transfer mode</source> <translation>Transfermodus</translation> </message> @@ -215,12 +206,12 @@ <context> <name>EventDispatcher</name> <message> - <location filename="../../../EventDispatcher.cpp" line="155"/> + <location filename="../../../EventDispatcher.cpp" line="152"/> <source>Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../EventDispatcher.cpp" line="155"/> + <location filename="../../../EventDispatcher.cpp" line="152"/> <source>Give the key of this software, more information on <a href="http://ultracopier.first-world.info/">ultracopier.first-world.info</a></source> <translation type="unfinished"></translation> </message> @@ -228,269 +219,269 @@ <context> <name>FacilityEngine</name> <message> - <location filename="../../../FacilityEngine.cpp" line="43"/> + <location filename="../../../FacilityEngine.cpp" line="53"/> <source>Copy engine</source> <translation>Kopier-Engine</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="45"/> + <location filename="../../../FacilityEngine.cpp" line="55"/> <source>Copy</source> <extracomment>a copy</extracomment> <translation>Kopieren</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="49"/> + <location filename="../../../FacilityEngine.cpp" line="59"/> <source>Move</source> <extracomment>a move</extracomment> <translation>Verschieben</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="51"/> + <location filename="../../../FacilityEngine.cpp" line="61"/> <source>Pause</source> <translation>Pause</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="52"/> + <location filename="../../../FacilityEngine.cpp" line="62"/> <source>Resume</source> <translation>Fortsetzen</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="53"/> - <location filename="../../../FacilityEngine.cpp" line="67"/> + <location filename="../../../FacilityEngine.cpp" line="63"/> + <location filename="../../../FacilityEngine.cpp" line="77"/> <source>Skip</source> <translation>Überspringen</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="54"/> + <location filename="../../../FacilityEngine.cpp" line="64"/> <source>Unlimited</source> <translation>Unbegrenzt</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="27"/> + <location filename="../../../FacilityEngine.cpp" line="37"/> <source>s</source> <translatorcomment>seconds?</translatorcomment> <translation>s</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="28"/> + <location filename="../../../FacilityEngine.cpp" line="38"/> <source>Too big</source> <translation>Zu groß</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="29"/> + <location filename="../../../FacilityEngine.cpp" line="39"/> <source>B</source> <translatorcomment>Byte?</translatorcomment> <translation>B</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="30"/> + <location filename="../../../FacilityEngine.cpp" line="40"/> <source>KB</source> <translatorcomment>Kilobyte</translatorcomment> <translation>KB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="31"/> + <location filename="../../../FacilityEngine.cpp" line="41"/> <source>MB</source> <translatorcomment>Megabyte</translatorcomment> <translation>MB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="32"/> + <location filename="../../../FacilityEngine.cpp" line="42"/> <source>GB</source> <translatorcomment>Gigabyte</translatorcomment> <translation>GB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="33"/> + <location filename="../../../FacilityEngine.cpp" line="43"/> <source>TB</source> <translatorcomment>Terrabyte</translatorcomment> <translation>TB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="34"/> + <location filename="../../../FacilityEngine.cpp" line="44"/> <source>PB</source> <translatorcomment>Petabyte</translatorcomment> <translation>PB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="35"/> + <location filename="../../../FacilityEngine.cpp" line="45"/> <source>EB</source> <translatorcomment>Etabyte</translatorcomment> <translation>EB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="36"/> + <location filename="../../../FacilityEngine.cpp" line="46"/> <source>ZB</source> <translatorcomment>Zetabyte</translatorcomment> <translation>ZB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="37"/> + <location filename="../../../FacilityEngine.cpp" line="47"/> <source>YB</source> <translatorcomment>Yotabyte</translatorcomment> <translation>YB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="38"/> + <location filename="../../../FacilityEngine.cpp" line="48"/> <source>Less than %10 seconds</source> <translation>Weniger als %10 Sekunden</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="39"/> + <location filename="../../../FacilityEngine.cpp" line="49"/> <source>About %10 seconds remaining</source> <translation>Ungefähr noch %10 Sekunden</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="40"/> + <location filename="../../../FacilityEngine.cpp" line="50"/> <source>About %1 minutes remaining</source> <translation>Ungefähr noch %1 Minuten</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="41"/> + <location filename="../../../FacilityEngine.cpp" line="51"/> <source>About %1 hours remaining</source> <translation>Ungefähr noch %1 Stunden</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="47"/> + <location filename="../../../FacilityEngine.cpp" line="57"/> <source>Transfer</source> <extracomment>a transfer</extracomment> <translatorcomment>evtl. "Datenübertragung", aber ich denke "Transfer" ist hier besser</translatorcomment> <translation>Transfer</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="50"/> + <location filename="../../../FacilityEngine.cpp" line="60"/> <source>Start</source> <translation>Start</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="55"/> + <location filename="../../../FacilityEngine.cpp" line="65"/> <source>Source</source> <translation>Quelle</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="56"/> + <location filename="../../../FacilityEngine.cpp" line="66"/> <source>Size</source> <translation>Größe</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="57"/> + <location filename="../../../FacilityEngine.cpp" line="67"/> <source>Destination</source> <translation>Ziel</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="58"/> + <location filename="../../../FacilityEngine.cpp" line="68"/> <source>Quit</source> <translation>Beenden</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="59"/> + <location filename="../../../FacilityEngine.cpp" line="69"/> <source>Target</source> <translation>Ziel</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="60"/> - <location filename="../../../FacilityEngine.cpp" line="64"/> + <location filename="../../../FacilityEngine.cpp" line="70"/> + <location filename="../../../FacilityEngine.cpp" line="74"/> <source>Time remaining:</source> <translation>Verbleibende Zeit:</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="61"/> + <location filename="../../../FacilityEngine.cpp" line="71"/> <source>Listing</source> <translation>Auflistung</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="62"/> + <location filename="../../../FacilityEngine.cpp" line="72"/> <source>Copying</source> <translation>Kopieren</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="63"/> + <location filename="../../../FacilityEngine.cpp" line="73"/> <source>Listing and copying</source> <translatorcomment>not sure... depends on context</translatorcomment> <translation>Auflistung und Kopiervorgang</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="66"/> + <location filename="../../../FacilityEngine.cpp" line="76"/> <source>Ask</source> <translation>Fragen</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="68"/> + <location filename="../../../FacilityEngine.cpp" line="78"/> <source>Overwrite</source> <translation>Überschreiben</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="69"/> + <location filename="../../../FacilityEngine.cpp" line="79"/> <source>Overwrite if newer</source> <translation>Überschreiben, falls neuer</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="70"/> + <location filename="../../../FacilityEngine.cpp" line="80"/> <source>Overwrite if the last modification dates are different</source> <translation>Überschreiben, falls die letzten Änderungsdaten unterschiedlich sind</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="71"/> + <location filename="../../../FacilityEngine.cpp" line="81"/> <source>Rename</source> <translation>Umbenennen</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="72"/> + <location filename="../../../FacilityEngine.cpp" line="82"/> <source>Put to the end of the list</source> <translation>Ans Ende der Liste verschieben</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="83"/> + <location filename="../../../FacilityEngine.cpp" line="93"/> <source>Completed in %1</source> <translation>Fertig in %1</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="73"/> + <location filename="../../../FacilityEngine.cpp" line="83"/> <source>Select source directory</source> <translation>Wählen Sie das Quellverzeichnis</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="74"/> + <location filename="../../../FacilityEngine.cpp" line="84"/> <source>Select destination directory</source> <translation>Wählen Sie das Zielverzeichnis</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="75"/> + <location filename="../../../FacilityEngine.cpp" line="85"/> <source>Internal error</source> <translation>Interner Fehler</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="76"/> + <location filename="../../../FacilityEngine.cpp" line="86"/> <source>Select one or more files to open</source> <translation>Wählen Sie eine oder mehrere Dateien zum Öffnen</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="77"/> + <location filename="../../../FacilityEngine.cpp" line="87"/> <source>All files</source> <translation>Alle Dateien</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="78"/> + <location filename="../../../FacilityEngine.cpp" line="88"/> <source>Save transfer list</source> <translation>Transferliste speichern</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="79"/> + <location filename="../../../FacilityEngine.cpp" line="89"/> <source>Open transfer list</source> <translation>Transferliste öffnen</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="80"/> + <location filename="../../../FacilityEngine.cpp" line="90"/> <source>Transfer list</source> <translation>Transferliste</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="81"/> + <location filename="../../../FacilityEngine.cpp" line="91"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="82"/> + <location filename="../../../FacilityEngine.cpp" line="92"/> <source>Not supported on this platform</source> <translation>Auf dieser Plattform nicht unterstützt</translation> </message> @@ -498,7 +489,7 @@ <context> <name>HelpDialog</name> <message> - <location filename="../../../HelpDialog.cpp" line="37"/> + <location filename="../../../HelpDialog.cpp" line="34"/> <source>About Ultracopier</source> <translation>Über Ultracopier</translation> </message> @@ -538,49 +529,42 @@ Diese Version wurde kompiliert als Version: %1.</translation> <translation>Schließen</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="35"/> - <source>About Supercopier</source> - <translation>Über Supercopier</translation> - </message> - <message> - <location filename="../../../HelpDialog.cpp" line="80"/> + <location filename="../../../HelpDialog.cpp" line="73"/> <source>For http://portableapps.com/</source> <translation>Zu http://portableapps.com/</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="83"/> + <location filename="../../../HelpDialog.cpp" line="76"/> <source>Portable and all in one version</source> <translation>Portable und "Alles-in-Einem" Version</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="85"/> + <location filename="../../../HelpDialog.cpp" line="78"/> <source>Portable version</source> <translation>Portable Version</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="90"/> + <location filename="../../../HelpDialog.cpp" line="83"/> <source>All in one version</source> <translation>"Alles-in-Einem" Version</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="92"/> + <location filename="../../../HelpDialog.cpp" line="85"/> <source>Normal version</source> <translation>Normale Version</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="110"/> - <location filename="../../../HelpDialog.cpp" line="112"/> - <location filename="../../../HelpDialog.cpp" line="123"/> + <location filename="../../../HelpDialog.cpp" line="102"/> <source>http://ultracopier.first-world.info/</source> <translation>http://ultracopier-de.first-world.info/</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="120"/> + <location filename="../../../HelpDialog.cpp" line="109"/> <source>http://ultracopier.first-world.info/shop.html</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="125"/> + <location filename="../../../HelpDialog.cpp" line="111"/> <source>http://ultracopier.first-world.info/download.html</source> <translation>http://ultracopier.first-world.info/download.html</translation> </message> @@ -594,12 +578,12 @@ Diese Version wurde kompiliert als Version: %1.</translation> <context> <name>LocalListener</name> <message> - <location filename="../../../LocalListener.cpp" line="146"/> + <location filename="../../../LocalListener.cpp" line="160"/> <source>Warning</source> <translation>Warnung</translation> </message> <message> - <location filename="../../../LocalListener.cpp" line="146"/> + <location filename="../../../LocalListener.cpp" line="160"/> <source>Timeout while recomposing data from connected clients</source> <translation>Timeout beim Zusammenfügen der Daten von verbundenen Clients</translation> </message> @@ -607,20 +591,20 @@ Diese Version wurde kompiliert als Version: %1.</translation> <context> <name>LogThread</name> <message> - <location filename="../../../LogThread.cpp" line="106"/> - <location filename="../../../LogThread.cpp" line="115"/> - <location filename="../../../LogThread.cpp" line="125"/> + <location filename="../../../LogThread.cpp" line="107"/> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../../../LogThread.cpp" line="106"/> + <location filename="../../../LogThread.cpp" line="107"/> <source>Log file already open, error: %1</source> <translation>Log-Datei ist bereits geöffnet, Fehler: %1</translation> </message> <message> - <location filename="../../../LogThread.cpp" line="115"/> - <location filename="../../../LogThread.cpp" line="125"/> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> <source>Unable to open the log file, error: %1</source> <translation>Kann Log-Datei nicht öffnen. Fehler: %1</translation> </message> @@ -662,21 +646,6 @@ Diese Version wurde kompiliert als Version: %1.</translation> <source>The replacement of default copy/move system should be not supported by the file manager.<br />Ask to the developer to support it.<br />You need do the copy/move manually.</source> <translation>Das Ersetzen des Standard Kopier/Verschieben-Systems wird von diesem File-Manager nicht unterstützt.<br />Bitten Sie die Entwickler darum es zu supporten. <br />Sie müssen das Kopieren/Verschieben daher manuell durchführen.</translation> </message> - <message> - <location filename="../../../OSSpecific.cpp" line="32"/> - <source>Consider Supercopier as deprecated, prefer Ultracopier</source> - <translation>Supercopier als veraltet betrachten, Ultracopier vorziehen</translation> - </message> - <message> - <location filename="../../../OSSpecific.cpp" line="35"/> - <source>This version use 100% of you graphic card/GPU (you computer can be noisy, or slow/buggy during the games) at exchange of free access to Ultimate version. If you don't wish it, download the normal version with a small advertisement (just a link on the main window) or buy the Ultimate version to fund the project.</source> - <translation>Diese Version nutzt die GPU Ihrer Grafikkarte zu 100% (Kann beim Spielen stören) aber kostenloser Zugang zur Ultimate-Version. Alternativ downloaden Sie die Normal-Version (mit Werbe-Link), oder kaufen Sie die Ultimate-Version, um das Projekt zu unterstützen.</translation> - </message> - <message> - <location filename="../../../OSSpecific.cpp" line="36"/> - <source>http://ultracopier.first-world.info/download.html</source> - <translation>http://ultracopier.first-world.info/download.html</translation> - </message> </context> <context> <name>OptionDialog</name> @@ -699,7 +668,7 @@ Diese Version wurde kompiliert als Version: %1.</translation> <message> <location filename="../../../OptionDialog.ui" line="66"/> <location filename="../../../OptionDialog.ui" line="322"/> - <location filename="../../../OptionDialog.cpp" line="354"/> + <location filename="../../../OptionDialog.cpp" line="286"/> <source>Copy engine</source> <translation>Kopier-Engine</translation> </message> @@ -742,21 +711,21 @@ Diese Version wurde kompiliert als Version: %1.</translation> <message> <location filename="../../../OptionDialog.ui" line="71"/> <location filename="../../../OptionDialog.ui" line="335"/> - <location filename="../../../OptionDialog.cpp" line="355"/> + <location filename="../../../OptionDialog.cpp" line="287"/> <source>Listener</source> <translation>Listener</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="76"/> <location filename="../../../OptionDialog.ui" line="340"/> - <location filename="../../../OptionDialog.cpp" line="356"/> + <location filename="../../../OptionDialog.cpp" line="288"/> <source>Plugin loader</source> <translation>Plugin loader</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="84"/> <location filename="../../../OptionDialog.ui" line="345"/> - <location filename="../../../OptionDialog.cpp" line="357"/> + <location filename="../../../OptionDialog.cpp" line="289"/> <source>Session loader</source> <translation>Session loader</translation> </message> @@ -878,99 +847,75 @@ Diese Version wurde kompiliert als Version: %1.</translation> <translation>Schreibe direkt in die Datei, wenn ein neuer Eintrag erreicht wird (50% Leistungsverlust möglich)</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="260"/> - <location filename="../../../OptionDialog.cpp" line="274"/> + <location filename="../../../OptionDialog.cpp" line="190"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load</source> <translation>Laden</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="260"/> + <location filename="../../../OptionDialog.cpp" line="190"/> <source>Load the theme?</source> <translation>Theme laden?</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="274"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load the language?</source> <translation>Sprache laden?</translation> </message> <message> - <source>Disabled because you do not have any SessionLoader plugin</source> - <translation type="obsolete">Deaktiviert, da kein SessionLoader-Plugin installiert ist</translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="362"/> + <location filename="../../../OptionDialog.cpp" line="294"/> <source>Do nothing</source> <translation>Nichts tun</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="363"/> + <location filename="../../../OptionDialog.cpp" line="295"/> <source>Ask source as folder</source> <translation>Nach Quell-Ordner fragen</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="364"/> + <location filename="../../../OptionDialog.cpp" line="296"/> <source>Ask sources as files</source> <translation>Nach Quell-Datei fragen</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="365"/> + <location filename="../../../OptionDialog.cpp" line="297"/> <source>Never</source> <translation>Nie</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="366"/> + <location filename="../../../OptionDialog.cpp" line="298"/> <source>When source is same</source> <translation>Falls Quelle gleich ist</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="367"/> + <location filename="../../../OptionDialog.cpp" line="299"/> <source>When destination is same</source> <translation>Falls Ziel gleich ist</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="368"/> + <location filename="../../../OptionDialog.cpp" line="300"/> <source>When source and destination are same</source> <translation>Falls Quelle und Ziel gleich sind</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="369"/> + <location filename="../../../OptionDialog.cpp" line="301"/> <source>When source or destination are same</source> <translation>Falls Quelle oder Ziel gleich sind</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="370"/> + <location filename="../../../OptionDialog.cpp" line="302"/> <source>Always</source> <translation>Immer</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="384"/> - <location filename="../../../OptionDialog.cpp" line="385"/> - <location filename="../../../OptionDialog.cpp" line="386"/> + <location filename="../../../OptionDialog.cpp" line="316"/> + <location filename="../../../OptionDialog.cpp" line="317"/> + <location filename="../../../OptionDialog.cpp" line="318"/> <source>The variables are %1</source> <translation>Die Variablen sind %1</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="478"/> - <source>Allow the application</source> - <translation>Anwendung zulassen</translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="478"/> - <source>This Ultimate free version is only if %1 is allowed by your antivirus. Else you can get the normal free version</source> - <translation>Diese Ultimate-Gratis-Version läuft nur, wenn %1 von Ihrer Antivirus-Software erlaubt ist. Sonst benutzen Sie die Normalversion.</translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="483"/> - <source>Enable the OpenCL</source> - <translation>OpenCL einschalten</translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="483"/> - <source>This Ultimate version is only if the OpenCL is installed with your graphic card drivers. Else you can get the normal free version</source> - <translation>Diese Ultimate-Gratis-Version läuft nur, wenn mit Ihrem Grafik-Treiber OpenCL installiert wurde. Sonst benutzen Sie die Normalversion.</translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="1591"/> + <location filename="../../../OptionDialog.cpp" line="948"/> <source>Save logs as: </source> <translation>Protokolle speichern als: </translation> </message> @@ -1009,10 +954,10 @@ Diese Version wurde kompiliert als Version: %1.</translation> <context> <name>OptionEngine</name> <message> - <location filename="../../../OptionEngine.cpp" line="161"/> - <location filename="../../../OptionEngine.cpp" line="165"/> - <location filename="../../../OptionEngine.cpp" line="202"/> - <location filename="../../../OptionEngine.cpp" line="206"/> + <location filename="../../../OptionEngine.cpp" line="162"/> + <location filename="../../../OptionEngine.cpp" line="169"/> + <location filename="../../../OptionEngine.cpp" line="211"/> + <location filename="../../../OptionEngine.cpp" line="215"/> <source>The variable was not found: %1 %2</source> <translation>Variablen nicht gefunden: %1 %2</translation> </message> @@ -1055,42 +1000,42 @@ Diese Version wurde kompiliert als Version: %1.</translation> <translation>Version:</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="38"/> + <location filename="../../../PluginInformation.cpp" line="39"/> <source>Copy engine</source> <translation>Kopier-Engine</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="41"/> + <location filename="../../../PluginInformation.cpp" line="42"/> <source>Languages</source> <translation>Sprachen</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="44"/> + <location filename="../../../PluginInformation.cpp" line="45"/> <source>Listener</source> <translation>Listener</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="47"/> + <location filename="../../../PluginInformation.cpp" line="48"/> <source>Plugin loader</source> <translation>Plugin-Loader</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="50"/> + <location filename="../../../PluginInformation.cpp" line="51"/> <source>Session loader</source> <translation>Session-Loader</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="53"/> + <location filename="../../../PluginInformation.cpp" line="54"/> <source>Themes</source> <translation>Themes</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="57"/> + <location filename="../../../PluginInformation.cpp" line="58"/> <source>Unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="67"/> + <location filename="../../../PluginInformation.cpp" line="68"/> <source>Information about %1</source> <translation>Informationen über %1</translation> </message> @@ -1108,128 +1053,127 @@ Diese Version wurde kompiliert als Version: %1.</translation> <context> <name>PluginsManager</name> <message> - <location filename="../../../PluginsManager.cpp" line="221"/> + <location filename="../../../PluginsManager.cpp" line="224"/> <source>informations.xml is not accessible</source> <translation>Auf "informations.xml" kann nicht zugegriffen werden</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="487"/> + <location filename="../../../PluginsManager.cpp" line="494"/> <source>Dependencies part is wrong</source> <translatorcomment>clumsy.</translatorcomment> <translation>Abhängigkeiten-Teil ist falsch</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="508"/> + <location filename="../../../PluginsManager.cpp" line="515"/> <source>Dependencies %1 are not satisfied, for plugin: %2</source> <translation>Die Abhängigkeiten "%1" sind nicht erfüllt für Plugin:%2</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="665"/> + <location filename="../../../PluginsManager.cpp" line="672"/> <source>Remove %1</source> <translation>Entferne %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="676"/> + <location filename="../../../PluginsManager.cpp" line="683"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="700"/> + <location filename="../../../PluginsManager.cpp" line="683"/> + <source>Error while the removing plugin, please check the rights on the folder: +%1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="707"/> <source>Information</source> <translation>Information</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="253"/> + <location filename="../../../PluginsManager.cpp" line="256"/> <source>%1, parse error at line %2, column %3: %4</source> <translation>%1, Parser-Fehler in Zeile %2, Spalte %3: %4</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="227"/> + <location filename="../../../PluginsManager.cpp" line="230"/> <source>informations.xml not found for the plugin</source> <translation>"informations.xml" für das Plugin nicht gefunden</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="261"/> + <location filename="../../../PluginsManager.cpp" line="264"/> <source>"package" root tag not found for the xml file</source> <translation>"package" Root-Tag für die XML-Datei nicht gefunden</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="337"/> + <location filename="../../../PluginsManager.cpp" line="340"/> <source>Duplicated plugin found, already loaded!</source> <translation>Plugin-Duplikat gefunden. Bereits geladen!</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="395"/> + <location filename="../../../PluginsManager.cpp" line="401"/> <source>English text missing in the informations.xml for the tag: %1</source> <translation>Englischer Text fehlt in "informations.xml" für das Tag: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="403"/> + <location filename="../../../PluginsManager.cpp" line="409"/> <source>Tag not found: %1</source> <translation>XML-Tag nicht gefunden: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="665"/> + <location filename="../../../PluginsManager.cpp" line="672"/> <source>Are you sure about removing "%1" in version %2?</source> <translation>Sind Sie sicher, dass Sie "%1" in der Version %2 entfernen wollen?</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="676"/> - <source>Error while the removing plugin, please check the rights on the folder: -%1</source> - <translation>Fehler beim Entfernen des Plugins. Überprüfen Sie bitte die Zugriffsrechte auf den Ordner: -%1</translation> - </message> - <message> - <location filename="../../../PluginsManager.cpp" line="700"/> + <location filename="../../../PluginsManager.cpp" line="707"/> <source>Previous import is in progress...</source> <translation>Vorheriger Import wird durchgeführt...</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="703"/> + <location filename="../../../PluginsManager.cpp" line="710"/> <source>Open Ultracopier plugin</source> <translation>Ultracopier Plugin öffnen</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="703"/> + <location filename="../../../PluginsManager.cpp" line="710"/> <source>Ultracopier plugin (*.urc)</source> <translation>Ultracopier plugin (*.urc)</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="720"/> - <location filename="../../../PluginsManager.cpp" line="745"/> - <location filename="../../../PluginsManager.cpp" line="813"/> - <location filename="../../../PluginsManager.cpp" line="826"/> - <location filename="../../../PluginsManager.cpp" line="845"/> - <location filename="../../../PluginsManager.cpp" line="851"/> - <location filename="../../../PluginsManager.cpp" line="857"/> - <location filename="../../../PluginsManager.cpp" line="863"/> - <location filename="../../../PluginsManager.cpp" line="869"/> + <location filename="../../../PluginsManager.cpp" line="727"/> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="820"/> + <location filename="../../../PluginsManager.cpp" line="833"/> + <location filename="../../../PluginsManager.cpp" line="852"/> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="870"/> <location filename="../../../PluginsManager.cpp" line="876"/> + <location filename="../../../PluginsManager.cpp" line="883"/> <source>Plugin loader</source> <translation>Plugin-Loader</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="720"/> + <location filename="../../../PluginsManager.cpp" line="727"/> <source>Unable to open the plugin: %1</source> <translation>Kann das Plugin nicht öffnen: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="745"/> - <location filename="../../../PluginsManager.cpp" line="863"/> - <location filename="../../../PluginsManager.cpp" line="876"/> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="870"/> + <location filename="../../../PluginsManager.cpp" line="883"/> <source>Unable to load the plugin content, please check it: %1</source> <translation>Kann Plugin-Inhalte nicht laden. Bitte überprüfen Sie das: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="813"/> + <location filename="../../../PluginsManager.cpp" line="820"/> <source>Unable to create a folder to install the plugin: %1</source> <translation>Kann keinen Ordner erstellen um das Plugin %1 zu installieren </translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="826"/> + <location filename="../../../PluginsManager.cpp" line="833"/> <source>Unable to create a file to install the plugin: %1 since:%2</source> @@ -1238,16 +1182,16 @@ since:%2</source> seit: %2</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="845"/> + <location filename="../../../PluginsManager.cpp" line="852"/> <source>Folder with same name is present, skip the plugin installation: %1</source> <translation>Ordner mit demselben Namen existiert bereits. Überspringen Sie die Plugin-Installation: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="851"/> - <location filename="../../../PluginsManager.cpp" line="857"/> - <location filename="../../../PluginsManager.cpp" line="869"/> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="876"/> <source>Unable to load the plugin content, please check it</source> <translation>Kann Plugin-Inhalte nicht laden. Bitte überprüfen Sie das</translation> </message> @@ -1300,125 +1244,34 @@ seit: %2</translation> <context> <name>SystrayIcon</name> <message> - <location filename="../../../SystrayIcon.cpp" line="163"/> + <location filename="../../../SystrayIcon.cpp" line="155"/> <source>No copy listener found. Do the copy manually by right click one the system tray icon.</source> <translation type="unfinished">Keine Kopie-Listener gefunden. Führen Sie die Kopie manuell durch Rechtsklick auf das Symbol im Systray aus.</translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="169"/> + <location filename="../../../SystrayIcon.cpp" line="161"/> <source>Information</source> <translation type="unfinished">Information</translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="187"/> + <location filename="../../../SystrayIcon.cpp" line="179"/> <source>Searching information...</source> <translation type="unfinished">Suche Informationen ...</translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="200"/> + <location filename="../../../SystrayIcon.cpp" line="192"/> <source>Do not replace the explorer copy/move</source> <translation type="unfinished">Explorer:-Kopieren/Verschieben nicht ersetzen</translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="205"/> + <location filename="../../../SystrayIcon.cpp" line="197"/> <source>Semi replace the explorer copy/move</source> <translation type="unfinished">Explorer: Kopieren/Verschieben teilweise ersetzen</translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="210"/> + <location filename="../../../SystrayIcon.cpp" line="202"/> <source>Replace the explorer copy/move</source> <translation type="unfinished">Explorer:-Kopieren/Verschieben ersetzen</translation> </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="377"/> - <source>Warning</source> - <translation type="unfinished">Warnung</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="377"/> - <source>The action on the systray icon is unknown!</source> - <translation type="unfinished">Die auf dem Systray-Icon angewandte Aktion ist unbekannt!</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="425"/> - <source>&About/Debug report</source> - <translation type="unfinished">&Über/Debug Bericht</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="427"/> - <source>&About</source> - <translation type="unfinished">&Über</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="430"/> - <source>&Save bug report</source> - <translation type="unfinished">Bug-Bericht &speichern</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="432"/> - <source>&Quit</source> - <translation type="unfinished">&Beenden</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="433"/> - <source>&Options</source> - <translation type="unfinished">&Optionen</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="485"/> - <source>A&dd copy/moving</source> - <translation type="unfinished">&Kopieren/Verschieben hinzufügen</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="471"/> - <source>New version: %1</source> - <translation type="unfinished">Neue Version: %1</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="471"/> - <source>Click here to go on download page</source> - <translation type="unfinished">Hier klicken für Downloadseite</translation> - </message> - <message> - <source>Click here to go to the shop and login. -Download the new version into the order details</source> - <translation type="obsolete">Hier klicken für Shop und Login. -Download der neuen Version unter: Order Details</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="511"/> - <source>&Copy</source> - <translation type="unfinished">&Kopieren</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="525"/> - <location filename="../../../SystrayIcon.cpp" line="539"/> - <source>&Transfer</source> - <translation type="unfinished">&Transfer</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="529"/> - <location filename="../../../SystrayIcon.cpp" line="543"/> - <source>&Move</source> - <translation type="unfinished">&Verschieben</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="560"/> - <location filename="../../../SystrayIcon.cpp" line="577"/> - <source>Add &copy</source> - <translation type="unfinished">Kopie hinzufügen (&C)</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="566"/> - <location filename="../../../SystrayIcon.cpp" line="583"/> - <source>Add &transfer</source> - <translation type="unfinished">Über&tragung hinzufügen</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="570"/> - <location filename="../../../SystrayIcon.cpp" line="587"/> - <source>Add &move</source> - <translation type="unfinished">Verschieben hinzufügen (&M)</translation> - </message> </context> </TS> diff --git a/plugins/Languages/el/informations.xml b/plugins/Languages/el/informations.xml index 2ef2308..f82a0d4 100644 --- a/plugins/Languages/el/informations.xml +++ b/plugins/Languages/el/informations.xml @@ -12,7 +12,7 @@ <!-- Detailed description --> <description xml:lang="en"><![CDATA[Translation of Ultracopier to greek. For more details see the web site.]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>1.2.3.6</version> + <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>el</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/el/translation.ts b/plugins/Languages/el/translation.ts index b02bb87..d364f81 100644 --- a/plugins/Languages/el/translation.ts +++ b/plugins/Languages/el/translation.ts @@ -1,86 +1,86 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>CliParser</name> <message> - <location filename="../../../CliParser.cpp" line="25"/> - <location filename="../../../CliParser.cpp" line="71"/> - <location filename="../../../CliParser.cpp" line="84"/> - <location filename="../../../CliParser.cpp" line="94"/> - <location filename="../../../CliParser.cpp" line="179"/> + <location filename="../../../CliParser.cpp" line="26"/> + <location filename="../../../CliParser.cpp" line="72"/> + <location filename="../../../CliParser.cpp" line="85"/> + <location filename="../../../CliParser.cpp" line="95"/> + <location filename="../../../CliParser.cpp" line="180"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="25"/> + <location filename="../../../CliParser.cpp" line="26"/> <source>Ultracopier is already running, right click on its system tray icon (near the clock) to use it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="71"/> + <location filename="../../../CliParser.cpp" line="72"/> <source>Problem reading file, or file size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="159"/> - <location filename="../../../CliParser.cpp" line="170"/> + <location filename="../../../CliParser.cpp" line="160"/> + <location filename="../../../CliParser.cpp" line="171"/> <source>The arguments possible are:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="161"/> - <location filename="../../../CliParser.cpp" line="172"/> + <location filename="../../../CliParser.cpp" line="162"/> + <location filename="../../../CliParser.cpp" line="173"/> <source>To display the options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="162"/> - <location filename="../../../CliParser.cpp" line="173"/> + <location filename="../../../CliParser.cpp" line="163"/> + <location filename="../../../CliParser.cpp" line="174"/> <source>To quit the other instances (if running)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="164"/> - <location filename="../../../CliParser.cpp" line="175"/> + <location filename="../../../CliParser.cpp" line="165"/> + <location filename="../../../CliParser.cpp" line="176"/> <source>To copy sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="165"/> - <location filename="../../../CliParser.cpp" line="176"/> + <location filename="../../../CliParser.cpp" line="166"/> + <location filename="../../../CliParser.cpp" line="177"/> <source>To move sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="169"/> + <location filename="../../../CliParser.cpp" line="170"/> <source>Command not valid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="84"/> + <location filename="../../../CliParser.cpp" line="85"/> <source>This file is not supported transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="94"/> + <location filename="../../../CliParser.cpp" line="95"/> <source>Unable to open the transfer list file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="160"/> - <location filename="../../../CliParser.cpp" line="171"/> + <location filename="../../../CliParser.cpp" line="161"/> + <location filename="../../../CliParser.cpp" line="172"/> <source>To display this help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="163"/> - <location filename="../../../CliParser.cpp" line="174"/> + <location filename="../../../CliParser.cpp" line="164"/> + <location filename="../../../CliParser.cpp" line="175"/> <source>Open transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="181"/> + <location filename="../../../CliParser.cpp" line="182"/> <source>Help</source> <translation type="unfinished"></translation> </message> @@ -88,30 +88,30 @@ <context> <name>CopyEngineManager</name> <message> - <location filename="../../../CopyEngineManager.cpp" line="229"/> - <location filename="../../../CopyEngineManager.cpp" line="234"/> - <location filename="../../../CopyEngineManager.cpp" line="257"/> - <location filename="../../../CopyEngineManager.cpp" line="271"/> + <location filename="../../../CopyEngineManager.cpp" line="231"/> + <location filename="../../../CopyEngineManager.cpp" line="236"/> + <location filename="../../../CopyEngineManager.cpp" line="259"/> + <location filename="../../../CopyEngineManager.cpp" line="273"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="229"/> + <location filename="../../../CopyEngineManager.cpp" line="231"/> <source>Cannot find any copy engine with move support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="257"/> + <location filename="../../../CopyEngineManager.cpp" line="259"/> <source>This copy engine does not support move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="234"/> + <location filename="../../../CopyEngineManager.cpp" line="236"/> <source>Cannot find any compatible engine!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="271"/> + <location filename="../../../CopyEngineManager.cpp" line="273"/> <source>Cannot find any engine with this name: %1</source> <translation type="unfinished"></translation> </message> @@ -119,12 +119,12 @@ <context> <name>CopyListener</name> <message> - <location filename="../../../CopyListener.cpp" line="158"/> + <location filename="../../../CopyListener.cpp" line="159"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyListener.cpp" line="158"/> + <location filename="../../../CopyListener.cpp" line="159"/> <source>Error during the reception of the copy/move list %1</source> <translation type="unfinished"></translation> @@ -133,70 +133,70 @@ <context> <name>Core</name> <message> - <location filename="../../../Core.cpp" line="45"/> - <location filename="../../../Core.cpp" line="116"/> - <location filename="../../../Core.cpp" line="142"/> - <location filename="../../../Core.cpp" line="157"/> - <location filename="../../../Core.cpp" line="177"/> - <location filename="../../../Core.cpp" line="191"/> - <location filename="../../../Core.cpp" line="200"/> - <location filename="../../../Core.cpp" line="209"/> - <location filename="../../../Core.cpp" line="216"/> - <location filename="../../../Core.cpp" line="250"/> - <location filename="../../../Core.cpp" line="387"/> - <location filename="../../../Core.cpp" line="392"/> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="117"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> + <location filename="../../../Core.cpp" line="217"/> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> + <location filename="../../../Core.cpp" line="393"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="45"/> - <location filename="../../../Core.cpp" line="142"/> - <location filename="../../../Core.cpp" line="157"/> - <location filename="../../../Core.cpp" line="177"/> - <location filename="../../../Core.cpp" line="191"/> - <location filename="../../../Core.cpp" line="200"/> - <location filename="../../../Core.cpp" line="209"/> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> <source>Unable to get a copy engine instance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="93"/> + <location filename="../../../Core.cpp" line="94"/> <source>Group window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="93"/> + <location filename="../../../Core.cpp" line="94"/> <source>Do you want group the transfer with another actual running transfer?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="116"/> + <location filename="../../../Core.cpp" line="117"/> <source>Unable to get a engine instance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="216"/> + <location filename="../../../Core.cpp" line="217"/> <source>The argument for the mode is not valid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="1133"/> + <location filename="../../../Core.cpp" line="1136"/> <source>Do you want to copy? If no, it will be moved.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="250"/> - <location filename="../../../Core.cpp" line="387"/> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> <source>Unable to load the interface, copy aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="392"/> + <location filename="../../../Core.cpp" line="393"/> <source>Unable to load the copy engine, copy aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="1133"/> + <location filename="../../../Core.cpp" line="1136"/> <source>Transfer mode</source> <translation type="unfinished"></translation> </message> @@ -204,12 +204,12 @@ <context> <name>EventDispatcher</name> <message> - <location filename="../../../EventDispatcher.cpp" line="155"/> + <location filename="../../../EventDispatcher.cpp" line="152"/> <source>Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../EventDispatcher.cpp" line="155"/> + <location filename="../../../EventDispatcher.cpp" line="152"/> <source>Give the key of this software, more information on <a href="http://ultracopier.first-world.info/">ultracopier.first-world.info</a></source> <translation type="unfinished"></translation> </message> @@ -217,257 +217,257 @@ <context> <name>FacilityEngine</name> <message> - <location filename="../../../FacilityEngine.cpp" line="43"/> + <location filename="../../../FacilityEngine.cpp" line="53"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="45"/> + <location filename="../../../FacilityEngine.cpp" line="55"/> <source>Copy</source> <extracomment>a copy</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="49"/> + <location filename="../../../FacilityEngine.cpp" line="59"/> <source>Move</source> <extracomment>a move</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="51"/> + <location filename="../../../FacilityEngine.cpp" line="61"/> <source>Pause</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="52"/> + <location filename="../../../FacilityEngine.cpp" line="62"/> <source>Resume</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="53"/> - <location filename="../../../FacilityEngine.cpp" line="67"/> + <location filename="../../../FacilityEngine.cpp" line="63"/> + <location filename="../../../FacilityEngine.cpp" line="77"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="54"/> + <location filename="../../../FacilityEngine.cpp" line="64"/> <source>Unlimited</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="27"/> + <location filename="../../../FacilityEngine.cpp" line="37"/> <source>s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="28"/> + <location filename="../../../FacilityEngine.cpp" line="38"/> <source>Too big</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="29"/> + <location filename="../../../FacilityEngine.cpp" line="39"/> <source>B</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="30"/> + <location filename="../../../FacilityEngine.cpp" line="40"/> <source>KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="31"/> + <location filename="../../../FacilityEngine.cpp" line="41"/> <source>MB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="32"/> + <location filename="../../../FacilityEngine.cpp" line="42"/> <source>GB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="33"/> + <location filename="../../../FacilityEngine.cpp" line="43"/> <source>TB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="34"/> + <location filename="../../../FacilityEngine.cpp" line="44"/> <source>PB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="35"/> + <location filename="../../../FacilityEngine.cpp" line="45"/> <source>EB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="36"/> + <location filename="../../../FacilityEngine.cpp" line="46"/> <source>ZB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="37"/> + <location filename="../../../FacilityEngine.cpp" line="47"/> <source>YB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="38"/> + <location filename="../../../FacilityEngine.cpp" line="48"/> <source>Less than %10 seconds</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="39"/> + <location filename="../../../FacilityEngine.cpp" line="49"/> <source>About %10 seconds remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="40"/> + <location filename="../../../FacilityEngine.cpp" line="50"/> <source>About %1 minutes remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="41"/> + <location filename="../../../FacilityEngine.cpp" line="51"/> <source>About %1 hours remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="47"/> + <location filename="../../../FacilityEngine.cpp" line="57"/> <source>Transfer</source> <extracomment>a transfer</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="50"/> + <location filename="../../../FacilityEngine.cpp" line="60"/> <source>Start</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="55"/> + <location filename="../../../FacilityEngine.cpp" line="65"/> <source>Source</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="56"/> + <location filename="../../../FacilityEngine.cpp" line="66"/> <source>Size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="57"/> + <location filename="../../../FacilityEngine.cpp" line="67"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="58"/> + <location filename="../../../FacilityEngine.cpp" line="68"/> <source>Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="59"/> + <location filename="../../../FacilityEngine.cpp" line="69"/> <source>Target</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="60"/> - <location filename="../../../FacilityEngine.cpp" line="64"/> + <location filename="../../../FacilityEngine.cpp" line="70"/> + <location filename="../../../FacilityEngine.cpp" line="74"/> <source>Time remaining:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="61"/> + <location filename="../../../FacilityEngine.cpp" line="71"/> <source>Listing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="62"/> + <location filename="../../../FacilityEngine.cpp" line="72"/> <source>Copying</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="63"/> + <location filename="../../../FacilityEngine.cpp" line="73"/> <source>Listing and copying</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="66"/> + <location filename="../../../FacilityEngine.cpp" line="76"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="68"/> + <location filename="../../../FacilityEngine.cpp" line="78"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="69"/> + <location filename="../../../FacilityEngine.cpp" line="79"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="70"/> + <location filename="../../../FacilityEngine.cpp" line="80"/> <source>Overwrite if the last modification dates are different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="71"/> + <location filename="../../../FacilityEngine.cpp" line="81"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="72"/> + <location filename="../../../FacilityEngine.cpp" line="82"/> <source>Put to the end of the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="73"/> + <location filename="../../../FacilityEngine.cpp" line="83"/> <source>Select source directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="74"/> + <location filename="../../../FacilityEngine.cpp" line="84"/> <source>Select destination directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="75"/> + <location filename="../../../FacilityEngine.cpp" line="85"/> <source>Internal error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="76"/> + <location filename="../../../FacilityEngine.cpp" line="86"/> <source>Select one or more files to open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="77"/> + <location filename="../../../FacilityEngine.cpp" line="87"/> <source>All files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="78"/> + <location filename="../../../FacilityEngine.cpp" line="88"/> <source>Save transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="79"/> + <location filename="../../../FacilityEngine.cpp" line="89"/> <source>Open transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="80"/> + <location filename="../../../FacilityEngine.cpp" line="90"/> <source>Transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="81"/> + <location filename="../../../FacilityEngine.cpp" line="91"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="82"/> + <location filename="../../../FacilityEngine.cpp" line="92"/> <source>Not supported on this platform</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="83"/> + <location filename="../../../FacilityEngine.cpp" line="93"/> <source>Completed in %1</source> <translation type="unfinished"></translation> </message> @@ -475,7 +475,7 @@ <context> <name>HelpDialog</name> <message> - <location filename="../../../HelpDialog.cpp" line="37"/> + <location filename="../../../HelpDialog.cpp" line="34"/> <source>About Ultracopier</source> <translation type="unfinished"></translation> </message> @@ -513,49 +513,42 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="35"/> - <source>About Supercopier</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../HelpDialog.cpp" line="80"/> + <location filename="../../../HelpDialog.cpp" line="73"/> <source>For http://portableapps.com/</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="83"/> + <location filename="../../../HelpDialog.cpp" line="76"/> <source>Portable and all in one version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="85"/> + <location filename="../../../HelpDialog.cpp" line="78"/> <source>Portable version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="90"/> + <location filename="../../../HelpDialog.cpp" line="83"/> <source>All in one version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="92"/> + <location filename="../../../HelpDialog.cpp" line="85"/> <source>Normal version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="110"/> - <location filename="../../../HelpDialog.cpp" line="112"/> - <location filename="../../../HelpDialog.cpp" line="123"/> + <location filename="../../../HelpDialog.cpp" line="102"/> <source>http://ultracopier.first-world.info/</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="120"/> + <location filename="../../../HelpDialog.cpp" line="109"/> <source>http://ultracopier.first-world.info/shop.html</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="125"/> + <location filename="../../../HelpDialog.cpp" line="111"/> <source>http://ultracopier.first-world.info/download.html</source> <translation type="unfinished"></translation> </message> @@ -569,12 +562,12 @@ This version is compiled as version: %1.</source> <context> <name>LocalListener</name> <message> - <location filename="../../../LocalListener.cpp" line="146"/> + <location filename="../../../LocalListener.cpp" line="160"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../LocalListener.cpp" line="146"/> + <location filename="../../../LocalListener.cpp" line="160"/> <source>Timeout while recomposing data from connected clients</source> <translation type="unfinished"></translation> </message> @@ -582,20 +575,20 @@ This version is compiled as version: %1.</source> <context> <name>LogThread</name> <message> - <location filename="../../../LogThread.cpp" line="106"/> - <location filename="../../../LogThread.cpp" line="115"/> - <location filename="../../../LogThread.cpp" line="125"/> + <location filename="../../../LogThread.cpp" line="107"/> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../LogThread.cpp" line="106"/> + <location filename="../../../LogThread.cpp" line="107"/> <source>Log file already open, error: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../LogThread.cpp" line="115"/> - <location filename="../../../LogThread.cpp" line="125"/> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> <source>Unable to open the log file, error: %1</source> <translation type="unfinished"></translation> </message> @@ -637,21 +630,6 @@ This version is compiled as version: %1.</source> <source>The replacement of default copy/move system should be not supported by the file manager.<br />Ask to the developer to support it.<br />You need do the copy/move manually.</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../../OSSpecific.cpp" line="32"/> - <source>Consider Supercopier as deprecated, prefer Ultracopier</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OSSpecific.cpp" line="35"/> - <source>This version use 100% of you graphic card/GPU (you computer can be noisy, or slow/buggy during the games) at exchange of free access to Ultimate version. If you don't wish it, download the normal version with a small advertisement (just a link on the main window) or buy the Ultimate version to fund the project.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OSSpecific.cpp" line="36"/> - <source>http://ultracopier.first-world.info/download.html</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>OptionDialog</name> @@ -674,7 +652,7 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="66"/> <location filename="../../../OptionDialog.ui" line="322"/> - <location filename="../../../OptionDialog.cpp" line="354"/> + <location filename="../../../OptionDialog.cpp" line="286"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> @@ -717,21 +695,21 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="71"/> <location filename="../../../OptionDialog.ui" line="335"/> - <location filename="../../../OptionDialog.cpp" line="355"/> + <location filename="../../../OptionDialog.cpp" line="287"/> <source>Listener</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="76"/> <location filename="../../../OptionDialog.ui" line="340"/> - <location filename="../../../OptionDialog.cpp" line="356"/> + <location filename="../../../OptionDialog.cpp" line="288"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="84"/> <location filename="../../../OptionDialog.ui" line="345"/> - <location filename="../../../OptionDialog.cpp" line="357"/> + <location filename="../../../OptionDialog.cpp" line="289"/> <source>Session loader</source> <translation type="unfinished"></translation> </message> @@ -863,95 +841,75 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="260"/> - <location filename="../../../OptionDialog.cpp" line="274"/> + <location filename="../../../OptionDialog.cpp" line="190"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="260"/> + <location filename="../../../OptionDialog.cpp" line="190"/> <source>Load the theme?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="274"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load the language?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="362"/> + <location filename="../../../OptionDialog.cpp" line="294"/> <source>Do nothing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="363"/> + <location filename="../../../OptionDialog.cpp" line="295"/> <source>Ask source as folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="364"/> + <location filename="../../../OptionDialog.cpp" line="296"/> <source>Ask sources as files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="365"/> + <location filename="../../../OptionDialog.cpp" line="297"/> <source>Never</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="366"/> + <location filename="../../../OptionDialog.cpp" line="298"/> <source>When source is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="367"/> + <location filename="../../../OptionDialog.cpp" line="299"/> <source>When destination is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="368"/> + <location filename="../../../OptionDialog.cpp" line="300"/> <source>When source and destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="369"/> + <location filename="../../../OptionDialog.cpp" line="301"/> <source>When source or destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="370"/> + <location filename="../../../OptionDialog.cpp" line="302"/> <source>Always</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="384"/> - <location filename="../../../OptionDialog.cpp" line="385"/> - <location filename="../../../OptionDialog.cpp" line="386"/> + <location filename="../../../OptionDialog.cpp" line="316"/> + <location filename="../../../OptionDialog.cpp" line="317"/> + <location filename="../../../OptionDialog.cpp" line="318"/> <source>The variables are %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="478"/> - <source>Allow the application</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="478"/> - <source>This Ultimate free version is only if %1 is allowed by your antivirus. Else you can get the normal free version</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="483"/> - <source>Enable the OpenCL</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="483"/> - <source>This Ultimate version is only if the OpenCL is installed with your graphic card drivers. Else you can get the normal free version</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="1591"/> + <location filename="../../../OptionDialog.cpp" line="948"/> <source>Save logs as: </source> <translation type="unfinished"></translation> </message> @@ -980,10 +938,10 @@ This version is compiled as version: %1.</source> <context> <name>OptionEngine</name> <message> - <location filename="../../../OptionEngine.cpp" line="161"/> - <location filename="../../../OptionEngine.cpp" line="165"/> - <location filename="../../../OptionEngine.cpp" line="202"/> - <location filename="../../../OptionEngine.cpp" line="206"/> + <location filename="../../../OptionEngine.cpp" line="162"/> + <location filename="../../../OptionEngine.cpp" line="169"/> + <location filename="../../../OptionEngine.cpp" line="211"/> + <location filename="../../../OptionEngine.cpp" line="215"/> <source>The variable was not found: %1 %2</source> <translation type="unfinished"></translation> </message> @@ -1026,42 +984,42 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="38"/> + <location filename="../../../PluginInformation.cpp" line="39"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="41"/> + <location filename="../../../PluginInformation.cpp" line="42"/> <source>Languages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="44"/> + <location filename="../../../PluginInformation.cpp" line="45"/> <source>Listener</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="47"/> + <location filename="../../../PluginInformation.cpp" line="48"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="50"/> + <location filename="../../../PluginInformation.cpp" line="51"/> <source>Session loader</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="53"/> + <location filename="../../../PluginInformation.cpp" line="54"/> <source>Themes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="57"/> + <location filename="../../../PluginInformation.cpp" line="58"/> <source>Unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="67"/> + <location filename="../../../PluginInformation.cpp" line="68"/> <source>Information about %1</source> <translation type="unfinished"></translation> </message> @@ -1079,140 +1037,140 @@ This version is compiled as version: %1.</source> <context> <name>PluginsManager</name> <message> - <location filename="../../../PluginsManager.cpp" line="221"/> + <location filename="../../../PluginsManager.cpp" line="224"/> <source>informations.xml is not accessible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="487"/> + <location filename="../../../PluginsManager.cpp" line="494"/> <source>Dependencies part is wrong</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="508"/> + <location filename="../../../PluginsManager.cpp" line="515"/> <source>Dependencies %1 are not satisfied, for plugin: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="665"/> + <location filename="../../../PluginsManager.cpp" line="672"/> <source>Remove %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="676"/> + <location filename="../../../PluginsManager.cpp" line="683"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="700"/> + <location filename="../../../PluginsManager.cpp" line="683"/> + <source>Error while the removing plugin, please check the rights on the folder: +%1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="707"/> <source>Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="253"/> + <location filename="../../../PluginsManager.cpp" line="256"/> <source>%1, parse error at line %2, column %3: %4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="227"/> + <location filename="../../../PluginsManager.cpp" line="230"/> <source>informations.xml not found for the plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="261"/> + <location filename="../../../PluginsManager.cpp" line="264"/> <source>"package" root tag not found for the xml file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="337"/> + <location filename="../../../PluginsManager.cpp" line="340"/> <source>Duplicated plugin found, already loaded!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="395"/> + <location filename="../../../PluginsManager.cpp" line="401"/> <source>English text missing in the informations.xml for the tag: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="403"/> + <location filename="../../../PluginsManager.cpp" line="409"/> <source>Tag not found: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="665"/> + <location filename="../../../PluginsManager.cpp" line="672"/> <source>Are you sure about removing "%1" in version %2?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="676"/> - <source>Error while the removing plugin, please check the rights on the folder: -%1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../PluginsManager.cpp" line="700"/> + <location filename="../../../PluginsManager.cpp" line="707"/> <source>Previous import is in progress...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="703"/> + <location filename="../../../PluginsManager.cpp" line="710"/> <source>Open Ultracopier plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="703"/> + <location filename="../../../PluginsManager.cpp" line="710"/> <source>Ultracopier plugin (*.urc)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="720"/> - <location filename="../../../PluginsManager.cpp" line="745"/> - <location filename="../../../PluginsManager.cpp" line="813"/> - <location filename="../../../PluginsManager.cpp" line="826"/> - <location filename="../../../PluginsManager.cpp" line="845"/> - <location filename="../../../PluginsManager.cpp" line="851"/> - <location filename="../../../PluginsManager.cpp" line="857"/> - <location filename="../../../PluginsManager.cpp" line="863"/> - <location filename="../../../PluginsManager.cpp" line="869"/> + <location filename="../../../PluginsManager.cpp" line="727"/> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="820"/> + <location filename="../../../PluginsManager.cpp" line="833"/> + <location filename="../../../PluginsManager.cpp" line="852"/> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="870"/> <location filename="../../../PluginsManager.cpp" line="876"/> + <location filename="../../../PluginsManager.cpp" line="883"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="720"/> + <location filename="../../../PluginsManager.cpp" line="727"/> <source>Unable to open the plugin: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="745"/> - <location filename="../../../PluginsManager.cpp" line="863"/> - <location filename="../../../PluginsManager.cpp" line="876"/> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="870"/> + <location filename="../../../PluginsManager.cpp" line="883"/> <source>Unable to load the plugin content, please check it: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="813"/> + <location filename="../../../PluginsManager.cpp" line="820"/> <source>Unable to create a folder to install the plugin: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="826"/> + <location filename="../../../PluginsManager.cpp" line="833"/> <source>Unable to create a file to install the plugin: %1 since:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="845"/> + <location filename="../../../PluginsManager.cpp" line="852"/> <source>Folder with same name is present, skip the plugin installation: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="851"/> - <location filename="../../../PluginsManager.cpp" line="857"/> - <location filename="../../../PluginsManager.cpp" line="869"/> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="876"/> <source>Unable to load the plugin content, please check it</source> <translation type="unfinished"></translation> </message> @@ -1265,119 +1223,34 @@ since:%2</source> <context> <name>SystrayIcon</name> <message> - <location filename="../../../SystrayIcon.cpp" line="163"/> + <location filename="../../../SystrayIcon.cpp" line="155"/> <source>No copy listener found. Do the copy manually by right click one the system tray icon.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="169"/> + <location filename="../../../SystrayIcon.cpp" line="161"/> <source>Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="187"/> + <location filename="../../../SystrayIcon.cpp" line="179"/> <source>Searching information...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="200"/> + <location filename="../../../SystrayIcon.cpp" line="192"/> <source>Do not replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="205"/> + <location filename="../../../SystrayIcon.cpp" line="197"/> <source>Semi replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="210"/> + <location filename="../../../SystrayIcon.cpp" line="202"/> <source>Replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="377"/> - <source>Warning</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="377"/> - <source>The action on the systray icon is unknown!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="425"/> - <source>&About/Debug report</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="427"/> - <source>&About</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="430"/> - <source>&Save bug report</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="432"/> - <source>&Quit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="433"/> - <source>&Options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="485"/> - <source>A&dd copy/moving</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="471"/> - <source>New version: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="471"/> - <source>Click here to go on download page</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="511"/> - <source>&Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="525"/> - <location filename="../../../SystrayIcon.cpp" line="539"/> - <source>&Transfer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="529"/> - <location filename="../../../SystrayIcon.cpp" line="543"/> - <source>&Move</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="560"/> - <location filename="../../../SystrayIcon.cpp" line="577"/> - <source>Add &copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="566"/> - <location filename="../../../SystrayIcon.cpp" line="583"/> - <source>Add &transfer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="570"/> - <location filename="../../../SystrayIcon.cpp" line="587"/> - <source>Add &move</source> - <translation type="unfinished"></translation> - </message> </context> </TS> diff --git a/plugins/Languages/es/informations.xml b/plugins/Languages/es/informations.xml index c3884fb..4c8d150 100644 --- a/plugins/Languages/es/informations.xml +++ b/plugins/Languages/es/informations.xml @@ -12,7 +12,7 @@ <!-- Detailed description --> <description xml:lang="en"><![CDATA[Translation of Ultracopier to spanish. For more details see the web site.]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>1.2.3.6</version> + <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>es</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/es/translation.ts b/plugins/Languages/es/translation.ts index b25dabe..c901398 100644 --- a/plugins/Languages/es/translation.ts +++ b/plugins/Languages/es/translation.ts @@ -1,110 +1,86 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0" language="es"> +<TS version="2.1" language="es"> <context> <name>CliParser</name> <message> - <location filename="../../../CliParser.cpp" line="25"/> - <location filename="../../../CliParser.cpp" line="71"/> - <location filename="../../../CliParser.cpp" line="84"/> - <location filename="../../../CliParser.cpp" line="94"/> - <location filename="../../../CliParser.cpp" line="179"/> + <location filename="../../../CliParser.cpp" line="26"/> + <location filename="../../../CliParser.cpp" line="72"/> + <location filename="../../../CliParser.cpp" line="85"/> + <location filename="../../../CliParser.cpp" line="95"/> + <location filename="../../../CliParser.cpp" line="180"/> <source>Warning</source> <translation>Advertencia</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="25"/> + <location filename="../../../CliParser.cpp" line="26"/> <source>Ultracopier is already running, right click on its system tray icon (near the clock) to use it</source> <translation>Ultracopier ya se está ejecutando, haga clic derecho sobre el icono de la bandeja del sistema (cerca del reloj) para poder utilizarlas</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="71"/> + <location filename="../../../CliParser.cpp" line="72"/> <source>Problem reading file, or file size is 0</source> <translation>Problema al leer el archivo, o el tamaño del archivo es 0</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="159"/> - <location filename="../../../CliParser.cpp" line="170"/> + <location filename="../../../CliParser.cpp" line="160"/> + <location filename="../../../CliParser.cpp" line="171"/> <source>The arguments possible are:</source> <translation>Los argumentos posibles son:</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="161"/> - <location filename="../../../CliParser.cpp" line="172"/> + <location filename="../../../CliParser.cpp" line="162"/> + <location filename="../../../CliParser.cpp" line="173"/> <source>To display the options</source> <translation>Para mostrar las opciones</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="164"/> - <location filename="../../../CliParser.cpp" line="175"/> + <location filename="../../../CliParser.cpp" line="165"/> + <location filename="../../../CliParser.cpp" line="176"/> <source>To copy sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> <translation>Para copiar las fuentes a destino, separados por un espacio. Si el destino es "?", Ultracopier le preguntará al usuario</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="165"/> - <location filename="../../../CliParser.cpp" line="176"/> + <location filename="../../../CliParser.cpp" line="166"/> + <location filename="../../../CliParser.cpp" line="177"/> <source>To move sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> <translation>Para mover las fuentes de destino, separados por un espacio. Si el destino es "?", Ultracopier le preguntará al usuario</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="169"/> + <location filename="../../../CliParser.cpp" line="170"/> <source>Command not valid</source> <translation>Comando no válido</translation> </message> <message> - <source>Problem at the reading, or file size is null</source> - <translation type="obsolete">Problema en la lectura, o el tamaño del archivo es nulo</translation> - </message> - <message> - <location filename="../../../CliParser.cpp" line="84"/> + <location filename="../../../CliParser.cpp" line="85"/> <source>This file is not supported transfer list</source> <translation>Este archivo no es compatible con lista de transferencias</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="94"/> + <location filename="../../../CliParser.cpp" line="95"/> <source>Unable to open the transfer list file</source> <translation>No se puede abrir el archivo de lista de transferencias</translation> </message> <message> - <source>The arguments possibles are:</source> - <translation type="obsolete">Los posibles argumentos son los siguientes:</translation> - </message> - <message> - <location filename="../../../CliParser.cpp" line="160"/> - <location filename="../../../CliParser.cpp" line="171"/> + <location filename="../../../CliParser.cpp" line="161"/> + <location filename="../../../CliParser.cpp" line="172"/> <source>To display this help</source> <translation>Para mostrar esta ayuda</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="162"/> - <location filename="../../../CliParser.cpp" line="173"/> + <location filename="../../../CliParser.cpp" line="163"/> + <location filename="../../../CliParser.cpp" line="174"/> <source>To quit the other instances (if running)</source> <translation>Para salir de los otros casos (si está activo)</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="163"/> - <location filename="../../../CliParser.cpp" line="174"/> + <location filename="../../../CliParser.cpp" line="164"/> + <location filename="../../../CliParser.cpp" line="175"/> <source>Open transfer list</source> <translation>Abrir lista de transferencias</translation> </message> <message> - <source>To quit the other instance running (if have)</source> - <translation type="obsolete">Para salir de la carrera otra instancia (si tiene)</translation> - </message> - <message> - <source>To copy sources to destination, separated by space. If destination is "?", ultracopier will ask it to the user</source> - <translation type="obsolete">Para copiar las fuentes a destino, separados por un espacio. Si el destino es "?", Ultracopier va a pedir al usuario</translation> - </message> - <message> - <source>To move sources to destination, separated by space. If destination is "?", ultracopier will ask it to the user</source> - <translation type="obsolete">Para mover fuentes de destino, separados por un espacio. Si el destino es "?", Ultracopier va a pedir al usuario</translation> - </message> - <message> - <source>Command line not understand</source> - <translation type="obsolete">La línea de comandos que no entiendo</translation> - </message> - <message> - <location filename="../../../CliParser.cpp" line="181"/> + <location filename="../../../CliParser.cpp" line="182"/> <source>Help</source> <translation>Ayuda</translation> </message> @@ -112,38 +88,30 @@ <context> <name>CopyEngineManager</name> <message> - <location filename="../../../CopyEngineManager.cpp" line="229"/> - <location filename="../../../CopyEngineManager.cpp" line="234"/> - <location filename="../../../CopyEngineManager.cpp" line="257"/> - <location filename="../../../CopyEngineManager.cpp" line="271"/> + <location filename="../../../CopyEngineManager.cpp" line="231"/> + <location filename="../../../CopyEngineManager.cpp" line="236"/> + <location filename="../../../CopyEngineManager.cpp" line="259"/> + <location filename="../../../CopyEngineManager.cpp" line="273"/> <source>Warning</source> <translation>Advertencia</translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="229"/> + <location filename="../../../CopyEngineManager.cpp" line="231"/> <source>Cannot find any copy engine with move support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="257"/> + <location filename="../../../CopyEngineManager.cpp" line="259"/> <source>This copy engine does not support move</source> <translation type="unfinished"></translation> </message> <message> - <source>Cannot find any copy engine with motions support</source> - <translation type="obsolete">No se puede encontrar cualquier motor de copia con movimientos de apoyo a</translation> - </message> - <message> - <location filename="../../../CopyEngineManager.cpp" line="234"/> + <location filename="../../../CopyEngineManager.cpp" line="236"/> <source>Cannot find any compatible engine!</source> <translation>No se puede encontrar un motor compatible!</translation> </message> <message> - <source>This copy engine does not support motions</source> - <translation type="obsolete">Este motor de copia no es compatible con los movimientos</translation> - </message> - <message> - <location filename="../../../CopyEngineManager.cpp" line="271"/> + <location filename="../../../CopyEngineManager.cpp" line="273"/> <source>Cannot find any engine with this name: %1</source> <translation>No se puede encontrar un motor con este nombre: %1</translation> </message> @@ -151,12 +119,12 @@ <context> <name>CopyListener</name> <message> - <location filename="../../../CopyListener.cpp" line="158"/> + <location filename="../../../CopyListener.cpp" line="159"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../../../CopyListener.cpp" line="158"/> + <location filename="../../../CopyListener.cpp" line="159"/> <source>Error during the reception of the copy/move list %1</source> <translation>Error durante la recepción de la lista de copia / movimiento @@ -166,91 +134,83 @@ <context> <name>Core</name> <message> - <location filename="../../../Core.cpp" line="45"/> - <location filename="../../../Core.cpp" line="116"/> - <location filename="../../../Core.cpp" line="142"/> - <location filename="../../../Core.cpp" line="157"/> - <location filename="../../../Core.cpp" line="177"/> - <location filename="../../../Core.cpp" line="191"/> - <location filename="../../../Core.cpp" line="200"/> - <location filename="../../../Core.cpp" line="209"/> - <location filename="../../../Core.cpp" line="216"/> - <location filename="../../../Core.cpp" line="250"/> - <location filename="../../../Core.cpp" line="387"/> - <location filename="../../../Core.cpp" line="392"/> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="117"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> + <location filename="../../../Core.cpp" line="217"/> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> + <location filename="../../../Core.cpp" line="393"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../../../Core.cpp" line="45"/> - <location filename="../../../Core.cpp" line="142"/> - <location filename="../../../Core.cpp" line="157"/> - <location filename="../../../Core.cpp" line="177"/> - <location filename="../../../Core.cpp" line="191"/> - <location filename="../../../Core.cpp" line="200"/> - <location filename="../../../Core.cpp" line="209"/> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> <source>Unable to get a copy engine instance</source> <translation>No se puede obtener una instancia de motor de copia</translation> </message> <message> - <location filename="../../../Core.cpp" line="93"/> + <location filename="../../../Core.cpp" line="94"/> <source>Group window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="93"/> + <location filename="../../../Core.cpp" line="94"/> <source>Do you want group the transfer with another actual running transfer?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="116"/> + <location filename="../../../Core.cpp" line="117"/> <source>Unable to get a engine instance</source> <translation>No se puede obtener una instancia del motor</translation> </message> <message> - <location filename="../../../Core.cpp" line="216"/> + <location filename="../../../Core.cpp" line="217"/> <source>The argument for the mode is not valid</source> <translation>El argumento para el modo no es válida</translation> </message> <message> - <location filename="../../../Core.cpp" line="1133"/> + <location filename="../../../Core.cpp" line="1136"/> <source>Do you want to copy? If no, it will be moved.</source> <translation>¿Quieres copiar? Si no, se puede mover.</translation> </message> <message> - <source>The argument for the mode is not understand</source> - <translation type="obsolete">El argumento para el modo no se entiende</translation> - </message> - <message> - <location filename="../../../Core.cpp" line="250"/> - <location filename="../../../Core.cpp" line="387"/> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> <source>Unable to load the interface, copy aborted</source> <translation>No se puede cargar la interfaz, copia abortados</translation> </message> <message> - <location filename="../../../Core.cpp" line="392"/> + <location filename="../../../Core.cpp" line="393"/> <source>Unable to load the copy engine, copy aborted</source> <translation>No se puede cargar el motor de copia, copia abortados</translation> </message> <message> - <location filename="../../../Core.cpp" line="1133"/> + <location filename="../../../Core.cpp" line="1136"/> <source>Transfer mode</source> <translation>Modo de transferencia</translation> </message> - <message> - <source>Do you want to copy? If you reply no, it will be moved.</source> - <translation type="obsolete">¿Quieres copiar? Si responde que no, que se moverá.</translation> - </message> </context> <context> <name>EventDispatcher</name> <message> - <location filename="../../../EventDispatcher.cpp" line="155"/> + <location filename="../../../EventDispatcher.cpp" line="152"/> <source>Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../EventDispatcher.cpp" line="155"/> + <location filename="../../../EventDispatcher.cpp" line="152"/> <source>Give the key of this software, more information on <a href="http://ultracopier.first-world.info/">ultracopier.first-world.info</a></source> <translation type="unfinished"></translation> </message> @@ -258,261 +218,257 @@ <context> <name>FacilityEngine</name> <message> - <location filename="../../../FacilityEngine.cpp" line="43"/> + <location filename="../../../FacilityEngine.cpp" line="53"/> <source>Copy engine</source> <translation>Motor de copia</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="45"/> + <location filename="../../../FacilityEngine.cpp" line="55"/> <source>Copy</source> <extracomment>a copy</extracomment> <translation>Copia</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="49"/> + <location filename="../../../FacilityEngine.cpp" line="59"/> <source>Move</source> <extracomment>a move</extracomment> <translation>Movimiento</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="51"/> + <location filename="../../../FacilityEngine.cpp" line="61"/> <source>Pause</source> <translation>Pausa</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="52"/> + <location filename="../../../FacilityEngine.cpp" line="62"/> <source>Resume</source> <translation>Resumen</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="53"/> - <location filename="../../../FacilityEngine.cpp" line="67"/> + <location filename="../../../FacilityEngine.cpp" line="63"/> + <location filename="../../../FacilityEngine.cpp" line="77"/> <source>Skip</source> <translation>Salto</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="54"/> + <location filename="../../../FacilityEngine.cpp" line="64"/> <source>Unlimited</source> <translation>Ilimitado</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="27"/> + <location filename="../../../FacilityEngine.cpp" line="37"/> <source>s</source> <translation>s</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="28"/> + <location filename="../../../FacilityEngine.cpp" line="38"/> <source>Too big</source> <translation>Demasiado grande</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="29"/> + <location filename="../../../FacilityEngine.cpp" line="39"/> <source>B</source> <translation>B</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="30"/> + <location filename="../../../FacilityEngine.cpp" line="40"/> <source>KB</source> <translation>KB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="31"/> + <location filename="../../../FacilityEngine.cpp" line="41"/> <source>MB</source> <translation>MB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="32"/> + <location filename="../../../FacilityEngine.cpp" line="42"/> <source>GB</source> <translation>GB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="33"/> + <location filename="../../../FacilityEngine.cpp" line="43"/> <source>TB</source> <translation>TB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="34"/> + <location filename="../../../FacilityEngine.cpp" line="44"/> <source>PB</source> <translation>PB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="35"/> + <location filename="../../../FacilityEngine.cpp" line="45"/> <source>EB</source> <translation>EB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="36"/> + <location filename="../../../FacilityEngine.cpp" line="46"/> <source>ZB</source> <translation>ZB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="37"/> + <location filename="../../../FacilityEngine.cpp" line="47"/> <source>YB</source> <translation>YB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="38"/> + <location filename="../../../FacilityEngine.cpp" line="48"/> <source>Less than %10 seconds</source> <translation>Menos de %10 segundos</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="39"/> + <location filename="../../../FacilityEngine.cpp" line="49"/> <source>About %10 seconds remaining</source> <translation>Alrededor de %10 segundos restantes</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="40"/> + <location filename="../../../FacilityEngine.cpp" line="50"/> <source>About %1 minutes remaining</source> <translation>Alrededor de %1 minutos restantes</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="41"/> + <location filename="../../../FacilityEngine.cpp" line="51"/> <source>About %1 hours remaining</source> <translation>Alrededor de %1 las horas restantes</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="47"/> + <location filename="../../../FacilityEngine.cpp" line="57"/> <source>Transfer</source> <extracomment>a transfer</extracomment> <translation>Transferencia</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="50"/> + <location filename="../../../FacilityEngine.cpp" line="60"/> <source>Start</source> <translation>Iniciar</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="55"/> + <location filename="../../../FacilityEngine.cpp" line="65"/> <source>Source</source> <translation>Origen</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="56"/> + <location filename="../../../FacilityEngine.cpp" line="66"/> <source>Size</source> <translation>Tamaño</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="57"/> + <location filename="../../../FacilityEngine.cpp" line="67"/> <source>Destination</source> <translation>Destino</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="58"/> + <location filename="../../../FacilityEngine.cpp" line="68"/> <source>Quit</source> <translation>Abandonar</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="59"/> + <location filename="../../../FacilityEngine.cpp" line="69"/> <source>Target</source> <translation>Objetivo</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="60"/> - <location filename="../../../FacilityEngine.cpp" line="64"/> + <location filename="../../../FacilityEngine.cpp" line="70"/> + <location filename="../../../FacilityEngine.cpp" line="74"/> <source>Time remaining:</source> <translation>Tiempo restante:</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="61"/> + <location filename="../../../FacilityEngine.cpp" line="71"/> <source>Listing</source> <translation>Listado</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="62"/> + <location filename="../../../FacilityEngine.cpp" line="72"/> <source>Copying</source> <translation>Copia</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="63"/> + <location filename="../../../FacilityEngine.cpp" line="73"/> <source>Listing and copying</source> <translation>Listado y copia</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="66"/> + <location filename="../../../FacilityEngine.cpp" line="76"/> <source>Ask</source> <translation>Pedir</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="68"/> + <location filename="../../../FacilityEngine.cpp" line="78"/> <source>Overwrite</source> <translation>Sobrescribir</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="69"/> + <location filename="../../../FacilityEngine.cpp" line="79"/> <source>Overwrite if newer</source> <translation>Sobrescribir si nuevo</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="70"/> + <location filename="../../../FacilityEngine.cpp" line="80"/> <source>Overwrite if the last modification dates are different</source> <translation>Sobrescribir si las fechas de modificación últimos son diferentes</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="71"/> + <location filename="../../../FacilityEngine.cpp" line="81"/> <source>Rename</source> <translation>Cambiar el nombre</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="72"/> + <location filename="../../../FacilityEngine.cpp" line="82"/> <source>Put to the end of the list</source> <translation>Ponga al final de la lista</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="83"/> + <location filename="../../../FacilityEngine.cpp" line="93"/> <source>Completed in %1</source> <translation>Terminado en %1</translation> </message> <message> - <source>Put to end of the list</source> - <translation type="obsolete">Poner a final de la lista</translation> - </message> - <message> - <location filename="../../../FacilityEngine.cpp" line="73"/> + <location filename="../../../FacilityEngine.cpp" line="83"/> <source>Select source directory</source> <translation>Seleccione el directorio de origen</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="74"/> + <location filename="../../../FacilityEngine.cpp" line="84"/> <source>Select destination directory</source> <translation>Seleccione el directorio de destino</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="75"/> + <location filename="../../../FacilityEngine.cpp" line="85"/> <source>Internal error</source> <translation>Error interno</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="76"/> + <location filename="../../../FacilityEngine.cpp" line="86"/> <source>Select one or more files to open</source> <translation>Seleccione uno o varios archivos para abrirlos</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="77"/> + <location filename="../../../FacilityEngine.cpp" line="87"/> <source>All files</source> <translation>Todos los archivos</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="78"/> + <location filename="../../../FacilityEngine.cpp" line="88"/> <source>Save transfer list</source> <translation>Guardar lista de transferencias</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="79"/> + <location filename="../../../FacilityEngine.cpp" line="89"/> <source>Open transfer list</source> <translation>Abrir lista de transferencias</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="80"/> + <location filename="../../../FacilityEngine.cpp" line="90"/> <source>Transfer list</source> <translation>Lista de transferencia</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="81"/> + <location filename="../../../FacilityEngine.cpp" line="91"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="82"/> + <location filename="../../../FacilityEngine.cpp" line="92"/> <source>Not supported on this platform</source> <translation>No es compatible con esta plataforma</translation> </message> @@ -520,7 +476,7 @@ <context> <name>HelpDialog</name> <message> - <location filename="../../../HelpDialog.cpp" line="37"/> + <location filename="../../../HelpDialog.cpp" line="34"/> <source>About Ultracopier</source> <translation>Acerca Ultracopier</translation> </message> @@ -559,49 +515,42 @@ Esta versión está compilada en versión:%1.</translation> <translation>Cerrar</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="35"/> - <source>About Supercopier</source> - <translation>Acerca de Supercopier</translation> - </message> - <message> - <location filename="../../../HelpDialog.cpp" line="80"/> + <location filename="../../../HelpDialog.cpp" line="73"/> <source>For http://portableapps.com/</source> <translation>Para http://portableapps.com/</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="83"/> + <location filename="../../../HelpDialog.cpp" line="76"/> <source>Portable and all in one version</source> <translation>Portable y todo en una versión</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="85"/> + <location filename="../../../HelpDialog.cpp" line="78"/> <source>Portable version</source> <translation>Version portable</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="90"/> + <location filename="../../../HelpDialog.cpp" line="83"/> <source>All in one version</source> <translation>Todo en una sola versión</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="92"/> + <location filename="../../../HelpDialog.cpp" line="85"/> <source>Normal version</source> <translation>Version normal</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="110"/> - <location filename="../../../HelpDialog.cpp" line="112"/> - <location filename="../../../HelpDialog.cpp" line="123"/> + <location filename="../../../HelpDialog.cpp" line="102"/> <source>http://ultracopier.first-world.info/</source> <translation>http://ultracopier-es.first-world.info/</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="120"/> + <location filename="../../../HelpDialog.cpp" line="109"/> <source>http://ultracopier.first-world.info/shop.html</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="125"/> + <location filename="../../../HelpDialog.cpp" line="111"/> <source>http://ultracopier.first-world.info/download.html</source> <translation>http://ultracopier-es.first-world.info/descarga.html</translation> </message> @@ -615,12 +564,12 @@ Esta versión está compilada en versión:%1.</translation> <context> <name>LocalListener</name> <message> - <location filename="../../../LocalListener.cpp" line="146"/> + <location filename="../../../LocalListener.cpp" line="160"/> <source>Warning</source> <translation>Advertencia</translation> </message> <message> - <location filename="../../../LocalListener.cpp" line="146"/> + <location filename="../../../LocalListener.cpp" line="160"/> <source>Timeout while recomposing data from connected clients</source> <translation>Tiempo de espera, mientras que la recomposición de datos de los clientes conectados</translation> </message> @@ -628,27 +577,23 @@ Esta versión está compilada en versión:%1.</translation> <context> <name>LogThread</name> <message> - <location filename="../../../LogThread.cpp" line="106"/> - <location filename="../../../LogThread.cpp" line="115"/> - <location filename="../../../LogThread.cpp" line="125"/> + <location filename="../../../LogThread.cpp" line="107"/> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../../../LogThread.cpp" line="106"/> + <location filename="../../../LogThread.cpp" line="107"/> <source>Log file already open, error: %1</source> <translation>Entrar archivo ya está abierto, error: %1</translation> </message> <message> - <location filename="../../../LogThread.cpp" line="115"/> - <location filename="../../../LogThread.cpp" line="125"/> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> <source>Unable to open the log file, error: %1</source> <translation>No se puede abrir el archivo de registro, error: %1</translation> </message> - <message> - <source>Unable to open file to keep the log file, error: %1</source> - <translation type="obsolete">No se puede abrir el archivo para mantener el archivo de registro, error: %1</translation> - </message> </context> <context> <name>OSSpecific</name> @@ -668,10 +613,6 @@ Esta versión está compilada en versión:%1.</translation> <translation>Ok</translation> </message> <message> - <source>The replacement of default copy/move system is not supported by the file manager (Dolphin, Nautilus, ...).<br />Ask to the developer to support it.<br />You need do the copy/move manually.</source> - <translation type="obsolete">La sustitución de la copia default / sistema de movimiento no está soportado por el gestor de archivos (Dolphin, Nautilus, ...). <br /> Pregunte al desarrollador para apoyarlo. <br /> Es necesario hacer el copiar / mover manualmente.</translation> - </message> - <message> <location filename="../../../OSSpecific.cpp" line="23"/> <source>The replacement of default copy/move system is not supported by the file manager (Dolphin, Nautilus, ...).<br />Ask the developer to support it.<br />You need do the copy/move manually.</source> <translation>La sustitución de la copia default / sistema de movimiento no está soportado por el gestor de archivos (Dolphin, Nautilus, ...). <br /> Pregunte al desarrollador para apoyarlo. <br /> Es necesario hacer el copiar / mover manualmente.</translation> @@ -691,21 +632,6 @@ Esta versión está compilada en versión:%1.</translation> <source>The replacement of default copy/move system should be not supported by the file manager.<br />Ask to the developer to support it.<br />You need do the copy/move manually.</source> <translation>La sustitución de incumplimiento de copiar / mover sistema no debe ser soportado por el gestor de archivos. <br /> Pregunte al desarrollador para apoyarlo. <br /> Usted necesita hacer el copiar / mover manualmente.</translation> </message> - <message> - <location filename="../../../OSSpecific.cpp" line="32"/> - <source>Consider Supercopier as deprecated, prefer Ultracopier</source> - <translation>Considere supercopier como obsoleto, prefieren Ultracopier</translation> - </message> - <message> - <location filename="../../../OSSpecific.cpp" line="35"/> - <source>This version use 100% of you graphic card/GPU (you computer can be noisy, or slow/buggy during the games) at exchange of free access to Ultimate version. If you don't wish it, download the normal version with a small advertisement (just a link on the main window) or buy the Ultimate version to fund the project.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OSSpecific.cpp" line="36"/> - <source>http://ultracopier.first-world.info/download.html</source> - <translation type="unfinished">http://ultracopier-es.first-world.info/descarga.html</translation> - </message> </context> <context> <name>OptionDialog</name> @@ -728,7 +654,7 @@ Esta versión está compilada en versión:%1.</translation> <message> <location filename="../../../OptionDialog.ui" line="66"/> <location filename="../../../OptionDialog.ui" line="322"/> - <location filename="../../../OptionDialog.cpp" line="354"/> + <location filename="../../../OptionDialog.cpp" line="286"/> <source>Copy engine</source> <translation>Motor de copia</translation> </message> @@ -744,28 +670,16 @@ Esta versión está compilada en versión:%1.</translation> <translation>Log</translation> </message> <message> - <source>Load at the session loading:</source> - <translation type="obsolete">Carga en la carga de la sesión:</translation> - </message> - <message> <location filename="../../../OptionDialog.ui" line="222"/> <source>Confirm to group the windows</source> <translation>Confirmar al grupo de las ventanas</translation> </message> <message> - <source>Display the OS warning:</source> - <translation type="obsolete">Muestra la advertencia OS:</translation> - </message> - <message> <location filename="../../../OptionDialog.ui" line="245"/> <source>Check for updates</source> <translation>Buscar actualizaciones</translation> </message> <message> - <source>Give GPU time to Ultracopier</source> - <translation type="obsolete">Dale GPU tiempo</translation> - </message> - <message> <location filename="../../../OptionDialog.ui" line="312"/> <source>Name</source> <translation>Nombre</translation> @@ -783,29 +697,25 @@ Esta versión está compilada en versión:%1.</translation> <message> <location filename="../../../OptionDialog.ui" line="71"/> <location filename="../../../OptionDialog.ui" line="335"/> - <location filename="../../../OptionDialog.cpp" line="355"/> + <location filename="../../../OptionDialog.cpp" line="287"/> <source>Listener</source> <translation>Oyente</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="76"/> <location filename="../../../OptionDialog.ui" line="340"/> - <location filename="../../../OptionDialog.cpp" line="356"/> + <location filename="../../../OptionDialog.cpp" line="288"/> <source>Plugin loader</source> <translation>Plugin cargador</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="84"/> <location filename="../../../OptionDialog.ui" line="345"/> - <location filename="../../../OptionDialog.cpp" line="357"/> + <location filename="../../../OptionDialog.cpp" line="289"/> <source>Session loader</source> <translation>Sesión cargador</translation> </message> <message> - <source>Check the update</source> - <translation type="obsolete">Compruebe la actualización</translation> - </message> - <message> <location filename="../../../OptionDialog.ui" line="117"/> <source>Force the language</source> <translation>Forzar el idioma</translation> @@ -916,10 +826,6 @@ Esta versión está compilada en versión:%1.</translation> <translation>Escriba la carpeta de las operaciones</translation> </message> <message> - <source>Write directly the file when it receive a new entry (can produce 50% of lost of performance)</source> - <translation type="obsolete">Escriba directamente el archivo cuando se recibe una nueva entrada (se puede producir un 50% de pérdida de rendimiento)</translation> - </message> - <message> <location filename="../../../OptionDialog.ui" line="748"/> <source>The variables are %time%, %source%, %size%, %destination%</source> <extracomment>%time%, %source%, %size%, %destination% should not be translated</extracomment> @@ -942,128 +848,80 @@ Esta versión está compilada en versión:%1.</translation> <translation>Escribir el archivo de registro en:</translation> </message> <message> - <source>Force the language:</source> - <translation type="obsolete">Forzar el idioma:</translation> - </message> - <message> - <source>Replace the default copy and move system:</source> - <translation type="obsolete">Vuelva a colocar la copia por omisión y el sistema de movimiento:</translation> - </message> - <message> <location filename="../../../OptionDialog.ui" line="728"/> <source>Write directly to the file when it receive a new entry (can produce 50% of lost of performance)</source> <translation>Escriba directamente el archivo cuando se recibe una nueva entrada (se puede producir un 50% de pérdida de rendimiento)</translation> </message> <message> - <source>Write the transfers:</source> - <translation type="obsolete">Escriba las transferencias:</translation> - </message> - <message> - <source>Write the errors:</source> - <translation type="obsolete">Escribir los errores:</translation> - </message> - <message> - <source>Write the folder operations:</source> - <translation type="obsolete">Escriba la carpeta de las operaciones:</translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="260"/> - <location filename="../../../OptionDialog.cpp" line="274"/> + <location filename="../../../OptionDialog.cpp" line="190"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load</source> <translation>Cargar</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="260"/> + <location filename="../../../OptionDialog.cpp" line="190"/> <source>Load the theme?</source> <translation>Cargue el tema?</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="274"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load the language?</source> <translation>Cargue el idioma?</translation> </message> <message> - <source>Disabled because you have any SessionLoader plugin</source> - <translation type="obsolete">Desactiveado porque no tienes niguano plugin SessionLoader</translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="478"/> - <source>Allow the application</source> - <translation>Permitir la aplicación</translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="478"/> - <source>This Ultimate free version is only if %1 is allowed by your antivirus. Else you can get the normal free version</source> - <translation>Esta versión gratuita de ruptura es sólo si %1 es permitido por su antivirus. Cosa que usted puede obtener la versión normal gratis</translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="483"/> - <source>Enable the OpenCL</source> - <translation>Habilite el OpenCL</translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="483"/> - <source>This Ultimate version is only if the OpenCL is installed with your graphic card drivers. Else you can get the normal free version</source> - <translation>Esta versión Ultimate es sólo si el OpenCL se instala con los controladores de la tarjeta gráfica. Cosa que usted puede obtener la versión normal gratis</translation> - </message> - <message> - <source>Disabled because you do not have any SessionLoader plugin</source> - <translation type="obsolete">Discapacitados, ya que no tiene ningún plugin SessionLoader</translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="362"/> + <location filename="../../../OptionDialog.cpp" line="294"/> <source>Do nothing</source> <translation>No hacer nada</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="363"/> + <location filename="../../../OptionDialog.cpp" line="295"/> <source>Ask source as folder</source> <translation>Pregunte a la fuente que la carpeta</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="364"/> + <location filename="../../../OptionDialog.cpp" line="296"/> <source>Ask sources as files</source> <translation>Pregunte a las fuentes como archivos</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="365"/> + <location filename="../../../OptionDialog.cpp" line="297"/> <source>Never</source> <translation>Nunca</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="366"/> + <location filename="../../../OptionDialog.cpp" line="298"/> <source>When source is same</source> <translation>Cuando la fuente es la misma</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="367"/> + <location filename="../../../OptionDialog.cpp" line="299"/> <source>When destination is same</source> <translation>Cuando destino es el mismo</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="368"/> + <location filename="../../../OptionDialog.cpp" line="300"/> <source>When source and destination are same</source> <translation>Cuando la fuente y el destino son los mismos</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="369"/> + <location filename="../../../OptionDialog.cpp" line="301"/> <source>When source or destination are same</source> <translation>Cuando la fuente o el destino son los mismos</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="370"/> + <location filename="../../../OptionDialog.cpp" line="302"/> <source>Always</source> <translation>Siempre</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="384"/> - <location filename="../../../OptionDialog.cpp" line="385"/> - <location filename="../../../OptionDialog.cpp" line="386"/> + <location filename="../../../OptionDialog.cpp" line="316"/> + <location filename="../../../OptionDialog.cpp" line="317"/> + <location filename="../../../OptionDialog.cpp" line="318"/> <source>The variables are %1</source> <translation>Las variables son %1</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="1591"/> + <location filename="../../../OptionDialog.cpp" line="948"/> <source>Save logs as: </source> <translation>Guardar registros como: </translation> </message> @@ -1073,14 +931,6 @@ Esta versión está compilada en versión:%1.</translation> <translation>Registro de sincronizada</translation> </message> <message> - <source>When manual open:</source> - <translation type="obsolete">Cuando apertura manual:</translation> - </message> - <message> - <source>Group the windows when:</source> - <translation type="obsolete">Grupo de las ventanas cuando:</translation> - </message> - <message> <location filename="../../../OptionDialog.ui" line="811"/> <source>The variables are %path%, %operation%</source> <extracomment>%path%, %operation% should not be translated</extracomment> @@ -1090,10 +940,10 @@ Esta versión está compilada en versión:%1.</translation> <context> <name>OptionEngine</name> <message> - <location filename="../../../OptionEngine.cpp" line="161"/> - <location filename="../../../OptionEngine.cpp" line="165"/> - <location filename="../../../OptionEngine.cpp" line="202"/> - <location filename="../../../OptionEngine.cpp" line="206"/> + <location filename="../../../OptionEngine.cpp" line="162"/> + <location filename="../../../OptionEngine.cpp" line="169"/> + <location filename="../../../OptionEngine.cpp" line="211"/> + <location filename="../../../OptionEngine.cpp" line="215"/> <source>The variable was not found: %1 %2</source> <translation>La variable no se ha encontrado: %1 %2</translation> </message> @@ -1136,42 +986,42 @@ Esta versión está compilada en versión:%1.</translation> <translation>Versión:</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="38"/> + <location filename="../../../PluginInformation.cpp" line="39"/> <source>Copy engine</source> <translation>Motor de copia</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="41"/> + <location filename="../../../PluginInformation.cpp" line="42"/> <source>Languages</source> <translation>Idiomas</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="44"/> + <location filename="../../../PluginInformation.cpp" line="45"/> <source>Listener</source> <translation>Oyente</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="47"/> + <location filename="../../../PluginInformation.cpp" line="48"/> <source>Plugin loader</source> <translation>Plugin cargador</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="50"/> + <location filename="../../../PluginInformation.cpp" line="51"/> <source>Session loader</source> <translation>Sesión cargador</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="53"/> + <location filename="../../../PluginInformation.cpp" line="54"/> <source>Themes</source> <translation>Themas</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="57"/> + <location filename="../../../PluginInformation.cpp" line="58"/> <source>Unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="67"/> + <location filename="../../../PluginInformation.cpp" line="68"/> <source>Information about %1</source> <translation>Información sobre %1</translation> </message> @@ -1189,135 +1039,126 @@ Esta versión está compilada en versión:%1.</translation> <context> <name>PluginsManager</name> <message> - <location filename="../../../PluginsManager.cpp" line="221"/> + <location filename="../../../PluginsManager.cpp" line="224"/> <source>informations.xml is not accessible</source> <translation>informations.xml no es accesible</translation> </message> <message> - <source>informations.xml not found into the plugin</source> - <translation type="obsolete">informations.xml que no se encuentran en el plug-in</translation> - </message> - <message> - <location filename="../../../PluginsManager.cpp" line="487"/> + <location filename="../../../PluginsManager.cpp" line="494"/> <source>Dependencies part is wrong</source> <translation>Parte las dependencias se equivoca</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="508"/> + <location filename="../../../PluginsManager.cpp" line="515"/> <source>Dependencies %1 are not satisfied, for plugin: %2</source> <translation>Dependencias %1 no está satisfecho, para el plugin:%2</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="665"/> + <location filename="../../../PluginsManager.cpp" line="672"/> <source>Remove %1</source> <translation>Eliminar %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="676"/> + <location filename="../../../PluginsManager.cpp" line="683"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="700"/> + <location filename="../../../PluginsManager.cpp" line="683"/> + <source>Error while the removing plugin, please check the rights on the folder: +%1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="707"/> <source>Information</source> <translation>Información</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="253"/> + <location filename="../../../PluginsManager.cpp" line="256"/> <source>%1, parse error at line %2, column %3: %4</source> <translation>%1, error de análisis en la línea %2, la columna %3: %4</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="227"/> + <location filename="../../../PluginsManager.cpp" line="230"/> <source>informations.xml not found for the plugin</source> <translation>informations.xml no se encuentra el plug-in</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="261"/> + <location filename="../../../PluginsManager.cpp" line="264"/> <source>"package" root tag not found for the xml file</source> <translation>"package" etiqueta raíz que no se encuentra el archivo xml</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="337"/> + <location filename="../../../PluginsManager.cpp" line="340"/> <source>Duplicated plugin found, already loaded!</source> <translation>Plugin de duplicados encontrados, ya está cargado!</translation> </message> <message> - <source>English text missing into the informations.xml for the tag: %1</source> - <translation type="obsolete">Texto de Inglés que falta en el informations.xml de la etiqueta: %1</translation> - </message> - <message> - <location filename="../../../PluginsManager.cpp" line="395"/> + <location filename="../../../PluginsManager.cpp" line="401"/> <source>English text missing in the informations.xml for the tag: %1</source> <translation>Texto Inglés falta en el informations.xml para la etiqueta: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="403"/> + <location filename="../../../PluginsManager.cpp" line="409"/> <source>Tag not found: %1</source> <translation>Etiqueta no encontrada: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="665"/> + <location filename="../../../PluginsManager.cpp" line="672"/> <source>Are you sure about removing "%1" in version %2?</source> <translation>¿Estás seguro de eliminar "%1" en la versión %2?</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="676"/> - <source>Error while the removing plugin, please check the rights on the folder: -%1</source> - <translation>Error al eliminar el plug-in, por favor, compruebe los derechos de la carpeta: -%1</translation> - </message> - <message> - <location filename="../../../PluginsManager.cpp" line="700"/> + <location filename="../../../PluginsManager.cpp" line="707"/> <source>Previous import is in progress...</source> <translation>Previo de importación está en curso ...</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="703"/> + <location filename="../../../PluginsManager.cpp" line="710"/> <source>Open Ultracopier plugin</source> <translation>Abrir Plugin Ultracopier</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="703"/> + <location filename="../../../PluginsManager.cpp" line="710"/> <source>Ultracopier plugin (*.urc)</source> <translation>Ultracopier plugin (*.urc)</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="720"/> - <location filename="../../../PluginsManager.cpp" line="745"/> - <location filename="../../../PluginsManager.cpp" line="813"/> - <location filename="../../../PluginsManager.cpp" line="826"/> - <location filename="../../../PluginsManager.cpp" line="845"/> - <location filename="../../../PluginsManager.cpp" line="851"/> - <location filename="../../../PluginsManager.cpp" line="857"/> - <location filename="../../../PluginsManager.cpp" line="863"/> - <location filename="../../../PluginsManager.cpp" line="869"/> + <location filename="../../../PluginsManager.cpp" line="727"/> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="820"/> + <location filename="../../../PluginsManager.cpp" line="833"/> + <location filename="../../../PluginsManager.cpp" line="852"/> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="870"/> <location filename="../../../PluginsManager.cpp" line="876"/> + <location filename="../../../PluginsManager.cpp" line="883"/> <source>Plugin loader</source> <translation>Plugin cargador</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="720"/> + <location filename="../../../PluginsManager.cpp" line="727"/> <source>Unable to open the plugin: %1</source> <translation>No se puede abrir el plugin: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="745"/> - <location filename="../../../PluginsManager.cpp" line="863"/> - <location filename="../../../PluginsManager.cpp" line="876"/> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="870"/> + <location filename="../../../PluginsManager.cpp" line="883"/> <source>Unable to load the plugin content, please check it: %1</source> <translation>No se puede cargar el contenido del plugin, por favor verifique que: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="813"/> + <location filename="../../../PluginsManager.cpp" line="820"/> <source>Unable to create a folder to install the plugin: %1</source> <translation>No se puede crear una carpeta para instalar el plugin: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="826"/> + <location filename="../../../PluginsManager.cpp" line="833"/> <source>Unable to create a file to install the plugin: %1 since:%2</source> @@ -1326,16 +1167,16 @@ since:%2</source> desde: %2</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="845"/> + <location filename="../../../PluginsManager.cpp" line="852"/> <source>Folder with same name is present, skip the plugin installation: %1</source> <translation>Carpeta con el mismo nombre está presente, no tome la instalación del plugin: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="851"/> - <location filename="../../../PluginsManager.cpp" line="857"/> - <location filename="../../../PluginsManager.cpp" line="869"/> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="876"/> <source>Unable to load the plugin content, please check it</source> <translation> @@ -1392,139 +1233,34 @@ No se puede cargar el contenido del plugin, por favor verifique que</translation <context> <name>SystrayIcon</name> <message> - <location filename="../../../SystrayIcon.cpp" line="169"/> + <location filename="../../../SystrayIcon.cpp" line="161"/> <source>Information</source> <translation type="unfinished">Información</translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="187"/> + <location filename="../../../SystrayIcon.cpp" line="179"/> <source>Searching information...</source> <translation type="unfinished">Buscar información...</translation> </message> <message> - <source>Not replace the explorer copy/move</source> - <translation type="obsolete">No reemplazar la copia explorador/mover</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="163"/> + <location filename="../../../SystrayIcon.cpp" line="155"/> <source>No copy listener found. Do the copy manually by right click one the system tray icon.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="200"/> + <location filename="../../../SystrayIcon.cpp" line="192"/> <source>Do not replace the explorer copy/move</source> <translation type="unfinished">No sustituya la copia explorer/move</translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="205"/> + <location filename="../../../SystrayIcon.cpp" line="197"/> <source>Semi replace the explorer copy/move</source> <translation type="unfinished">Semi reemplazar la copia explorer/mudanza</translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="210"/> + <location filename="../../../SystrayIcon.cpp" line="202"/> <source>Replace the explorer copy/move</source> <translation type="unfinished">Vuelva a colocar la copia explorer/mudanza</translation> </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="377"/> - <source>Warning</source> - <translation type="unfinished">Advertencia</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="377"/> - <source>The action on the systray icon is unknown!</source> - <translation type="unfinished">La acción en el icono de la bandeja del sistema es desconocido!</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="425"/> - <source>&About/Debug report</source> - <translation type="unfinished">&Acerca de/Debug informe</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="427"/> - <source>&About</source> - <translation type="unfinished">&Sobre</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="471"/> - <source>New version: %1</source> - <translation type="unfinished">Nueva versión: %1</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="471"/> - <source>Click here to go on download page</source> - <translation type="unfinished">Haga clic aquí para ir a la página de descarga</translation> - </message> - <message> - <source>Click here to go to the shop and login. -Download the new version into the order details</source> - <translation type="obsolete">Haga clic aquí para ir a la tienda y al acceso. -Descarga la nueva versión en los detalles de la orden</translation> - </message> - <message> - <source>&Save bug Report</source> - <translation type="obsolete">&Guardar informe de error</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="430"/> - <source>&Save bug report</source> - <translation type="unfinished">&Guardar informe de error</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="432"/> - <source>&Quit</source> - <translation type="unfinished">&Dejar de</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="433"/> - <source>&Options</source> - <translation type="unfinished">&Opciones</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="485"/> - <source>A&dd copy/moving</source> - <translation type="unfinished">Aña&dir copiar/mover</translation> - </message> - <message> - <source>New version: %1 -Site: %2</source> - <translation type="obsolete">Nueva versión: %1 -Sitio web: %2</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="511"/> - <source>&Copy</source> - <translation type="unfinished">&Copia</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="525"/> - <location filename="../../../SystrayIcon.cpp" line="539"/> - <source>&Transfer</source> - <translation type="unfinished">&Transferencia</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="529"/> - <location filename="../../../SystrayIcon.cpp" line="543"/> - <source>&Move</source> - <translation type="unfinished">&Movimiento</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="560"/> - <location filename="../../../SystrayIcon.cpp" line="577"/> - <source>Add &copy</source> - <translation type="unfinished">Agregar &copia</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="566"/> - <location filename="../../../SystrayIcon.cpp" line="583"/> - <source>Add &transfer</source> - <translation type="unfinished">Añadir &transferencia</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="570"/> - <location filename="../../../SystrayIcon.cpp" line="587"/> - <source>Add &move</source> - <translation type="unfinished">Añadir &movimiento</translation> - </message> </context> </TS> diff --git a/plugins/Languages/fr/informations.xml b/plugins/Languages/fr/informations.xml index a20768f..e7a4224 100644 --- a/plugins/Languages/fr/informations.xml +++ b/plugins/Languages/fr/informations.xml @@ -15,7 +15,7 @@ <description xml:lang="en"><![CDATA[Translation of Ultracopier to French. For more details see the web site.]]></description> <description xml:lang="fr"><![CDATA[Traduction d'ultracopier en Français. Pour plus de détails regardez le site web]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>1.2.3.6</version> + <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>fr</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/fr/translation.ts b/plugins/Languages/fr/translation.ts index 8f1fc7d..77868c0 100644 --- a/plugins/Languages/fr/translation.ts +++ b/plugins/Languages/fr/translation.ts @@ -1,110 +1,86 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0" language="fr" sourcelanguage="en"> +<TS version="2.1" language="fr" sourcelanguage="en"> <context> <name>CliParser</name> <message> - <location filename="../../../CliParser.cpp" line="25"/> - <location filename="../../../CliParser.cpp" line="71"/> - <location filename="../../../CliParser.cpp" line="84"/> - <location filename="../../../CliParser.cpp" line="94"/> - <location filename="../../../CliParser.cpp" line="179"/> + <location filename="../../../CliParser.cpp" line="26"/> + <location filename="../../../CliParser.cpp" line="72"/> + <location filename="../../../CliParser.cpp" line="85"/> + <location filename="../../../CliParser.cpp" line="95"/> + <location filename="../../../CliParser.cpp" line="180"/> <source>Warning</source> <translation>Avertissement</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="25"/> + <location filename="../../../CliParser.cpp" line="26"/> <source>Ultracopier is already running, right click on its system tray icon (near the clock) to use it</source> <translation>Ultracopier est déjà lancé! Cliquez droit sur l'icône de la zone de notifications (près de l'horloge) pour l'utiliser</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="71"/> + <location filename="../../../CliParser.cpp" line="72"/> <source>Problem reading file, or file size is 0</source> <translation>Problème à la lecture, ou taille de fichier nulle</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="159"/> - <location filename="../../../CliParser.cpp" line="170"/> + <location filename="../../../CliParser.cpp" line="160"/> + <location filename="../../../CliParser.cpp" line="171"/> <source>The arguments possible are:</source> <translation>Les arguments possible sont:</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="161"/> - <location filename="../../../CliParser.cpp" line="172"/> + <location filename="../../../CliParser.cpp" line="162"/> + <location filename="../../../CliParser.cpp" line="173"/> <source>To display the options</source> <translation>Afficher les options</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="164"/> - <location filename="../../../CliParser.cpp" line="175"/> + <location filename="../../../CliParser.cpp" line="165"/> + <location filename="../../../CliParser.cpp" line="176"/> <source>To copy sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> <translation>Pour copier les sources vers la destination, séparées par des espaces. Si la destination est "?", Ultracopier demandera à l'utilisateur</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="165"/> - <location filename="../../../CliParser.cpp" line="176"/> + <location filename="../../../CliParser.cpp" line="166"/> + <location filename="../../../CliParser.cpp" line="177"/> <source>To move sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> <translation>Pour copier les sources vers la destination, séparées par des espaces. Si la destination est "?", Ultracopier demandera à l'utilisateur</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="169"/> + <location filename="../../../CliParser.cpp" line="170"/> <source>Command not valid</source> <translation>Ligne de commande invalide</translation> </message> <message> - <source>Problem at the reading, or file size is null</source> - <translation type="obsolete">Problème à la lecture, ou taille de fichier nulle</translation> - </message> - <message> - <location filename="../../../CliParser.cpp" line="84"/> + <location filename="../../../CliParser.cpp" line="85"/> <source>This file is not supported transfer list</source> <translation>Ce fichier n'est pas une list de transfert supporté</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="94"/> + <location filename="../../../CliParser.cpp" line="95"/> <source>Unable to open the transfer list file</source> <translation>Impossible d'ouvrir le fichier de liste de transfert</translation> </message> <message> - <source>The arguments possibles are:</source> - <translation type="obsolete">Les arguments possible sont:</translation> - </message> - <message> - <location filename="../../../CliParser.cpp" line="160"/> - <location filename="../../../CliParser.cpp" line="171"/> + <location filename="../../../CliParser.cpp" line="161"/> + <location filename="../../../CliParser.cpp" line="172"/> <source>To display this help</source> <translation>Pour afficher cette aide</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="162"/> - <location filename="../../../CliParser.cpp" line="173"/> + <location filename="../../../CliParser.cpp" line="163"/> + <location filename="../../../CliParser.cpp" line="174"/> <source>To quit the other instances (if running)</source> <translation>Pour quiter l'autre instance en cour</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="163"/> - <location filename="../../../CliParser.cpp" line="174"/> + <location filename="../../../CliParser.cpp" line="164"/> + <location filename="../../../CliParser.cpp" line="175"/> <source>Open transfer list</source> <translation>Ouvrir la liste de transfert</translation> </message> <message> - <source>To quit the other instance running (if have)</source> - <translation type="obsolete">Pour quiter l'autre instance en cour (si il y as)</translation> - </message> - <message> - <source>To copy sources to destination, separated by space. If destination is "?", ultracopier will ask it to the user</source> - <translation type="obsolete">Pour copier les sources vers la destination, séparées par des espaces. Si la destination est "?", Ultracopier demandera à l'utilisateur</translation> - </message> - <message> - <source>To move sources to destination, separated by space. If destination is "?", ultracopier will ask it to the user</source> - <translation type="obsolete">Pour déplacer les sources vers la destination, séparées par des espaces. Si la destination est "?", Ultracopier demandera à l'utilisateur</translation> - </message> - <message> - <source>Command line not understand</source> - <translation type="obsolete">Ligne de commands non comprise</translation> - </message> - <message> - <location filename="../../../CliParser.cpp" line="181"/> + <location filename="../../../CliParser.cpp" line="182"/> <source>Help</source> <translation>Aide</translation> </message> @@ -112,38 +88,30 @@ <context> <name>CopyEngineManager</name> <message> - <location filename="../../../CopyEngineManager.cpp" line="229"/> - <location filename="../../../CopyEngineManager.cpp" line="234"/> - <location filename="../../../CopyEngineManager.cpp" line="257"/> - <location filename="../../../CopyEngineManager.cpp" line="271"/> + <location filename="../../../CopyEngineManager.cpp" line="231"/> + <location filename="../../../CopyEngineManager.cpp" line="236"/> + <location filename="../../../CopyEngineManager.cpp" line="259"/> + <location filename="../../../CopyEngineManager.cpp" line="273"/> <source>Warning</source> <translation>Avertissement</translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="229"/> + <location filename="../../../CopyEngineManager.cpp" line="231"/> <source>Cannot find any copy engine with move support</source> <translation>Impossible de trouver un moteur avec le support du déplacement</translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="257"/> + <location filename="../../../CopyEngineManager.cpp" line="259"/> <source>This copy engine does not support move</source> <translation>Ce moteur de copie ne supporte pas les déplacements</translation> </message> <message> - <source>Cannot find any copy engine with motions support</source> - <translation type="obsolete">Impossible de trouver un moteur de copie avec le support des déplacements</translation> - </message> - <message> - <location filename="../../../CopyEngineManager.cpp" line="234"/> + <location filename="../../../CopyEngineManager.cpp" line="236"/> <source>Cannot find any compatible engine!</source> <translation>Impossible de trouver un moteur de copie compatible!</translation> </message> <message> - <source>This copy engine does not support motions</source> - <translation type="obsolete">Ce moteur de copie ne supporte pas les déplacements</translation> - </message> - <message> - <location filename="../../../CopyEngineManager.cpp" line="271"/> + <location filename="../../../CopyEngineManager.cpp" line="273"/> <source>Cannot find any engine with this name: %1</source> <translation>Impossible de trouver un moteur portant ce nom: %1</translation> </message> @@ -151,12 +119,12 @@ <context> <name>CopyListener</name> <message> - <location filename="../../../CopyListener.cpp" line="158"/> + <location filename="../../../CopyListener.cpp" line="159"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location filename="../../../CopyListener.cpp" line="158"/> + <location filename="../../../CopyListener.cpp" line="159"/> <source>Error during the reception of the copy/move list %1</source> <translation>Erreur pendant la réception de la liste de copy/déplacement @@ -166,91 +134,83 @@ <context> <name>Core</name> <message> - <location filename="../../../Core.cpp" line="45"/> - <location filename="../../../Core.cpp" line="116"/> - <location filename="../../../Core.cpp" line="142"/> - <location filename="../../../Core.cpp" line="157"/> - <location filename="../../../Core.cpp" line="177"/> - <location filename="../../../Core.cpp" line="191"/> - <location filename="../../../Core.cpp" line="200"/> - <location filename="../../../Core.cpp" line="209"/> - <location filename="../../../Core.cpp" line="216"/> - <location filename="../../../Core.cpp" line="250"/> - <location filename="../../../Core.cpp" line="387"/> - <location filename="../../../Core.cpp" line="392"/> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="117"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> + <location filename="../../../Core.cpp" line="217"/> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> + <location filename="../../../Core.cpp" line="393"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location filename="../../../Core.cpp" line="45"/> - <location filename="../../../Core.cpp" line="142"/> - <location filename="../../../Core.cpp" line="157"/> - <location filename="../../../Core.cpp" line="177"/> - <location filename="../../../Core.cpp" line="191"/> - <location filename="../../../Core.cpp" line="200"/> - <location filename="../../../Core.cpp" line="209"/> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> <source>Unable to get a copy engine instance</source> <translation>Impossible d'obtenir une instance du moteur de copie</translation> </message> <message> - <location filename="../../../Core.cpp" line="93"/> + <location filename="../../../Core.cpp" line="94"/> <source>Group window</source> <translation>Grouper des fenêtres</translation> </message> <message> - <location filename="../../../Core.cpp" line="93"/> + <location filename="../../../Core.cpp" line="94"/> <source>Do you want group the transfer with another actual running transfer?</source> <translation>Voulez vous grouper le transfert avec le transfert actuel?</translation> </message> <message> - <location filename="../../../Core.cpp" line="116"/> + <location filename="../../../Core.cpp" line="117"/> <source>Unable to get a engine instance</source> <translation>Impossible d'otenir une instance du moteur de copie</translation> </message> <message> - <location filename="../../../Core.cpp" line="216"/> + <location filename="../../../Core.cpp" line="217"/> <source>The argument for the mode is not valid</source> <translation>L'argument pour le mode n'est pas valide</translation> </message> <message> - <location filename="../../../Core.cpp" line="1133"/> + <location filename="../../../Core.cpp" line="1136"/> <source>Do you want to copy? If no, it will be moved.</source> <translation>Voulez vous faire une copie? Si vous repondez non alors il sera déplacé.</translation> </message> <message> - <source>The argument for the mode is not understand</source> - <translation type="obsolete">L'argument pour le mode n'est pas compris</translation> - </message> - <message> - <location filename="../../../Core.cpp" line="250"/> - <location filename="../../../Core.cpp" line="387"/> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> <source>Unable to load the interface, copy aborted</source> <translation>Impossible de charger l'interface, copie annulée</translation> </message> <message> - <location filename="../../../Core.cpp" line="392"/> + <location filename="../../../Core.cpp" line="393"/> <source>Unable to load the copy engine, copy aborted</source> <translation>Impossible de charger le moteur de copie, copie annulée</translation> </message> <message> - <location filename="../../../Core.cpp" line="1133"/> + <location filename="../../../Core.cpp" line="1136"/> <source>Transfer mode</source> <translation>Mode de transfert</translation> </message> - <message> - <source>Do you want to copy? If you reply no, it will be moved.</source> - <translation type="obsolete">Voulez vous faire une copie? Si vous repondez nous alors il sera déplacé.</translation> - </message> </context> <context> <name>EventDispatcher</name> <message> - <location filename="../../../EventDispatcher.cpp" line="155"/> + <location filename="../../../EventDispatcher.cpp" line="152"/> <source>Key</source> <translation>Clef</translation> </message> <message> - <location filename="../../../EventDispatcher.cpp" line="155"/> + <location filename="../../../EventDispatcher.cpp" line="152"/> <source>Give the key of this software, more information on <a href="http://ultracopier.first-world.info/">ultracopier.first-world.info</a></source> <translation>Donnez la clef de ce logiciel, plus d'information sur <a href="http://ultracopier-fr.first-world.info/">ultracopier-fr.first-world.info</a></translation> </message> @@ -258,263 +218,259 @@ <context> <name>FacilityEngine</name> <message> - <location filename="../../../FacilityEngine.cpp" line="43"/> + <location filename="../../../FacilityEngine.cpp" line="53"/> <source>Copy engine</source> <translation>Moteur de copie</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="45"/> + <location filename="../../../FacilityEngine.cpp" line="55"/> <source>Copy</source> <extracomment>a copy</extracomment> <translation>Copie</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="49"/> + <location filename="../../../FacilityEngine.cpp" line="59"/> <source>Move</source> <extracomment>a move</extracomment> <translation>Déplacer</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="51"/> + <location filename="../../../FacilityEngine.cpp" line="61"/> <source>Pause</source> <translation>Pause</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="52"/> + <location filename="../../../FacilityEngine.cpp" line="62"/> <source>Resume</source> <translation>Reprendre</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="53"/> - <location filename="../../../FacilityEngine.cpp" line="67"/> + <location filename="../../../FacilityEngine.cpp" line="63"/> + <location filename="../../../FacilityEngine.cpp" line="77"/> <source>Skip</source> <translation>Passer</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="54"/> + <location filename="../../../FacilityEngine.cpp" line="64"/> <source>Unlimited</source> <translation>Illimité</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="27"/> + <location filename="../../../FacilityEngine.cpp" line="37"/> <source>s</source> <translation>s</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="28"/> + <location filename="../../../FacilityEngine.cpp" line="38"/> <source>Too big</source> <translation>Trop grand</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="29"/> + <location filename="../../../FacilityEngine.cpp" line="39"/> <source>B</source> <translation>o</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="30"/> + <location filename="../../../FacilityEngine.cpp" line="40"/> <source>KB</source> <translation>Ko</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="31"/> + <location filename="../../../FacilityEngine.cpp" line="41"/> <source>MB</source> <translation>Mo</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="32"/> + <location filename="../../../FacilityEngine.cpp" line="42"/> <source>GB</source> <translation>Go</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="33"/> + <location filename="../../../FacilityEngine.cpp" line="43"/> <source>TB</source> <translation>To</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="34"/> + <location filename="../../../FacilityEngine.cpp" line="44"/> <source>PB</source> <translation>Po</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="35"/> + <location filename="../../../FacilityEngine.cpp" line="45"/> <source>EB</source> <translation>Eo</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="36"/> + <location filename="../../../FacilityEngine.cpp" line="46"/> <source>ZB</source> <translation>Zo</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="37"/> + <location filename="../../../FacilityEngine.cpp" line="47"/> <source>YB</source> <translation>Yo</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="38"/> + <location filename="../../../FacilityEngine.cpp" line="48"/> <source>Less than %10 seconds</source> <translation>Moins de %10 secondes</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="39"/> + <location filename="../../../FacilityEngine.cpp" line="49"/> <source>About %10 seconds remaining</source> <translation>Environ %10 secondes restantes</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="40"/> + <location filename="../../../FacilityEngine.cpp" line="50"/> <source>About %1 minutes remaining</source> <translation>Environ %1 minutes restantes</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="41"/> + <location filename="../../../FacilityEngine.cpp" line="51"/> <source>About %1 hours remaining</source> <translation>Environ %1 heures restantes</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="47"/> + <location filename="../../../FacilityEngine.cpp" line="57"/> <source>Transfer</source> <extracomment>a transfer</extracomment> <translation>Transfert</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="50"/> + <location filename="../../../FacilityEngine.cpp" line="60"/> <source>Start</source> <translation>Démarrer</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="55"/> + <location filename="../../../FacilityEngine.cpp" line="65"/> <source>Source</source> <translation>Source</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="56"/> + <location filename="../../../FacilityEngine.cpp" line="66"/> <source>Size</source> <translation>Taille</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="57"/> + <location filename="../../../FacilityEngine.cpp" line="67"/> <source>Destination</source> <translation>Destination</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="58"/> + <location filename="../../../FacilityEngine.cpp" line="68"/> <source>Quit</source> <translation>Quitter</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="59"/> + <location filename="../../../FacilityEngine.cpp" line="69"/> <source>Target</source> <translation>Cible</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="60"/> - <location filename="../../../FacilityEngine.cpp" line="64"/> + <location filename="../../../FacilityEngine.cpp" line="70"/> + <location filename="../../../FacilityEngine.cpp" line="74"/> <source>Time remaining:</source> <translation>Temps restant:</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="61"/> + <location filename="../../../FacilityEngine.cpp" line="71"/> <source>Listing</source> <translatorcomment>Création de la liste? Listage?</translatorcomment> <translation>Listing</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="62"/> + <location filename="../../../FacilityEngine.cpp" line="72"/> <source>Copying</source> <translatorcomment>Copie en cour -> copying in progress</translatorcomment> <translation>Copie</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="63"/> + <location filename="../../../FacilityEngine.cpp" line="73"/> <source>Listing and copying</source> <translation>Listing et copie</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="66"/> + <location filename="../../../FacilityEngine.cpp" line="76"/> <source>Ask</source> <translation>Demander</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="68"/> + <location filename="../../../FacilityEngine.cpp" line="78"/> <source>Overwrite</source> <translation>Écraser</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="69"/> + <location filename="../../../FacilityEngine.cpp" line="79"/> <source>Overwrite if newer</source> <translation>Écraser si plus récent</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="70"/> + <location filename="../../../FacilityEngine.cpp" line="80"/> <source>Overwrite if the last modification dates are different</source> <translation>Écraser si les dates de modification sont différentes</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="71"/> + <location filename="../../../FacilityEngine.cpp" line="81"/> <source>Rename</source> <translation>Renommer</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="72"/> + <location filename="../../../FacilityEngine.cpp" line="82"/> <source>Put to the end of the list</source> <translation>Mettre à la fin</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="83"/> + <location filename="../../../FacilityEngine.cpp" line="93"/> <source>Completed in %1</source> <translation>Fini en %1</translation> </message> <message> - <source>Put to end of the list</source> - <translation type="obsolete">Mettre à la fin</translation> - </message> - <message> - <location filename="../../../FacilityEngine.cpp" line="73"/> + <location filename="../../../FacilityEngine.cpp" line="83"/> <source>Select source directory</source> <translation>Sélectionner un dossier source</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="74"/> + <location filename="../../../FacilityEngine.cpp" line="84"/> <source>Select destination directory</source> <translation>Sélectionner un dossier de destination</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="75"/> + <location filename="../../../FacilityEngine.cpp" line="85"/> <source>Internal error</source> <translation>Erreur interne</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="76"/> + <location filename="../../../FacilityEngine.cpp" line="86"/> <source>Select one or more files to open</source> <translation>Sélectionner un ou des fichiers à ouvrir</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="77"/> + <location filename="../../../FacilityEngine.cpp" line="87"/> <source>All files</source> <translation>Tous les fichiers</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="78"/> + <location filename="../../../FacilityEngine.cpp" line="88"/> <source>Save transfer list</source> <translation>Sauvegarder la liste de transfert</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="79"/> + <location filename="../../../FacilityEngine.cpp" line="89"/> <source>Open transfer list</source> <translation>Ouvrir la liste de transfert</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="80"/> + <location filename="../../../FacilityEngine.cpp" line="90"/> <source>Transfer list</source> <translation>Liste de transfert</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="81"/> + <location filename="../../../FacilityEngine.cpp" line="91"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="82"/> + <location filename="../../../FacilityEngine.cpp" line="92"/> <source>Not supported on this platform</source> <translation>Pas supporté sur cette platforme</translation> </message> @@ -522,7 +478,7 @@ <context> <name>HelpDialog</name> <message> - <location filename="../../../HelpDialog.cpp" line="37"/> + <location filename="../../../HelpDialog.cpp" line="34"/> <source>About Ultracopier</source> <translation>À propos d'Ultracopier</translation> </message> @@ -561,49 +517,42 @@ Cette version est compilée comme version : %1.</translation> <translation>Fermer</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="35"/> - <source>About Supercopier</source> - <translation>À propos de Supercopier</translation> - </message> - <message> - <location filename="../../../HelpDialog.cpp" line="80"/> + <location filename="../../../HelpDialog.cpp" line="73"/> <source>For http://portableapps.com/</source> <translation>Pour http://portableapps.com/</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="83"/> + <location filename="../../../HelpDialog.cpp" line="76"/> <source>Portable and all in one version</source> <translation>Portable et tout en un</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="85"/> + <location filename="../../../HelpDialog.cpp" line="78"/> <source>Portable version</source> <translation>Version portable</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="90"/> + <location filename="../../../HelpDialog.cpp" line="83"/> <source>All in one version</source> <translation>Tout en un</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="92"/> + <location filename="../../../HelpDialog.cpp" line="85"/> <source>Normal version</source> <translation>Version normale</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="110"/> - <location filename="../../../HelpDialog.cpp" line="112"/> - <location filename="../../../HelpDialog.cpp" line="123"/> + <location filename="../../../HelpDialog.cpp" line="102"/> <source>http://ultracopier.first-world.info/</source> <translation>http://ultracopier-fr.first-world.info/</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="120"/> + <location filename="../../../HelpDialog.cpp" line="109"/> <source>http://ultracopier.first-world.info/shop.html</source> <translation>http://ultracopier-fr.first-world.info/shop.html</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="125"/> + <location filename="../../../HelpDialog.cpp" line="111"/> <source>http://ultracopier.first-world.info/download.html</source> <translation>http://ultracopier-fr.first-world.info/telecharger.html</translation> </message> @@ -617,12 +566,12 @@ Cette version est compilée comme version : %1.</translation> <context> <name>LocalListener</name> <message> - <location filename="../../../LocalListener.cpp" line="146"/> + <location filename="../../../LocalListener.cpp" line="160"/> <source>Warning</source> <translation>Avertissement</translation> </message> <message> - <location filename="../../../LocalListener.cpp" line="146"/> + <location filename="../../../LocalListener.cpp" line="160"/> <source>Timeout while recomposing data from connected clients</source> <translation>Timeout pendant la recompossition des données des clients connectés</translation> </message> @@ -630,27 +579,23 @@ Cette version est compilée comme version : %1.</translation> <context> <name>LogThread</name> <message> - <location filename="../../../LogThread.cpp" line="106"/> - <location filename="../../../LogThread.cpp" line="115"/> - <location filename="../../../LogThread.cpp" line="125"/> + <location filename="../../../LogThread.cpp" line="107"/> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location filename="../../../LogThread.cpp" line="106"/> + <location filename="../../../LogThread.cpp" line="107"/> <source>Log file already open, error: %1</source> <translation>Fichier de log déjà ouvert, erreur: %1</translation> </message> <message> - <location filename="../../../LogThread.cpp" line="115"/> - <location filename="../../../LogThread.cpp" line="125"/> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> <source>Unable to open the log file, error: %1</source> <translation>Impossible d'ouvrir le fichier de log, erreur: %1</translation> </message> - <message> - <source>Unable to open file to keep the log file, error: %1</source> - <translation type="obsolete">Impossible d'ouvrir le fichier de log, erreur: %1</translation> - </message> </context> <context> <name>OSSpecific</name> @@ -670,10 +615,6 @@ Cette version est compilée comme version : %1.</translation> <translation>Ok</translation> </message> <message> - <source>The replacement of default copy/move system is not supported by the file manager (Dolphin, Nautilus, ...).<br />Ask to the developer to support it.<br />You need do the copy/move manually.</source> - <translation type="obsolete">Le remplacement du systéme de copie/déplacement n'est pas supporté par le gestionnaire de fichier (Dolphin, Nautilus, ...).<br />Demander aux developpeurs de le supporter.<br />Vous devez faire la copie/déplacement manuellement.</translation> - </message> - <message> <location filename="../../../OSSpecific.cpp" line="23"/> <source>The replacement of default copy/move system is not supported by the file manager (Dolphin, Nautilus, ...).<br />Ask the developer to support it.<br />You need do the copy/move manually.</source> <translation>Le remplacement du systéme de copie/déplacement n'est pas supporté par le gestionnaire de fichier (Dolphin, Nautilus, ...).<br />Demander aux developpeurs de le supporter.<br />Vous devez faire la copie/déplacement manuellement.</translation> @@ -693,21 +634,6 @@ Cette version est compilée comme version : %1.</translation> <source>The replacement of default copy/move system should be not supported by the file manager.<br />Ask to the developer to support it.<br />You need do the copy/move manually.</source> <translation>Le remplacement du systéme de copie/déplacement n'est pas supporté par le gestionnaire de fichier.<br />Demander aux developpeurs de le supporter.<br />Vous devez faire la copie/déplacement manuellement.</translation> </message> - <message> - <location filename="../../../OSSpecific.cpp" line="32"/> - <source>Consider Supercopier as deprecated, prefer Ultracopier</source> - <translation>Considérez Supercopier comme obsolète, préférez Ultracopier</translation> - </message> - <message> - <location filename="../../../OSSpecific.cpp" line="35"/> - <source>This version use 100% of you graphic card/GPU (you computer can be noisy, or slow/buggy during the games) at exchange of free access to Ultimate version. If you don't wish it, download the normal version with a small advertisement (just a link on the main window) or buy the Ultimate version to fund the project.</source> - <translation>Cette version utilise 100% de votre carte graphique/GPU (votre ordinateur peu devenir bruyant ou buggé) en échange d'un accés gratuit à la version Ultimate. Si vous ne le voulez pas téléchargez la version normal qui as une petite publicité (juste un lien sur la fenêtre principal) ou acheter votre version pour financer le projet.</translation> - </message> - <message> - <location filename="../../../OSSpecific.cpp" line="36"/> - <source>http://ultracopier.first-world.info/download.html</source> - <translation>http://ultracopier-fr.first-world.info/telecharger.html</translation> - </message> </context> <context> <name>OptionDialog</name> @@ -730,7 +656,7 @@ Cette version est compilée comme version : %1.</translation> <message> <location filename="../../../OptionDialog.ui" line="66"/> <location filename="../../../OptionDialog.ui" line="322"/> - <location filename="../../../OptionDialog.cpp" line="354"/> + <location filename="../../../OptionDialog.cpp" line="286"/> <source>Copy engine</source> <translation>Moteurs de copie</translation> </message> @@ -746,28 +672,16 @@ Cette version est compilée comme version : %1.</translation> <translation>Logs</translation> </message> <message> - <source>Load at the session loading:</source> - <translation type="obsolete">Lancer à l'ouverture de la session:</translation> - </message> - <message> <location filename="../../../OptionDialog.ui" line="222"/> <source>Confirm to group the windows</source> <translation>Confirmer pour grouper les fenêtres</translation> </message> <message> - <source>Display the OS warning:</source> - <translation type="obsolete">Afficher les avertissements de l'OS:</translation> - </message> - <message> <location filename="../../../OptionDialog.ui" line="245"/> <source>Check for updates</source> <translation>Vérifier les mise à jour</translation> </message> <message> - <source>Give GPU time to Ultracopier</source> - <translation type="obsolete">Donner du temps GPU à Ultracopier</translation> - </message> - <message> <location filename="../../../OptionDialog.ui" line="312"/> <source>Name</source> <translation>Nom</translation> @@ -785,29 +699,25 @@ Cette version est compilée comme version : %1.</translation> <message> <location filename="../../../OptionDialog.ui" line="71"/> <location filename="../../../OptionDialog.ui" line="335"/> - <location filename="../../../OptionDialog.cpp" line="355"/> + <location filename="../../../OptionDialog.cpp" line="287"/> <source>Listener</source> <translation>Écouteur</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="76"/> <location filename="../../../OptionDialog.ui" line="340"/> - <location filename="../../../OptionDialog.cpp" line="356"/> + <location filename="../../../OptionDialog.cpp" line="288"/> <source>Plugin loader</source> <translation>Chargeur de plugin</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="84"/> <location filename="../../../OptionDialog.ui" line="345"/> - <location filename="../../../OptionDialog.cpp" line="357"/> + <location filename="../../../OptionDialog.cpp" line="289"/> <source>Session loader</source> <translation>Chargeur de session</translation> </message> <message> - <source>Check the update</source> - <translation type="obsolete">Vérifié les mise à jour</translation> - </message> - <message> <location filename="../../../OptionDialog.ui" line="117"/> <source>Force the language</source> <translation>Forcer la langue</translation> @@ -918,10 +828,6 @@ Cette version est compilée comme version : %1.</translation> <translation>Écrire les opérations dossier</translation> </message> <message> - <source>Write directly the file when it receive a new entry (can produce 50% of lost of performance)</source> - <translation type="obsolete">Écrire directement le fichier quand il reçoit une nouvelle entrée (peut entrainer 50% de perte de performances)</translation> - </message> - <message> <location filename="../../../OptionDialog.ui" line="748"/> <source>The variables are %time%, %source%, %size%, %destination%</source> <extracomment>%time%, %source%, %size%, %destination% should not be translated</extracomment> @@ -944,152 +850,80 @@ Cette version est compilée comme version : %1.</translation> <translation>Écrire le fichier journal dans:</translation> </message> <message> - <source>Force the language:</source> - <translation type="obsolete">Forcer la langue:</translation> - </message> - <message> - <source>Replace the default copy and move system:</source> - <translation type="obsolete">Remplacer le système de copie/déplacement par défaut:</translation> - </message> - <message> <location filename="../../../OptionDialog.ui" line="728"/> <source>Write directly to the file when it receive a new entry (can produce 50% of lost of performance)</source> <translation>Écrire directement le fichier quand il reçoit une nouvelle entrée (peut entrainer 50% de perte de performances)</translation> </message> <message> - <source>Write the transfers:</source> - <translation type="obsolete">Écrire les transferts:</translation> - </message> - <message> - <source>Write the errors:</source> - <translation type="obsolete">Écrire les erreurs:</translation> - </message> - <message> - <source>Write the folder operations:</source> - <translation type="obsolete">Écrire les opérations dossier:</translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="260"/> - <location filename="../../../OptionDialog.cpp" line="274"/> + <location filename="../../../OptionDialog.cpp" line="190"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load</source> <translation>Charger</translation> </message> <message> - <source>Load the themes?</source> - <translation type="obsolete">Charger les thèmes?</translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="260"/> + <location filename="../../../OptionDialog.cpp" line="190"/> <source>Load the theme?</source> <translation>Charger le thème?</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="274"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load the language?</source> <translation>Charger la langue?</translation> </message> <message> - <source>Disabled because you have any SessionLoader plugin</source> - <translation type="obsolete">Désactivé car vous n'avez aucun plugin SessionLoader</translation> - </message> - <message> - <source>Allow cgminer</source> - <translation type="obsolete">Autoriser cgminer</translation> - </message> - <message> - <source>Allow OpenCL</source> - <translation type="obsolete">Autorisé OpenCL</translation> - </message> - <message> - <source>This Ultimate version is only if cgminer is allowed by your antivirus. You can get the normal free version (without cgminer)</source> - <translation type="obsolete">Cette version Ultimate est seuelement is cgminer</translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="478"/> - <source>Allow the application</source> - <translation>Autorisé l'application</translation> - </message> - <message> - <source>This Ultimate free version is only if %1 is allowed by your antivirus. You can get the normal free version</source> - <translation type="obsolete">Cette version Ultimate gratuite est seulement is %1 est autorisé par votre antivirus.</translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="478"/> - <source>This Ultimate free version is only if %1 is allowed by your antivirus. Else you can get the normal free version</source> - <translation>Cette version Ultimate gratuite est seulement si %1 est autorisé par votre antivirus. Sinon vous pouvez obtenir la version gratuite normale</translation> - </message> - <message> - <source>This Ultimate version is only if OpenCL is installed with your graphic card drivers. Else you can get the normal free version</source> - <translation type="obsolete">Cette version Ultimate gratuite est seulement si . Sinon vous pouvez obtenir la version gratuite normale</translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="483"/> - <source>Enable the OpenCL</source> - <translation>Activé l'OpenCL</translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="483"/> - <source>This Ultimate version is only if the OpenCL is installed with your graphic card drivers. Else you can get the normal free version</source> - <translation>Cette version Ultimate gratuite est seulement si l'OpenCL est installé avec vos drivers graphiques. Sinon vous pouvez obtenir la version gratuite normale</translation> - </message> - <message> - <source>Disabled because you do not have any SessionLoader plugin</source> - <translation type="obsolete">Désactivé car vous n'avez aucun plugin SessionLoader</translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="362"/> + <location filename="../../../OptionDialog.cpp" line="294"/> <source>Do nothing</source> <translation>Ne rien faire</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="363"/> + <location filename="../../../OptionDialog.cpp" line="295"/> <source>Ask source as folder</source> <translation>Demander la source comme un dossier</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="364"/> + <location filename="../../../OptionDialog.cpp" line="296"/> <source>Ask sources as files</source> <translation>Demander la sources comme des fichiers</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="365"/> + <location filename="../../../OptionDialog.cpp" line="297"/> <source>Never</source> <translation>Jamais</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="366"/> + <location filename="../../../OptionDialog.cpp" line="298"/> <source>When source is same</source> <translation>Quand la source est la même</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="367"/> + <location filename="../../../OptionDialog.cpp" line="299"/> <source>When destination is same</source> <translation>Quand la destination est la même</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="368"/> + <location filename="../../../OptionDialog.cpp" line="300"/> <source>When source and destination are same</source> <translation>Quand la destination et la source sont les mêmes</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="369"/> + <location filename="../../../OptionDialog.cpp" line="301"/> <source>When source or destination are same</source> <translation>Quand la destination ou la source sont les mêmes</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="370"/> + <location filename="../../../OptionDialog.cpp" line="302"/> <source>Always</source> <translation>Toujours</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="384"/> - <location filename="../../../OptionDialog.cpp" line="385"/> - <location filename="../../../OptionDialog.cpp" line="386"/> + <location filename="../../../OptionDialog.cpp" line="316"/> + <location filename="../../../OptionDialog.cpp" line="317"/> + <location filename="../../../OptionDialog.cpp" line="318"/> <source>The variables are %1</source> <translation>Les variables sont %1</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="1591"/> + <location filename="../../../OptionDialog.cpp" line="948"/> <source>Save logs as: </source> <translation>Sauvegarder les logs sous: </translation> </message> @@ -1099,14 +933,6 @@ Cette version est compilée comme version : %1.</translation> <translation>Log synchronisé</translation> </message> <message> - <source>When manual open:</source> - <translation type="obsolete">Quand ouverture manuel:</translation> - </message> - <message> - <source>Group the windows when:</source> - <translation type="obsolete">Grouper les fenêtres quand:</translation> - </message> - <message> <location filename="../../../OptionDialog.ui" line="811"/> <source>The variables are %path%, %operation%</source> <extracomment>%path%, %operation% should not be translated</extracomment> @@ -1116,10 +942,10 @@ Cette version est compilée comme version : %1.</translation> <context> <name>OptionEngine</name> <message> - <location filename="../../../OptionEngine.cpp" line="161"/> - <location filename="../../../OptionEngine.cpp" line="165"/> - <location filename="../../../OptionEngine.cpp" line="202"/> - <location filename="../../../OptionEngine.cpp" line="206"/> + <location filename="../../../OptionEngine.cpp" line="162"/> + <location filename="../../../OptionEngine.cpp" line="169"/> + <location filename="../../../OptionEngine.cpp" line="211"/> + <location filename="../../../OptionEngine.cpp" line="215"/> <source>The variable was not found: %1 %2</source> <translation>La variable n'a pas été trouvée: %1 %2</translation> </message> @@ -1162,42 +988,42 @@ Cette version est compilée comme version : %1.</translation> <translation>Version:</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="38"/> + <location filename="../../../PluginInformation.cpp" line="39"/> <source>Copy engine</source> <translation>Moteur de copie</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="41"/> + <location filename="../../../PluginInformation.cpp" line="42"/> <source>Languages</source> <translation>Langues</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="44"/> + <location filename="../../../PluginInformation.cpp" line="45"/> <source>Listener</source> <translation>Écouteur</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="47"/> + <location filename="../../../PluginInformation.cpp" line="48"/> <source>Plugin loader</source> <translation>Chargeur de plugin</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="50"/> + <location filename="../../../PluginInformation.cpp" line="51"/> <source>Session loader</source> <translation>Chargeur de session</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="53"/> + <location filename="../../../PluginInformation.cpp" line="54"/> <source>Themes</source> <translation>Thèmes</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="57"/> + <location filename="../../../PluginInformation.cpp" line="58"/> <source>Unknown</source> <translation>Inconnu</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="67"/> + <location filename="../../../PluginInformation.cpp" line="68"/> <source>Information about %1</source> <translation>Informations à propos de %1</translation> </message> @@ -1215,137 +1041,127 @@ Cette version est compilée comme version : %1.</translation> <context> <name>PluginsManager</name> <message> - <source>informations.xml not found into the plugin</source> - <translatorcomment>En anglais c'est: the file informations.xml was not found into the plugin ou the informations.xml file was not found into the plugin?</translatorcomment> - <translation type="obsolete">Le fichier informations.xml n'a pas été trouvé dans le plugin</translation> - </message> - <message> - <location filename="../../../PluginsManager.cpp" line="221"/> + <location filename="../../../PluginsManager.cpp" line="224"/> <source>informations.xml is not accessible</source> <translation>informations.xml n'est pas accessible</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="227"/> + <location filename="../../../PluginsManager.cpp" line="230"/> <source>informations.xml not found for the plugin</source> <translation>Le fichier informations.xml n'a pas été trouvé dans le plugin</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="395"/> + <location filename="../../../PluginsManager.cpp" line="401"/> <source>English text missing in the informations.xml for the tag: %1</source> <translation>Texte anglais manquant dans le informations.xml pour la balise: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="487"/> + <location filename="../../../PluginsManager.cpp" line="494"/> <source>Dependencies part is wrong</source> <translation>Les dépendances sont fausses</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="508"/> + <location filename="../../../PluginsManager.cpp" line="515"/> <source>Dependencies %1 are not satisfied, for plugin: %2</source> <translation>Des dépendances %1 ne sont pas satisfaites, pour le plugin: %2</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="720"/> - <location filename="../../../PluginsManager.cpp" line="745"/> - <location filename="../../../PluginsManager.cpp" line="813"/> - <location filename="../../../PluginsManager.cpp" line="826"/> - <location filename="../../../PluginsManager.cpp" line="845"/> - <location filename="../../../PluginsManager.cpp" line="851"/> - <location filename="../../../PluginsManager.cpp" line="857"/> - <location filename="../../../PluginsManager.cpp" line="863"/> - <location filename="../../../PluginsManager.cpp" line="869"/> + <location filename="../../../PluginsManager.cpp" line="683"/> + <source>Error while the removing plugin, please check the rights on the folder: +%1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="727"/> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="820"/> + <location filename="../../../PluginsManager.cpp" line="833"/> + <location filename="../../../PluginsManager.cpp" line="852"/> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="870"/> <location filename="../../../PluginsManager.cpp" line="876"/> + <location filename="../../../PluginsManager.cpp" line="883"/> <source>Plugin loader</source> <translation>Chargeur de plugin</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="665"/> + <location filename="../../../PluginsManager.cpp" line="672"/> <source>Remove %1</source> <translation>Supprimer %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="676"/> + <location filename="../../../PluginsManager.cpp" line="683"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="700"/> + <location filename="../../../PluginsManager.cpp" line="707"/> <source>Information</source> <translation>Informations</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="253"/> + <location filename="../../../PluginsManager.cpp" line="256"/> <source>%1, parse error at line %2, column %3: %4</source> <translation>%1, erreur à la ligne %2, à l'emplacement %3: %4</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="261"/> + <location filename="../../../PluginsManager.cpp" line="264"/> <source>"package" root tag not found for the xml file</source> <translation>La balise racine "package" n'a pas été trouvée pour le fichier xml</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="337"/> + <location filename="../../../PluginsManager.cpp" line="340"/> <source>Duplicated plugin found, already loaded!</source> <translatorcomment>Le plugins courrant est un doublont, donc déjà chargé!</translatorcomment> <translation>Plugin dupliqué trouvé, déjà chargé!</translation> </message> <message> - <source>English text missing into the informations.xml for the tag: %1</source> - <translation type="obsolete">Texte anglais manquant dans le informations.xml pour la balise: %1</translation> - </message> - <message> - <location filename="../../../PluginsManager.cpp" line="403"/> + <location filename="../../../PluginsManager.cpp" line="409"/> <source>Tag not found: %1</source> <translation>Balise non trouvée: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="665"/> + <location filename="../../../PluginsManager.cpp" line="672"/> <source>Are you sure about removing "%1" in version %2?</source> <translation>Êtes vous sûr de vouloir supprimer "%1" en version %2?</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="676"/> - <source>Error while the removing plugin, please check the rights on the folder: -%1</source> - <translation>Erreur pendant la suppression du plugin, merci de vérifier les droits du dossier: -%1</translation> - </message> - <message> - <location filename="../../../PluginsManager.cpp" line="700"/> + <location filename="../../../PluginsManager.cpp" line="707"/> <source>Previous import is in progress...</source> <translation>Importation précédente en cours...</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="703"/> + <location filename="../../../PluginsManager.cpp" line="710"/> <source>Open Ultracopier plugin</source> <translation>Ouvrir un plugin d'Ultracopier</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="703"/> + <location filename="../../../PluginsManager.cpp" line="710"/> <source>Ultracopier plugin (*.urc)</source> <translation>Plugin d'Ultracopier (*.urc)</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="720"/> + <location filename="../../../PluginsManager.cpp" line="727"/> <source>Unable to open the plugin: %1</source> <translation>Impossible d'ouvrir le plugin: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="745"/> - <location filename="../../../PluginsManager.cpp" line="863"/> - <location filename="../../../PluginsManager.cpp" line="876"/> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="870"/> + <location filename="../../../PluginsManager.cpp" line="883"/> <source>Unable to load the plugin content, please check it: %1</source> <translation>Impossible de charger le contenu du plugin, veuillez le vérifier: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="813"/> + <location filename="../../../PluginsManager.cpp" line="820"/> <source>Unable to create a folder to install the plugin: %1</source> <translation>Impossible de créer un dossier pour installer le plugin: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="826"/> + <location filename="../../../PluginsManager.cpp" line="833"/> <source>Unable to create a file to install the plugin: %1 since:%2</source> @@ -1354,16 +1170,16 @@ since:%2</source> depuis:%2</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="845"/> + <location filename="../../../PluginsManager.cpp" line="852"/> <source>Folder with same name is present, skip the plugin installation: %1</source> <translation>Le répertoire est déjà présent, on saute l'installation du plugin: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="851"/> - <location filename="../../../PluginsManager.cpp" line="857"/> - <location filename="../../../PluginsManager.cpp" line="869"/> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="876"/> <source>Unable to load the plugin content, please check it</source> <translation>Impossible de charger le contenu du plugin, veuillez le vérifier</translation> </message> @@ -1416,137 +1232,32 @@ depuis:%2</translation> <context> <name>SystrayIcon</name> <message> - <location filename="../../../SystrayIcon.cpp" line="163"/> + <location filename="../../../SystrayIcon.cpp" line="155"/> <source>No copy listener found. Do the copy manually by right click one the system tray icon.</source> <translation>Pas d'écouteur trouvé. Effectuez la copie manuellement par clic droit sur l'icône dans la zone de notification (près de l'horloge).</translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="187"/> + <location filename="../../../SystrayIcon.cpp" line="179"/> <source>Searching information...</source> <translation>Recherche d'informations...</translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="200"/> + <location filename="../../../SystrayIcon.cpp" line="192"/> <source>Do not replace the explorer copy/move</source> <translation>Ne remplace pas la copie/déplacement de l'explorateur</translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="377"/> - <source>The action on the systray icon is unknown!</source> - <translation>L'action sur l'icône de la zone de notifications est inconnue!</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="425"/> - <source>&About/Debug report</source> - <translation>&À propos/Debug</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="427"/> - <source>&About</source> - <translation>&À propos d'ultracopier</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="471"/> - <source>New version: %1</source> - <translation>Nouvelle version: %1</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="471"/> - <source>Click here to go on download page</source> - <translation>Cliquez içi pour aller sur la page de téléchargement</translation> - </message> - <message> - <source>Click here to go to the shop and login. -Download the new version into the order details</source> - <translation type="obsolete">Cliquez içi pour aller sur la boutique et vous logger. -Téléchargez la novuelle version dans les détails de la commande</translation> - </message> - <message> - <source>&Save bug Report</source> - <translation type="obsolete">&Sauvergarder le rapport de bug</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="430"/> - <source>&Save bug report</source> - <translation>&Sauvergarder le rapport de bug</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="432"/> - <source>&Quit</source> - <translation>&Quitter</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="433"/> - <source>&Options</source> - <translation>&Options</translation> - </message> - <message> - <source>New version: %1 -Site: %2</source> - <translation type="obsolete">Nouvelle version: %1 -Site: %2</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="511"/> - <source>&Copy</source> - <translation>&Copie</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="525"/> - <location filename="../../../SystrayIcon.cpp" line="539"/> - <source>&Transfer</source> - <translation>&Transfert</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="529"/> - <location filename="../../../SystrayIcon.cpp" line="543"/> - <source>&Move</source> - <translation>&Déplacer</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="560"/> - <location filename="../../../SystrayIcon.cpp" line="577"/> - <source>Add &copy</source> - <translation>Ajouter une &copie</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="566"/> - <location filename="../../../SystrayIcon.cpp" line="583"/> - <source>Add &transfer</source> - <translation>Ajouter un &transfert</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="570"/> - <location filename="../../../SystrayIcon.cpp" line="587"/> - <source>Add &move</source> - <translation>Ajouter un &déplacement</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="485"/> - <source>A&dd copy/moving</source> - <translation>&Ajouter une copie/déplacement</translation> - </message> - <message> - <source>Not replace the explorer copy/move</source> - <translation type="obsolete">Ne remplace pas la copie/déplacement de l'explorateur</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="205"/> + <location filename="../../../SystrayIcon.cpp" line="197"/> <source>Semi replace the explorer copy/move</source> <translation>Remplace partiellement la copie/déplacement de l'explorateur</translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="210"/> + <location filename="../../../SystrayIcon.cpp" line="202"/> <source>Replace the explorer copy/move</source> <translation>Remplace la copie/déplacement de l'explorateur</translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="377"/> - <source>Warning</source> - <translation>Avertissement</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="169"/> + <location filename="../../../SystrayIcon.cpp" line="161"/> <source>Information</source> <translation>Informations</translation> </message> diff --git a/plugins/Languages/hi/informations.xml b/plugins/Languages/hi/informations.xml index e093732..d0453f3 100644 --- a/plugins/Languages/hi/informations.xml +++ b/plugins/Languages/hi/informations.xml @@ -12,7 +12,7 @@ <!-- Detailed description --> <description xml:lang="en"><![CDATA[Translation of Ultracopier to hindi. For more details see the web site.]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>1.2.3.6</version> + <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>hi</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/hi/translation.ts b/plugins/Languages/hi/translation.ts index 2514652..8b70d26 100644 --- a/plugins/Languages/hi/translation.ts +++ b/plugins/Languages/hi/translation.ts @@ -1,86 +1,86 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0" language="hi"> +<TS version="2.1" language="hi"> <context> <name>CliParser</name> <message> - <location filename="../../../CliParser.cpp" line="25"/> - <location filename="../../../CliParser.cpp" line="71"/> - <location filename="../../../CliParser.cpp" line="84"/> - <location filename="../../../CliParser.cpp" line="94"/> - <location filename="../../../CliParser.cpp" line="179"/> + <location filename="../../../CliParser.cpp" line="26"/> + <location filename="../../../CliParser.cpp" line="72"/> + <location filename="../../../CliParser.cpp" line="85"/> + <location filename="../../../CliParser.cpp" line="95"/> + <location filename="../../../CliParser.cpp" line="180"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="25"/> + <location filename="../../../CliParser.cpp" line="26"/> <source>Ultracopier is already running, right click on its system tray icon (near the clock) to use it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="71"/> + <location filename="../../../CliParser.cpp" line="72"/> <source>Problem reading file, or file size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="159"/> - <location filename="../../../CliParser.cpp" line="170"/> + <location filename="../../../CliParser.cpp" line="160"/> + <location filename="../../../CliParser.cpp" line="171"/> <source>The arguments possible are:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="161"/> - <location filename="../../../CliParser.cpp" line="172"/> + <location filename="../../../CliParser.cpp" line="162"/> + <location filename="../../../CliParser.cpp" line="173"/> <source>To display the options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="162"/> - <location filename="../../../CliParser.cpp" line="173"/> + <location filename="../../../CliParser.cpp" line="163"/> + <location filename="../../../CliParser.cpp" line="174"/> <source>To quit the other instances (if running)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="164"/> - <location filename="../../../CliParser.cpp" line="175"/> + <location filename="../../../CliParser.cpp" line="165"/> + <location filename="../../../CliParser.cpp" line="176"/> <source>To copy sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="165"/> - <location filename="../../../CliParser.cpp" line="176"/> + <location filename="../../../CliParser.cpp" line="166"/> + <location filename="../../../CliParser.cpp" line="177"/> <source>To move sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="169"/> + <location filename="../../../CliParser.cpp" line="170"/> <source>Command not valid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="84"/> + <location filename="../../../CliParser.cpp" line="85"/> <source>This file is not supported transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="94"/> + <location filename="../../../CliParser.cpp" line="95"/> <source>Unable to open the transfer list file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="160"/> - <location filename="../../../CliParser.cpp" line="171"/> + <location filename="../../../CliParser.cpp" line="161"/> + <location filename="../../../CliParser.cpp" line="172"/> <source>To display this help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="163"/> - <location filename="../../../CliParser.cpp" line="174"/> + <location filename="../../../CliParser.cpp" line="164"/> + <location filename="../../../CliParser.cpp" line="175"/> <source>Open transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="181"/> + <location filename="../../../CliParser.cpp" line="182"/> <source>Help</source> <translation type="unfinished"></translation> </message> @@ -88,30 +88,30 @@ <context> <name>CopyEngineManager</name> <message> - <location filename="../../../CopyEngineManager.cpp" line="229"/> - <location filename="../../../CopyEngineManager.cpp" line="234"/> - <location filename="../../../CopyEngineManager.cpp" line="257"/> - <location filename="../../../CopyEngineManager.cpp" line="271"/> + <location filename="../../../CopyEngineManager.cpp" line="231"/> + <location filename="../../../CopyEngineManager.cpp" line="236"/> + <location filename="../../../CopyEngineManager.cpp" line="259"/> + <location filename="../../../CopyEngineManager.cpp" line="273"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="229"/> + <location filename="../../../CopyEngineManager.cpp" line="231"/> <source>Cannot find any copy engine with move support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="257"/> + <location filename="../../../CopyEngineManager.cpp" line="259"/> <source>This copy engine does not support move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="234"/> + <location filename="../../../CopyEngineManager.cpp" line="236"/> <source>Cannot find any compatible engine!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="271"/> + <location filename="../../../CopyEngineManager.cpp" line="273"/> <source>Cannot find any engine with this name: %1</source> <translation type="unfinished"></translation> </message> @@ -119,12 +119,12 @@ <context> <name>CopyListener</name> <message> - <location filename="../../../CopyListener.cpp" line="158"/> + <location filename="../../../CopyListener.cpp" line="159"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyListener.cpp" line="158"/> + <location filename="../../../CopyListener.cpp" line="159"/> <source>Error during the reception of the copy/move list %1</source> <translation type="unfinished"></translation> @@ -133,70 +133,70 @@ <context> <name>Core</name> <message> - <location filename="../../../Core.cpp" line="45"/> - <location filename="../../../Core.cpp" line="116"/> - <location filename="../../../Core.cpp" line="142"/> - <location filename="../../../Core.cpp" line="157"/> - <location filename="../../../Core.cpp" line="177"/> - <location filename="../../../Core.cpp" line="191"/> - <location filename="../../../Core.cpp" line="200"/> - <location filename="../../../Core.cpp" line="209"/> - <location filename="../../../Core.cpp" line="216"/> - <location filename="../../../Core.cpp" line="250"/> - <location filename="../../../Core.cpp" line="387"/> - <location filename="../../../Core.cpp" line="392"/> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="117"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> + <location filename="../../../Core.cpp" line="217"/> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> + <location filename="../../../Core.cpp" line="393"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="45"/> - <location filename="../../../Core.cpp" line="142"/> - <location filename="../../../Core.cpp" line="157"/> - <location filename="../../../Core.cpp" line="177"/> - <location filename="../../../Core.cpp" line="191"/> - <location filename="../../../Core.cpp" line="200"/> - <location filename="../../../Core.cpp" line="209"/> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> <source>Unable to get a copy engine instance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="93"/> + <location filename="../../../Core.cpp" line="94"/> <source>Group window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="93"/> + <location filename="../../../Core.cpp" line="94"/> <source>Do you want group the transfer with another actual running transfer?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="116"/> + <location filename="../../../Core.cpp" line="117"/> <source>Unable to get a engine instance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="216"/> + <location filename="../../../Core.cpp" line="217"/> <source>The argument for the mode is not valid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="1133"/> + <location filename="../../../Core.cpp" line="1136"/> <source>Do you want to copy? If no, it will be moved.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="250"/> - <location filename="../../../Core.cpp" line="387"/> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> <source>Unable to load the interface, copy aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="392"/> + <location filename="../../../Core.cpp" line="393"/> <source>Unable to load the copy engine, copy aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="1133"/> + <location filename="../../../Core.cpp" line="1136"/> <source>Transfer mode</source> <translation type="unfinished"></translation> </message> @@ -204,12 +204,12 @@ <context> <name>EventDispatcher</name> <message> - <location filename="../../../EventDispatcher.cpp" line="155"/> + <location filename="../../../EventDispatcher.cpp" line="152"/> <source>Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../EventDispatcher.cpp" line="155"/> + <location filename="../../../EventDispatcher.cpp" line="152"/> <source>Give the key of this software, more information on <a href="http://ultracopier.first-world.info/">ultracopier.first-world.info</a></source> <translation type="unfinished"></translation> </message> @@ -217,257 +217,257 @@ <context> <name>FacilityEngine</name> <message> - <location filename="../../../FacilityEngine.cpp" line="43"/> + <location filename="../../../FacilityEngine.cpp" line="53"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="45"/> + <location filename="../../../FacilityEngine.cpp" line="55"/> <source>Copy</source> <extracomment>a copy</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="49"/> + <location filename="../../../FacilityEngine.cpp" line="59"/> <source>Move</source> <extracomment>a move</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="51"/> + <location filename="../../../FacilityEngine.cpp" line="61"/> <source>Pause</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="52"/> + <location filename="../../../FacilityEngine.cpp" line="62"/> <source>Resume</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="53"/> - <location filename="../../../FacilityEngine.cpp" line="67"/> + <location filename="../../../FacilityEngine.cpp" line="63"/> + <location filename="../../../FacilityEngine.cpp" line="77"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="54"/> + <location filename="../../../FacilityEngine.cpp" line="64"/> <source>Unlimited</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="27"/> + <location filename="../../../FacilityEngine.cpp" line="37"/> <source>s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="28"/> + <location filename="../../../FacilityEngine.cpp" line="38"/> <source>Too big</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="29"/> + <location filename="../../../FacilityEngine.cpp" line="39"/> <source>B</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="30"/> + <location filename="../../../FacilityEngine.cpp" line="40"/> <source>KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="31"/> + <location filename="../../../FacilityEngine.cpp" line="41"/> <source>MB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="32"/> + <location filename="../../../FacilityEngine.cpp" line="42"/> <source>GB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="33"/> + <location filename="../../../FacilityEngine.cpp" line="43"/> <source>TB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="34"/> + <location filename="../../../FacilityEngine.cpp" line="44"/> <source>PB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="35"/> + <location filename="../../../FacilityEngine.cpp" line="45"/> <source>EB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="36"/> + <location filename="../../../FacilityEngine.cpp" line="46"/> <source>ZB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="37"/> + <location filename="../../../FacilityEngine.cpp" line="47"/> <source>YB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="38"/> + <location filename="../../../FacilityEngine.cpp" line="48"/> <source>Less than %10 seconds</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="39"/> + <location filename="../../../FacilityEngine.cpp" line="49"/> <source>About %10 seconds remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="40"/> + <location filename="../../../FacilityEngine.cpp" line="50"/> <source>About %1 minutes remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="41"/> + <location filename="../../../FacilityEngine.cpp" line="51"/> <source>About %1 hours remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="47"/> + <location filename="../../../FacilityEngine.cpp" line="57"/> <source>Transfer</source> <extracomment>a transfer</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="50"/> + <location filename="../../../FacilityEngine.cpp" line="60"/> <source>Start</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="55"/> + <location filename="../../../FacilityEngine.cpp" line="65"/> <source>Source</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="56"/> + <location filename="../../../FacilityEngine.cpp" line="66"/> <source>Size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="57"/> + <location filename="../../../FacilityEngine.cpp" line="67"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="58"/> + <location filename="../../../FacilityEngine.cpp" line="68"/> <source>Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="59"/> + <location filename="../../../FacilityEngine.cpp" line="69"/> <source>Target</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="60"/> - <location filename="../../../FacilityEngine.cpp" line="64"/> + <location filename="../../../FacilityEngine.cpp" line="70"/> + <location filename="../../../FacilityEngine.cpp" line="74"/> <source>Time remaining:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="61"/> + <location filename="../../../FacilityEngine.cpp" line="71"/> <source>Listing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="62"/> + <location filename="../../../FacilityEngine.cpp" line="72"/> <source>Copying</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="63"/> + <location filename="../../../FacilityEngine.cpp" line="73"/> <source>Listing and copying</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="66"/> + <location filename="../../../FacilityEngine.cpp" line="76"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="68"/> + <location filename="../../../FacilityEngine.cpp" line="78"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="69"/> + <location filename="../../../FacilityEngine.cpp" line="79"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="70"/> + <location filename="../../../FacilityEngine.cpp" line="80"/> <source>Overwrite if the last modification dates are different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="71"/> + <location filename="../../../FacilityEngine.cpp" line="81"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="72"/> + <location filename="../../../FacilityEngine.cpp" line="82"/> <source>Put to the end of the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="73"/> + <location filename="../../../FacilityEngine.cpp" line="83"/> <source>Select source directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="74"/> + <location filename="../../../FacilityEngine.cpp" line="84"/> <source>Select destination directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="75"/> + <location filename="../../../FacilityEngine.cpp" line="85"/> <source>Internal error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="76"/> + <location filename="../../../FacilityEngine.cpp" line="86"/> <source>Select one or more files to open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="77"/> + <location filename="../../../FacilityEngine.cpp" line="87"/> <source>All files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="78"/> + <location filename="../../../FacilityEngine.cpp" line="88"/> <source>Save transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="79"/> + <location filename="../../../FacilityEngine.cpp" line="89"/> <source>Open transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="80"/> + <location filename="../../../FacilityEngine.cpp" line="90"/> <source>Transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="81"/> + <location filename="../../../FacilityEngine.cpp" line="91"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="82"/> + <location filename="../../../FacilityEngine.cpp" line="92"/> <source>Not supported on this platform</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="83"/> + <location filename="../../../FacilityEngine.cpp" line="93"/> <source>Completed in %1</source> <translation type="unfinished"></translation> </message> @@ -475,7 +475,7 @@ <context> <name>HelpDialog</name> <message> - <location filename="../../../HelpDialog.cpp" line="37"/> + <location filename="../../../HelpDialog.cpp" line="34"/> <source>About Ultracopier</source> <translation type="unfinished"></translation> </message> @@ -513,49 +513,42 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="35"/> - <source>About Supercopier</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../HelpDialog.cpp" line="80"/> + <location filename="../../../HelpDialog.cpp" line="73"/> <source>For http://portableapps.com/</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="83"/> + <location filename="../../../HelpDialog.cpp" line="76"/> <source>Portable and all in one version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="85"/> + <location filename="../../../HelpDialog.cpp" line="78"/> <source>Portable version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="90"/> + <location filename="../../../HelpDialog.cpp" line="83"/> <source>All in one version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="92"/> + <location filename="../../../HelpDialog.cpp" line="85"/> <source>Normal version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="110"/> - <location filename="../../../HelpDialog.cpp" line="112"/> - <location filename="../../../HelpDialog.cpp" line="123"/> + <location filename="../../../HelpDialog.cpp" line="102"/> <source>http://ultracopier.first-world.info/</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="120"/> + <location filename="../../../HelpDialog.cpp" line="109"/> <source>http://ultracopier.first-world.info/shop.html</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="125"/> + <location filename="../../../HelpDialog.cpp" line="111"/> <source>http://ultracopier.first-world.info/download.html</source> <translation type="unfinished"></translation> </message> @@ -569,12 +562,12 @@ This version is compiled as version: %1.</source> <context> <name>LocalListener</name> <message> - <location filename="../../../LocalListener.cpp" line="146"/> + <location filename="../../../LocalListener.cpp" line="160"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../LocalListener.cpp" line="146"/> + <location filename="../../../LocalListener.cpp" line="160"/> <source>Timeout while recomposing data from connected clients</source> <translation type="unfinished"></translation> </message> @@ -582,20 +575,20 @@ This version is compiled as version: %1.</source> <context> <name>LogThread</name> <message> - <location filename="../../../LogThread.cpp" line="106"/> - <location filename="../../../LogThread.cpp" line="115"/> - <location filename="../../../LogThread.cpp" line="125"/> + <location filename="../../../LogThread.cpp" line="107"/> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../LogThread.cpp" line="106"/> + <location filename="../../../LogThread.cpp" line="107"/> <source>Log file already open, error: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../LogThread.cpp" line="115"/> - <location filename="../../../LogThread.cpp" line="125"/> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> <source>Unable to open the log file, error: %1</source> <translation type="unfinished"></translation> </message> @@ -637,21 +630,6 @@ This version is compiled as version: %1.</source> <source>The replacement of default copy/move system should be not supported by the file manager.<br />Ask to the developer to support it.<br />You need do the copy/move manually.</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../../OSSpecific.cpp" line="32"/> - <source>Consider Supercopier as deprecated, prefer Ultracopier</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OSSpecific.cpp" line="35"/> - <source>This version use 100% of you graphic card/GPU (you computer can be noisy, or slow/buggy during the games) at exchange of free access to Ultimate version. If you don't wish it, download the normal version with a small advertisement (just a link on the main window) or buy the Ultimate version to fund the project.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OSSpecific.cpp" line="36"/> - <source>http://ultracopier.first-world.info/download.html</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>OptionDialog</name> @@ -674,7 +652,7 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="66"/> <location filename="../../../OptionDialog.ui" line="322"/> - <location filename="../../../OptionDialog.cpp" line="354"/> + <location filename="../../../OptionDialog.cpp" line="286"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> @@ -717,21 +695,21 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="71"/> <location filename="../../../OptionDialog.ui" line="335"/> - <location filename="../../../OptionDialog.cpp" line="355"/> + <location filename="../../../OptionDialog.cpp" line="287"/> <source>Listener</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="76"/> <location filename="../../../OptionDialog.ui" line="340"/> - <location filename="../../../OptionDialog.cpp" line="356"/> + <location filename="../../../OptionDialog.cpp" line="288"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="84"/> <location filename="../../../OptionDialog.ui" line="345"/> - <location filename="../../../OptionDialog.cpp" line="357"/> + <location filename="../../../OptionDialog.cpp" line="289"/> <source>Session loader</source> <translation type="unfinished"></translation> </message> @@ -863,95 +841,75 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="260"/> - <location filename="../../../OptionDialog.cpp" line="274"/> + <location filename="../../../OptionDialog.cpp" line="190"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="260"/> + <location filename="../../../OptionDialog.cpp" line="190"/> <source>Load the theme?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="274"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load the language?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="362"/> + <location filename="../../../OptionDialog.cpp" line="294"/> <source>Do nothing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="363"/> + <location filename="../../../OptionDialog.cpp" line="295"/> <source>Ask source as folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="364"/> + <location filename="../../../OptionDialog.cpp" line="296"/> <source>Ask sources as files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="365"/> + <location filename="../../../OptionDialog.cpp" line="297"/> <source>Never</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="366"/> + <location filename="../../../OptionDialog.cpp" line="298"/> <source>When source is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="367"/> + <location filename="../../../OptionDialog.cpp" line="299"/> <source>When destination is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="368"/> + <location filename="../../../OptionDialog.cpp" line="300"/> <source>When source and destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="369"/> + <location filename="../../../OptionDialog.cpp" line="301"/> <source>When source or destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="370"/> + <location filename="../../../OptionDialog.cpp" line="302"/> <source>Always</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="384"/> - <location filename="../../../OptionDialog.cpp" line="385"/> - <location filename="../../../OptionDialog.cpp" line="386"/> + <location filename="../../../OptionDialog.cpp" line="316"/> + <location filename="../../../OptionDialog.cpp" line="317"/> + <location filename="../../../OptionDialog.cpp" line="318"/> <source>The variables are %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="478"/> - <source>Allow the application</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="478"/> - <source>This Ultimate free version is only if %1 is allowed by your antivirus. Else you can get the normal free version</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="483"/> - <source>Enable the OpenCL</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="483"/> - <source>This Ultimate version is only if the OpenCL is installed with your graphic card drivers. Else you can get the normal free version</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="1591"/> + <location filename="../../../OptionDialog.cpp" line="948"/> <source>Save logs as: </source> <translation type="unfinished"></translation> </message> @@ -980,10 +938,10 @@ This version is compiled as version: %1.</source> <context> <name>OptionEngine</name> <message> - <location filename="../../../OptionEngine.cpp" line="161"/> - <location filename="../../../OptionEngine.cpp" line="165"/> - <location filename="../../../OptionEngine.cpp" line="202"/> - <location filename="../../../OptionEngine.cpp" line="206"/> + <location filename="../../../OptionEngine.cpp" line="162"/> + <location filename="../../../OptionEngine.cpp" line="169"/> + <location filename="../../../OptionEngine.cpp" line="211"/> + <location filename="../../../OptionEngine.cpp" line="215"/> <source>The variable was not found: %1 %2</source> <translation type="unfinished"></translation> </message> @@ -1026,42 +984,42 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="38"/> + <location filename="../../../PluginInformation.cpp" line="39"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="41"/> + <location filename="../../../PluginInformation.cpp" line="42"/> <source>Languages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="44"/> + <location filename="../../../PluginInformation.cpp" line="45"/> <source>Listener</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="47"/> + <location filename="../../../PluginInformation.cpp" line="48"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="50"/> + <location filename="../../../PluginInformation.cpp" line="51"/> <source>Session loader</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="53"/> + <location filename="../../../PluginInformation.cpp" line="54"/> <source>Themes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="57"/> + <location filename="../../../PluginInformation.cpp" line="58"/> <source>Unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="67"/> + <location filename="../../../PluginInformation.cpp" line="68"/> <source>Information about %1</source> <translation type="unfinished"></translation> </message> @@ -1079,140 +1037,140 @@ This version is compiled as version: %1.</source> <context> <name>PluginsManager</name> <message> - <location filename="../../../PluginsManager.cpp" line="221"/> + <location filename="../../../PluginsManager.cpp" line="224"/> <source>informations.xml is not accessible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="487"/> + <location filename="../../../PluginsManager.cpp" line="494"/> <source>Dependencies part is wrong</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="508"/> + <location filename="../../../PluginsManager.cpp" line="515"/> <source>Dependencies %1 are not satisfied, for plugin: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="665"/> + <location filename="../../../PluginsManager.cpp" line="672"/> <source>Remove %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="676"/> + <location filename="../../../PluginsManager.cpp" line="683"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="700"/> + <location filename="../../../PluginsManager.cpp" line="683"/> + <source>Error while the removing plugin, please check the rights on the folder: +%1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="707"/> <source>Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="253"/> + <location filename="../../../PluginsManager.cpp" line="256"/> <source>%1, parse error at line %2, column %3: %4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="227"/> + <location filename="../../../PluginsManager.cpp" line="230"/> <source>informations.xml not found for the plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="261"/> + <location filename="../../../PluginsManager.cpp" line="264"/> <source>"package" root tag not found for the xml file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="337"/> + <location filename="../../../PluginsManager.cpp" line="340"/> <source>Duplicated plugin found, already loaded!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="395"/> + <location filename="../../../PluginsManager.cpp" line="401"/> <source>English text missing in the informations.xml for the tag: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="403"/> + <location filename="../../../PluginsManager.cpp" line="409"/> <source>Tag not found: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="665"/> + <location filename="../../../PluginsManager.cpp" line="672"/> <source>Are you sure about removing "%1" in version %2?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="676"/> - <source>Error while the removing plugin, please check the rights on the folder: -%1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../PluginsManager.cpp" line="700"/> + <location filename="../../../PluginsManager.cpp" line="707"/> <source>Previous import is in progress...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="703"/> + <location filename="../../../PluginsManager.cpp" line="710"/> <source>Open Ultracopier plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="703"/> + <location filename="../../../PluginsManager.cpp" line="710"/> <source>Ultracopier plugin (*.urc)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="720"/> - <location filename="../../../PluginsManager.cpp" line="745"/> - <location filename="../../../PluginsManager.cpp" line="813"/> - <location filename="../../../PluginsManager.cpp" line="826"/> - <location filename="../../../PluginsManager.cpp" line="845"/> - <location filename="../../../PluginsManager.cpp" line="851"/> - <location filename="../../../PluginsManager.cpp" line="857"/> - <location filename="../../../PluginsManager.cpp" line="863"/> - <location filename="../../../PluginsManager.cpp" line="869"/> + <location filename="../../../PluginsManager.cpp" line="727"/> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="820"/> + <location filename="../../../PluginsManager.cpp" line="833"/> + <location filename="../../../PluginsManager.cpp" line="852"/> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="870"/> <location filename="../../../PluginsManager.cpp" line="876"/> + <location filename="../../../PluginsManager.cpp" line="883"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="720"/> + <location filename="../../../PluginsManager.cpp" line="727"/> <source>Unable to open the plugin: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="745"/> - <location filename="../../../PluginsManager.cpp" line="863"/> - <location filename="../../../PluginsManager.cpp" line="876"/> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="870"/> + <location filename="../../../PluginsManager.cpp" line="883"/> <source>Unable to load the plugin content, please check it: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="813"/> + <location filename="../../../PluginsManager.cpp" line="820"/> <source>Unable to create a folder to install the plugin: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="826"/> + <location filename="../../../PluginsManager.cpp" line="833"/> <source>Unable to create a file to install the plugin: %1 since:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="845"/> + <location filename="../../../PluginsManager.cpp" line="852"/> <source>Folder with same name is present, skip the plugin installation: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="851"/> - <location filename="../../../PluginsManager.cpp" line="857"/> - <location filename="../../../PluginsManager.cpp" line="869"/> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="876"/> <source>Unable to load the plugin content, please check it</source> <translation type="unfinished"></translation> </message> @@ -1265,119 +1223,34 @@ since:%2</source> <context> <name>SystrayIcon</name> <message> - <location filename="../../../SystrayIcon.cpp" line="163"/> + <location filename="../../../SystrayIcon.cpp" line="155"/> <source>No copy listener found. Do the copy manually by right click one the system tray icon.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="169"/> + <location filename="../../../SystrayIcon.cpp" line="161"/> <source>Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="187"/> + <location filename="../../../SystrayIcon.cpp" line="179"/> <source>Searching information...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="200"/> + <location filename="../../../SystrayIcon.cpp" line="192"/> <source>Do not replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="205"/> + <location filename="../../../SystrayIcon.cpp" line="197"/> <source>Semi replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="210"/> + <location filename="../../../SystrayIcon.cpp" line="202"/> <source>Replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="377"/> - <source>Warning</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="377"/> - <source>The action on the systray icon is unknown!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="425"/> - <source>&About/Debug report</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="427"/> - <source>&About</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="430"/> - <source>&Save bug report</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="432"/> - <source>&Quit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="433"/> - <source>&Options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="485"/> - <source>A&dd copy/moving</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="471"/> - <source>New version: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="471"/> - <source>Click here to go on download page</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="511"/> - <source>&Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="525"/> - <location filename="../../../SystrayIcon.cpp" line="539"/> - <source>&Transfer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="529"/> - <location filename="../../../SystrayIcon.cpp" line="543"/> - <source>&Move</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="560"/> - <location filename="../../../SystrayIcon.cpp" line="577"/> - <source>Add &copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="566"/> - <location filename="../../../SystrayIcon.cpp" line="583"/> - <source>Add &transfer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="570"/> - <location filename="../../../SystrayIcon.cpp" line="587"/> - <source>Add &move</source> - <translation type="unfinished"></translation> - </message> </context> </TS> diff --git a/plugins/Languages/hu/informations.xml b/plugins/Languages/hu/informations.xml index 19a1b38..1cee401 100644 --- a/plugins/Languages/hu/informations.xml +++ b/plugins/Languages/hu/informations.xml @@ -12,7 +12,7 @@ <!-- Detailed description --> <description xml:lang="en"><![CDATA[Hungarian translation of Ultracopier]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>1.2.3.6</version> + <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>hu</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/hu/translation.ts b/plugins/Languages/hu/translation.ts index a78377e..fb5e79a 100644 --- a/plugins/Languages/hu/translation.ts +++ b/plugins/Languages/hu/translation.ts @@ -1,86 +1,86 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0" language="hu"> +<TS version="2.1" language="hu"> <context> <name>CliParser</name> <message> - <location filename="../../../CliParser.cpp" line="25"/> - <location filename="../../../CliParser.cpp" line="71"/> - <location filename="../../../CliParser.cpp" line="84"/> - <location filename="../../../CliParser.cpp" line="94"/> - <location filename="../../../CliParser.cpp" line="179"/> + <location filename="../../../CliParser.cpp" line="26"/> + <location filename="../../../CliParser.cpp" line="72"/> + <location filename="../../../CliParser.cpp" line="85"/> + <location filename="../../../CliParser.cpp" line="95"/> + <location filename="../../../CliParser.cpp" line="180"/> <source>Warning</source> <translation>Figyelmeztetés</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="25"/> + <location filename="../../../CliParser.cpp" line="26"/> <source>Ultracopier is already running, right click on its system tray icon (near the clock) to use it</source> <translation>Az Ultracopier már fut, kattints a jobb egérombbal a tálcaikonjára (az óra mellett) a használatához</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="71"/> + <location filename="../../../CliParser.cpp" line="72"/> <source>Problem reading file, or file size is 0</source> <translation>Probléma a fájl olvasásánál vagy a fájlméret 0</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="159"/> - <location filename="../../../CliParser.cpp" line="170"/> + <location filename="../../../CliParser.cpp" line="160"/> + <location filename="../../../CliParser.cpp" line="171"/> <source>The arguments possible are:</source> <translation>A lehetséges argumentumok:</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="161"/> - <location filename="../../../CliParser.cpp" line="172"/> + <location filename="../../../CliParser.cpp" line="162"/> + <location filename="../../../CliParser.cpp" line="173"/> <source>To display the options</source> <translation>A beállítások megjelenítéséhez</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="162"/> - <location filename="../../../CliParser.cpp" line="173"/> + <location filename="../../../CliParser.cpp" line="163"/> + <location filename="../../../CliParser.cpp" line="174"/> <source>To quit the other instances (if running)</source> <translation>Kilépés a többi példányból (ha fut)</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="164"/> - <location filename="../../../CliParser.cpp" line="175"/> + <location filename="../../../CliParser.cpp" line="165"/> + <location filename="../../../CliParser.cpp" line="176"/> <source>To copy sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> <translation>A forrás másolása a célba, szóközzel elválasztva. Ha a cél "?", az Ultracopier rákérdez a felhasználónál</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="165"/> - <location filename="../../../CliParser.cpp" line="176"/> + <location filename="../../../CliParser.cpp" line="166"/> + <location filename="../../../CliParser.cpp" line="177"/> <source>To move sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> <translation>A forrás mozgatása a célba, szóközzel elválasztva. Ha a cél "?", az Ultracopier rákérdez a felhasználónál</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="169"/> + <location filename="../../../CliParser.cpp" line="170"/> <source>Command not valid</source> <translation>A parancs nem érvényes</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="84"/> + <location filename="../../../CliParser.cpp" line="85"/> <source>This file is not supported transfer list</source> <translation>Ez a fájl nem támogatott átviteli lista</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="94"/> + <location filename="../../../CliParser.cpp" line="95"/> <source>Unable to open the transfer list file</source> <translation>Az átviteli listafájl megnyitása nem lehetséges</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="160"/> - <location filename="../../../CliParser.cpp" line="171"/> + <location filename="../../../CliParser.cpp" line="161"/> + <location filename="../../../CliParser.cpp" line="172"/> <source>To display this help</source> <translation>Ennek a súgónak a megjelenítéséhez</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="163"/> - <location filename="../../../CliParser.cpp" line="174"/> + <location filename="../../../CliParser.cpp" line="164"/> + <location filename="../../../CliParser.cpp" line="175"/> <source>Open transfer list</source> <translation>Átviteli lista megnyitása</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="181"/> + <location filename="../../../CliParser.cpp" line="182"/> <source>Help</source> <translation>Súgó</translation> </message> @@ -88,38 +88,30 @@ <context> <name>CopyEngineManager</name> <message> - <location filename="../../../CopyEngineManager.cpp" line="229"/> - <location filename="../../../CopyEngineManager.cpp" line="234"/> - <location filename="../../../CopyEngineManager.cpp" line="257"/> - <location filename="../../../CopyEngineManager.cpp" line="271"/> + <location filename="../../../CopyEngineManager.cpp" line="231"/> + <location filename="../../../CopyEngineManager.cpp" line="236"/> + <location filename="../../../CopyEngineManager.cpp" line="259"/> + <location filename="../../../CopyEngineManager.cpp" line="273"/> <source>Warning</source> <translation>Figyelmzetetés</translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="229"/> + <location filename="../../../CopyEngineManager.cpp" line="231"/> <source>Cannot find any copy engine with move support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="257"/> + <location filename="../../../CopyEngineManager.cpp" line="259"/> <source>This copy engine does not support move</source> <translation type="unfinished"></translation> </message> <message> - <source>Cannot find any copy engine with motions support</source> - <translation type="obsolete">Nem található másolási motor mozgatási támogatással</translation> - </message> - <message> - <location filename="../../../CopyEngineManager.cpp" line="234"/> + <location filename="../../../CopyEngineManager.cpp" line="236"/> <source>Cannot find any compatible engine!</source> <translation>Nem található semmilyen kompatibilis motor!</translation> </message> <message> - <source>This copy engine does not support motions</source> - <translation type="obsolete">Ez a másoló motor nem támogatja a mozgatást</translation> - </message> - <message> - <location filename="../../../CopyEngineManager.cpp" line="271"/> + <location filename="../../../CopyEngineManager.cpp" line="273"/> <source>Cannot find any engine with this name: %1</source> <translation>Nem található motor ezzel a névvel: %1</translation> </message> @@ -127,12 +119,12 @@ <context> <name>CopyListener</name> <message> - <location filename="../../../CopyListener.cpp" line="158"/> + <location filename="../../../CopyListener.cpp" line="159"/> <source>Error</source> <translation>Hiba</translation> </message> <message> - <location filename="../../../CopyListener.cpp" line="158"/> + <location filename="../../../CopyListener.cpp" line="159"/> <source>Error during the reception of the copy/move list %1</source> <translation>Hiba a másolási/mozgatási lista fogadásakor @@ -142,70 +134,70 @@ <context> <name>Core</name> <message> - <location filename="../../../Core.cpp" line="45"/> - <location filename="../../../Core.cpp" line="116"/> - <location filename="../../../Core.cpp" line="142"/> - <location filename="../../../Core.cpp" line="157"/> - <location filename="../../../Core.cpp" line="177"/> - <location filename="../../../Core.cpp" line="191"/> - <location filename="../../../Core.cpp" line="200"/> - <location filename="../../../Core.cpp" line="209"/> - <location filename="../../../Core.cpp" line="216"/> - <location filename="../../../Core.cpp" line="250"/> - <location filename="../../../Core.cpp" line="387"/> - <location filename="../../../Core.cpp" line="392"/> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="117"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> + <location filename="../../../Core.cpp" line="217"/> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> + <location filename="../../../Core.cpp" line="393"/> <source>Error</source> <translation>Hiba</translation> </message> <message> - <location filename="../../../Core.cpp" line="45"/> - <location filename="../../../Core.cpp" line="142"/> - <location filename="../../../Core.cpp" line="157"/> - <location filename="../../../Core.cpp" line="177"/> - <location filename="../../../Core.cpp" line="191"/> - <location filename="../../../Core.cpp" line="200"/> - <location filename="../../../Core.cpp" line="209"/> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> <source>Unable to get a copy engine instance</source> <translation>Nem lehetséges másoló motor példány észlelése</translation> </message> <message> - <location filename="../../../Core.cpp" line="93"/> + <location filename="../../../Core.cpp" line="94"/> <source>Group window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="93"/> + <location filename="../../../Core.cpp" line="94"/> <source>Do you want group the transfer with another actual running transfer?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="116"/> + <location filename="../../../Core.cpp" line="117"/> <source>Unable to get a engine instance</source> <translation>Motor állapot lekérése nem lehetséges</translation> </message> <message> - <location filename="../../../Core.cpp" line="216"/> + <location filename="../../../Core.cpp" line="217"/> <source>The argument for the mode is not valid</source> <translation>A mód argumentuma nem érvényes</translation> </message> <message> - <location filename="../../../Core.cpp" line="1133"/> + <location filename="../../../Core.cpp" line="1136"/> <source>Do you want to copy? If no, it will be moved.</source> <translation>Szeretnél másolni? Ha nem, akkor átmozgatva lesz.</translation> </message> <message> - <location filename="../../../Core.cpp" line="250"/> - <location filename="../../../Core.cpp" line="387"/> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> <source>Unable to load the interface, copy aborted</source> <translation>Kezelőfelület betöltése nem lehetséges, másolás megszakítva</translation> </message> <message> - <location filename="../../../Core.cpp" line="392"/> + <location filename="../../../Core.cpp" line="393"/> <source>Unable to load the copy engine, copy aborted</source> <translation>Másoló motor betöltése nem lehetséges, másolás megszakítva</translation> </message> <message> - <location filename="../../../Core.cpp" line="1133"/> + <location filename="../../../Core.cpp" line="1136"/> <source>Transfer mode</source> <translation>Átviteli mód</translation> </message> @@ -213,12 +205,12 @@ <context> <name>EventDispatcher</name> <message> - <location filename="../../../EventDispatcher.cpp" line="155"/> + <location filename="../../../EventDispatcher.cpp" line="152"/> <source>Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../EventDispatcher.cpp" line="155"/> + <location filename="../../../EventDispatcher.cpp" line="152"/> <source>Give the key of this software, more information on <a href="http://ultracopier.first-world.info/">ultracopier.first-world.info</a></source> <translation type="unfinished"></translation> </message> @@ -226,257 +218,257 @@ <context> <name>FacilityEngine</name> <message> - <location filename="../../../FacilityEngine.cpp" line="27"/> + <location filename="../../../FacilityEngine.cpp" line="37"/> <source>s</source> <translation>mp</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="28"/> + <location filename="../../../FacilityEngine.cpp" line="38"/> <source>Too big</source> <translation>Túl nagy</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="29"/> + <location filename="../../../FacilityEngine.cpp" line="39"/> <source>B</source> <translation>B</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="30"/> + <location filename="../../../FacilityEngine.cpp" line="40"/> <source>KB</source> <translation>KB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="31"/> + <location filename="../../../FacilityEngine.cpp" line="41"/> <source>MB</source> <translation>MB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="32"/> + <location filename="../../../FacilityEngine.cpp" line="42"/> <source>GB</source> <translation>GB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="33"/> + <location filename="../../../FacilityEngine.cpp" line="43"/> <source>TB</source> <translation>TB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="34"/> + <location filename="../../../FacilityEngine.cpp" line="44"/> <source>PB</source> <translation>PB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="35"/> + <location filename="../../../FacilityEngine.cpp" line="45"/> <source>EB</source> <translation>EB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="36"/> + <location filename="../../../FacilityEngine.cpp" line="46"/> <source>ZB</source> <translation>ZB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="37"/> + <location filename="../../../FacilityEngine.cpp" line="47"/> <source>YB</source> <translation>YB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="38"/> + <location filename="../../../FacilityEngine.cpp" line="48"/> <source>Less than %10 seconds</source> <translation>Kevesebb mint %10 másodperc</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="39"/> + <location filename="../../../FacilityEngine.cpp" line="49"/> <source>About %10 seconds remaining</source> <translation>Körülbelül %10 másodperc van hátra</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="40"/> + <location filename="../../../FacilityEngine.cpp" line="50"/> <source>About %1 minutes remaining</source> <translation>Körülbelül %1 perc van hátra</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="41"/> + <location filename="../../../FacilityEngine.cpp" line="51"/> <source>About %1 hours remaining</source> <translation>Körülbelül %1 óra van hátra</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="43"/> + <location filename="../../../FacilityEngine.cpp" line="53"/> <source>Copy engine</source> <translation>Másoló motor</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="45"/> + <location filename="../../../FacilityEngine.cpp" line="55"/> <source>Copy</source> <extracomment>a copy</extracomment> <translation>Másolás</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="47"/> + <location filename="../../../FacilityEngine.cpp" line="57"/> <source>Transfer</source> <extracomment>a transfer</extracomment> <translation>Átvitel</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="49"/> + <location filename="../../../FacilityEngine.cpp" line="59"/> <source>Move</source> <extracomment>a move</extracomment> <translation>Mozgatás</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="50"/> + <location filename="../../../FacilityEngine.cpp" line="60"/> <source>Start</source> <translation>Indítás</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="51"/> + <location filename="../../../FacilityEngine.cpp" line="61"/> <source>Pause</source> <translation>Szünet</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="52"/> + <location filename="../../../FacilityEngine.cpp" line="62"/> <source>Resume</source> <translation>Folytatás</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="53"/> - <location filename="../../../FacilityEngine.cpp" line="67"/> + <location filename="../../../FacilityEngine.cpp" line="63"/> + <location filename="../../../FacilityEngine.cpp" line="77"/> <source>Skip</source> <translation>Kihagyás</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="54"/> + <location filename="../../../FacilityEngine.cpp" line="64"/> <source>Unlimited</source> <translation>Korlátlan</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="55"/> + <location filename="../../../FacilityEngine.cpp" line="65"/> <source>Source</source> <translation>Forrás</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="56"/> + <location filename="../../../FacilityEngine.cpp" line="66"/> <source>Size</source> <translation>Méret</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="57"/> + <location filename="../../../FacilityEngine.cpp" line="67"/> <source>Destination</source> <translation>Cél</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="58"/> + <location filename="../../../FacilityEngine.cpp" line="68"/> <source>Quit</source> <translation>Kilépés</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="59"/> + <location filename="../../../FacilityEngine.cpp" line="69"/> <source>Target</source> <translation>Cél</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="60"/> - <location filename="../../../FacilityEngine.cpp" line="64"/> + <location filename="../../../FacilityEngine.cpp" line="70"/> + <location filename="../../../FacilityEngine.cpp" line="74"/> <source>Time remaining:</source> <translation>Hátralévő idő:</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="61"/> + <location filename="../../../FacilityEngine.cpp" line="71"/> <source>Listing</source> <translation>Listázás</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="62"/> + <location filename="../../../FacilityEngine.cpp" line="72"/> <source>Copying</source> <translation>Másolás</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="63"/> + <location filename="../../../FacilityEngine.cpp" line="73"/> <source>Listing and copying</source> <translation>Listázás és másolás</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="66"/> + <location filename="../../../FacilityEngine.cpp" line="76"/> <source>Ask</source> <translation>Rákérdez</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="68"/> + <location filename="../../../FacilityEngine.cpp" line="78"/> <source>Overwrite</source> <translation>Felülírás</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="69"/> + <location filename="../../../FacilityEngine.cpp" line="79"/> <source>Overwrite if newer</source> <translation>Felülírás, ha újabb</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="70"/> + <location filename="../../../FacilityEngine.cpp" line="80"/> <source>Overwrite if the last modification dates are different</source> <translation>Felülír, ha az legutóbbi módosítás dátumai különböznek</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="71"/> + <location filename="../../../FacilityEngine.cpp" line="81"/> <source>Rename</source> <translation>Átnevezés</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="72"/> + <location filename="../../../FacilityEngine.cpp" line="82"/> <source>Put to the end of the list</source> <translation>Helyezze a lista végére</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="73"/> + <location filename="../../../FacilityEngine.cpp" line="83"/> <source>Select source directory</source> <translation>Válassz forrásmappát</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="74"/> + <location filename="../../../FacilityEngine.cpp" line="84"/> <source>Select destination directory</source> <translation>Válassz célmappát</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="75"/> + <location filename="../../../FacilityEngine.cpp" line="85"/> <source>Internal error</source> <translation>Belső hiba</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="76"/> + <location filename="../../../FacilityEngine.cpp" line="86"/> <source>Select one or more files to open</source> <translation>Válassz egy vagy több fájlt megnyitásra</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="77"/> + <location filename="../../../FacilityEngine.cpp" line="87"/> <source>All files</source> <translation>Minden fájl</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="78"/> + <location filename="../../../FacilityEngine.cpp" line="88"/> <source>Save transfer list</source> <translation>Átviteli lista mentése</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="79"/> + <location filename="../../../FacilityEngine.cpp" line="89"/> <source>Open transfer list</source> <translation>Átviteli lista megnyitása</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="80"/> + <location filename="../../../FacilityEngine.cpp" line="90"/> <source>Transfer list</source> <translation>Átviteli lista</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="81"/> + <location filename="../../../FacilityEngine.cpp" line="91"/> <source>Error</source> <translation>Hiba</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="82"/> + <location filename="../../../FacilityEngine.cpp" line="92"/> <source>Not supported on this platform</source> <translation>Ezen a platformon nem támogatott</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="83"/> + <location filename="../../../FacilityEngine.cpp" line="93"/> <source>Completed in %1</source> <translation>Befejezve %1 alatt</translation> </message> @@ -484,7 +476,7 @@ <context> <name>HelpDialog</name> <message> - <location filename="../../../HelpDialog.cpp" line="37"/> + <location filename="../../../HelpDialog.cpp" line="34"/> <source>About Ultracopier</source> <translation>Az Ultracopier névjegye</translation> </message> @@ -529,49 +521,42 @@ Ez a verzió a következő verzióként került lefordításra: %1.</translation <translation>Bezárás</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="35"/> - <source>About Supercopier</source> - <translation>A Supercopier névjegye</translation> - </message> - <message> - <location filename="../../../HelpDialog.cpp" line="80"/> + <location filename="../../../HelpDialog.cpp" line="73"/> <source>For http://portableapps.com/</source> <translation>http://portableapps.com/</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="83"/> + <location filename="../../../HelpDialog.cpp" line="76"/> <source>Portable and all in one version</source> <translation>Hordozható és teljes verzió</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="85"/> + <location filename="../../../HelpDialog.cpp" line="78"/> <source>Portable version</source> <translation>Hordozható verzió</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="90"/> + <location filename="../../../HelpDialog.cpp" line="83"/> <source>All in one version</source> <translation>Teljes verzió</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="92"/> + <location filename="../../../HelpDialog.cpp" line="85"/> <source>Normal version</source> <translation>Normál verzió</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="110"/> - <location filename="../../../HelpDialog.cpp" line="112"/> - <location filename="../../../HelpDialog.cpp" line="123"/> + <location filename="../../../HelpDialog.cpp" line="102"/> <source>http://ultracopier.first-world.info/</source> <translation>http://ultracopier.first-world.info/</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="120"/> + <location filename="../../../HelpDialog.cpp" line="109"/> <source>http://ultracopier.first-world.info/shop.html</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="125"/> + <location filename="../../../HelpDialog.cpp" line="111"/> <source>http://ultracopier.first-world.info/download.html</source> <translation type="unfinished"></translation> </message> @@ -579,12 +564,12 @@ Ez a verzió a következő verzióként került lefordításra: %1.</translation <context> <name>LocalListener</name> <message> - <location filename="../../../LocalListener.cpp" line="146"/> + <location filename="../../../LocalListener.cpp" line="160"/> <source>Warning</source> <translation>Figyelmeztetés</translation> </message> <message> - <location filename="../../../LocalListener.cpp" line="146"/> + <location filename="../../../LocalListener.cpp" line="160"/> <source>Timeout while recomposing data from connected clients</source> <translation>Időtúllépés történt az adatok összeilesztése közben a kapcsolódott kliensektől</translation> </message> @@ -592,20 +577,20 @@ Ez a verzió a következő verzióként került lefordításra: %1.</translation <context> <name>LogThread</name> <message> - <location filename="../../../LogThread.cpp" line="106"/> - <location filename="../../../LogThread.cpp" line="115"/> - <location filename="../../../LogThread.cpp" line="125"/> + <location filename="../../../LogThread.cpp" line="107"/> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> <source>Error</source> <translation>Hiba</translation> </message> <message> - <location filename="../../../LogThread.cpp" line="106"/> + <location filename="../../../LogThread.cpp" line="107"/> <source>Log file already open, error: %1</source> <translation>Naplófájl már meg van nyitva, hiba: %1</translation> </message> <message> - <location filename="../../../LogThread.cpp" line="115"/> - <location filename="../../../LogThread.cpp" line="125"/> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> <source>Unable to open the log file, error: %1</source> <translation>Naplófájl megnyitása nem lehetséges, hiba: %1</translation> </message> @@ -648,21 +633,6 @@ Ez a verzió a következő verzióként került lefordításra: %1.</translation <source>The replacement of default copy/move system should be not supported by the file manager.<br />Ask to the developer to support it.<br />You need do the copy/move manually.</source> <translation>Az alapértelmezett másoló/mozgató rendszer lecserélését nem szabad támogatnia a fájlkezelőnek.<br />Kérd meg a fejlesztőt, hogy támogassa.<br />A másolás/mozgatást manuálisan kell elvégezned.</translation> </message> - <message> - <location filename="../../../OSSpecific.cpp" line="32"/> - <source>Consider Supercopier as deprecated, prefer Ultracopier</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OSSpecific.cpp" line="35"/> - <source>This version use 100% of you graphic card/GPU (you computer can be noisy, or slow/buggy during the games) at exchange of free access to Ultimate version. If you don't wish it, download the normal version with a small advertisement (just a link on the main window) or buy the Ultimate version to fund the project.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OSSpecific.cpp" line="36"/> - <source>http://ultracopier.first-world.info/download.html</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>OptionDialog</name> @@ -685,28 +655,28 @@ Ez a verzió a következő verzióként került lefordításra: %1.</translation <message> <location filename="../../../OptionDialog.ui" line="66"/> <location filename="../../../OptionDialog.ui" line="322"/> - <location filename="../../../OptionDialog.cpp" line="354"/> + <location filename="../../../OptionDialog.cpp" line="286"/> <source>Copy engine</source> <translation>Másoló motor</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="71"/> <location filename="../../../OptionDialog.ui" line="335"/> - <location filename="../../../OptionDialog.cpp" line="355"/> + <location filename="../../../OptionDialog.cpp" line="287"/> <source>Listener</source> <translation>Figyelő</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="76"/> <location filename="../../../OptionDialog.ui" line="340"/> - <location filename="../../../OptionDialog.cpp" line="356"/> + <location filename="../../../OptionDialog.cpp" line="288"/> <source>Plugin loader</source> <translation>Beépüő betöltő</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="84"/> <location filename="../../../OptionDialog.ui" line="345"/> - <location filename="../../../OptionDialog.cpp" line="357"/> + <location filename="../../../OptionDialog.cpp" line="289"/> <source>Session loader</source> <translation>Folyamat betöltő</translation> </message> @@ -895,99 +865,75 @@ Ez a verzió a következő verzióként került lefordításra: %1.</translation <translation>A változók: %path%, %operation%</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="478"/> - <source>Allow the application</source> - <translation>Alkalmazás engedélyezése</translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="478"/> - <source>This Ultimate free version is only if %1 is allowed by your antivirus. Else you can get the normal free version</source> - <translation>Ez az Ultimate ingyenes verzió csak akkor működik, ha a(z) %1-t engedélyezted a vírusirtódban. Egyéb esetben használd a normál ingyenes verziót</translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="483"/> - <source>Enable the OpenCL</source> - <translation>OpenCL engedélyezése</translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="483"/> - <source>This Ultimate version is only if the OpenCL is installed with your graphic card drivers. Else you can get the normal free version</source> - <translation>Ez az Ultimate ingyenes verzió csak akkor működik, ha az OpenCL telepítve van a videókártya driverrel. Egyéb esetben használd a normál ingyenes verziót</translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="260"/> - <location filename="../../../OptionDialog.cpp" line="274"/> + <location filename="../../../OptionDialog.cpp" line="190"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load</source> <translation>Betöltés</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="260"/> + <location filename="../../../OptionDialog.cpp" line="190"/> <source>Load the theme?</source> <translation>Téma betöltése?</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="274"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load the language?</source> <translation>Nyelv betöltése?</translation> </message> <message> - <source>Disabled because you do not have any SessionLoader plugin</source> - <translation type="obsolete">Letiltva, mert nem rendelkezel SessionLoader beépülővel</translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="362"/> + <location filename="../../../OptionDialog.cpp" line="294"/> <source>Do nothing</source> <translation>Ne tegyen semmit</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="363"/> + <location filename="../../../OptionDialog.cpp" line="295"/> <source>Ask source as folder</source> <translation>Rákérdezés a forrás mint mappa</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="364"/> + <location filename="../../../OptionDialog.cpp" line="296"/> <source>Ask sources as files</source> <translation>Rákérdezés a forrásokra mint fájlok</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="365"/> + <location filename="../../../OptionDialog.cpp" line="297"/> <source>Never</source> <translation>Soha</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="366"/> + <location filename="../../../OptionDialog.cpp" line="298"/> <source>When source is same</source> <translation>Amikor a forrás ugyanaz</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="367"/> + <location filename="../../../OptionDialog.cpp" line="299"/> <source>When destination is same</source> <translation>Amikor a cél ugyanaz</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="368"/> + <location filename="../../../OptionDialog.cpp" line="300"/> <source>When source and destination are same</source> <translation>Amikor a forrás és a cél ugyanaz</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="369"/> + <location filename="../../../OptionDialog.cpp" line="301"/> <source>When source or destination are same</source> <translation>Amikor a forrás vagy cél ugyanaz</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="370"/> + <location filename="../../../OptionDialog.cpp" line="302"/> <source>Always</source> <translation>Mindig</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="384"/> - <location filename="../../../OptionDialog.cpp" line="385"/> - <location filename="../../../OptionDialog.cpp" line="386"/> + <location filename="../../../OptionDialog.cpp" line="316"/> + <location filename="../../../OptionDialog.cpp" line="317"/> + <location filename="../../../OptionDialog.cpp" line="318"/> <source>The variables are %1</source> <translation>A változók: %1</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="1591"/> + <location filename="../../../OptionDialog.cpp" line="948"/> <source>Save logs as: </source> <translation>Napló mentése mint:</translation> </message> @@ -995,10 +941,10 @@ Ez a verzió a következő verzióként került lefordításra: %1.</translation <context> <name>OptionEngine</name> <message> - <location filename="../../../OptionEngine.cpp" line="161"/> - <location filename="../../../OptionEngine.cpp" line="165"/> - <location filename="../../../OptionEngine.cpp" line="202"/> - <location filename="../../../OptionEngine.cpp" line="206"/> + <location filename="../../../OptionEngine.cpp" line="162"/> + <location filename="../../../OptionEngine.cpp" line="169"/> + <location filename="../../../OptionEngine.cpp" line="211"/> + <location filename="../../../OptionEngine.cpp" line="215"/> <source>The variable was not found: %1 %2</source> <translation>A változó nem található: %1 %2</translation> </message> @@ -1051,42 +997,42 @@ Ez a verzió a következő verzióként került lefordításra: %1.</translation <translation>Cím:</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="38"/> + <location filename="../../../PluginInformation.cpp" line="39"/> <source>Copy engine</source> <translation>Másoló motor</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="41"/> + <location filename="../../../PluginInformation.cpp" line="42"/> <source>Languages</source> <translation>Nyelvek</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="44"/> + <location filename="../../../PluginInformation.cpp" line="45"/> <source>Listener</source> <translation>Figyelő</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="47"/> + <location filename="../../../PluginInformation.cpp" line="48"/> <source>Plugin loader</source> <translation>Beépülő betöltő</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="50"/> + <location filename="../../../PluginInformation.cpp" line="51"/> <source>Session loader</source> <translation>Folyamat betöltő</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="53"/> + <location filename="../../../PluginInformation.cpp" line="54"/> <source>Themes</source> <translation>Témák</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="57"/> + <location filename="../../../PluginInformation.cpp" line="58"/> <source>Unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="67"/> + <location filename="../../../PluginInformation.cpp" line="68"/> <source>Information about %1</source> <translation>%1 információi</translation> </message> @@ -1094,126 +1040,126 @@ Ez a verzió a következő verzióként került lefordításra: %1.</translation <context> <name>PluginsManager</name> <message> - <location filename="../../../PluginsManager.cpp" line="221"/> + <location filename="../../../PluginsManager.cpp" line="224"/> <source>informations.xml is not accessible</source> <translation>informations.xml nem férhető hozzá</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="253"/> + <location filename="../../../PluginsManager.cpp" line="256"/> <source>%1, parse error at line %2, column %3: %4</source> <translation>%1, elemzési hiba a(z) %2. sorban, %3. oszlopban: %4</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="261"/> + <location filename="../../../PluginsManager.cpp" line="264"/> <source>"package" root tag not found for the xml file</source> <translation>"package" gyökércímke nem található az xml fájlban</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="337"/> + <location filename="../../../PluginsManager.cpp" line="340"/> <source>Duplicated plugin found, already loaded!</source> <translation>Duplikált beépülő található, már be van töltve!</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="227"/> + <location filename="../../../PluginsManager.cpp" line="230"/> <source>informations.xml not found for the plugin</source> <translation>informations.xml nem található a beépülőhöz</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="395"/> + <location filename="../../../PluginsManager.cpp" line="401"/> <source>English text missing in the informations.xml for the tag: %1</source> <translation>Angol szöveg hiányzik az informations.xml-ből a címkéhez: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="403"/> + <location filename="../../../PluginsManager.cpp" line="409"/> <source>Tag not found: %1</source> <translation>Címke nem található: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="487"/> + <location filename="../../../PluginsManager.cpp" line="494"/> <source>Dependencies part is wrong</source> <translation>A függőségek rész hibás</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="508"/> + <location filename="../../../PluginsManager.cpp" line="515"/> <source>Dependencies %1 are not satisfied, for plugin: %2</source> <translation>A(z) %1 függőségek nem megfelelőek a következő beépülőhöz: %2</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="665"/> + <location filename="../../../PluginsManager.cpp" line="672"/> <source>Remove %1</source> <translation>%1 eltávolítása</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="665"/> + <location filename="../../../PluginsManager.cpp" line="672"/> <source>Are you sure about removing "%1" in version %2?</source> <translation>Biztosan el akarod távolítani "%1"-t a(z) %2 verzióban?</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="676"/> + <location filename="../../../PluginsManager.cpp" line="683"/> <source>Error</source> <translation>Hiba</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="676"/> + <location filename="../../../PluginsManager.cpp" line="683"/> <source>Error while the removing plugin, please check the rights on the folder: %1</source> - <translation>Hiba történt a beépülő eltávolítása közben, kérlek ellenőrizd a jogokat a mappán: %1</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="700"/> + <location filename="../../../PluginsManager.cpp" line="707"/> <source>Information</source> <translation>Információ</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="700"/> + <location filename="../../../PluginsManager.cpp" line="707"/> <source>Previous import is in progress...</source> <translation>Előző importálás folyamatban van...</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="703"/> + <location filename="../../../PluginsManager.cpp" line="710"/> <source>Open Ultracopier plugin</source> <translation>Ultracopier beépülő megnyitása</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="703"/> + <location filename="../../../PluginsManager.cpp" line="710"/> <source>Ultracopier plugin (*.urc)</source> <translation>Ultracopier beépülő (*.urc)</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="720"/> - <location filename="../../../PluginsManager.cpp" line="745"/> - <location filename="../../../PluginsManager.cpp" line="813"/> - <location filename="../../../PluginsManager.cpp" line="826"/> - <location filename="../../../PluginsManager.cpp" line="845"/> - <location filename="../../../PluginsManager.cpp" line="851"/> - <location filename="../../../PluginsManager.cpp" line="857"/> - <location filename="../../../PluginsManager.cpp" line="863"/> - <location filename="../../../PluginsManager.cpp" line="869"/> + <location filename="../../../PluginsManager.cpp" line="727"/> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="820"/> + <location filename="../../../PluginsManager.cpp" line="833"/> + <location filename="../../../PluginsManager.cpp" line="852"/> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="870"/> <location filename="../../../PluginsManager.cpp" line="876"/> + <location filename="../../../PluginsManager.cpp" line="883"/> <source>Plugin loader</source> <translation>Beépülő betöltő</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="720"/> + <location filename="../../../PluginsManager.cpp" line="727"/> <source>Unable to open the plugin: %1</source> <translation>Beéülő megnyitása nem lehetséges: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="745"/> - <location filename="../../../PluginsManager.cpp" line="863"/> - <location filename="../../../PluginsManager.cpp" line="876"/> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="870"/> + <location filename="../../../PluginsManager.cpp" line="883"/> <source>Unable to load the plugin content, please check it: %1</source> <translation>Beépülő tartalmának betöltése nem lehetséges, kérlek ellenőrizd: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="813"/> + <location filename="../../../PluginsManager.cpp" line="820"/> <source>Unable to create a folder to install the plugin: %1</source> <translation>Mappa létrehozása a beépülő telepítéséhez nem lehetséges: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="826"/> + <location filename="../../../PluginsManager.cpp" line="833"/> <source>Unable to create a file to install the plugin: %1 since:%2</source> @@ -1222,16 +1168,16 @@ since:%2</source> óta:%2</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="845"/> + <location filename="../../../PluginsManager.cpp" line="852"/> <source>Folder with same name is present, skip the plugin installation: %1</source> <translation>Mappa már létezik ilyen néven, beépülő telepítésének kihagyása: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="851"/> - <location filename="../../../PluginsManager.cpp" line="857"/> - <location filename="../../../PluginsManager.cpp" line="869"/> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="876"/> <source>Unable to load the plugin content, please check it</source> <translation>Beépülő tartalmának betöltése nem lehetséges, kérlek ellenőrizd</translation> </message> @@ -1284,129 +1230,34 @@ since:%2</source> <context> <name>SystrayIcon</name> <message> - <location filename="../../../SystrayIcon.cpp" line="163"/> + <location filename="../../../SystrayIcon.cpp" line="155"/> <source>No copy listener found. Do the copy manually by right click one the system tray icon.</source> <translation type="unfinished">Nem található másoló figyelő. Végezd el manuálisan a másolást a jobb egérgombbal a tálcaikonra kattintva.</translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="169"/> + <location filename="../../../SystrayIcon.cpp" line="161"/> <source>Information</source> <translation type="unfinished">Információ</translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="187"/> + <location filename="../../../SystrayIcon.cpp" line="179"/> <source>Searching information...</source> <translation type="unfinished">Információ keresése...</translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="200"/> + <location filename="../../../SystrayIcon.cpp" line="192"/> <source>Do not replace the explorer copy/move</source> <translation type="unfinished">Ne cserélje le az Intéző másolását/mozgatását</translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="205"/> + <location filename="../../../SystrayIcon.cpp" line="197"/> <source>Semi replace the explorer copy/move</source> <translation type="unfinished">Az Intéző másolás/mozgatás félig lecserélése</translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="210"/> + <location filename="../../../SystrayIcon.cpp" line="202"/> <source>Replace the explorer copy/move</source> <translation type="unfinished">Az Intéző másolás/mozgatás lecserélése</translation> </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="377"/> - <source>Warning</source> - <translation type="unfinished">Figyelmeztetés</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="377"/> - <source>The action on the systray icon is unknown!</source> - <translation type="unfinished">A művelet a tálcaikonon ismeretlen!</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="425"/> - <source>&About/Debug report</source> - <translation type="unfinished">Né&vjegy/Hibajelentés</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="427"/> - <source>&About</source> - <translation type="unfinished">&Névjegy</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="430"/> - <source>&Save bug report</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="471"/> - <source>New version: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="471"/> - <source>Click here to go on download page</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>&Save bug Report</source> - <translation type="obsolete">&Hibajelentés mentése</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="432"/> - <source>&Quit</source> - <translation type="unfinished">&Kilépés</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="433"/> - <source>&Options</source> - <translation type="unfinished">&Beállítások</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="485"/> - <source>A&dd copy/moving</source> - <translation type="unfinished">Más&olás/mozgatás hozzáadása</translation> - </message> - <message> - <source>New version: %1 -Site: %2</source> - <translation type="obsolete">Új verzió: %1 -Honlap: %2</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="511"/> - <source>&Copy</source> - <translation type="unfinished">&Másolás</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="525"/> - <location filename="../../../SystrayIcon.cpp" line="539"/> - <source>&Transfer</source> - <translation type="unfinished">&Átvitel</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="529"/> - <location filename="../../../SystrayIcon.cpp" line="543"/> - <source>&Move</source> - <translation type="unfinished">M&ozgatás</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="560"/> - <location filename="../../../SystrayIcon.cpp" line="577"/> - <source>Add &copy</source> - <translation type="unfinished">Má&solás hozzáadása</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="566"/> - <location filename="../../../SystrayIcon.cpp" line="583"/> - <source>Add &transfer</source> - <translation type="unfinished">&Átvitel hozzáadása</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="570"/> - <location filename="../../../SystrayIcon.cpp" line="587"/> - <source>Add &move</source> - <translation type="unfinished">&Mozgatás hozzáadása</translation> - </message> </context> </TS> diff --git a/plugins/Languages/id/informations.xml b/plugins/Languages/id/informations.xml index 3821ee0..79ea152 100644 --- a/plugins/Languages/id/informations.xml +++ b/plugins/Languages/id/informations.xml @@ -12,7 +12,7 @@ <!-- Detailed description --> <description xml:lang="en"><![CDATA[Translation of Ultracopier to indonesian. For more details see the web site.]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>1.2.3.6</version> + <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>id</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/id/translation.ts b/plugins/Languages/id/translation.ts index b02bb87..d364f81 100644 --- a/plugins/Languages/id/translation.ts +++ b/plugins/Languages/id/translation.ts @@ -1,86 +1,86 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>CliParser</name> <message> - <location filename="../../../CliParser.cpp" line="25"/> - <location filename="../../../CliParser.cpp" line="71"/> - <location filename="../../../CliParser.cpp" line="84"/> - <location filename="../../../CliParser.cpp" line="94"/> - <location filename="../../../CliParser.cpp" line="179"/> + <location filename="../../../CliParser.cpp" line="26"/> + <location filename="../../../CliParser.cpp" line="72"/> + <location filename="../../../CliParser.cpp" line="85"/> + <location filename="../../../CliParser.cpp" line="95"/> + <location filename="../../../CliParser.cpp" line="180"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="25"/> + <location filename="../../../CliParser.cpp" line="26"/> <source>Ultracopier is already running, right click on its system tray icon (near the clock) to use it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="71"/> + <location filename="../../../CliParser.cpp" line="72"/> <source>Problem reading file, or file size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="159"/> - <location filename="../../../CliParser.cpp" line="170"/> + <location filename="../../../CliParser.cpp" line="160"/> + <location filename="../../../CliParser.cpp" line="171"/> <source>The arguments possible are:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="161"/> - <location filename="../../../CliParser.cpp" line="172"/> + <location filename="../../../CliParser.cpp" line="162"/> + <location filename="../../../CliParser.cpp" line="173"/> <source>To display the options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="162"/> - <location filename="../../../CliParser.cpp" line="173"/> + <location filename="../../../CliParser.cpp" line="163"/> + <location filename="../../../CliParser.cpp" line="174"/> <source>To quit the other instances (if running)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="164"/> - <location filename="../../../CliParser.cpp" line="175"/> + <location filename="../../../CliParser.cpp" line="165"/> + <location filename="../../../CliParser.cpp" line="176"/> <source>To copy sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="165"/> - <location filename="../../../CliParser.cpp" line="176"/> + <location filename="../../../CliParser.cpp" line="166"/> + <location filename="../../../CliParser.cpp" line="177"/> <source>To move sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="169"/> + <location filename="../../../CliParser.cpp" line="170"/> <source>Command not valid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="84"/> + <location filename="../../../CliParser.cpp" line="85"/> <source>This file is not supported transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="94"/> + <location filename="../../../CliParser.cpp" line="95"/> <source>Unable to open the transfer list file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="160"/> - <location filename="../../../CliParser.cpp" line="171"/> + <location filename="../../../CliParser.cpp" line="161"/> + <location filename="../../../CliParser.cpp" line="172"/> <source>To display this help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="163"/> - <location filename="../../../CliParser.cpp" line="174"/> + <location filename="../../../CliParser.cpp" line="164"/> + <location filename="../../../CliParser.cpp" line="175"/> <source>Open transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="181"/> + <location filename="../../../CliParser.cpp" line="182"/> <source>Help</source> <translation type="unfinished"></translation> </message> @@ -88,30 +88,30 @@ <context> <name>CopyEngineManager</name> <message> - <location filename="../../../CopyEngineManager.cpp" line="229"/> - <location filename="../../../CopyEngineManager.cpp" line="234"/> - <location filename="../../../CopyEngineManager.cpp" line="257"/> - <location filename="../../../CopyEngineManager.cpp" line="271"/> + <location filename="../../../CopyEngineManager.cpp" line="231"/> + <location filename="../../../CopyEngineManager.cpp" line="236"/> + <location filename="../../../CopyEngineManager.cpp" line="259"/> + <location filename="../../../CopyEngineManager.cpp" line="273"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="229"/> + <location filename="../../../CopyEngineManager.cpp" line="231"/> <source>Cannot find any copy engine with move support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="257"/> + <location filename="../../../CopyEngineManager.cpp" line="259"/> <source>This copy engine does not support move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="234"/> + <location filename="../../../CopyEngineManager.cpp" line="236"/> <source>Cannot find any compatible engine!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="271"/> + <location filename="../../../CopyEngineManager.cpp" line="273"/> <source>Cannot find any engine with this name: %1</source> <translation type="unfinished"></translation> </message> @@ -119,12 +119,12 @@ <context> <name>CopyListener</name> <message> - <location filename="../../../CopyListener.cpp" line="158"/> + <location filename="../../../CopyListener.cpp" line="159"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyListener.cpp" line="158"/> + <location filename="../../../CopyListener.cpp" line="159"/> <source>Error during the reception of the copy/move list %1</source> <translation type="unfinished"></translation> @@ -133,70 +133,70 @@ <context> <name>Core</name> <message> - <location filename="../../../Core.cpp" line="45"/> - <location filename="../../../Core.cpp" line="116"/> - <location filename="../../../Core.cpp" line="142"/> - <location filename="../../../Core.cpp" line="157"/> - <location filename="../../../Core.cpp" line="177"/> - <location filename="../../../Core.cpp" line="191"/> - <location filename="../../../Core.cpp" line="200"/> - <location filename="../../../Core.cpp" line="209"/> - <location filename="../../../Core.cpp" line="216"/> - <location filename="../../../Core.cpp" line="250"/> - <location filename="../../../Core.cpp" line="387"/> - <location filename="../../../Core.cpp" line="392"/> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="117"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> + <location filename="../../../Core.cpp" line="217"/> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> + <location filename="../../../Core.cpp" line="393"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="45"/> - <location filename="../../../Core.cpp" line="142"/> - <location filename="../../../Core.cpp" line="157"/> - <location filename="../../../Core.cpp" line="177"/> - <location filename="../../../Core.cpp" line="191"/> - <location filename="../../../Core.cpp" line="200"/> - <location filename="../../../Core.cpp" line="209"/> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> <source>Unable to get a copy engine instance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="93"/> + <location filename="../../../Core.cpp" line="94"/> <source>Group window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="93"/> + <location filename="../../../Core.cpp" line="94"/> <source>Do you want group the transfer with another actual running transfer?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="116"/> + <location filename="../../../Core.cpp" line="117"/> <source>Unable to get a engine instance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="216"/> + <location filename="../../../Core.cpp" line="217"/> <source>The argument for the mode is not valid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="1133"/> + <location filename="../../../Core.cpp" line="1136"/> <source>Do you want to copy? If no, it will be moved.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="250"/> - <location filename="../../../Core.cpp" line="387"/> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> <source>Unable to load the interface, copy aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="392"/> + <location filename="../../../Core.cpp" line="393"/> <source>Unable to load the copy engine, copy aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="1133"/> + <location filename="../../../Core.cpp" line="1136"/> <source>Transfer mode</source> <translation type="unfinished"></translation> </message> @@ -204,12 +204,12 @@ <context> <name>EventDispatcher</name> <message> - <location filename="../../../EventDispatcher.cpp" line="155"/> + <location filename="../../../EventDispatcher.cpp" line="152"/> <source>Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../EventDispatcher.cpp" line="155"/> + <location filename="../../../EventDispatcher.cpp" line="152"/> <source>Give the key of this software, more information on <a href="http://ultracopier.first-world.info/">ultracopier.first-world.info</a></source> <translation type="unfinished"></translation> </message> @@ -217,257 +217,257 @@ <context> <name>FacilityEngine</name> <message> - <location filename="../../../FacilityEngine.cpp" line="43"/> + <location filename="../../../FacilityEngine.cpp" line="53"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="45"/> + <location filename="../../../FacilityEngine.cpp" line="55"/> <source>Copy</source> <extracomment>a copy</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="49"/> + <location filename="../../../FacilityEngine.cpp" line="59"/> <source>Move</source> <extracomment>a move</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="51"/> + <location filename="../../../FacilityEngine.cpp" line="61"/> <source>Pause</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="52"/> + <location filename="../../../FacilityEngine.cpp" line="62"/> <source>Resume</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="53"/> - <location filename="../../../FacilityEngine.cpp" line="67"/> + <location filename="../../../FacilityEngine.cpp" line="63"/> + <location filename="../../../FacilityEngine.cpp" line="77"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="54"/> + <location filename="../../../FacilityEngine.cpp" line="64"/> <source>Unlimited</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="27"/> + <location filename="../../../FacilityEngine.cpp" line="37"/> <source>s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="28"/> + <location filename="../../../FacilityEngine.cpp" line="38"/> <source>Too big</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="29"/> + <location filename="../../../FacilityEngine.cpp" line="39"/> <source>B</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="30"/> + <location filename="../../../FacilityEngine.cpp" line="40"/> <source>KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="31"/> + <location filename="../../../FacilityEngine.cpp" line="41"/> <source>MB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="32"/> + <location filename="../../../FacilityEngine.cpp" line="42"/> <source>GB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="33"/> + <location filename="../../../FacilityEngine.cpp" line="43"/> <source>TB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="34"/> + <location filename="../../../FacilityEngine.cpp" line="44"/> <source>PB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="35"/> + <location filename="../../../FacilityEngine.cpp" line="45"/> <source>EB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="36"/> + <location filename="../../../FacilityEngine.cpp" line="46"/> <source>ZB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="37"/> + <location filename="../../../FacilityEngine.cpp" line="47"/> <source>YB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="38"/> + <location filename="../../../FacilityEngine.cpp" line="48"/> <source>Less than %10 seconds</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="39"/> + <location filename="../../../FacilityEngine.cpp" line="49"/> <source>About %10 seconds remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="40"/> + <location filename="../../../FacilityEngine.cpp" line="50"/> <source>About %1 minutes remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="41"/> + <location filename="../../../FacilityEngine.cpp" line="51"/> <source>About %1 hours remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="47"/> + <location filename="../../../FacilityEngine.cpp" line="57"/> <source>Transfer</source> <extracomment>a transfer</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="50"/> + <location filename="../../../FacilityEngine.cpp" line="60"/> <source>Start</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="55"/> + <location filename="../../../FacilityEngine.cpp" line="65"/> <source>Source</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="56"/> + <location filename="../../../FacilityEngine.cpp" line="66"/> <source>Size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="57"/> + <location filename="../../../FacilityEngine.cpp" line="67"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="58"/> + <location filename="../../../FacilityEngine.cpp" line="68"/> <source>Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="59"/> + <location filename="../../../FacilityEngine.cpp" line="69"/> <source>Target</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="60"/> - <location filename="../../../FacilityEngine.cpp" line="64"/> + <location filename="../../../FacilityEngine.cpp" line="70"/> + <location filename="../../../FacilityEngine.cpp" line="74"/> <source>Time remaining:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="61"/> + <location filename="../../../FacilityEngine.cpp" line="71"/> <source>Listing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="62"/> + <location filename="../../../FacilityEngine.cpp" line="72"/> <source>Copying</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="63"/> + <location filename="../../../FacilityEngine.cpp" line="73"/> <source>Listing and copying</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="66"/> + <location filename="../../../FacilityEngine.cpp" line="76"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="68"/> + <location filename="../../../FacilityEngine.cpp" line="78"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="69"/> + <location filename="../../../FacilityEngine.cpp" line="79"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="70"/> + <location filename="../../../FacilityEngine.cpp" line="80"/> <source>Overwrite if the last modification dates are different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="71"/> + <location filename="../../../FacilityEngine.cpp" line="81"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="72"/> + <location filename="../../../FacilityEngine.cpp" line="82"/> <source>Put to the end of the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="73"/> + <location filename="../../../FacilityEngine.cpp" line="83"/> <source>Select source directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="74"/> + <location filename="../../../FacilityEngine.cpp" line="84"/> <source>Select destination directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="75"/> + <location filename="../../../FacilityEngine.cpp" line="85"/> <source>Internal error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="76"/> + <location filename="../../../FacilityEngine.cpp" line="86"/> <source>Select one or more files to open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="77"/> + <location filename="../../../FacilityEngine.cpp" line="87"/> <source>All files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="78"/> + <location filename="../../../FacilityEngine.cpp" line="88"/> <source>Save transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="79"/> + <location filename="../../../FacilityEngine.cpp" line="89"/> <source>Open transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="80"/> + <location filename="../../../FacilityEngine.cpp" line="90"/> <source>Transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="81"/> + <location filename="../../../FacilityEngine.cpp" line="91"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="82"/> + <location filename="../../../FacilityEngine.cpp" line="92"/> <source>Not supported on this platform</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="83"/> + <location filename="../../../FacilityEngine.cpp" line="93"/> <source>Completed in %1</source> <translation type="unfinished"></translation> </message> @@ -475,7 +475,7 @@ <context> <name>HelpDialog</name> <message> - <location filename="../../../HelpDialog.cpp" line="37"/> + <location filename="../../../HelpDialog.cpp" line="34"/> <source>About Ultracopier</source> <translation type="unfinished"></translation> </message> @@ -513,49 +513,42 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="35"/> - <source>About Supercopier</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../HelpDialog.cpp" line="80"/> + <location filename="../../../HelpDialog.cpp" line="73"/> <source>For http://portableapps.com/</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="83"/> + <location filename="../../../HelpDialog.cpp" line="76"/> <source>Portable and all in one version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="85"/> + <location filename="../../../HelpDialog.cpp" line="78"/> <source>Portable version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="90"/> + <location filename="../../../HelpDialog.cpp" line="83"/> <source>All in one version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="92"/> + <location filename="../../../HelpDialog.cpp" line="85"/> <source>Normal version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="110"/> - <location filename="../../../HelpDialog.cpp" line="112"/> - <location filename="../../../HelpDialog.cpp" line="123"/> + <location filename="../../../HelpDialog.cpp" line="102"/> <source>http://ultracopier.first-world.info/</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="120"/> + <location filename="../../../HelpDialog.cpp" line="109"/> <source>http://ultracopier.first-world.info/shop.html</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="125"/> + <location filename="../../../HelpDialog.cpp" line="111"/> <source>http://ultracopier.first-world.info/download.html</source> <translation type="unfinished"></translation> </message> @@ -569,12 +562,12 @@ This version is compiled as version: %1.</source> <context> <name>LocalListener</name> <message> - <location filename="../../../LocalListener.cpp" line="146"/> + <location filename="../../../LocalListener.cpp" line="160"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../LocalListener.cpp" line="146"/> + <location filename="../../../LocalListener.cpp" line="160"/> <source>Timeout while recomposing data from connected clients</source> <translation type="unfinished"></translation> </message> @@ -582,20 +575,20 @@ This version is compiled as version: %1.</source> <context> <name>LogThread</name> <message> - <location filename="../../../LogThread.cpp" line="106"/> - <location filename="../../../LogThread.cpp" line="115"/> - <location filename="../../../LogThread.cpp" line="125"/> + <location filename="../../../LogThread.cpp" line="107"/> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../LogThread.cpp" line="106"/> + <location filename="../../../LogThread.cpp" line="107"/> <source>Log file already open, error: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../LogThread.cpp" line="115"/> - <location filename="../../../LogThread.cpp" line="125"/> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> <source>Unable to open the log file, error: %1</source> <translation type="unfinished"></translation> </message> @@ -637,21 +630,6 @@ This version is compiled as version: %1.</source> <source>The replacement of default copy/move system should be not supported by the file manager.<br />Ask to the developer to support it.<br />You need do the copy/move manually.</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../../OSSpecific.cpp" line="32"/> - <source>Consider Supercopier as deprecated, prefer Ultracopier</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OSSpecific.cpp" line="35"/> - <source>This version use 100% of you graphic card/GPU (you computer can be noisy, or slow/buggy during the games) at exchange of free access to Ultimate version. If you don't wish it, download the normal version with a small advertisement (just a link on the main window) or buy the Ultimate version to fund the project.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OSSpecific.cpp" line="36"/> - <source>http://ultracopier.first-world.info/download.html</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>OptionDialog</name> @@ -674,7 +652,7 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="66"/> <location filename="../../../OptionDialog.ui" line="322"/> - <location filename="../../../OptionDialog.cpp" line="354"/> + <location filename="../../../OptionDialog.cpp" line="286"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> @@ -717,21 +695,21 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="71"/> <location filename="../../../OptionDialog.ui" line="335"/> - <location filename="../../../OptionDialog.cpp" line="355"/> + <location filename="../../../OptionDialog.cpp" line="287"/> <source>Listener</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="76"/> <location filename="../../../OptionDialog.ui" line="340"/> - <location filename="../../../OptionDialog.cpp" line="356"/> + <location filename="../../../OptionDialog.cpp" line="288"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="84"/> <location filename="../../../OptionDialog.ui" line="345"/> - <location filename="../../../OptionDialog.cpp" line="357"/> + <location filename="../../../OptionDialog.cpp" line="289"/> <source>Session loader</source> <translation type="unfinished"></translation> </message> @@ -863,95 +841,75 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="260"/> - <location filename="../../../OptionDialog.cpp" line="274"/> + <location filename="../../../OptionDialog.cpp" line="190"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="260"/> + <location filename="../../../OptionDialog.cpp" line="190"/> <source>Load the theme?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="274"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load the language?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="362"/> + <location filename="../../../OptionDialog.cpp" line="294"/> <source>Do nothing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="363"/> + <location filename="../../../OptionDialog.cpp" line="295"/> <source>Ask source as folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="364"/> + <location filename="../../../OptionDialog.cpp" line="296"/> <source>Ask sources as files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="365"/> + <location filename="../../../OptionDialog.cpp" line="297"/> <source>Never</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="366"/> + <location filename="../../../OptionDialog.cpp" line="298"/> <source>When source is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="367"/> + <location filename="../../../OptionDialog.cpp" line="299"/> <source>When destination is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="368"/> + <location filename="../../../OptionDialog.cpp" line="300"/> <source>When source and destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="369"/> + <location filename="../../../OptionDialog.cpp" line="301"/> <source>When source or destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="370"/> + <location filename="../../../OptionDialog.cpp" line="302"/> <source>Always</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="384"/> - <location filename="../../../OptionDialog.cpp" line="385"/> - <location filename="../../../OptionDialog.cpp" line="386"/> + <location filename="../../../OptionDialog.cpp" line="316"/> + <location filename="../../../OptionDialog.cpp" line="317"/> + <location filename="../../../OptionDialog.cpp" line="318"/> <source>The variables are %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="478"/> - <source>Allow the application</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="478"/> - <source>This Ultimate free version is only if %1 is allowed by your antivirus. Else you can get the normal free version</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="483"/> - <source>Enable the OpenCL</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="483"/> - <source>This Ultimate version is only if the OpenCL is installed with your graphic card drivers. Else you can get the normal free version</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="1591"/> + <location filename="../../../OptionDialog.cpp" line="948"/> <source>Save logs as: </source> <translation type="unfinished"></translation> </message> @@ -980,10 +938,10 @@ This version is compiled as version: %1.</source> <context> <name>OptionEngine</name> <message> - <location filename="../../../OptionEngine.cpp" line="161"/> - <location filename="../../../OptionEngine.cpp" line="165"/> - <location filename="../../../OptionEngine.cpp" line="202"/> - <location filename="../../../OptionEngine.cpp" line="206"/> + <location filename="../../../OptionEngine.cpp" line="162"/> + <location filename="../../../OptionEngine.cpp" line="169"/> + <location filename="../../../OptionEngine.cpp" line="211"/> + <location filename="../../../OptionEngine.cpp" line="215"/> <source>The variable was not found: %1 %2</source> <translation type="unfinished"></translation> </message> @@ -1026,42 +984,42 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="38"/> + <location filename="../../../PluginInformation.cpp" line="39"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="41"/> + <location filename="../../../PluginInformation.cpp" line="42"/> <source>Languages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="44"/> + <location filename="../../../PluginInformation.cpp" line="45"/> <source>Listener</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="47"/> + <location filename="../../../PluginInformation.cpp" line="48"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="50"/> + <location filename="../../../PluginInformation.cpp" line="51"/> <source>Session loader</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="53"/> + <location filename="../../../PluginInformation.cpp" line="54"/> <source>Themes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="57"/> + <location filename="../../../PluginInformation.cpp" line="58"/> <source>Unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="67"/> + <location filename="../../../PluginInformation.cpp" line="68"/> <source>Information about %1</source> <translation type="unfinished"></translation> </message> @@ -1079,140 +1037,140 @@ This version is compiled as version: %1.</source> <context> <name>PluginsManager</name> <message> - <location filename="../../../PluginsManager.cpp" line="221"/> + <location filename="../../../PluginsManager.cpp" line="224"/> <source>informations.xml is not accessible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="487"/> + <location filename="../../../PluginsManager.cpp" line="494"/> <source>Dependencies part is wrong</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="508"/> + <location filename="../../../PluginsManager.cpp" line="515"/> <source>Dependencies %1 are not satisfied, for plugin: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="665"/> + <location filename="../../../PluginsManager.cpp" line="672"/> <source>Remove %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="676"/> + <location filename="../../../PluginsManager.cpp" line="683"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="700"/> + <location filename="../../../PluginsManager.cpp" line="683"/> + <source>Error while the removing plugin, please check the rights on the folder: +%1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="707"/> <source>Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="253"/> + <location filename="../../../PluginsManager.cpp" line="256"/> <source>%1, parse error at line %2, column %3: %4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="227"/> + <location filename="../../../PluginsManager.cpp" line="230"/> <source>informations.xml not found for the plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="261"/> + <location filename="../../../PluginsManager.cpp" line="264"/> <source>"package" root tag not found for the xml file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="337"/> + <location filename="../../../PluginsManager.cpp" line="340"/> <source>Duplicated plugin found, already loaded!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="395"/> + <location filename="../../../PluginsManager.cpp" line="401"/> <source>English text missing in the informations.xml for the tag: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="403"/> + <location filename="../../../PluginsManager.cpp" line="409"/> <source>Tag not found: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="665"/> + <location filename="../../../PluginsManager.cpp" line="672"/> <source>Are you sure about removing "%1" in version %2?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="676"/> - <source>Error while the removing plugin, please check the rights on the folder: -%1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../PluginsManager.cpp" line="700"/> + <location filename="../../../PluginsManager.cpp" line="707"/> <source>Previous import is in progress...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="703"/> + <location filename="../../../PluginsManager.cpp" line="710"/> <source>Open Ultracopier plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="703"/> + <location filename="../../../PluginsManager.cpp" line="710"/> <source>Ultracopier plugin (*.urc)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="720"/> - <location filename="../../../PluginsManager.cpp" line="745"/> - <location filename="../../../PluginsManager.cpp" line="813"/> - <location filename="../../../PluginsManager.cpp" line="826"/> - <location filename="../../../PluginsManager.cpp" line="845"/> - <location filename="../../../PluginsManager.cpp" line="851"/> - <location filename="../../../PluginsManager.cpp" line="857"/> - <location filename="../../../PluginsManager.cpp" line="863"/> - <location filename="../../../PluginsManager.cpp" line="869"/> + <location filename="../../../PluginsManager.cpp" line="727"/> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="820"/> + <location filename="../../../PluginsManager.cpp" line="833"/> + <location filename="../../../PluginsManager.cpp" line="852"/> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="870"/> <location filename="../../../PluginsManager.cpp" line="876"/> + <location filename="../../../PluginsManager.cpp" line="883"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="720"/> + <location filename="../../../PluginsManager.cpp" line="727"/> <source>Unable to open the plugin: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="745"/> - <location filename="../../../PluginsManager.cpp" line="863"/> - <location filename="../../../PluginsManager.cpp" line="876"/> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="870"/> + <location filename="../../../PluginsManager.cpp" line="883"/> <source>Unable to load the plugin content, please check it: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="813"/> + <location filename="../../../PluginsManager.cpp" line="820"/> <source>Unable to create a folder to install the plugin: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="826"/> + <location filename="../../../PluginsManager.cpp" line="833"/> <source>Unable to create a file to install the plugin: %1 since:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="845"/> + <location filename="../../../PluginsManager.cpp" line="852"/> <source>Folder with same name is present, skip the plugin installation: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="851"/> - <location filename="../../../PluginsManager.cpp" line="857"/> - <location filename="../../../PluginsManager.cpp" line="869"/> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="876"/> <source>Unable to load the plugin content, please check it</source> <translation type="unfinished"></translation> </message> @@ -1265,119 +1223,34 @@ since:%2</source> <context> <name>SystrayIcon</name> <message> - <location filename="../../../SystrayIcon.cpp" line="163"/> + <location filename="../../../SystrayIcon.cpp" line="155"/> <source>No copy listener found. Do the copy manually by right click one the system tray icon.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="169"/> + <location filename="../../../SystrayIcon.cpp" line="161"/> <source>Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="187"/> + <location filename="../../../SystrayIcon.cpp" line="179"/> <source>Searching information...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="200"/> + <location filename="../../../SystrayIcon.cpp" line="192"/> <source>Do not replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="205"/> + <location filename="../../../SystrayIcon.cpp" line="197"/> <source>Semi replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="210"/> + <location filename="../../../SystrayIcon.cpp" line="202"/> <source>Replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="377"/> - <source>Warning</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="377"/> - <source>The action on the systray icon is unknown!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="425"/> - <source>&About/Debug report</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="427"/> - <source>&About</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="430"/> - <source>&Save bug report</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="432"/> - <source>&Quit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="433"/> - <source>&Options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="485"/> - <source>A&dd copy/moving</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="471"/> - <source>New version: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="471"/> - <source>Click here to go on download page</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="511"/> - <source>&Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="525"/> - <location filename="../../../SystrayIcon.cpp" line="539"/> - <source>&Transfer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="529"/> - <location filename="../../../SystrayIcon.cpp" line="543"/> - <source>&Move</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="560"/> - <location filename="../../../SystrayIcon.cpp" line="577"/> - <source>Add &copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="566"/> - <location filename="../../../SystrayIcon.cpp" line="583"/> - <source>Add &transfer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="570"/> - <location filename="../../../SystrayIcon.cpp" line="587"/> - <source>Add &move</source> - <translation type="unfinished"></translation> - </message> </context> </TS> diff --git a/plugins/Languages/it/informations.xml b/plugins/Languages/it/informations.xml index 20f5298..181b891 100644 --- a/plugins/Languages/it/informations.xml +++ b/plugins/Languages/it/informations.xml @@ -12,7 +12,7 @@ <!-- Detailed description --> <description xml:lang="en"><![CDATA[Translation of Ultracopier to italian. For more details see the web site.]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>1.2.3.6</version> + <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>it</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/it/translation.ts b/plugins/Languages/it/translation.ts index 594562c..28f5b6b 100644 --- a/plugins/Languages/it/translation.ts +++ b/plugins/Languages/it/translation.ts @@ -1,110 +1,86 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0" language="it" sourcelanguage="en"> +<TS version="2.1" language="it" sourcelanguage="en"> <context> <name>CliParser</name> <message> - <location filename="../../../CliParser.cpp" line="25"/> - <location filename="../../../CliParser.cpp" line="71"/> - <location filename="../../../CliParser.cpp" line="84"/> - <location filename="../../../CliParser.cpp" line="94"/> - <location filename="../../../CliParser.cpp" line="179"/> + <location filename="../../../CliParser.cpp" line="26"/> + <location filename="../../../CliParser.cpp" line="72"/> + <location filename="../../../CliParser.cpp" line="85"/> + <location filename="../../../CliParser.cpp" line="95"/> + <location filename="../../../CliParser.cpp" line="180"/> <source>Warning</source> <translation>Avviso</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="25"/> + <location filename="../../../CliParser.cpp" line="26"/> <source>Ultracopier is already running, right click on its system tray icon (near the clock) to use it</source> <translation>Il programma è gia in esecuzione, fare clic con il tasto destro del mouse sulla sua icona della barra di sistema (vicino l'orologio) per usarlo</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="71"/> + <location filename="../../../CliParser.cpp" line="72"/> <source>Problem reading file, or file size is 0</source> <translation>Problema di lettura o dimensione nulla del file</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="159"/> - <location filename="../../../CliParser.cpp" line="170"/> + <location filename="../../../CliParser.cpp" line="160"/> + <location filename="../../../CliParser.cpp" line="171"/> <source>The arguments possible are:</source> <translation>Gli argomenti possibili sono:</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="161"/> - <location filename="../../../CliParser.cpp" line="172"/> + <location filename="../../../CliParser.cpp" line="162"/> + <location filename="../../../CliParser.cpp" line="173"/> <source>To display the options</source> <translation>Mostra le opzioni</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="164"/> - <location filename="../../../CliParser.cpp" line="175"/> + <location filename="../../../CliParser.cpp" line="165"/> + <location filename="../../../CliParser.cpp" line="176"/> <source>To copy sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> <translation>Copiare i file di origine alla destinazione separati da uno spazio. Se la destinazione è "?", Ultracopier chiederà all'utente</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="165"/> - <location filename="../../../CliParser.cpp" line="176"/> + <location filename="../../../CliParser.cpp" line="166"/> + <location filename="../../../CliParser.cpp" line="177"/> <source>To move sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> <translation>Spostare i file di origine alla destinazione separati da uno spazio. Se la destinazione è "?", Ultracopier chiederà all'utente</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="169"/> + <location filename="../../../CliParser.cpp" line="170"/> <source>Command not valid</source> <translation>Comando non valido</translation> </message> <message> - <source>Problem at the reading, or file size is null</source> - <translation type="obsolete">Problema di lettura o dimensione nulla del file</translation> - </message> - <message> - <location filename="../../../CliParser.cpp" line="84"/> + <location filename="../../../CliParser.cpp" line="85"/> <source>This file is not supported transfer list</source> <translation>Questo file non è supportato dalla lista dei trasferimenti</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="94"/> + <location filename="../../../CliParser.cpp" line="95"/> <source>Unable to open the transfer list file</source> <translation>Impossibile aprire il file della lista dei trasferimenti</translation> </message> <message> - <source>The arguments possibles are:</source> - <translation type="obsolete">Gli argomenti possibili sono:</translation> - </message> - <message> - <location filename="../../../CliParser.cpp" line="160"/> - <location filename="../../../CliParser.cpp" line="171"/> + <location filename="../../../CliParser.cpp" line="161"/> + <location filename="../../../CliParser.cpp" line="172"/> <source>To display this help</source> <translation>Mostra questo aiuto</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="162"/> - <location filename="../../../CliParser.cpp" line="173"/> + <location filename="../../../CliParser.cpp" line="163"/> + <location filename="../../../CliParser.cpp" line="174"/> <source>To quit the other instances (if running)</source> <translation>Chiudere le altre istanze (se in esecuzione)</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="163"/> - <location filename="../../../CliParser.cpp" line="174"/> + <location filename="../../../CliParser.cpp" line="164"/> + <location filename="../../../CliParser.cpp" line="175"/> <source>Open transfer list</source> <translation>Apri la lista dei trasferimenti</translation> </message> <message> - <source>To quit the other instance running (if have)</source> - <translation type="obsolete">Chiudere l'altra istanza in esecuzione (se necessario)</translation> - </message> - <message> - <source>To copy sources to destination, separated by space. If destination is "?", ultracopier will ask it to the user</source> - <translation type="obsolete">Copiare i file di origine alla destinazione separati da uno spazio. Se la destinazione è "?", Ultracopier chiederà all'utente</translation> - </message> - <message> - <source>To move sources to destination, separated by space. If destination is "?", ultracopier will ask it to the user</source> - <translation type="obsolete">Spostare i file di origine alla destinazione separati da uno spazio. Se la destinazione è "?", Ultracopier chiederà all'utente</translation> - </message> - <message> - <source>Command line not understand</source> - <translation type="obsolete">Riga di comando non idonea</translation> - </message> - <message> - <location filename="../../../CliParser.cpp" line="181"/> + <location filename="../../../CliParser.cpp" line="182"/> <source>Help</source> <translation>Aiuto</translation> </message> @@ -112,38 +88,30 @@ <context> <name>CopyEngineManager</name> <message> - <location filename="../../../CopyEngineManager.cpp" line="229"/> - <location filename="../../../CopyEngineManager.cpp" line="234"/> - <location filename="../../../CopyEngineManager.cpp" line="257"/> - <location filename="../../../CopyEngineManager.cpp" line="271"/> + <location filename="../../../CopyEngineManager.cpp" line="231"/> + <location filename="../../../CopyEngineManager.cpp" line="236"/> + <location filename="../../../CopyEngineManager.cpp" line="259"/> + <location filename="../../../CopyEngineManager.cpp" line="273"/> <source>Warning</source> <translation>Avviso</translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="229"/> + <location filename="../../../CopyEngineManager.cpp" line="231"/> <source>Cannot find any copy engine with move support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="257"/> + <location filename="../../../CopyEngineManager.cpp" line="259"/> <source>This copy engine does not support move</source> <translation type="unfinished"></translation> </message> <message> - <source>Cannot find any copy engine with motions support</source> - <translation type="obsolete">Impossibile trovare alcun motore per la copia con supporto trasferimenti</translation> - </message> - <message> - <location filename="../../../CopyEngineManager.cpp" line="234"/> + <location filename="../../../CopyEngineManager.cpp" line="236"/> <source>Cannot find any compatible engine!</source> <translation>Impossibile trovare un motore per la copia compatibile!</translation> </message> <message> - <source>This copy engine does not support motions</source> - <translation type="obsolete">Questo motore per la copia non supporta trasferimenti</translation> - </message> - <message> - <location filename="../../../CopyEngineManager.cpp" line="271"/> + <location filename="../../../CopyEngineManager.cpp" line="273"/> <source>Cannot find any engine with this name: %1</source> <translation>Impossibile trovare un motore per la copia con questo nome: %1</translation> </message> @@ -151,12 +119,12 @@ <context> <name>CopyListener</name> <message> - <location filename="../../../CopyListener.cpp" line="158"/> + <location filename="../../../CopyListener.cpp" line="159"/> <source>Error</source> <translation>Errore</translation> </message> <message> - <location filename="../../../CopyListener.cpp" line="158"/> + <location filename="../../../CopyListener.cpp" line="159"/> <source>Error during the reception of the copy/move list %1</source> <translation>Errore durante la ricezione della lista di copia/spostamento @@ -166,74 +134,70 @@ <context> <name>Core</name> <message> - <location filename="../../../Core.cpp" line="45"/> - <location filename="../../../Core.cpp" line="116"/> - <location filename="../../../Core.cpp" line="142"/> - <location filename="../../../Core.cpp" line="157"/> - <location filename="../../../Core.cpp" line="177"/> - <location filename="../../../Core.cpp" line="191"/> - <location filename="../../../Core.cpp" line="200"/> - <location filename="../../../Core.cpp" line="209"/> - <location filename="../../../Core.cpp" line="216"/> - <location filename="../../../Core.cpp" line="250"/> - <location filename="../../../Core.cpp" line="387"/> - <location filename="../../../Core.cpp" line="392"/> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="117"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> + <location filename="../../../Core.cpp" line="217"/> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> + <location filename="../../../Core.cpp" line="393"/> <source>Error</source> <translation>Errore</translation> </message> <message> - <location filename="../../../Core.cpp" line="45"/> - <location filename="../../../Core.cpp" line="142"/> - <location filename="../../../Core.cpp" line="157"/> - <location filename="../../../Core.cpp" line="177"/> - <location filename="../../../Core.cpp" line="191"/> - <location filename="../../../Core.cpp" line="200"/> - <location filename="../../../Core.cpp" line="209"/> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> <source>Unable to get a copy engine instance</source> <translation>Impossibile ottenere un'istanza dal motore per la copia</translation> </message> <message> - <location filename="../../../Core.cpp" line="93"/> + <location filename="../../../Core.cpp" line="94"/> <source>Group window</source> <translation>Raggruppa finestre</translation> </message> <message> - <location filename="../../../Core.cpp" line="93"/> + <location filename="../../../Core.cpp" line="94"/> <source>Do you want group the transfer with another actual running transfer?</source> <translation>Vuoi un altro gruppo di trasferimento con un altro trasferimento attualmente avviato?</translation> </message> <message> - <location filename="../../../Core.cpp" line="116"/> + <location filename="../../../Core.cpp" line="117"/> <source>Unable to get a engine instance</source> <translation>Impossibile ottenere un'istanza dal motore per la copia</translation> </message> <message> - <location filename="../../../Core.cpp" line="216"/> + <location filename="../../../Core.cpp" line="217"/> <source>The argument for the mode is not valid</source> <translation>L'argomento per la modalità non è valido</translation> </message> <message> - <location filename="../../../Core.cpp" line="1133"/> + <location filename="../../../Core.cpp" line="1136"/> <source>Do you want to copy? If no, it will be moved.</source> <translation>Vuoi copiarlo? se no, verrà spostato.</translation> </message> <message> - <source>The argument for the mode is not understand</source> - <translation type="obsolete">L'argomento per la modalità non è idoneo</translation> - </message> - <message> - <location filename="../../../Core.cpp" line="250"/> - <location filename="../../../Core.cpp" line="387"/> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> <source>Unable to load the interface, copy aborted</source> <translation>Impossibile avviare l'interfaccia, copia interrotta</translation> </message> <message> - <location filename="../../../Core.cpp" line="392"/> + <location filename="../../../Core.cpp" line="393"/> <source>Unable to load the copy engine, copy aborted</source> <translation>Impossibile avviare il motore per la copia, copia interrotta</translation> </message> <message> - <location filename="../../../Core.cpp" line="1133"/> + <location filename="../../../Core.cpp" line="1136"/> <source>Transfer mode</source> <translation>Modalità di trasferimento</translation> </message> @@ -241,12 +205,12 @@ <context> <name>EventDispatcher</name> <message> - <location filename="../../../EventDispatcher.cpp" line="155"/> + <location filename="../../../EventDispatcher.cpp" line="152"/> <source>Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../EventDispatcher.cpp" line="155"/> + <location filename="../../../EventDispatcher.cpp" line="152"/> <source>Give the key of this software, more information on <a href="http://ultracopier.first-world.info/">ultracopier.first-world.info</a></source> <translation type="unfinished"></translation> </message> @@ -254,262 +218,258 @@ <context> <name>FacilityEngine</name> <message> - <location filename="../../../FacilityEngine.cpp" line="43"/> + <location filename="../../../FacilityEngine.cpp" line="53"/> <source>Copy engine</source> <translation>Motore per la copia</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="45"/> + <location filename="../../../FacilityEngine.cpp" line="55"/> <source>Copy</source> <extracomment>a copy</extracomment> <translation>Copia</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="49"/> + <location filename="../../../FacilityEngine.cpp" line="59"/> <source>Move</source> <extracomment>a move</extracomment> <translation>Sposta</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="51"/> + <location filename="../../../FacilityEngine.cpp" line="61"/> <source>Pause</source> <translation>Pausa</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="52"/> + <location filename="../../../FacilityEngine.cpp" line="62"/> <source>Resume</source> <translation>Riprendi</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="53"/> - <location filename="../../../FacilityEngine.cpp" line="67"/> + <location filename="../../../FacilityEngine.cpp" line="63"/> + <location filename="../../../FacilityEngine.cpp" line="77"/> <source>Skip</source> <translation>Salta</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="54"/> + <location filename="../../../FacilityEngine.cpp" line="64"/> <source>Unlimited</source> <translation>Illimitato</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="27"/> + <location filename="../../../FacilityEngine.cpp" line="37"/> <source>s</source> <translation>s</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="28"/> + <location filename="../../../FacilityEngine.cpp" line="38"/> <source>Too big</source> <translation>Troppo grande</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="29"/> + <location filename="../../../FacilityEngine.cpp" line="39"/> <source>B</source> <translation>B</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="30"/> + <location filename="../../../FacilityEngine.cpp" line="40"/> <source>KB</source> <translation>KB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="31"/> + <location filename="../../../FacilityEngine.cpp" line="41"/> <source>MB</source> <translation>MB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="32"/> + <location filename="../../../FacilityEngine.cpp" line="42"/> <source>GB</source> <translation>GB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="33"/> + <location filename="../../../FacilityEngine.cpp" line="43"/> <source>TB</source> <translation>TB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="34"/> + <location filename="../../../FacilityEngine.cpp" line="44"/> <source>PB</source> <translation>PB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="35"/> + <location filename="../../../FacilityEngine.cpp" line="45"/> <source>EB</source> <translation>EB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="36"/> + <location filename="../../../FacilityEngine.cpp" line="46"/> <source>ZB</source> <translation>ZB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="37"/> + <location filename="../../../FacilityEngine.cpp" line="47"/> <source>YB</source> <translation>YB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="38"/> + <location filename="../../../FacilityEngine.cpp" line="48"/> <source>Less than %10 seconds</source> <translation>Meno di %10 secondi</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="39"/> + <location filename="../../../FacilityEngine.cpp" line="49"/> <source>About %10 seconds remaining</source> <translation>Circa %10 secondi rimanenti</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="40"/> + <location filename="../../../FacilityEngine.cpp" line="50"/> <source>About %1 minutes remaining</source> <translation>Circa %1 minuti rimanenti</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="41"/> + <location filename="../../../FacilityEngine.cpp" line="51"/> <source>About %1 hours remaining</source> <translation>Circa %1 ore rimanenti</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="47"/> + <location filename="../../../FacilityEngine.cpp" line="57"/> <source>Transfer</source> <extracomment>a transfer</extracomment> <translation>Trasferisci</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="50"/> + <location filename="../../../FacilityEngine.cpp" line="60"/> <source>Start</source> <translatorcomment>Uno spostamento</translatorcomment> <translation>Avvia</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="55"/> + <location filename="../../../FacilityEngine.cpp" line="65"/> <source>Source</source> <translation>Cartella di origine</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="56"/> + <location filename="../../../FacilityEngine.cpp" line="66"/> <source>Size</source> <translation>Dimensione</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="57"/> + <location filename="../../../FacilityEngine.cpp" line="67"/> <source>Destination</source> <translation>Cartella di destinazione</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="58"/> + <location filename="../../../FacilityEngine.cpp" line="68"/> <source>Quit</source> <translation>Esci</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="59"/> + <location filename="../../../FacilityEngine.cpp" line="69"/> <source>Target</source> <translation>Obiettivo</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="60"/> - <location filename="../../../FacilityEngine.cpp" line="64"/> + <location filename="../../../FacilityEngine.cpp" line="70"/> + <location filename="../../../FacilityEngine.cpp" line="74"/> <source>Time remaining:</source> <translation>Tempo residuo:</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="61"/> + <location filename="../../../FacilityEngine.cpp" line="71"/> <source>Listing</source> <translation>Elenco</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="62"/> + <location filename="../../../FacilityEngine.cpp" line="72"/> <source>Copying</source> <translation>Copiatura</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="63"/> + <location filename="../../../FacilityEngine.cpp" line="73"/> <source>Listing and copying</source> <translation>Elenca e copia</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="66"/> + <location filename="../../../FacilityEngine.cpp" line="76"/> <source>Ask</source> <translation>Chiedi</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="68"/> + <location filename="../../../FacilityEngine.cpp" line="78"/> <source>Overwrite</source> <translation>Sovrascrivi</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="69"/> + <location filename="../../../FacilityEngine.cpp" line="79"/> <source>Overwrite if newer</source> <translation>Sovrascrivi se più recente</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="70"/> + <location filename="../../../FacilityEngine.cpp" line="80"/> <source>Overwrite if the last modification dates are different</source> <translation>Sovrascrivi se sono diverse le date dell'ultima modifica</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="71"/> + <location filename="../../../FacilityEngine.cpp" line="81"/> <source>Rename</source> <translation>Rinomina</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="72"/> + <location filename="../../../FacilityEngine.cpp" line="82"/> <source>Put to the end of the list</source> <translation>Metti in coda alla lista</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="83"/> + <location filename="../../../FacilityEngine.cpp" line="93"/> <source>Completed in %1</source> <translation>Completato in %1</translation> </message> <message> - <source>Put to end of the list</source> - <translation type="obsolete">Metti in coda alla lista</translation> - </message> - <message> - <location filename="../../../FacilityEngine.cpp" line="73"/> + <location filename="../../../FacilityEngine.cpp" line="83"/> <source>Select source directory</source> <translation>Selezionare la cartella di origine</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="74"/> + <location filename="../../../FacilityEngine.cpp" line="84"/> <source>Select destination directory</source> <translation>Selezionare la cartella di destinazione</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="75"/> + <location filename="../../../FacilityEngine.cpp" line="85"/> <source>Internal error</source> <translation>Errore interno</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="76"/> + <location filename="../../../FacilityEngine.cpp" line="86"/> <source>Select one or more files to open</source> <translation>Selezionare uno o più file da aprire</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="77"/> + <location filename="../../../FacilityEngine.cpp" line="87"/> <source>All files</source> <translation>Tutti i file</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="78"/> + <location filename="../../../FacilityEngine.cpp" line="88"/> <source>Save transfer list</source> <translation>Salvare la lista dei trasferimenti</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="79"/> + <location filename="../../../FacilityEngine.cpp" line="89"/> <source>Open transfer list</source> <translation>Aprire lista dei trasferimenti</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="80"/> + <location filename="../../../FacilityEngine.cpp" line="90"/> <source>Transfer list</source> <translation>Lista dei trasferimenti</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="81"/> + <location filename="../../../FacilityEngine.cpp" line="91"/> <source>Error</source> <translation>Errore</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="82"/> + <location filename="../../../FacilityEngine.cpp" line="92"/> <source>Not supported on this platform</source> <translation>Non supportato su questa piattaforma</translation> </message> @@ -517,7 +477,7 @@ <context> <name>HelpDialog</name> <message> - <location filename="../../../HelpDialog.cpp" line="37"/> + <location filename="../../../HelpDialog.cpp" line="34"/> <source>About Ultracopier</source> <translation>Informazioni su Ultracopier</translation> </message> @@ -558,50 +518,43 @@ Compilata come versione: %1.</translation> <translation>Chiudi</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="35"/> - <source>About Supercopier</source> - <translation>Info su Supercopier</translation> - </message> - <message> - <location filename="../../../HelpDialog.cpp" line="80"/> + <location filename="../../../HelpDialog.cpp" line="73"/> <source>For http://portableapps.com/</source> <translation>Su http://portableapps.com/</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="83"/> + <location filename="../../../HelpDialog.cpp" line="76"/> <source>Portable and all in one version</source> <translation>Versione portatile e pluricomprensiva</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="85"/> + <location filename="../../../HelpDialog.cpp" line="78"/> <source>Portable version</source> <translation>Versione portatile</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="90"/> + <location filename="../../../HelpDialog.cpp" line="83"/> <source>All in one version</source> <translation>Versione pluricomprensiva</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="92"/> + <location filename="../../../HelpDialog.cpp" line="85"/> <source>Normal version</source> <translation>Versione normale</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="110"/> - <location filename="../../../HelpDialog.cpp" line="112"/> - <location filename="../../../HelpDialog.cpp" line="123"/> + <location filename="../../../HelpDialog.cpp" line="102"/> <source>http://ultracopier.first-world.info/</source> <translatorcomment>Questo dovrebbe essere il sito ufficiale di Ultracopier in italiano</translatorcomment> <translation>http://ultracopier-it.first-world.info/</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="120"/> + <location filename="../../../HelpDialog.cpp" line="109"/> <source>http://ultracopier.first-world.info/shop.html</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="125"/> + <location filename="../../../HelpDialog.cpp" line="111"/> <source>http://ultracopier.first-world.info/download.html</source> <translation>http://ultracopier.first-world.info/download.html</translation> </message> @@ -616,12 +569,12 @@ Compilata come versione: %1.</translation> <context> <name>LocalListener</name> <message> - <location filename="../../../LocalListener.cpp" line="146"/> + <location filename="../../../LocalListener.cpp" line="160"/> <source>Warning</source> <translation>Avviso</translation> </message> <message> - <location filename="../../../LocalListener.cpp" line="146"/> + <location filename="../../../LocalListener.cpp" line="160"/> <source>Timeout while recomposing data from connected clients</source> <translation>Tempo scaduto durante la ricomposizione dei dati dai client collegati</translation> </message> @@ -629,27 +582,23 @@ Compilata come versione: %1.</translation> <context> <name>LogThread</name> <message> - <location filename="../../../LogThread.cpp" line="106"/> - <location filename="../../../LogThread.cpp" line="115"/> - <location filename="../../../LogThread.cpp" line="125"/> + <location filename="../../../LogThread.cpp" line="107"/> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> <source>Error</source> <translation>Errore</translation> </message> <message> - <location filename="../../../LogThread.cpp" line="106"/> + <location filename="../../../LogThread.cpp" line="107"/> <source>Log file already open, error: %1</source> <translation>File log già aperto, errore: %1</translation> </message> <message> - <location filename="../../../LogThread.cpp" line="115"/> - <location filename="../../../LogThread.cpp" line="125"/> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> <source>Unable to open the log file, error: %1</source> <translation>Impossibile aprire il file di log, errore: %1</translation> </message> - <message> - <source>Unable to open file to keep the log file, error: %1</source> - <translation type="obsolete">Impossibile aprire il file che contiene il log, errore: %1</translation> - </message> </context> <context> <name>OSSpecific</name> @@ -669,10 +618,6 @@ Compilata come versione: %1.</translation> <translation>Ok</translation> </message> <message> - <source>The replacement of default copy/move system is not supported by the file manager (Dolphin, Nautilus, ...).<br />Ask to the developer to support it.<br />You need do the copy/move manually.</source> - <translation type="obsolete">Il ripristino del sistema predefinito di copia/spostamento non è supportato dal file manager (Dolphin, Nautilus, ...).<br />Chiedere supporto allo sviluppatore.<br />Bisogna fare la copia/spostamento manuale.</translation> - </message> - <message> <location filename="../../../OSSpecific.cpp" line="23"/> <source>The replacement of default copy/move system is not supported by the file manager (Dolphin, Nautilus, ...).<br />Ask the developer to support it.<br />You need do the copy/move manually.</source> <translation>Il ripristino del sistema predefinito di copia/spostamento non è supportato dal file manager (Dolphin, Nautilus, ...).<br />Chiedere supporto allo sviluppatore.<br />Bisogna fare la copia/spostamento manuale.</translation> @@ -692,21 +637,6 @@ Compilata come versione: %1.</translation> <source>The replacement of default copy/move system should be not supported by the file manager.<br />Ask to the developer to support it.<br />You need do the copy/move manually.</source> <translation>Il ripristino del sistema predefinito di copia/spostamento potrebbe non essere supportato dal file manager.<br />Chiedere supporto allo sviluppatore.<br />Bisogna fare la copia/spostamento manuale.</translation> </message> - <message> - <location filename="../../../OSSpecific.cpp" line="32"/> - <source>Consider Supercopier as deprecated, prefer Ultracopier</source> - <translation>Considera Supercopier obsoleto, preferisco Ultracopier</translation> - </message> - <message> - <location filename="../../../OSSpecific.cpp" line="35"/> - <source>This version use 100% of you graphic card/GPU (you computer can be noisy, or slow/buggy during the games) at exchange of free access to Ultimate version. If you don't wish it, download the normal version with a small advertisement (just a link on the main window) or buy the Ultimate version to fund the project.</source> - <translation>Questa versione utilizza il 100% della tua scheda grafica/GPU (il computer può essere rumoroso, o lento durante i giochi) in cambio del libero accesso alla versione Ultimate. Se non lo desideri, scarica la versione normale con un piccolo annuncio (solo un link sulla finestra principale) o acquista la versione Ultimate per finanziare il progetto.</translation> - </message> - <message> - <location filename="../../../OSSpecific.cpp" line="36"/> - <source>http://ultracopier.first-world.info/download.html</source> - <translation>http://ultracopier.first-world.info/download.html</translation> - </message> </context> <context> <name>OptionDialog</name> @@ -729,7 +659,7 @@ Compilata come versione: %1.</translation> <message> <location filename="../../../OptionDialog.ui" line="66"/> <location filename="../../../OptionDialog.ui" line="322"/> - <location filename="../../../OptionDialog.cpp" line="354"/> + <location filename="../../../OptionDialog.cpp" line="286"/> <source>Copy engine</source> <translation>Motore per la copia</translation> </message> @@ -745,14 +675,6 @@ Compilata come versione: %1.</translation> <translation>Log</translation> </message> <message> - <source>Load at the session loading:</source> - <translation type="obsolete">Carica il programma all'avvio:</translation> - </message> - <message> - <source>Display the OS warning:</source> - <translation type="obsolete">Mostra l'avviso del Sistema Operativo:</translation> - </message> - <message> <location filename="../../../OptionDialog.ui" line="245"/> <source>Check for updates</source> <translation>Controlla aggiornamenti automaticamente</translation> @@ -775,21 +697,21 @@ Compilata come versione: %1.</translation> <message> <location filename="../../../OptionDialog.ui" line="71"/> <location filename="../../../OptionDialog.ui" line="335"/> - <location filename="../../../OptionDialog.cpp" line="355"/> + <location filename="../../../OptionDialog.cpp" line="287"/> <source>Listener</source> <translation>Rilevatore</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="76"/> <location filename="../../../OptionDialog.ui" line="340"/> - <location filename="../../../OptionDialog.cpp" line="356"/> + <location filename="../../../OptionDialog.cpp" line="288"/> <source>Plugin loader</source> <translation>Caricatore di plug-in</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="84"/> <location filename="../../../OptionDialog.ui" line="345"/> - <location filename="../../../OptionDialog.cpp" line="357"/> + <location filename="../../../OptionDialog.cpp" line="289"/> <source>Session loader</source> <translation>Caricatore di sessione</translation> </message> @@ -824,10 +746,6 @@ Compilata come versione: %1.</translation> <translation>Conferma il raggruppamento delle finestre</translation> </message> <message> - <source>Check the update</source> - <translation type="obsolete">Controllare aggiornamenti</translation> - </message> - <message> <location filename="../../../OptionDialog.ui" line="229"/> <source>Display the OS warning</source> <translation>Mostra l'avviso del Sistema Operativo</translation> @@ -913,10 +831,6 @@ Compilata come versione: %1.</translation> <translation>Scrivere le operazioni di cartella</translation> </message> <message> - <source>Write directly the file when it receive a new entry (can produce 50% of lost of performance)</source> - <translation type="obsolete">Scrivere direttamente il file quando si riceve una nuova voce (può causare il 50% di perdita di prestazioni)</translation> - </message> - <message> <location filename="../../../OptionDialog.ui" line="748"/> <source>The variables are %time%, %source%, %size%, %destination%</source> <extracomment>%time%, %source%, %size%, %destination% should not be translated</extracomment> @@ -941,132 +855,80 @@ Compilata come versione: %1.</translation> <translation>Scrivere il file di log in:</translation> </message> <message> - <source>Force the language:</source> - <translation type="obsolete">Utilizzare la lingua:</translation> - </message> - <message> - <source>Replace the default copy and move system:</source> - <translation type="obsolete">Ripristina il sistema di copia e spostamento predefinito:</translation> - </message> - <message> <location filename="../../../OptionDialog.ui" line="728"/> <source>Write directly to the file when it receive a new entry (can produce 50% of lost of performance)</source> <translation>Scrivere direttamente il file quando si riceve una nuova voce (può causare il 50% di perdita di prestazioni)</translation> </message> <message> - <source>Write the transfers:</source> - <translation type="obsolete">Scrivere i trasferimenti:</translation> - </message> - <message> - <source>Write the errors:</source> - <translation type="obsolete">Scrivere gli errori:</translation> - </message> - <message> - <source>Write the folder operations:</source> - <translation type="obsolete">Scrivere le operazioni di cartella:</translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="260"/> - <location filename="../../../OptionDialog.cpp" line="274"/> + <location filename="../../../OptionDialog.cpp" line="190"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load</source> <translation>Carica</translation> </message> <message> - <source>Load the themes?</source> - <translation type="obsolete">Caricare i temi?</translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="260"/> + <location filename="../../../OptionDialog.cpp" line="190"/> <source>Load the theme?</source> <translation>Caricare i temi?</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="274"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load the language?</source> <translation>Caricare questa lingua?</translation> </message> <message> - <source>Disabled because you have any SessionLoader plugin</source> - <translation type="obsolete">Disattivato perché non c'è nessun plug-in SessionLoader</translation> - </message> - <message> - <source>Disabled because you do not have any SessionLoader plugin</source> - <translation type="obsolete">Disattivato perché non si dispone di alcun plug-in SessionLoader</translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="362"/> + <location filename="../../../OptionDialog.cpp" line="294"/> <source>Do nothing</source> <translation>Non fare nulla</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="363"/> + <location filename="../../../OptionDialog.cpp" line="295"/> <source>Ask source as folder</source> <translation>Chiedere la cartella di origine</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="364"/> + <location filename="../../../OptionDialog.cpp" line="296"/> <source>Ask sources as files</source> <translation>Chiedere i file di origine</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="365"/> + <location filename="../../../OptionDialog.cpp" line="297"/> <source>Never</source> <translation>Mai</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="366"/> + <location filename="../../../OptionDialog.cpp" line="298"/> <source>When source is same</source> <translation>Quando la cartella di origine è uguale</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="367"/> + <location filename="../../../OptionDialog.cpp" line="299"/> <source>When destination is same</source> <translation>Quando la cartella di destinazione è uguale</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="368"/> + <location filename="../../../OptionDialog.cpp" line="300"/> <source>When source and destination are same</source> <translation>Quando sia le cartelle di origine che di destinazione sono uguali</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="369"/> + <location filename="../../../OptionDialog.cpp" line="301"/> <source>When source or destination are same</source> <translation>Quando le cartelle di origine o di destinazione coincidono</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="370"/> + <location filename="../../../OptionDialog.cpp" line="302"/> <source>Always</source> <translation>Sempre</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="384"/> - <location filename="../../../OptionDialog.cpp" line="385"/> - <location filename="../../../OptionDialog.cpp" line="386"/> + <location filename="../../../OptionDialog.cpp" line="316"/> + <location filename="../../../OptionDialog.cpp" line="317"/> + <location filename="../../../OptionDialog.cpp" line="318"/> <source>The variables are %1</source> <translation>Le variabili sono %1</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="478"/> - <source>Allow the application</source> - <translation>Consentire l'applicazione</translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="478"/> - <source>This Ultimate free version is only if %1 is allowed by your antivirus. Else you can get the normal free version</source> - <translation>Questa versione Ultimate è gratuita solo se %1 è consentita dal tuo antivirus. Altrimenti si può ottenere la versione normale gratuita</translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="483"/> - <source>Enable the OpenCL</source> - <translation>Abilita le OpenCL</translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="483"/> - <source>This Ultimate version is only if the OpenCL is installed with your graphic card drivers. Else you can get the normal free version</source> - <translation>Questa versione Ultimate è solo per chi ha installato OpenCL con i driver della scheda grafica. Diversamente puoi ottenere la versione gratuita</translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="1591"/> + <location filename="../../../OptionDialog.cpp" line="948"/> <source>Save logs as: </source> <translation>Salvare i log come: </translation> </message> @@ -1076,14 +938,6 @@ Compilata come versione: %1.</translation> <translation>Log sincronizzato</translation> </message> <message> - <source>When manual open:</source> - <translation type="obsolete">Se avviato manualmente:</translation> - </message> - <message> - <source>Group the windows when:</source> - <translation type="obsolete">Raggruppa le finestre quando:</translation> - </message> - <message> <location filename="../../../OptionDialog.ui" line="811"/> <source>The variables are %path%, %operation%</source> <extracomment>%path%, %operation% should not be translated</extracomment> @@ -1094,10 +948,10 @@ Compilata come versione: %1.</translation> <context> <name>OptionEngine</name> <message> - <location filename="../../../OptionEngine.cpp" line="161"/> - <location filename="../../../OptionEngine.cpp" line="165"/> - <location filename="../../../OptionEngine.cpp" line="202"/> - <location filename="../../../OptionEngine.cpp" line="206"/> + <location filename="../../../OptionEngine.cpp" line="162"/> + <location filename="../../../OptionEngine.cpp" line="169"/> + <location filename="../../../OptionEngine.cpp" line="211"/> + <location filename="../../../OptionEngine.cpp" line="215"/> <source>The variable was not found: %1 %2</source> <translation>Variabile non trovata: %1 %2</translation> </message> @@ -1140,42 +994,42 @@ Compilata come versione: %1.</translation> <translation>Versione:</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="38"/> + <location filename="../../../PluginInformation.cpp" line="39"/> <source>Copy engine</source> <translation>Motore per la copia</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="41"/> + <location filename="../../../PluginInformation.cpp" line="42"/> <source>Languages</source> <translation>Lingue</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="44"/> + <location filename="../../../PluginInformation.cpp" line="45"/> <source>Listener</source> <translation>Rilevatore</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="47"/> + <location filename="../../../PluginInformation.cpp" line="48"/> <source>Plugin loader</source> <translation>Caricatore di plug-in</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="50"/> + <location filename="../../../PluginInformation.cpp" line="51"/> <source>Session loader</source> <translation>Caricatore di sessione</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="53"/> + <location filename="../../../PluginInformation.cpp" line="54"/> <source>Themes</source> <translation>Temi</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="57"/> + <location filename="../../../PluginInformation.cpp" line="58"/> <source>Unknown</source> <translation>Sconosciuto</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="67"/> + <location filename="../../../PluginInformation.cpp" line="68"/> <source>Information about %1</source> <translation>Informazioni su %1</translation> </message> @@ -1193,135 +1047,126 @@ Compilata come versione: %1.</translation> <context> <name>PluginsManager</name> <message> - <location filename="../../../PluginsManager.cpp" line="221"/> + <location filename="../../../PluginsManager.cpp" line="224"/> <source>informations.xml is not accessible</source> <translation>informations.xml non è accessibile</translation> </message> <message> - <source>informations.xml not found into the plugin</source> - <translation type="obsolete">informations.xml non trovato nel plug-in</translation> - </message> - <message> - <location filename="../../../PluginsManager.cpp" line="487"/> + <location filename="../../../PluginsManager.cpp" line="494"/> <source>Dependencies part is wrong</source> <translation>Alcune dipendenze non sono idonee</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="508"/> + <location filename="../../../PluginsManager.cpp" line="515"/> <source>Dependencies %1 are not satisfied, for plugin: %2</source> <translation>Le dipendenze %1 per il plug-in: %2, non sono soddisfatte</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="665"/> + <location filename="../../../PluginsManager.cpp" line="672"/> <source>Remove %1</source> <translation>Elimina %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="676"/> + <location filename="../../../PluginsManager.cpp" line="683"/> <source>Error</source> <translation>Errore</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="700"/> + <location filename="../../../PluginsManager.cpp" line="683"/> + <source>Error while the removing plugin, please check the rights on the folder: +%1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="707"/> <source>Information</source> <translation>Informazioni</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="253"/> + <location filename="../../../PluginsManager.cpp" line="256"/> <source>%1, parse error at line %2, column %3: %4</source> <translation>%1, errore di analisi alla riga %2, colonna %3: %4</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="227"/> + <location filename="../../../PluginsManager.cpp" line="230"/> <source>informations.xml not found for the plugin</source> <translation>informations.xml non trovato per il plug-in</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="261"/> + <location filename="../../../PluginsManager.cpp" line="264"/> <source>"package" root tag not found for the xml file</source> <translation>Tag root "package" non trovato nel file xml</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="337"/> + <location filename="../../../PluginsManager.cpp" line="340"/> <source>Duplicated plugin found, already loaded!</source> <translation>Trovato plug-in duplicato, già caricato!</translation> </message> <message> - <source>English text missing into the informations.xml for the tag: %1</source> - <translation type="obsolete">Testo in inglese mancante in informations.xml per il tag: %1</translation> - </message> - <message> - <location filename="../../../PluginsManager.cpp" line="395"/> + <location filename="../../../PluginsManager.cpp" line="401"/> <source>English text missing in the informations.xml for the tag: %1</source> <translation>Testo in inglese mancante in informations.xml per il tag: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="403"/> + <location filename="../../../PluginsManager.cpp" line="409"/> <source>Tag not found: %1</source> <translation>Tag non trovato: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="665"/> + <location filename="../../../PluginsManager.cpp" line="672"/> <source>Are you sure about removing "%1" in version %2?</source> <translation>Si desidera eliminare "%1" nella versione %2?</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="676"/> - <source>Error while the removing plugin, please check the rights on the folder: -%1</source> - <translation>Errore durante l'eliminazione del plug-in, controllare le autorizzazioni per la cartella: -%1</translation> - </message> - <message> - <location filename="../../../PluginsManager.cpp" line="700"/> + <location filename="../../../PluginsManager.cpp" line="707"/> <source>Previous import is in progress...</source> <translation>Importazione precedente in corso ...</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="703"/> + <location filename="../../../PluginsManager.cpp" line="710"/> <source>Open Ultracopier plugin</source> <translation>Apri plug-in di Ultracopier</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="703"/> + <location filename="../../../PluginsManager.cpp" line="710"/> <source>Ultracopier plugin (*.urc)</source> <translation>Plug-in di Ultracopier (*.urc)</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="720"/> - <location filename="../../../PluginsManager.cpp" line="745"/> - <location filename="../../../PluginsManager.cpp" line="813"/> - <location filename="../../../PluginsManager.cpp" line="826"/> - <location filename="../../../PluginsManager.cpp" line="845"/> - <location filename="../../../PluginsManager.cpp" line="851"/> - <location filename="../../../PluginsManager.cpp" line="857"/> - <location filename="../../../PluginsManager.cpp" line="863"/> - <location filename="../../../PluginsManager.cpp" line="869"/> + <location filename="../../../PluginsManager.cpp" line="727"/> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="820"/> + <location filename="../../../PluginsManager.cpp" line="833"/> + <location filename="../../../PluginsManager.cpp" line="852"/> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="870"/> <location filename="../../../PluginsManager.cpp" line="876"/> + <location filename="../../../PluginsManager.cpp" line="883"/> <source>Plugin loader</source> <translation>Caricatore di plug-in</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="720"/> + <location filename="../../../PluginsManager.cpp" line="727"/> <source>Unable to open the plugin: %1</source> <translation>Impossibile aprire il plug-in: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="745"/> - <location filename="../../../PluginsManager.cpp" line="863"/> - <location filename="../../../PluginsManager.cpp" line="876"/> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="870"/> + <location filename="../../../PluginsManager.cpp" line="883"/> <source>Unable to load the plugin content, please check it: %1</source> <translation>Impossibile caricare il contenuto del plug-in, si prega di controllare: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="813"/> + <location filename="../../../PluginsManager.cpp" line="820"/> <source>Unable to create a folder to install the plugin: %1</source> <translation>Impossibile creare una cartella per installare il plug-in: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="826"/> + <location filename="../../../PluginsManager.cpp" line="833"/> <source>Unable to create a file to install the plugin: %1 since:%2</source> @@ -1330,16 +1175,16 @@ since:%2</source> da: %2</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="845"/> + <location filename="../../../PluginsManager.cpp" line="852"/> <source>Folder with same name is present, skip the plugin installation: %1</source> <translation>E' presente una cartella con lo stesso nome, non sarà installato il plug-in: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="851"/> - <location filename="../../../PluginsManager.cpp" line="857"/> - <location filename="../../../PluginsManager.cpp" line="869"/> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="876"/> <source>Unable to load the plugin content, please check it</source> <translation>Impossibile caricare il contenuto del plug-in, si prega di controllare</translation> </message> @@ -1392,131 +1237,34 @@ da: %2</translation> <context> <name>SystrayIcon</name> <message> - <location filename="../../../SystrayIcon.cpp" line="163"/> + <location filename="../../../SystrayIcon.cpp" line="155"/> <source>No copy listener found. Do the copy manually by right click one the system tray icon.</source> <translation>Nessuna copia del rilevatore trovata. Fare una copia manualmente cliccando col tasto destro del mouse sull'icona nella barra di sistema.</translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="169"/> + <location filename="../../../SystrayIcon.cpp" line="161"/> <source>Information</source> <translation>Informazioni</translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="187"/> + <location filename="../../../SystrayIcon.cpp" line="179"/> <source>Searching information...</source> <translation>Ricerca informazioni...</translation> </message> <message> - <source>Not replace the explorer copy/move</source> - <translation type="obsolete">Non ripristinare la copia/spostamento di Windows explorer</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="200"/> + <location filename="../../../SystrayIcon.cpp" line="192"/> <source>Do not replace the explorer copy/move</source> <translation>Non ripristinare la copia/spostamento di Windows explorer</translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="205"/> + <location filename="../../../SystrayIcon.cpp" line="197"/> <source>Semi replace the explorer copy/move</source> <translation>Ripristinare parzialmente la copia/spostamento di Windows explorer</translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="210"/> + <location filename="../../../SystrayIcon.cpp" line="202"/> <source>Replace the explorer copy/move</source> <translation>Ripristina la copia/spostamento di Windows explorer</translation> </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="377"/> - <source>Warning</source> - <translation>Avviso</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="377"/> - <source>The action on the systray icon is unknown!</source> - <translation>Azione non idonea nell'area di notifica!</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="425"/> - <source>&About/Debug report</source> - <translation>&Informazioni/Rapporto di Debug</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="427"/> - <source>&About</source> - <translation>&Informazioni</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="430"/> - <source>&Save bug report</source> - <translation>&Salva il bug</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="432"/> - <source>&Quit</source> - <translation>&Esci</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="433"/> - <source>&Options</source> - <translation>&Opzioni</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="485"/> - <source>A&dd copy/moving</source> - <translation>&Aggiungi copia/spostamento</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="471"/> - <source>New version: %1</source> - <translation>Nuova versione: %1</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="471"/> - <source>Click here to go on download page</source> - <translation>Clicca qui per accedere alla pagina di download</translation> - </message> - <message> - <source>Click here to go to the shop and login. -Download the new version into the order details. -The new version have been sended by email too, look into your spams if needed.</source> - <translation type="obsolete">Clicca qui per andare al negozio ed effettuare il login. -Scarica la nuova versione nei dettagli dell'ordine. -La nuova versione è stata inviata anche via e-mail, controlla negli spam se necessario.</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="511"/> - <source>&Copy</source> - <translation>&Copia</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="525"/> - <location filename="../../../SystrayIcon.cpp" line="539"/> - <source>&Transfer</source> - <translation>&Trasferisci</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="529"/> - <location filename="../../../SystrayIcon.cpp" line="543"/> - <source>&Move</source> - <translation>&Sposta</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="560"/> - <location filename="../../../SystrayIcon.cpp" line="577"/> - <source>Add &copy</source> - <translation>Aggiungi &copia</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="566"/> - <location filename="../../../SystrayIcon.cpp" line="583"/> - <source>Add &transfer</source> - <translation>Aggiungi &trasferimento</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="570"/> - <location filename="../../../SystrayIcon.cpp" line="587"/> - <source>Add &move</source> - <translation>Aggiungi &spostamento</translation> - </message> </context> </TS> diff --git a/plugins/Languages/ja/informations.xml b/plugins/Languages/ja/informations.xml index 555a952..7e5e3b6 100644 --- a/plugins/Languages/ja/informations.xml +++ b/plugins/Languages/ja/informations.xml @@ -12,7 +12,7 @@ <!-- Detailed description --> <description xml:lang="en"><![CDATA[Translation of Ultracopier to japanese. For more details see the web site.]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>1.2.3.6</version> + <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>jp</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/ja/translation.ts b/plugins/Languages/ja/translation.ts index 8a6d55f..ffb9111 100644 --- a/plugins/Languages/ja/translation.ts +++ b/plugins/Languages/ja/translation.ts @@ -1,86 +1,86 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>CliParser</name> <message> - <location filename="../../../CliParser.cpp" line="25"/> - <location filename="../../../CliParser.cpp" line="71"/> - <location filename="../../../CliParser.cpp" line="84"/> - <location filename="../../../CliParser.cpp" line="94"/> - <location filename="../../../CliParser.cpp" line="179"/> + <location filename="../../../CliParser.cpp" line="26"/> + <location filename="../../../CliParser.cpp" line="72"/> + <location filename="../../../CliParser.cpp" line="85"/> + <location filename="../../../CliParser.cpp" line="95"/> + <location filename="../../../CliParser.cpp" line="180"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="25"/> + <location filename="../../../CliParser.cpp" line="26"/> <source>Ultracopier is already running, right click on its system tray icon (near the clock) to use it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="71"/> + <location filename="../../../CliParser.cpp" line="72"/> <source>Problem reading file, or file size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="159"/> - <location filename="../../../CliParser.cpp" line="170"/> + <location filename="../../../CliParser.cpp" line="160"/> + <location filename="../../../CliParser.cpp" line="171"/> <source>The arguments possible are:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="161"/> - <location filename="../../../CliParser.cpp" line="172"/> + <location filename="../../../CliParser.cpp" line="162"/> + <location filename="../../../CliParser.cpp" line="173"/> <source>To display the options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="162"/> - <location filename="../../../CliParser.cpp" line="173"/> + <location filename="../../../CliParser.cpp" line="163"/> + <location filename="../../../CliParser.cpp" line="174"/> <source>To quit the other instances (if running)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="164"/> - <location filename="../../../CliParser.cpp" line="175"/> + <location filename="../../../CliParser.cpp" line="165"/> + <location filename="../../../CliParser.cpp" line="176"/> <source>To copy sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="165"/> - <location filename="../../../CliParser.cpp" line="176"/> + <location filename="../../../CliParser.cpp" line="166"/> + <location filename="../../../CliParser.cpp" line="177"/> <source>To move sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="169"/> + <location filename="../../../CliParser.cpp" line="170"/> <source>Command not valid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="84"/> + <location filename="../../../CliParser.cpp" line="85"/> <source>This file is not supported transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="94"/> + <location filename="../../../CliParser.cpp" line="95"/> <source>Unable to open the transfer list file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="160"/> - <location filename="../../../CliParser.cpp" line="171"/> + <location filename="../../../CliParser.cpp" line="161"/> + <location filename="../../../CliParser.cpp" line="172"/> <source>To display this help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="163"/> - <location filename="../../../CliParser.cpp" line="174"/> + <location filename="../../../CliParser.cpp" line="164"/> + <location filename="../../../CliParser.cpp" line="175"/> <source>Open transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="181"/> + <location filename="../../../CliParser.cpp" line="182"/> <source>Help</source> <translation type="unfinished"></translation> </message> @@ -88,30 +88,30 @@ <context> <name>CopyEngineManager</name> <message> - <location filename="../../../CopyEngineManager.cpp" line="229"/> - <location filename="../../../CopyEngineManager.cpp" line="234"/> - <location filename="../../../CopyEngineManager.cpp" line="257"/> - <location filename="../../../CopyEngineManager.cpp" line="271"/> + <location filename="../../../CopyEngineManager.cpp" line="231"/> + <location filename="../../../CopyEngineManager.cpp" line="236"/> + <location filename="../../../CopyEngineManager.cpp" line="259"/> + <location filename="../../../CopyEngineManager.cpp" line="273"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="229"/> + <location filename="../../../CopyEngineManager.cpp" line="231"/> <source>Cannot find any copy engine with move support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="257"/> + <location filename="../../../CopyEngineManager.cpp" line="259"/> <source>This copy engine does not support move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="234"/> + <location filename="../../../CopyEngineManager.cpp" line="236"/> <source>Cannot find any compatible engine!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="271"/> + <location filename="../../../CopyEngineManager.cpp" line="273"/> <source>Cannot find any engine with this name: %1</source> <translation type="unfinished"></translation> </message> @@ -119,12 +119,12 @@ <context> <name>CopyListener</name> <message> - <location filename="../../../CopyListener.cpp" line="158"/> + <location filename="../../../CopyListener.cpp" line="159"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyListener.cpp" line="158"/> + <location filename="../../../CopyListener.cpp" line="159"/> <source>Error during the reception of the copy/move list %1</source> <translation type="unfinished"></translation> @@ -133,70 +133,70 @@ <context> <name>Core</name> <message> - <location filename="../../../Core.cpp" line="45"/> - <location filename="../../../Core.cpp" line="116"/> - <location filename="../../../Core.cpp" line="142"/> - <location filename="../../../Core.cpp" line="157"/> - <location filename="../../../Core.cpp" line="177"/> - <location filename="../../../Core.cpp" line="191"/> - <location filename="../../../Core.cpp" line="200"/> - <location filename="../../../Core.cpp" line="209"/> - <location filename="../../../Core.cpp" line="216"/> - <location filename="../../../Core.cpp" line="250"/> - <location filename="../../../Core.cpp" line="387"/> - <location filename="../../../Core.cpp" line="392"/> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="117"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> + <location filename="../../../Core.cpp" line="217"/> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> + <location filename="../../../Core.cpp" line="393"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="45"/> - <location filename="../../../Core.cpp" line="142"/> - <location filename="../../../Core.cpp" line="157"/> - <location filename="../../../Core.cpp" line="177"/> - <location filename="../../../Core.cpp" line="191"/> - <location filename="../../../Core.cpp" line="200"/> - <location filename="../../../Core.cpp" line="209"/> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> <source>Unable to get a copy engine instance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="93"/> + <location filename="../../../Core.cpp" line="94"/> <source>Group window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="93"/> + <location filename="../../../Core.cpp" line="94"/> <source>Do you want group the transfer with another actual running transfer?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="116"/> + <location filename="../../../Core.cpp" line="117"/> <source>Unable to get a engine instance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="216"/> + <location filename="../../../Core.cpp" line="217"/> <source>The argument for the mode is not valid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="1133"/> + <location filename="../../../Core.cpp" line="1136"/> <source>Do you want to copy? If no, it will be moved.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="250"/> - <location filename="../../../Core.cpp" line="387"/> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> <source>Unable to load the interface, copy aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="392"/> + <location filename="../../../Core.cpp" line="393"/> <source>Unable to load the copy engine, copy aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="1133"/> + <location filename="../../../Core.cpp" line="1136"/> <source>Transfer mode</source> <translation type="unfinished"></translation> </message> @@ -204,12 +204,12 @@ <context> <name>EventDispatcher</name> <message> - <location filename="../../../EventDispatcher.cpp" line="155"/> + <location filename="../../../EventDispatcher.cpp" line="152"/> <source>Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../EventDispatcher.cpp" line="155"/> + <location filename="../../../EventDispatcher.cpp" line="152"/> <source>Give the key of this software, more information on <a href="http://ultracopier.first-world.info/">ultracopier.first-world.info</a></source> <translation type="unfinished"></translation> </message> @@ -217,257 +217,257 @@ <context> <name>FacilityEngine</name> <message> - <location filename="../../../FacilityEngine.cpp" line="43"/> + <location filename="../../../FacilityEngine.cpp" line="53"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="45"/> + <location filename="../../../FacilityEngine.cpp" line="55"/> <source>Copy</source> <extracomment>a copy</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="49"/> + <location filename="../../../FacilityEngine.cpp" line="59"/> <source>Move</source> <extracomment>a move</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="51"/> + <location filename="../../../FacilityEngine.cpp" line="61"/> <source>Pause</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="52"/> + <location filename="../../../FacilityEngine.cpp" line="62"/> <source>Resume</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="53"/> - <location filename="../../../FacilityEngine.cpp" line="67"/> + <location filename="../../../FacilityEngine.cpp" line="63"/> + <location filename="../../../FacilityEngine.cpp" line="77"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="54"/> + <location filename="../../../FacilityEngine.cpp" line="64"/> <source>Unlimited</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="27"/> + <location filename="../../../FacilityEngine.cpp" line="37"/> <source>s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="28"/> + <location filename="../../../FacilityEngine.cpp" line="38"/> <source>Too big</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="29"/> + <location filename="../../../FacilityEngine.cpp" line="39"/> <source>B</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="30"/> + <location filename="../../../FacilityEngine.cpp" line="40"/> <source>KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="31"/> + <location filename="../../../FacilityEngine.cpp" line="41"/> <source>MB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="32"/> + <location filename="../../../FacilityEngine.cpp" line="42"/> <source>GB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="33"/> + <location filename="../../../FacilityEngine.cpp" line="43"/> <source>TB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="34"/> + <location filename="../../../FacilityEngine.cpp" line="44"/> <source>PB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="35"/> + <location filename="../../../FacilityEngine.cpp" line="45"/> <source>EB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="36"/> + <location filename="../../../FacilityEngine.cpp" line="46"/> <source>ZB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="37"/> + <location filename="../../../FacilityEngine.cpp" line="47"/> <source>YB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="38"/> + <location filename="../../../FacilityEngine.cpp" line="48"/> <source>Less than %10 seconds</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="39"/> + <location filename="../../../FacilityEngine.cpp" line="49"/> <source>About %10 seconds remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="40"/> + <location filename="../../../FacilityEngine.cpp" line="50"/> <source>About %1 minutes remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="41"/> + <location filename="../../../FacilityEngine.cpp" line="51"/> <source>About %1 hours remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="47"/> + <location filename="../../../FacilityEngine.cpp" line="57"/> <source>Transfer</source> <extracomment>a transfer</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="50"/> + <location filename="../../../FacilityEngine.cpp" line="60"/> <source>Start</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="55"/> + <location filename="../../../FacilityEngine.cpp" line="65"/> <source>Source</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="56"/> + <location filename="../../../FacilityEngine.cpp" line="66"/> <source>Size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="57"/> + <location filename="../../../FacilityEngine.cpp" line="67"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="58"/> + <location filename="../../../FacilityEngine.cpp" line="68"/> <source>Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="59"/> + <location filename="../../../FacilityEngine.cpp" line="69"/> <source>Target</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="60"/> - <location filename="../../../FacilityEngine.cpp" line="64"/> + <location filename="../../../FacilityEngine.cpp" line="70"/> + <location filename="../../../FacilityEngine.cpp" line="74"/> <source>Time remaining:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="61"/> + <location filename="../../../FacilityEngine.cpp" line="71"/> <source>Listing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="62"/> + <location filename="../../../FacilityEngine.cpp" line="72"/> <source>Copying</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="63"/> + <location filename="../../../FacilityEngine.cpp" line="73"/> <source>Listing and copying</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="66"/> + <location filename="../../../FacilityEngine.cpp" line="76"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="68"/> + <location filename="../../../FacilityEngine.cpp" line="78"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="69"/> + <location filename="../../../FacilityEngine.cpp" line="79"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="70"/> + <location filename="../../../FacilityEngine.cpp" line="80"/> <source>Overwrite if the last modification dates are different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="71"/> + <location filename="../../../FacilityEngine.cpp" line="81"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="72"/> + <location filename="../../../FacilityEngine.cpp" line="82"/> <source>Put to the end of the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="73"/> + <location filename="../../../FacilityEngine.cpp" line="83"/> <source>Select source directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="74"/> + <location filename="../../../FacilityEngine.cpp" line="84"/> <source>Select destination directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="75"/> + <location filename="../../../FacilityEngine.cpp" line="85"/> <source>Internal error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="76"/> + <location filename="../../../FacilityEngine.cpp" line="86"/> <source>Select one or more files to open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="77"/> + <location filename="../../../FacilityEngine.cpp" line="87"/> <source>All files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="78"/> + <location filename="../../../FacilityEngine.cpp" line="88"/> <source>Save transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="79"/> + <location filename="../../../FacilityEngine.cpp" line="89"/> <source>Open transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="80"/> + <location filename="../../../FacilityEngine.cpp" line="90"/> <source>Transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="81"/> + <location filename="../../../FacilityEngine.cpp" line="91"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="82"/> + <location filename="../../../FacilityEngine.cpp" line="92"/> <source>Not supported on this platform</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="83"/> + <location filename="../../../FacilityEngine.cpp" line="93"/> <source>Completed in %1</source> <translation type="unfinished"></translation> </message> @@ -475,7 +475,7 @@ <context> <name>HelpDialog</name> <message> - <location filename="../../../HelpDialog.cpp" line="37"/> + <location filename="../../../HelpDialog.cpp" line="34"/> <source>About Ultracopier</source> <translation type="unfinished"></translation> </message> @@ -519,49 +519,42 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="35"/> - <source>About Supercopier</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../HelpDialog.cpp" line="80"/> + <location filename="../../../HelpDialog.cpp" line="73"/> <source>For http://portableapps.com/</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="83"/> + <location filename="../../../HelpDialog.cpp" line="76"/> <source>Portable and all in one version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="85"/> + <location filename="../../../HelpDialog.cpp" line="78"/> <source>Portable version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="90"/> + <location filename="../../../HelpDialog.cpp" line="83"/> <source>All in one version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="92"/> + <location filename="../../../HelpDialog.cpp" line="85"/> <source>Normal version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="110"/> - <location filename="../../../HelpDialog.cpp" line="112"/> - <location filename="../../../HelpDialog.cpp" line="123"/> + <location filename="../../../HelpDialog.cpp" line="102"/> <source>http://ultracopier.first-world.info/</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="120"/> + <location filename="../../../HelpDialog.cpp" line="109"/> <source>http://ultracopier.first-world.info/shop.html</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="125"/> + <location filename="../../../HelpDialog.cpp" line="111"/> <source>http://ultracopier.first-world.info/download.html</source> <translation type="unfinished"></translation> </message> @@ -569,12 +562,12 @@ This version is compiled as version: %1.</source> <context> <name>LocalListener</name> <message> - <location filename="../../../LocalListener.cpp" line="146"/> + <location filename="../../../LocalListener.cpp" line="160"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../LocalListener.cpp" line="146"/> + <location filename="../../../LocalListener.cpp" line="160"/> <source>Timeout while recomposing data from connected clients</source> <translation type="unfinished"></translation> </message> @@ -582,20 +575,20 @@ This version is compiled as version: %1.</source> <context> <name>LogThread</name> <message> - <location filename="../../../LogThread.cpp" line="106"/> - <location filename="../../../LogThread.cpp" line="115"/> - <location filename="../../../LogThread.cpp" line="125"/> + <location filename="../../../LogThread.cpp" line="107"/> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../LogThread.cpp" line="106"/> + <location filename="../../../LogThread.cpp" line="107"/> <source>Log file already open, error: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../LogThread.cpp" line="115"/> - <location filename="../../../LogThread.cpp" line="125"/> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> <source>Unable to open the log file, error: %1</source> <translation type="unfinished"></translation> </message> @@ -637,21 +630,6 @@ This version is compiled as version: %1.</source> <source>The replacement of default copy/move system should be not supported by the file manager.<br />Ask to the developer to support it.<br />You need do the copy/move manually.</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../../OSSpecific.cpp" line="32"/> - <source>Consider Supercopier as deprecated, prefer Ultracopier</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OSSpecific.cpp" line="35"/> - <source>This version use 100% of you graphic card/GPU (you computer can be noisy, or slow/buggy during the games) at exchange of free access to Ultimate version. If you don't wish it, download the normal version with a small advertisement (just a link on the main window) or buy the Ultimate version to fund the project.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OSSpecific.cpp" line="36"/> - <source>http://ultracopier.first-world.info/download.html</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>OptionDialog</name> @@ -674,7 +652,7 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="66"/> <location filename="../../../OptionDialog.ui" line="322"/> - <location filename="../../../OptionDialog.cpp" line="354"/> + <location filename="../../../OptionDialog.cpp" line="286"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> @@ -723,21 +701,21 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="71"/> <location filename="../../../OptionDialog.ui" line="335"/> - <location filename="../../../OptionDialog.cpp" line="355"/> + <location filename="../../../OptionDialog.cpp" line="287"/> <source>Listener</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="76"/> <location filename="../../../OptionDialog.ui" line="340"/> - <location filename="../../../OptionDialog.cpp" line="356"/> + <location filename="../../../OptionDialog.cpp" line="288"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="84"/> <location filename="../../../OptionDialog.ui" line="345"/> - <location filename="../../../OptionDialog.cpp" line="357"/> + <location filename="../../../OptionDialog.cpp" line="289"/> <source>Session loader</source> <translation type="unfinished"></translation> </message> @@ -879,95 +857,75 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="260"/> - <location filename="../../../OptionDialog.cpp" line="274"/> + <location filename="../../../OptionDialog.cpp" line="190"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="260"/> + <location filename="../../../OptionDialog.cpp" line="190"/> <source>Load the theme?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="274"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load the language?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="362"/> + <location filename="../../../OptionDialog.cpp" line="294"/> <source>Do nothing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="363"/> + <location filename="../../../OptionDialog.cpp" line="295"/> <source>Ask source as folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="364"/> + <location filename="../../../OptionDialog.cpp" line="296"/> <source>Ask sources as files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="365"/> + <location filename="../../../OptionDialog.cpp" line="297"/> <source>Never</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="366"/> + <location filename="../../../OptionDialog.cpp" line="298"/> <source>When source is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="367"/> + <location filename="../../../OptionDialog.cpp" line="299"/> <source>When destination is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="368"/> + <location filename="../../../OptionDialog.cpp" line="300"/> <source>When source and destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="369"/> + <location filename="../../../OptionDialog.cpp" line="301"/> <source>When source or destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="370"/> + <location filename="../../../OptionDialog.cpp" line="302"/> <source>Always</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="384"/> - <location filename="../../../OptionDialog.cpp" line="385"/> - <location filename="../../../OptionDialog.cpp" line="386"/> + <location filename="../../../OptionDialog.cpp" line="316"/> + <location filename="../../../OptionDialog.cpp" line="317"/> + <location filename="../../../OptionDialog.cpp" line="318"/> <source>The variables are %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="478"/> - <source>Allow the application</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="478"/> - <source>This Ultimate free version is only if %1 is allowed by your antivirus. Else you can get the normal free version</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="483"/> - <source>Enable the OpenCL</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="483"/> - <source>This Ultimate version is only if the OpenCL is installed with your graphic card drivers. Else you can get the normal free version</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="1591"/> + <location filename="../../../OptionDialog.cpp" line="948"/> <source>Save logs as: </source> <translation type="unfinished"></translation> </message> @@ -980,10 +938,10 @@ This version is compiled as version: %1.</source> <context> <name>OptionEngine</name> <message> - <location filename="../../../OptionEngine.cpp" line="161"/> - <location filename="../../../OptionEngine.cpp" line="165"/> - <location filename="../../../OptionEngine.cpp" line="202"/> - <location filename="../../../OptionEngine.cpp" line="206"/> + <location filename="../../../OptionEngine.cpp" line="162"/> + <location filename="../../../OptionEngine.cpp" line="169"/> + <location filename="../../../OptionEngine.cpp" line="211"/> + <location filename="../../../OptionEngine.cpp" line="215"/> <source>The variable was not found: %1 %2</source> <translation type="unfinished"></translation> </message> @@ -1026,42 +984,42 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="38"/> + <location filename="../../../PluginInformation.cpp" line="39"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="41"/> + <location filename="../../../PluginInformation.cpp" line="42"/> <source>Languages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="44"/> + <location filename="../../../PluginInformation.cpp" line="45"/> <source>Listener</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="47"/> + <location filename="../../../PluginInformation.cpp" line="48"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="50"/> + <location filename="../../../PluginInformation.cpp" line="51"/> <source>Session loader</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="53"/> + <location filename="../../../PluginInformation.cpp" line="54"/> <source>Themes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="57"/> + <location filename="../../../PluginInformation.cpp" line="58"/> <source>Unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="67"/> + <location filename="../../../PluginInformation.cpp" line="68"/> <source>Information about %1</source> <translation type="unfinished"></translation> </message> @@ -1079,140 +1037,140 @@ This version is compiled as version: %1.</source> <context> <name>PluginsManager</name> <message> - <location filename="../../../PluginsManager.cpp" line="221"/> + <location filename="../../../PluginsManager.cpp" line="224"/> <source>informations.xml is not accessible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="487"/> + <location filename="../../../PluginsManager.cpp" line="494"/> <source>Dependencies part is wrong</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="508"/> + <location filename="../../../PluginsManager.cpp" line="515"/> <source>Dependencies %1 are not satisfied, for plugin: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="665"/> + <location filename="../../../PluginsManager.cpp" line="672"/> <source>Remove %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="676"/> + <location filename="../../../PluginsManager.cpp" line="683"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="700"/> + <location filename="../../../PluginsManager.cpp" line="683"/> + <source>Error while the removing plugin, please check the rights on the folder: +%1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="707"/> <source>Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="253"/> + <location filename="../../../PluginsManager.cpp" line="256"/> <source>%1, parse error at line %2, column %3: %4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="227"/> + <location filename="../../../PluginsManager.cpp" line="230"/> <source>informations.xml not found for the plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="261"/> + <location filename="../../../PluginsManager.cpp" line="264"/> <source>"package" root tag not found for the xml file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="337"/> + <location filename="../../../PluginsManager.cpp" line="340"/> <source>Duplicated plugin found, already loaded!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="395"/> + <location filename="../../../PluginsManager.cpp" line="401"/> <source>English text missing in the informations.xml for the tag: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="403"/> + <location filename="../../../PluginsManager.cpp" line="409"/> <source>Tag not found: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="665"/> + <location filename="../../../PluginsManager.cpp" line="672"/> <source>Are you sure about removing "%1" in version %2?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="676"/> - <source>Error while the removing plugin, please check the rights on the folder: -%1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../PluginsManager.cpp" line="700"/> + <location filename="../../../PluginsManager.cpp" line="707"/> <source>Previous import is in progress...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="703"/> + <location filename="../../../PluginsManager.cpp" line="710"/> <source>Open Ultracopier plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="703"/> + <location filename="../../../PluginsManager.cpp" line="710"/> <source>Ultracopier plugin (*.urc)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="720"/> - <location filename="../../../PluginsManager.cpp" line="745"/> - <location filename="../../../PluginsManager.cpp" line="813"/> - <location filename="../../../PluginsManager.cpp" line="826"/> - <location filename="../../../PluginsManager.cpp" line="845"/> - <location filename="../../../PluginsManager.cpp" line="851"/> - <location filename="../../../PluginsManager.cpp" line="857"/> - <location filename="../../../PluginsManager.cpp" line="863"/> - <location filename="../../../PluginsManager.cpp" line="869"/> + <location filename="../../../PluginsManager.cpp" line="727"/> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="820"/> + <location filename="../../../PluginsManager.cpp" line="833"/> + <location filename="../../../PluginsManager.cpp" line="852"/> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="870"/> <location filename="../../../PluginsManager.cpp" line="876"/> + <location filename="../../../PluginsManager.cpp" line="883"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="720"/> + <location filename="../../../PluginsManager.cpp" line="727"/> <source>Unable to open the plugin: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="745"/> - <location filename="../../../PluginsManager.cpp" line="863"/> - <location filename="../../../PluginsManager.cpp" line="876"/> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="870"/> + <location filename="../../../PluginsManager.cpp" line="883"/> <source>Unable to load the plugin content, please check it: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="813"/> + <location filename="../../../PluginsManager.cpp" line="820"/> <source>Unable to create a folder to install the plugin: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="826"/> + <location filename="../../../PluginsManager.cpp" line="833"/> <source>Unable to create a file to install the plugin: %1 since:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="845"/> + <location filename="../../../PluginsManager.cpp" line="852"/> <source>Folder with same name is present, skip the plugin installation: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="851"/> - <location filename="../../../PluginsManager.cpp" line="857"/> - <location filename="../../../PluginsManager.cpp" line="869"/> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="876"/> <source>Unable to load the plugin content, please check it</source> <translation type="unfinished"></translation> </message> @@ -1265,119 +1223,34 @@ since:%2</source> <context> <name>SystrayIcon</name> <message> - <location filename="../../../SystrayIcon.cpp" line="163"/> + <location filename="../../../SystrayIcon.cpp" line="155"/> <source>No copy listener found. Do the copy manually by right click one the system tray icon.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="169"/> + <location filename="../../../SystrayIcon.cpp" line="161"/> <source>Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="187"/> + <location filename="../../../SystrayIcon.cpp" line="179"/> <source>Searching information...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="200"/> + <location filename="../../../SystrayIcon.cpp" line="192"/> <source>Do not replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="205"/> + <location filename="../../../SystrayIcon.cpp" line="197"/> <source>Semi replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="210"/> + <location filename="../../../SystrayIcon.cpp" line="202"/> <source>Replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="377"/> - <source>Warning</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="377"/> - <source>The action on the systray icon is unknown!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="425"/> - <source>&About/Debug report</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="427"/> - <source>&About</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="430"/> - <source>&Save bug report</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="432"/> - <source>&Quit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="433"/> - <source>&Options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="485"/> - <source>A&dd copy/moving</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="471"/> - <source>New version: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="471"/> - <source>Click here to go on download page</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="511"/> - <source>&Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="525"/> - <location filename="../../../SystrayIcon.cpp" line="539"/> - <source>&Transfer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="529"/> - <location filename="../../../SystrayIcon.cpp" line="543"/> - <source>&Move</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="560"/> - <location filename="../../../SystrayIcon.cpp" line="577"/> - <source>Add &copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="566"/> - <location filename="../../../SystrayIcon.cpp" line="583"/> - <source>Add &transfer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="570"/> - <location filename="../../../SystrayIcon.cpp" line="587"/> - <source>Add &move</source> - <translation type="unfinished"></translation> - </message> </context> </TS> diff --git a/plugins/Languages/ko/informations.xml b/plugins/Languages/ko/informations.xml index 877111a..6baf140 100644 --- a/plugins/Languages/ko/informations.xml +++ b/plugins/Languages/ko/informations.xml @@ -13,7 +13,7 @@ <description xml:lang="en"><![CDATA[File to define all English language related, Ultracopier is written in English, then not translation file needed]]></description> <description xml:lang="ko"><![CDATA[Ultracopier의 한국어 번역입니다. 더 나은 번역이나 오타, 오역에 대한 제보는 이메일로 연락해주시면 감사하겠습니다.]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>1.2.3.6</version> + <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>ko</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/ko/translation.ts b/plugins/Languages/ko/translation.ts index e6c41b2..41d1700 100644 --- a/plugins/Languages/ko/translation.ts +++ b/plugins/Languages/ko/translation.ts @@ -1,86 +1,86 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0" language="ko_KR"> +<TS version="2.1" language="ko_KR"> <context> <name>CliParser</name> <message> - <location filename="../../../CliParser.cpp" line="25"/> - <location filename="../../../CliParser.cpp" line="71"/> - <location filename="../../../CliParser.cpp" line="84"/> - <location filename="../../../CliParser.cpp" line="94"/> - <location filename="../../../CliParser.cpp" line="179"/> + <location filename="../../../CliParser.cpp" line="26"/> + <location filename="../../../CliParser.cpp" line="72"/> + <location filename="../../../CliParser.cpp" line="85"/> + <location filename="../../../CliParser.cpp" line="95"/> + <location filename="../../../CliParser.cpp" line="180"/> <source>Warning</source> <translation>알림</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="25"/> + <location filename="../../../CliParser.cpp" line="26"/> <source>Ultracopier is already running, right click on its system tray icon (near the clock) to use it</source> <translation>Ultracopier가 이미 실행중입니다. 사용하려면 트레이 아이콘에서 우클릭하십시오</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="71"/> + <location filename="../../../CliParser.cpp" line="72"/> <source>Problem reading file, or file size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="159"/> - <location filename="../../../CliParser.cpp" line="170"/> + <location filename="../../../CliParser.cpp" line="160"/> + <location filename="../../../CliParser.cpp" line="171"/> <source>The arguments possible are:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="161"/> - <location filename="../../../CliParser.cpp" line="172"/> + <location filename="../../../CliParser.cpp" line="162"/> + <location filename="../../../CliParser.cpp" line="173"/> <source>To display the options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="162"/> - <location filename="../../../CliParser.cpp" line="173"/> + <location filename="../../../CliParser.cpp" line="163"/> + <location filename="../../../CliParser.cpp" line="174"/> <source>To quit the other instances (if running)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="164"/> - <location filename="../../../CliParser.cpp" line="175"/> + <location filename="../../../CliParser.cpp" line="165"/> + <location filename="../../../CliParser.cpp" line="176"/> <source>To copy sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="165"/> - <location filename="../../../CliParser.cpp" line="176"/> + <location filename="../../../CliParser.cpp" line="166"/> + <location filename="../../../CliParser.cpp" line="177"/> <source>To move sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="169"/> + <location filename="../../../CliParser.cpp" line="170"/> <source>Command not valid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="84"/> + <location filename="../../../CliParser.cpp" line="85"/> <source>This file is not supported transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="94"/> + <location filename="../../../CliParser.cpp" line="95"/> <source>Unable to open the transfer list file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="160"/> - <location filename="../../../CliParser.cpp" line="171"/> + <location filename="../../../CliParser.cpp" line="161"/> + <location filename="../../../CliParser.cpp" line="172"/> <source>To display this help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="163"/> - <location filename="../../../CliParser.cpp" line="174"/> + <location filename="../../../CliParser.cpp" line="164"/> + <location filename="../../../CliParser.cpp" line="175"/> <source>Open transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="181"/> + <location filename="../../../CliParser.cpp" line="182"/> <source>Help</source> <translation type="unfinished"></translation> </message> @@ -88,38 +88,30 @@ <context> <name>CopyEngineManager</name> <message> - <location filename="../../../CopyEngineManager.cpp" line="229"/> - <location filename="../../../CopyEngineManager.cpp" line="234"/> - <location filename="../../../CopyEngineManager.cpp" line="257"/> - <location filename="../../../CopyEngineManager.cpp" line="271"/> + <location filename="../../../CopyEngineManager.cpp" line="231"/> + <location filename="../../../CopyEngineManager.cpp" line="236"/> + <location filename="../../../CopyEngineManager.cpp" line="259"/> + <location filename="../../../CopyEngineManager.cpp" line="273"/> <source>Warning</source> <translation>알림</translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="229"/> + <location filename="../../../CopyEngineManager.cpp" line="231"/> <source>Cannot find any copy engine with move support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="257"/> + <location filename="../../../CopyEngineManager.cpp" line="259"/> <source>This copy engine does not support move</source> <translation type="unfinished"></translation> </message> <message> - <source>Cannot find any copy engine with motions support</source> - <translation type="obsolete">동작 감지를 지원하는 복사 엔진을 찾을 수 없습니다</translation> - </message> - <message> - <location filename="../../../CopyEngineManager.cpp" line="234"/> + <location filename="../../../CopyEngineManager.cpp" line="236"/> <source>Cannot find any compatible engine!</source> <translation>호환되는 엔진을 찾을 수 없습니다!</translation> </message> <message> - <source>This copy engine does not support motions</source> - <translation type="obsolete">이 복사 엔진은 동작 감지를 지원하지 않습니다</translation> - </message> - <message> - <location filename="../../../CopyEngineManager.cpp" line="271"/> + <location filename="../../../CopyEngineManager.cpp" line="273"/> <source>Cannot find any engine with this name: %1</source> <translation type="unfinished"></translation> </message> @@ -127,12 +119,12 @@ <context> <name>CopyListener</name> <message> - <location filename="../../../CopyListener.cpp" line="158"/> + <location filename="../../../CopyListener.cpp" line="159"/> <source>Error</source> <translation type="unfinished">오류</translation> </message> <message> - <location filename="../../../CopyListener.cpp" line="158"/> + <location filename="../../../CopyListener.cpp" line="159"/> <source>Error during the reception of the copy/move list %1</source> <translation type="unfinished"></translation> @@ -141,70 +133,70 @@ <context> <name>Core</name> <message> - <location filename="../../../Core.cpp" line="45"/> - <location filename="../../../Core.cpp" line="116"/> - <location filename="../../../Core.cpp" line="142"/> - <location filename="../../../Core.cpp" line="157"/> - <location filename="../../../Core.cpp" line="177"/> - <location filename="../../../Core.cpp" line="191"/> - <location filename="../../../Core.cpp" line="200"/> - <location filename="../../../Core.cpp" line="209"/> - <location filename="../../../Core.cpp" line="216"/> - <location filename="../../../Core.cpp" line="250"/> - <location filename="../../../Core.cpp" line="387"/> - <location filename="../../../Core.cpp" line="392"/> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="117"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> + <location filename="../../../Core.cpp" line="217"/> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> + <location filename="../../../Core.cpp" line="393"/> <source>Error</source> <translation>오류</translation> </message> <message> - <location filename="../../../Core.cpp" line="45"/> - <location filename="../../../Core.cpp" line="142"/> - <location filename="../../../Core.cpp" line="157"/> - <location filename="../../../Core.cpp" line="177"/> - <location filename="../../../Core.cpp" line="191"/> - <location filename="../../../Core.cpp" line="200"/> - <location filename="../../../Core.cpp" line="209"/> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> <source>Unable to get a copy engine instance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="93"/> + <location filename="../../../Core.cpp" line="94"/> <source>Group window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="93"/> + <location filename="../../../Core.cpp" line="94"/> <source>Do you want group the transfer with another actual running transfer?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="116"/> + <location filename="../../../Core.cpp" line="117"/> <source>Unable to get a engine instance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="216"/> + <location filename="../../../Core.cpp" line="217"/> <source>The argument for the mode is not valid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="1133"/> + <location filename="../../../Core.cpp" line="1136"/> <source>Do you want to copy? If no, it will be moved.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="250"/> - <location filename="../../../Core.cpp" line="387"/> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> <source>Unable to load the interface, copy aborted</source> <translation>인터페이스를 불러올 수 없음, 복사가 취소되었습니다</translation> </message> <message> - <location filename="../../../Core.cpp" line="392"/> + <location filename="../../../Core.cpp" line="393"/> <source>Unable to load the copy engine, copy aborted</source> <translation>복사 엔진을 불러올 수 없음, 복사가 취소되었습니다</translation> </message> <message> - <location filename="../../../Core.cpp" line="1133"/> + <location filename="../../../Core.cpp" line="1136"/> <source>Transfer mode</source> <translation type="unfinished"></translation> </message> @@ -212,12 +204,12 @@ <context> <name>EventDispatcher</name> <message> - <location filename="../../../EventDispatcher.cpp" line="155"/> + <location filename="../../../EventDispatcher.cpp" line="152"/> <source>Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../EventDispatcher.cpp" line="155"/> + <location filename="../../../EventDispatcher.cpp" line="152"/> <source>Give the key of this software, more information on <a href="http://ultracopier.first-world.info/">ultracopier.first-world.info</a></source> <translation type="unfinished"></translation> </message> @@ -225,257 +217,257 @@ <context> <name>FacilityEngine</name> <message> - <location filename="../../../FacilityEngine.cpp" line="43"/> + <location filename="../../../FacilityEngine.cpp" line="53"/> <source>Copy engine</source> <translation>복사 엔진</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="45"/> + <location filename="../../../FacilityEngine.cpp" line="55"/> <source>Copy</source> <extracomment>a copy</extracomment> <translation>복사</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="49"/> + <location filename="../../../FacilityEngine.cpp" line="59"/> <source>Move</source> <extracomment>a move</extracomment> <translation>이동</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="51"/> + <location filename="../../../FacilityEngine.cpp" line="61"/> <source>Pause</source> <translation>일시 중지</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="52"/> + <location filename="../../../FacilityEngine.cpp" line="62"/> <source>Resume</source> <translation>다시 시작</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="53"/> - <location filename="../../../FacilityEngine.cpp" line="67"/> + <location filename="../../../FacilityEngine.cpp" line="63"/> + <location filename="../../../FacilityEngine.cpp" line="77"/> <source>Skip</source> <translation>건너뛰기</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="54"/> + <location filename="../../../FacilityEngine.cpp" line="64"/> <source>Unlimited</source> <translation>무제한</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="27"/> + <location filename="../../../FacilityEngine.cpp" line="37"/> <source>s</source> <translation>초</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="28"/> + <location filename="../../../FacilityEngine.cpp" line="38"/> <source>Too big</source> <translation>너무 큽니다</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="29"/> + <location filename="../../../FacilityEngine.cpp" line="39"/> <source>B</source> <translation>B</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="30"/> + <location filename="../../../FacilityEngine.cpp" line="40"/> <source>KB</source> <translation>KB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="31"/> + <location filename="../../../FacilityEngine.cpp" line="41"/> <source>MB</source> <translation>MB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="32"/> + <location filename="../../../FacilityEngine.cpp" line="42"/> <source>GB</source> <translation>GB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="33"/> + <location filename="../../../FacilityEngine.cpp" line="43"/> <source>TB</source> <translation>TB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="34"/> + <location filename="../../../FacilityEngine.cpp" line="44"/> <source>PB</source> <translation>PB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="35"/> + <location filename="../../../FacilityEngine.cpp" line="45"/> <source>EB</source> <translation>EB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="36"/> + <location filename="../../../FacilityEngine.cpp" line="46"/> <source>ZB</source> <translation>ZB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="37"/> + <location filename="../../../FacilityEngine.cpp" line="47"/> <source>YB</source> <translation>YB</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="38"/> + <location filename="../../../FacilityEngine.cpp" line="48"/> <source>Less than %10 seconds</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="39"/> + <location filename="../../../FacilityEngine.cpp" line="49"/> <source>About %10 seconds remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="40"/> + <location filename="../../../FacilityEngine.cpp" line="50"/> <source>About %1 minutes remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="41"/> + <location filename="../../../FacilityEngine.cpp" line="51"/> <source>About %1 hours remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="47"/> + <location filename="../../../FacilityEngine.cpp" line="57"/> <source>Transfer</source> <extracomment>a transfer</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="50"/> + <location filename="../../../FacilityEngine.cpp" line="60"/> <source>Start</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="55"/> + <location filename="../../../FacilityEngine.cpp" line="65"/> <source>Source</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="56"/> + <location filename="../../../FacilityEngine.cpp" line="66"/> <source>Size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="57"/> + <location filename="../../../FacilityEngine.cpp" line="67"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="58"/> + <location filename="../../../FacilityEngine.cpp" line="68"/> <source>Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="59"/> + <location filename="../../../FacilityEngine.cpp" line="69"/> <source>Target</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="60"/> - <location filename="../../../FacilityEngine.cpp" line="64"/> + <location filename="../../../FacilityEngine.cpp" line="70"/> + <location filename="../../../FacilityEngine.cpp" line="74"/> <source>Time remaining:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="61"/> + <location filename="../../../FacilityEngine.cpp" line="71"/> <source>Listing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="62"/> + <location filename="../../../FacilityEngine.cpp" line="72"/> <source>Copying</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="63"/> + <location filename="../../../FacilityEngine.cpp" line="73"/> <source>Listing and copying</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="66"/> + <location filename="../../../FacilityEngine.cpp" line="76"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="68"/> + <location filename="../../../FacilityEngine.cpp" line="78"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="69"/> + <location filename="../../../FacilityEngine.cpp" line="79"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="70"/> + <location filename="../../../FacilityEngine.cpp" line="80"/> <source>Overwrite if the last modification dates are different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="71"/> + <location filename="../../../FacilityEngine.cpp" line="81"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="72"/> + <location filename="../../../FacilityEngine.cpp" line="82"/> <source>Put to the end of the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="73"/> + <location filename="../../../FacilityEngine.cpp" line="83"/> <source>Select source directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="74"/> + <location filename="../../../FacilityEngine.cpp" line="84"/> <source>Select destination directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="75"/> + <location filename="../../../FacilityEngine.cpp" line="85"/> <source>Internal error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="76"/> + <location filename="../../../FacilityEngine.cpp" line="86"/> <source>Select one or more files to open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="77"/> + <location filename="../../../FacilityEngine.cpp" line="87"/> <source>All files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="78"/> + <location filename="../../../FacilityEngine.cpp" line="88"/> <source>Save transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="79"/> + <location filename="../../../FacilityEngine.cpp" line="89"/> <source>Open transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="80"/> + <location filename="../../../FacilityEngine.cpp" line="90"/> <source>Transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="81"/> + <location filename="../../../FacilityEngine.cpp" line="91"/> <source>Error</source> <translation type="unfinished">오류</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="82"/> + <location filename="../../../FacilityEngine.cpp" line="92"/> <source>Not supported on this platform</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="83"/> + <location filename="../../../FacilityEngine.cpp" line="93"/> <source>Completed in %1</source> <translation type="unfinished"></translation> </message> @@ -483,7 +475,7 @@ <context> <name>HelpDialog</name> <message> - <location filename="../../../HelpDialog.cpp" line="37"/> + <location filename="../../../HelpDialog.cpp" line="34"/> <source>About Ultracopier</source> <translation type="unfinished"></translation> </message> @@ -527,49 +519,42 @@ This version is compiled as version: %1.</source> <translation>닫기</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="35"/> - <source>About Supercopier</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../HelpDialog.cpp" line="80"/> + <location filename="../../../HelpDialog.cpp" line="73"/> <source>For http://portableapps.com/</source> <translation>http://portableapps.com을 위해</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="83"/> + <location filename="../../../HelpDialog.cpp" line="76"/> <source>Portable and all in one version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="85"/> + <location filename="../../../HelpDialog.cpp" line="78"/> <source>Portable version</source> <translation>포터블 버전</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="90"/> + <location filename="../../../HelpDialog.cpp" line="83"/> <source>All in one version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="92"/> + <location filename="../../../HelpDialog.cpp" line="85"/> <source>Normal version</source> <translation>일반 버전</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="110"/> - <location filename="../../../HelpDialog.cpp" line="112"/> - <location filename="../../../HelpDialog.cpp" line="123"/> + <location filename="../../../HelpDialog.cpp" line="102"/> <source>http://ultracopier.first-world.info/</source> <translation>http://ultracopier.first-world.info/</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="120"/> + <location filename="../../../HelpDialog.cpp" line="109"/> <source>http://ultracopier.first-world.info/shop.html</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="125"/> + <location filename="../../../HelpDialog.cpp" line="111"/> <source>http://ultracopier.first-world.info/download.html</source> <translation type="unfinished"></translation> </message> @@ -577,12 +562,12 @@ This version is compiled as version: %1.</source> <context> <name>LocalListener</name> <message> - <location filename="../../../LocalListener.cpp" line="146"/> + <location filename="../../../LocalListener.cpp" line="160"/> <source>Warning</source> <translation>알림</translation> </message> <message> - <location filename="../../../LocalListener.cpp" line="146"/> + <location filename="../../../LocalListener.cpp" line="160"/> <source>Timeout while recomposing data from connected clients</source> <translation>연결된 클라이언트로부터 데이터를 재구성하는 동안에 시간이 초과되었습니다</translation> </message> @@ -590,27 +575,23 @@ This version is compiled as version: %1.</source> <context> <name>LogThread</name> <message> - <location filename="../../../LogThread.cpp" line="106"/> - <location filename="../../../LogThread.cpp" line="115"/> - <location filename="../../../LogThread.cpp" line="125"/> + <location filename="../../../LogThread.cpp" line="107"/> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> <source>Error</source> <translation>오류</translation> </message> <message> - <location filename="../../../LogThread.cpp" line="106"/> + <location filename="../../../LogThread.cpp" line="107"/> <source>Log file already open, error: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../LogThread.cpp" line="115"/> - <location filename="../../../LogThread.cpp" line="125"/> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> <source>Unable to open the log file, error: %1</source> <translation type="unfinished"></translation> </message> - <message> - <source>Unable to open file to keep the log file, error: %1</source> - <translation type="obsolete">로그 파일로 보존할 파일을 열 수 없습니다. 오류: %1</translation> - </message> </context> <context> <name>OSSpecific</name> @@ -649,21 +630,6 @@ This version is compiled as version: %1.</source> <source>The replacement of default copy/move system should be not supported by the file manager.<br />Ask to the developer to support it.<br />You need do the copy/move manually.</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../../OSSpecific.cpp" line="32"/> - <source>Consider Supercopier as deprecated, prefer Ultracopier</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OSSpecific.cpp" line="35"/> - <source>This version use 100% of you graphic card/GPU (you computer can be noisy, or slow/buggy during the games) at exchange of free access to Ultimate version. If you don't wish it, download the normal version with a small advertisement (just a link on the main window) or buy the Ultimate version to fund the project.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OSSpecific.cpp" line="36"/> - <source>http://ultracopier.first-world.info/download.html</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>OptionDialog</name> @@ -686,7 +652,7 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="66"/> <location filename="../../../OptionDialog.ui" line="322"/> - <location filename="../../../OptionDialog.cpp" line="354"/> + <location filename="../../../OptionDialog.cpp" line="286"/> <source>Copy engine</source> <translation>복사 엔진</translation> </message> @@ -702,10 +668,6 @@ This version is compiled as version: %1.</source> <translation>로그</translation> </message> <message> - <source>Load at the session loading:</source> - <translation type="obsolete">세션 시작시 프로그램 실행:</translation> - </message> - <message> <location filename="../../../OptionDialog.ui" line="222"/> <source>Confirm to group the windows</source> <translation type="unfinished"></translation> @@ -749,21 +711,21 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="71"/> <location filename="../../../OptionDialog.ui" line="335"/> - <location filename="../../../OptionDialog.cpp" line="355"/> + <location filename="../../../OptionDialog.cpp" line="287"/> <source>Listener</source> <translation>리스너</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="76"/> <location filename="../../../OptionDialog.ui" line="340"/> - <location filename="../../../OptionDialog.cpp" line="356"/> + <location filename="../../../OptionDialog.cpp" line="288"/> <source>Plugin loader</source> <translation>플러그인 로더</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="84"/> <location filename="../../../OptionDialog.ui" line="345"/> - <location filename="../../../OptionDialog.cpp" line="357"/> + <location filename="../../../OptionDialog.cpp" line="289"/> <source>Session loader</source> <translation>섹션 로더</translation> </message> @@ -895,111 +857,75 @@ This version is compiled as version: %1.</source> <translation>로그 파일 작성:</translation> </message> <message> - <source>Write the transfers:</source> - <translation type="obsolete">전송 내역 작성:</translation> - </message> - <message> - <source>Write the errors:</source> - <translation type="obsolete">오류 내역 작성:</translation> - </message> - <message> - <source>Write the folder operations:</source> - <translation type="obsolete">폴더 작업 작성:</translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="260"/> - <location filename="../../../OptionDialog.cpp" line="274"/> + <location filename="../../../OptionDialog.cpp" line="190"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="260"/> + <location filename="../../../OptionDialog.cpp" line="190"/> <source>Load the theme?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="274"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load the language?</source> <translation type="unfinished"></translation> </message> <message> - <source>Disabled because you have any SessionLoader plugin</source> - <translation type="obsolete">어떤 세션로더 플러그인을 보유중이므로 비활성화되었습니다</translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="362"/> + <location filename="../../../OptionDialog.cpp" line="294"/> <source>Do nothing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="363"/> + <location filename="../../../OptionDialog.cpp" line="295"/> <source>Ask source as folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="364"/> + <location filename="../../../OptionDialog.cpp" line="296"/> <source>Ask sources as files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="365"/> + <location filename="../../../OptionDialog.cpp" line="297"/> <source>Never</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="366"/> + <location filename="../../../OptionDialog.cpp" line="298"/> <source>When source is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="367"/> + <location filename="../../../OptionDialog.cpp" line="299"/> <source>When destination is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="368"/> + <location filename="../../../OptionDialog.cpp" line="300"/> <source>When source and destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="369"/> + <location filename="../../../OptionDialog.cpp" line="301"/> <source>When source or destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="370"/> + <location filename="../../../OptionDialog.cpp" line="302"/> <source>Always</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="384"/> - <location filename="../../../OptionDialog.cpp" line="385"/> - <location filename="../../../OptionDialog.cpp" line="386"/> + <location filename="../../../OptionDialog.cpp" line="316"/> + <location filename="../../../OptionDialog.cpp" line="317"/> + <location filename="../../../OptionDialog.cpp" line="318"/> <source>The variables are %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="478"/> - <source>Allow the application</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="478"/> - <source>This Ultimate free version is only if %1 is allowed by your antivirus. Else you can get the normal free version</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="483"/> - <source>Enable the OpenCL</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="483"/> - <source>This Ultimate version is only if the OpenCL is installed with your graphic card drivers. Else you can get the normal free version</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="1591"/> + <location filename="../../../OptionDialog.cpp" line="948"/> <source>Save logs as: </source> <translation>로그 따로 저장:</translation> </message> @@ -1012,10 +938,10 @@ This version is compiled as version: %1.</source> <context> <name>OptionEngine</name> <message> - <location filename="../../../OptionEngine.cpp" line="161"/> - <location filename="../../../OptionEngine.cpp" line="165"/> - <location filename="../../../OptionEngine.cpp" line="202"/> - <location filename="../../../OptionEngine.cpp" line="206"/> + <location filename="../../../OptionEngine.cpp" line="162"/> + <location filename="../../../OptionEngine.cpp" line="169"/> + <location filename="../../../OptionEngine.cpp" line="211"/> + <location filename="../../../OptionEngine.cpp" line="215"/> <source>The variable was not found: %1 %2</source> <translation type="unfinished"></translation> </message> @@ -1058,42 +984,42 @@ This version is compiled as version: %1.</source> <translation>버전:</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="38"/> + <location filename="../../../PluginInformation.cpp" line="39"/> <source>Copy engine</source> <translation type="unfinished">복사 엔진</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="41"/> + <location filename="../../../PluginInformation.cpp" line="42"/> <source>Languages</source> <translation>언어</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="44"/> + <location filename="../../../PluginInformation.cpp" line="45"/> <source>Listener</source> <translation>리스너</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="47"/> + <location filename="../../../PluginInformation.cpp" line="48"/> <source>Plugin loader</source> <translation type="unfinished">플러그인 로더</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="50"/> + <location filename="../../../PluginInformation.cpp" line="51"/> <source>Session loader</source> <translation type="unfinished">섹션 로더</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="53"/> + <location filename="../../../PluginInformation.cpp" line="54"/> <source>Themes</source> <translation>테마</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="57"/> + <location filename="../../../PluginInformation.cpp" line="58"/> <source>Unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="67"/> + <location filename="../../../PluginInformation.cpp" line="68"/> <source>Information about %1</source> <translation>%1 파일 정보</translation> </message> @@ -1111,134 +1037,126 @@ This version is compiled as version: %1.</source> <context> <name>PluginsManager</name> <message> - <location filename="../../../PluginsManager.cpp" line="221"/> + <location filename="../../../PluginsManager.cpp" line="224"/> <source>informations.xml is not accessible</source> <translation>informations.xml 파일에 연결할 수 없습니다</translation> </message> <message> - <source>informations.xml not found into the plugin</source> - <translation type="obsolete">플러그인에서 informations.xml 파일을 찾을 수 없습니다</translation> - </message> - <message> - <location filename="../../../PluginsManager.cpp" line="487"/> + <location filename="../../../PluginsManager.cpp" line="494"/> <source>Dependencies part is wrong</source> <translation>종속된 부분이 잘못되었습니다</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="508"/> + <location filename="../../../PluginsManager.cpp" line="515"/> <source>Dependencies %1 are not satisfied, for plugin: %2</source> <translation>플러그인 %2에 대한 %1 종속성이 충족되지 않습니다</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="665"/> + <location filename="../../../PluginsManager.cpp" line="672"/> <source>Remove %1</source> <translation>%1 제거</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="676"/> + <location filename="../../../PluginsManager.cpp" line="683"/> <source>Error</source> <translation>오류</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="700"/> + <location filename="../../../PluginsManager.cpp" line="683"/> + <source>Error while the removing plugin, please check the rights on the folder: +%1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="707"/> <source>Information</source> <translation>정보</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="253"/> + <location filename="../../../PluginsManager.cpp" line="256"/> <source>%1, parse error at line %2, column %3: %4</source> <translation>%1, %2 라인에서 문법 오류, %3 열: %4</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="227"/> + <location filename="../../../PluginsManager.cpp" line="230"/> <source>informations.xml not found for the plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="261"/> + <location filename="../../../PluginsManager.cpp" line="264"/> <source>"package" root tag not found for the xml file</source> <translation>xml 파일을 위한 "패키지" 루트 태그를 찾을 수 없습니다</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="337"/> + <location filename="../../../PluginsManager.cpp" line="340"/> <source>Duplicated plugin found, already loaded!</source> <translation>중복된 플러그인 발견, 이미 호출되었습니다!</translation> </message> <message> - <source>English text missing into the informations.xml for the tag: %1</source> - <translation type="obsolete">태그 표시를 위한 informations.xml 파일에서 누락된 영문 텍스트: %1</translation> - </message> - <message> - <location filename="../../../PluginsManager.cpp" line="395"/> + <location filename="../../../PluginsManager.cpp" line="401"/> <source>English text missing in the informations.xml for the tag: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="403"/> + <location filename="../../../PluginsManager.cpp" line="409"/> <source>Tag not found: %1</source> <translation>태그를 찾을 수 없음: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="665"/> + <location filename="../../../PluginsManager.cpp" line="672"/> <source>Are you sure about removing "%1" in version %2?</source> <translation>%2 버전에서 %1을 제거하시겠습니까?</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="676"/> - <source>Error while the removing plugin, please check the rights on the folder: -%1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../PluginsManager.cpp" line="700"/> + <location filename="../../../PluginsManager.cpp" line="707"/> <source>Previous import is in progress...</source> <translation>이전의 가져오기가 진행중입니다...</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="703"/> + <location filename="../../../PluginsManager.cpp" line="710"/> <source>Open Ultracopier plugin</source> <translation>Ultracopier 플러그인 열기</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="703"/> + <location filename="../../../PluginsManager.cpp" line="710"/> <source>Ultracopier plugin (*.urc)</source> <translation>Ultracopier (*.urc)</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="720"/> - <location filename="../../../PluginsManager.cpp" line="745"/> - <location filename="../../../PluginsManager.cpp" line="813"/> - <location filename="../../../PluginsManager.cpp" line="826"/> - <location filename="../../../PluginsManager.cpp" line="845"/> - <location filename="../../../PluginsManager.cpp" line="851"/> - <location filename="../../../PluginsManager.cpp" line="857"/> - <location filename="../../../PluginsManager.cpp" line="863"/> - <location filename="../../../PluginsManager.cpp" line="869"/> + <location filename="../../../PluginsManager.cpp" line="727"/> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="820"/> + <location filename="../../../PluginsManager.cpp" line="833"/> + <location filename="../../../PluginsManager.cpp" line="852"/> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="870"/> <location filename="../../../PluginsManager.cpp" line="876"/> + <location filename="../../../PluginsManager.cpp" line="883"/> <source>Plugin loader</source> <translation>플러그인 로더</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="720"/> + <location filename="../../../PluginsManager.cpp" line="727"/> <source>Unable to open the plugin: %1</source> <translation>플러그인 열기 불가: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="745"/> - <location filename="../../../PluginsManager.cpp" line="863"/> - <location filename="../../../PluginsManager.cpp" line="876"/> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="870"/> + <location filename="../../../PluginsManager.cpp" line="883"/> <source>Unable to load the plugin content, please check it: %1</source> <translation>플러그인 내용을 불러올 수 없습니다. 확인해주십시오: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="813"/> + <location filename="../../../PluginsManager.cpp" line="820"/> <source>Unable to create a folder to install the plugin: %1</source> <translation>플러그인을 설치할 폴더를 생성할 수 없음: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="826"/> + <location filename="../../../PluginsManager.cpp" line="833"/> <source>Unable to create a file to install the plugin: %1 since:%2</source> @@ -1247,16 +1165,16 @@ since:%2</source> since:%2</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="845"/> + <location filename="../../../PluginsManager.cpp" line="852"/> <source>Folder with same name is present, skip the plugin installation: %1</source> <translation>동일한 이름의 폴더가 존재합니다. 플러그인 설치 건너뛰기: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="851"/> - <location filename="../../../PluginsManager.cpp" line="857"/> - <location filename="../../../PluginsManager.cpp" line="869"/> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="876"/> <source>Unable to load the plugin content, please check it</source> <translation>플러그인 컨태츠를 불러올 수 없습니다. 확인해주십시오</translation> </message> @@ -1309,119 +1227,34 @@ since:%2</translation> <context> <name>SystrayIcon</name> <message> - <location filename="../../../SystrayIcon.cpp" line="163"/> + <location filename="../../../SystrayIcon.cpp" line="155"/> <source>No copy listener found. Do the copy manually by right click one the system tray icon.</source> <translation type="unfinished">복사 리스너를 찾을 수 없습니다. 트레이 아이콘에서 우클릭하여 수동으로 복사하십시오.</translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="169"/> + <location filename="../../../SystrayIcon.cpp" line="161"/> <source>Information</source> <translation type="unfinished">정보</translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="187"/> + <location filename="../../../SystrayIcon.cpp" line="179"/> <source>Searching information...</source> <translation type="unfinished">정보 검색중...</translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="200"/> + <location filename="../../../SystrayIcon.cpp" line="192"/> <source>Do not replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="205"/> + <location filename="../../../SystrayIcon.cpp" line="197"/> <source>Semi replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="210"/> + <location filename="../../../SystrayIcon.cpp" line="202"/> <source>Replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="377"/> - <source>Warning</source> - <translation type="unfinished">알림</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="377"/> - <source>The action on the systray icon is unknown!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="425"/> - <source>&About/Debug report</source> - <translation type="unfinished">&정보/디버그 보고서</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="427"/> - <source>&About</source> - <translation type="unfinished">&정보</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="430"/> - <source>&Save bug report</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="432"/> - <source>&Quit</source> - <translation type="unfinished">&끝내기</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="433"/> - <source>&Options</source> - <translation type="unfinished">&옵션</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="485"/> - <source>A&dd copy/moving</source> - <translation type="unfinished">복사/이동 &추가</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="471"/> - <source>New version: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="471"/> - <source>Click here to go on download page</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="511"/> - <source>&Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="525"/> - <location filename="../../../SystrayIcon.cpp" line="539"/> - <source>&Transfer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="529"/> - <location filename="../../../SystrayIcon.cpp" line="543"/> - <source>&Move</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="560"/> - <location filename="../../../SystrayIcon.cpp" line="577"/> - <source>Add &copy</source> - <translation type="unfinished">&복사 추가</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="566"/> - <location filename="../../../SystrayIcon.cpp" line="583"/> - <source>Add &transfer</source> - <translation type="unfinished">&전송 추가</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="570"/> - <location filename="../../../SystrayIcon.cpp" line="587"/> - <source>Add &move</source> - <translation type="unfinished">&이동 추가</translation> - </message> </context> </TS> diff --git a/plugins/Languages/nl/informations.xml b/plugins/Languages/nl/informations.xml index f24488a..f5d04f8 100644 --- a/plugins/Languages/nl/informations.xml +++ b/plugins/Languages/nl/informations.xml @@ -12,7 +12,7 @@ <!-- Detailed description --> <description xml:lang="en"><![CDATA[Translation of Ultracopier to dutch. For more details see the web site.]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>1.2.3.6</version> + <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>nl</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/nl/translation.ts b/plugins/Languages/nl/translation.ts index b02bb87..d364f81 100644 --- a/plugins/Languages/nl/translation.ts +++ b/plugins/Languages/nl/translation.ts @@ -1,86 +1,86 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>CliParser</name> <message> - <location filename="../../../CliParser.cpp" line="25"/> - <location filename="../../../CliParser.cpp" line="71"/> - <location filename="../../../CliParser.cpp" line="84"/> - <location filename="../../../CliParser.cpp" line="94"/> - <location filename="../../../CliParser.cpp" line="179"/> + <location filename="../../../CliParser.cpp" line="26"/> + <location filename="../../../CliParser.cpp" line="72"/> + <location filename="../../../CliParser.cpp" line="85"/> + <location filename="../../../CliParser.cpp" line="95"/> + <location filename="../../../CliParser.cpp" line="180"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="25"/> + <location filename="../../../CliParser.cpp" line="26"/> <source>Ultracopier is already running, right click on its system tray icon (near the clock) to use it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="71"/> + <location filename="../../../CliParser.cpp" line="72"/> <source>Problem reading file, or file size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="159"/> - <location filename="../../../CliParser.cpp" line="170"/> + <location filename="../../../CliParser.cpp" line="160"/> + <location filename="../../../CliParser.cpp" line="171"/> <source>The arguments possible are:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="161"/> - <location filename="../../../CliParser.cpp" line="172"/> + <location filename="../../../CliParser.cpp" line="162"/> + <location filename="../../../CliParser.cpp" line="173"/> <source>To display the options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="162"/> - <location filename="../../../CliParser.cpp" line="173"/> + <location filename="../../../CliParser.cpp" line="163"/> + <location filename="../../../CliParser.cpp" line="174"/> <source>To quit the other instances (if running)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="164"/> - <location filename="../../../CliParser.cpp" line="175"/> + <location filename="../../../CliParser.cpp" line="165"/> + <location filename="../../../CliParser.cpp" line="176"/> <source>To copy sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="165"/> - <location filename="../../../CliParser.cpp" line="176"/> + <location filename="../../../CliParser.cpp" line="166"/> + <location filename="../../../CliParser.cpp" line="177"/> <source>To move sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="169"/> + <location filename="../../../CliParser.cpp" line="170"/> <source>Command not valid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="84"/> + <location filename="../../../CliParser.cpp" line="85"/> <source>This file is not supported transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="94"/> + <location filename="../../../CliParser.cpp" line="95"/> <source>Unable to open the transfer list file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="160"/> - <location filename="../../../CliParser.cpp" line="171"/> + <location filename="../../../CliParser.cpp" line="161"/> + <location filename="../../../CliParser.cpp" line="172"/> <source>To display this help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="163"/> - <location filename="../../../CliParser.cpp" line="174"/> + <location filename="../../../CliParser.cpp" line="164"/> + <location filename="../../../CliParser.cpp" line="175"/> <source>Open transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="181"/> + <location filename="../../../CliParser.cpp" line="182"/> <source>Help</source> <translation type="unfinished"></translation> </message> @@ -88,30 +88,30 @@ <context> <name>CopyEngineManager</name> <message> - <location filename="../../../CopyEngineManager.cpp" line="229"/> - <location filename="../../../CopyEngineManager.cpp" line="234"/> - <location filename="../../../CopyEngineManager.cpp" line="257"/> - <location filename="../../../CopyEngineManager.cpp" line="271"/> + <location filename="../../../CopyEngineManager.cpp" line="231"/> + <location filename="../../../CopyEngineManager.cpp" line="236"/> + <location filename="../../../CopyEngineManager.cpp" line="259"/> + <location filename="../../../CopyEngineManager.cpp" line="273"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="229"/> + <location filename="../../../CopyEngineManager.cpp" line="231"/> <source>Cannot find any copy engine with move support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="257"/> + <location filename="../../../CopyEngineManager.cpp" line="259"/> <source>This copy engine does not support move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="234"/> + <location filename="../../../CopyEngineManager.cpp" line="236"/> <source>Cannot find any compatible engine!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="271"/> + <location filename="../../../CopyEngineManager.cpp" line="273"/> <source>Cannot find any engine with this name: %1</source> <translation type="unfinished"></translation> </message> @@ -119,12 +119,12 @@ <context> <name>CopyListener</name> <message> - <location filename="../../../CopyListener.cpp" line="158"/> + <location filename="../../../CopyListener.cpp" line="159"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyListener.cpp" line="158"/> + <location filename="../../../CopyListener.cpp" line="159"/> <source>Error during the reception of the copy/move list %1</source> <translation type="unfinished"></translation> @@ -133,70 +133,70 @@ <context> <name>Core</name> <message> - <location filename="../../../Core.cpp" line="45"/> - <location filename="../../../Core.cpp" line="116"/> - <location filename="../../../Core.cpp" line="142"/> - <location filename="../../../Core.cpp" line="157"/> - <location filename="../../../Core.cpp" line="177"/> - <location filename="../../../Core.cpp" line="191"/> - <location filename="../../../Core.cpp" line="200"/> - <location filename="../../../Core.cpp" line="209"/> - <location filename="../../../Core.cpp" line="216"/> - <location filename="../../../Core.cpp" line="250"/> - <location filename="../../../Core.cpp" line="387"/> - <location filename="../../../Core.cpp" line="392"/> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="117"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> + <location filename="../../../Core.cpp" line="217"/> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> + <location filename="../../../Core.cpp" line="393"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="45"/> - <location filename="../../../Core.cpp" line="142"/> - <location filename="../../../Core.cpp" line="157"/> - <location filename="../../../Core.cpp" line="177"/> - <location filename="../../../Core.cpp" line="191"/> - <location filename="../../../Core.cpp" line="200"/> - <location filename="../../../Core.cpp" line="209"/> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> <source>Unable to get a copy engine instance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="93"/> + <location filename="../../../Core.cpp" line="94"/> <source>Group window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="93"/> + <location filename="../../../Core.cpp" line="94"/> <source>Do you want group the transfer with another actual running transfer?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="116"/> + <location filename="../../../Core.cpp" line="117"/> <source>Unable to get a engine instance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="216"/> + <location filename="../../../Core.cpp" line="217"/> <source>The argument for the mode is not valid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="1133"/> + <location filename="../../../Core.cpp" line="1136"/> <source>Do you want to copy? If no, it will be moved.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="250"/> - <location filename="../../../Core.cpp" line="387"/> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> <source>Unable to load the interface, copy aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="392"/> + <location filename="../../../Core.cpp" line="393"/> <source>Unable to load the copy engine, copy aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="1133"/> + <location filename="../../../Core.cpp" line="1136"/> <source>Transfer mode</source> <translation type="unfinished"></translation> </message> @@ -204,12 +204,12 @@ <context> <name>EventDispatcher</name> <message> - <location filename="../../../EventDispatcher.cpp" line="155"/> + <location filename="../../../EventDispatcher.cpp" line="152"/> <source>Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../EventDispatcher.cpp" line="155"/> + <location filename="../../../EventDispatcher.cpp" line="152"/> <source>Give the key of this software, more information on <a href="http://ultracopier.first-world.info/">ultracopier.first-world.info</a></source> <translation type="unfinished"></translation> </message> @@ -217,257 +217,257 @@ <context> <name>FacilityEngine</name> <message> - <location filename="../../../FacilityEngine.cpp" line="43"/> + <location filename="../../../FacilityEngine.cpp" line="53"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="45"/> + <location filename="../../../FacilityEngine.cpp" line="55"/> <source>Copy</source> <extracomment>a copy</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="49"/> + <location filename="../../../FacilityEngine.cpp" line="59"/> <source>Move</source> <extracomment>a move</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="51"/> + <location filename="../../../FacilityEngine.cpp" line="61"/> <source>Pause</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="52"/> + <location filename="../../../FacilityEngine.cpp" line="62"/> <source>Resume</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="53"/> - <location filename="../../../FacilityEngine.cpp" line="67"/> + <location filename="../../../FacilityEngine.cpp" line="63"/> + <location filename="../../../FacilityEngine.cpp" line="77"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="54"/> + <location filename="../../../FacilityEngine.cpp" line="64"/> <source>Unlimited</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="27"/> + <location filename="../../../FacilityEngine.cpp" line="37"/> <source>s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="28"/> + <location filename="../../../FacilityEngine.cpp" line="38"/> <source>Too big</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="29"/> + <location filename="../../../FacilityEngine.cpp" line="39"/> <source>B</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="30"/> + <location filename="../../../FacilityEngine.cpp" line="40"/> <source>KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="31"/> + <location filename="../../../FacilityEngine.cpp" line="41"/> <source>MB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="32"/> + <location filename="../../../FacilityEngine.cpp" line="42"/> <source>GB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="33"/> + <location filename="../../../FacilityEngine.cpp" line="43"/> <source>TB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="34"/> + <location filename="../../../FacilityEngine.cpp" line="44"/> <source>PB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="35"/> + <location filename="../../../FacilityEngine.cpp" line="45"/> <source>EB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="36"/> + <location filename="../../../FacilityEngine.cpp" line="46"/> <source>ZB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="37"/> + <location filename="../../../FacilityEngine.cpp" line="47"/> <source>YB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="38"/> + <location filename="../../../FacilityEngine.cpp" line="48"/> <source>Less than %10 seconds</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="39"/> + <location filename="../../../FacilityEngine.cpp" line="49"/> <source>About %10 seconds remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="40"/> + <location filename="../../../FacilityEngine.cpp" line="50"/> <source>About %1 minutes remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="41"/> + <location filename="../../../FacilityEngine.cpp" line="51"/> <source>About %1 hours remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="47"/> + <location filename="../../../FacilityEngine.cpp" line="57"/> <source>Transfer</source> <extracomment>a transfer</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="50"/> + <location filename="../../../FacilityEngine.cpp" line="60"/> <source>Start</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="55"/> + <location filename="../../../FacilityEngine.cpp" line="65"/> <source>Source</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="56"/> + <location filename="../../../FacilityEngine.cpp" line="66"/> <source>Size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="57"/> + <location filename="../../../FacilityEngine.cpp" line="67"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="58"/> + <location filename="../../../FacilityEngine.cpp" line="68"/> <source>Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="59"/> + <location filename="../../../FacilityEngine.cpp" line="69"/> <source>Target</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="60"/> - <location filename="../../../FacilityEngine.cpp" line="64"/> + <location filename="../../../FacilityEngine.cpp" line="70"/> + <location filename="../../../FacilityEngine.cpp" line="74"/> <source>Time remaining:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="61"/> + <location filename="../../../FacilityEngine.cpp" line="71"/> <source>Listing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="62"/> + <location filename="../../../FacilityEngine.cpp" line="72"/> <source>Copying</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="63"/> + <location filename="../../../FacilityEngine.cpp" line="73"/> <source>Listing and copying</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="66"/> + <location filename="../../../FacilityEngine.cpp" line="76"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="68"/> + <location filename="../../../FacilityEngine.cpp" line="78"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="69"/> + <location filename="../../../FacilityEngine.cpp" line="79"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="70"/> + <location filename="../../../FacilityEngine.cpp" line="80"/> <source>Overwrite if the last modification dates are different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="71"/> + <location filename="../../../FacilityEngine.cpp" line="81"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="72"/> + <location filename="../../../FacilityEngine.cpp" line="82"/> <source>Put to the end of the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="73"/> + <location filename="../../../FacilityEngine.cpp" line="83"/> <source>Select source directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="74"/> + <location filename="../../../FacilityEngine.cpp" line="84"/> <source>Select destination directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="75"/> + <location filename="../../../FacilityEngine.cpp" line="85"/> <source>Internal error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="76"/> + <location filename="../../../FacilityEngine.cpp" line="86"/> <source>Select one or more files to open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="77"/> + <location filename="../../../FacilityEngine.cpp" line="87"/> <source>All files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="78"/> + <location filename="../../../FacilityEngine.cpp" line="88"/> <source>Save transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="79"/> + <location filename="../../../FacilityEngine.cpp" line="89"/> <source>Open transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="80"/> + <location filename="../../../FacilityEngine.cpp" line="90"/> <source>Transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="81"/> + <location filename="../../../FacilityEngine.cpp" line="91"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="82"/> + <location filename="../../../FacilityEngine.cpp" line="92"/> <source>Not supported on this platform</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="83"/> + <location filename="../../../FacilityEngine.cpp" line="93"/> <source>Completed in %1</source> <translation type="unfinished"></translation> </message> @@ -475,7 +475,7 @@ <context> <name>HelpDialog</name> <message> - <location filename="../../../HelpDialog.cpp" line="37"/> + <location filename="../../../HelpDialog.cpp" line="34"/> <source>About Ultracopier</source> <translation type="unfinished"></translation> </message> @@ -513,49 +513,42 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="35"/> - <source>About Supercopier</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../HelpDialog.cpp" line="80"/> + <location filename="../../../HelpDialog.cpp" line="73"/> <source>For http://portableapps.com/</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="83"/> + <location filename="../../../HelpDialog.cpp" line="76"/> <source>Portable and all in one version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="85"/> + <location filename="../../../HelpDialog.cpp" line="78"/> <source>Portable version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="90"/> + <location filename="../../../HelpDialog.cpp" line="83"/> <source>All in one version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="92"/> + <location filename="../../../HelpDialog.cpp" line="85"/> <source>Normal version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="110"/> - <location filename="../../../HelpDialog.cpp" line="112"/> - <location filename="../../../HelpDialog.cpp" line="123"/> + <location filename="../../../HelpDialog.cpp" line="102"/> <source>http://ultracopier.first-world.info/</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="120"/> + <location filename="../../../HelpDialog.cpp" line="109"/> <source>http://ultracopier.first-world.info/shop.html</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="125"/> + <location filename="../../../HelpDialog.cpp" line="111"/> <source>http://ultracopier.first-world.info/download.html</source> <translation type="unfinished"></translation> </message> @@ -569,12 +562,12 @@ This version is compiled as version: %1.</source> <context> <name>LocalListener</name> <message> - <location filename="../../../LocalListener.cpp" line="146"/> + <location filename="../../../LocalListener.cpp" line="160"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../LocalListener.cpp" line="146"/> + <location filename="../../../LocalListener.cpp" line="160"/> <source>Timeout while recomposing data from connected clients</source> <translation type="unfinished"></translation> </message> @@ -582,20 +575,20 @@ This version is compiled as version: %1.</source> <context> <name>LogThread</name> <message> - <location filename="../../../LogThread.cpp" line="106"/> - <location filename="../../../LogThread.cpp" line="115"/> - <location filename="../../../LogThread.cpp" line="125"/> + <location filename="../../../LogThread.cpp" line="107"/> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../LogThread.cpp" line="106"/> + <location filename="../../../LogThread.cpp" line="107"/> <source>Log file already open, error: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../LogThread.cpp" line="115"/> - <location filename="../../../LogThread.cpp" line="125"/> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> <source>Unable to open the log file, error: %1</source> <translation type="unfinished"></translation> </message> @@ -637,21 +630,6 @@ This version is compiled as version: %1.</source> <source>The replacement of default copy/move system should be not supported by the file manager.<br />Ask to the developer to support it.<br />You need do the copy/move manually.</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../../OSSpecific.cpp" line="32"/> - <source>Consider Supercopier as deprecated, prefer Ultracopier</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OSSpecific.cpp" line="35"/> - <source>This version use 100% of you graphic card/GPU (you computer can be noisy, or slow/buggy during the games) at exchange of free access to Ultimate version. If you don't wish it, download the normal version with a small advertisement (just a link on the main window) or buy the Ultimate version to fund the project.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OSSpecific.cpp" line="36"/> - <source>http://ultracopier.first-world.info/download.html</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>OptionDialog</name> @@ -674,7 +652,7 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="66"/> <location filename="../../../OptionDialog.ui" line="322"/> - <location filename="../../../OptionDialog.cpp" line="354"/> + <location filename="../../../OptionDialog.cpp" line="286"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> @@ -717,21 +695,21 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="71"/> <location filename="../../../OptionDialog.ui" line="335"/> - <location filename="../../../OptionDialog.cpp" line="355"/> + <location filename="../../../OptionDialog.cpp" line="287"/> <source>Listener</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="76"/> <location filename="../../../OptionDialog.ui" line="340"/> - <location filename="../../../OptionDialog.cpp" line="356"/> + <location filename="../../../OptionDialog.cpp" line="288"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="84"/> <location filename="../../../OptionDialog.ui" line="345"/> - <location filename="../../../OptionDialog.cpp" line="357"/> + <location filename="../../../OptionDialog.cpp" line="289"/> <source>Session loader</source> <translation type="unfinished"></translation> </message> @@ -863,95 +841,75 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="260"/> - <location filename="../../../OptionDialog.cpp" line="274"/> + <location filename="../../../OptionDialog.cpp" line="190"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="260"/> + <location filename="../../../OptionDialog.cpp" line="190"/> <source>Load the theme?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="274"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load the language?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="362"/> + <location filename="../../../OptionDialog.cpp" line="294"/> <source>Do nothing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="363"/> + <location filename="../../../OptionDialog.cpp" line="295"/> <source>Ask source as folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="364"/> + <location filename="../../../OptionDialog.cpp" line="296"/> <source>Ask sources as files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="365"/> + <location filename="../../../OptionDialog.cpp" line="297"/> <source>Never</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="366"/> + <location filename="../../../OptionDialog.cpp" line="298"/> <source>When source is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="367"/> + <location filename="../../../OptionDialog.cpp" line="299"/> <source>When destination is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="368"/> + <location filename="../../../OptionDialog.cpp" line="300"/> <source>When source and destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="369"/> + <location filename="../../../OptionDialog.cpp" line="301"/> <source>When source or destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="370"/> + <location filename="../../../OptionDialog.cpp" line="302"/> <source>Always</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="384"/> - <location filename="../../../OptionDialog.cpp" line="385"/> - <location filename="../../../OptionDialog.cpp" line="386"/> + <location filename="../../../OptionDialog.cpp" line="316"/> + <location filename="../../../OptionDialog.cpp" line="317"/> + <location filename="../../../OptionDialog.cpp" line="318"/> <source>The variables are %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="478"/> - <source>Allow the application</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="478"/> - <source>This Ultimate free version is only if %1 is allowed by your antivirus. Else you can get the normal free version</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="483"/> - <source>Enable the OpenCL</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="483"/> - <source>This Ultimate version is only if the OpenCL is installed with your graphic card drivers. Else you can get the normal free version</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="1591"/> + <location filename="../../../OptionDialog.cpp" line="948"/> <source>Save logs as: </source> <translation type="unfinished"></translation> </message> @@ -980,10 +938,10 @@ This version is compiled as version: %1.</source> <context> <name>OptionEngine</name> <message> - <location filename="../../../OptionEngine.cpp" line="161"/> - <location filename="../../../OptionEngine.cpp" line="165"/> - <location filename="../../../OptionEngine.cpp" line="202"/> - <location filename="../../../OptionEngine.cpp" line="206"/> + <location filename="../../../OptionEngine.cpp" line="162"/> + <location filename="../../../OptionEngine.cpp" line="169"/> + <location filename="../../../OptionEngine.cpp" line="211"/> + <location filename="../../../OptionEngine.cpp" line="215"/> <source>The variable was not found: %1 %2</source> <translation type="unfinished"></translation> </message> @@ -1026,42 +984,42 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="38"/> + <location filename="../../../PluginInformation.cpp" line="39"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="41"/> + <location filename="../../../PluginInformation.cpp" line="42"/> <source>Languages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="44"/> + <location filename="../../../PluginInformation.cpp" line="45"/> <source>Listener</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="47"/> + <location filename="../../../PluginInformation.cpp" line="48"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="50"/> + <location filename="../../../PluginInformation.cpp" line="51"/> <source>Session loader</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="53"/> + <location filename="../../../PluginInformation.cpp" line="54"/> <source>Themes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="57"/> + <location filename="../../../PluginInformation.cpp" line="58"/> <source>Unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="67"/> + <location filename="../../../PluginInformation.cpp" line="68"/> <source>Information about %1</source> <translation type="unfinished"></translation> </message> @@ -1079,140 +1037,140 @@ This version is compiled as version: %1.</source> <context> <name>PluginsManager</name> <message> - <location filename="../../../PluginsManager.cpp" line="221"/> + <location filename="../../../PluginsManager.cpp" line="224"/> <source>informations.xml is not accessible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="487"/> + <location filename="../../../PluginsManager.cpp" line="494"/> <source>Dependencies part is wrong</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="508"/> + <location filename="../../../PluginsManager.cpp" line="515"/> <source>Dependencies %1 are not satisfied, for plugin: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="665"/> + <location filename="../../../PluginsManager.cpp" line="672"/> <source>Remove %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="676"/> + <location filename="../../../PluginsManager.cpp" line="683"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="700"/> + <location filename="../../../PluginsManager.cpp" line="683"/> + <source>Error while the removing plugin, please check the rights on the folder: +%1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="707"/> <source>Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="253"/> + <location filename="../../../PluginsManager.cpp" line="256"/> <source>%1, parse error at line %2, column %3: %4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="227"/> + <location filename="../../../PluginsManager.cpp" line="230"/> <source>informations.xml not found for the plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="261"/> + <location filename="../../../PluginsManager.cpp" line="264"/> <source>"package" root tag not found for the xml file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="337"/> + <location filename="../../../PluginsManager.cpp" line="340"/> <source>Duplicated plugin found, already loaded!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="395"/> + <location filename="../../../PluginsManager.cpp" line="401"/> <source>English text missing in the informations.xml for the tag: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="403"/> + <location filename="../../../PluginsManager.cpp" line="409"/> <source>Tag not found: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="665"/> + <location filename="../../../PluginsManager.cpp" line="672"/> <source>Are you sure about removing "%1" in version %2?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="676"/> - <source>Error while the removing plugin, please check the rights on the folder: -%1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../PluginsManager.cpp" line="700"/> + <location filename="../../../PluginsManager.cpp" line="707"/> <source>Previous import is in progress...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="703"/> + <location filename="../../../PluginsManager.cpp" line="710"/> <source>Open Ultracopier plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="703"/> + <location filename="../../../PluginsManager.cpp" line="710"/> <source>Ultracopier plugin (*.urc)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="720"/> - <location filename="../../../PluginsManager.cpp" line="745"/> - <location filename="../../../PluginsManager.cpp" line="813"/> - <location filename="../../../PluginsManager.cpp" line="826"/> - <location filename="../../../PluginsManager.cpp" line="845"/> - <location filename="../../../PluginsManager.cpp" line="851"/> - <location filename="../../../PluginsManager.cpp" line="857"/> - <location filename="../../../PluginsManager.cpp" line="863"/> - <location filename="../../../PluginsManager.cpp" line="869"/> + <location filename="../../../PluginsManager.cpp" line="727"/> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="820"/> + <location filename="../../../PluginsManager.cpp" line="833"/> + <location filename="../../../PluginsManager.cpp" line="852"/> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="870"/> <location filename="../../../PluginsManager.cpp" line="876"/> + <location filename="../../../PluginsManager.cpp" line="883"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="720"/> + <location filename="../../../PluginsManager.cpp" line="727"/> <source>Unable to open the plugin: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="745"/> - <location filename="../../../PluginsManager.cpp" line="863"/> - <location filename="../../../PluginsManager.cpp" line="876"/> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="870"/> + <location filename="../../../PluginsManager.cpp" line="883"/> <source>Unable to load the plugin content, please check it: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="813"/> + <location filename="../../../PluginsManager.cpp" line="820"/> <source>Unable to create a folder to install the plugin: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="826"/> + <location filename="../../../PluginsManager.cpp" line="833"/> <source>Unable to create a file to install the plugin: %1 since:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="845"/> + <location filename="../../../PluginsManager.cpp" line="852"/> <source>Folder with same name is present, skip the plugin installation: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="851"/> - <location filename="../../../PluginsManager.cpp" line="857"/> - <location filename="../../../PluginsManager.cpp" line="869"/> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="876"/> <source>Unable to load the plugin content, please check it</source> <translation type="unfinished"></translation> </message> @@ -1265,119 +1223,34 @@ since:%2</source> <context> <name>SystrayIcon</name> <message> - <location filename="../../../SystrayIcon.cpp" line="163"/> + <location filename="../../../SystrayIcon.cpp" line="155"/> <source>No copy listener found. Do the copy manually by right click one the system tray icon.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="169"/> + <location filename="../../../SystrayIcon.cpp" line="161"/> <source>Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="187"/> + <location filename="../../../SystrayIcon.cpp" line="179"/> <source>Searching information...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="200"/> + <location filename="../../../SystrayIcon.cpp" line="192"/> <source>Do not replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="205"/> + <location filename="../../../SystrayIcon.cpp" line="197"/> <source>Semi replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="210"/> + <location filename="../../../SystrayIcon.cpp" line="202"/> <source>Replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="377"/> - <source>Warning</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="377"/> - <source>The action on the systray icon is unknown!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="425"/> - <source>&About/Debug report</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="427"/> - <source>&About</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="430"/> - <source>&Save bug report</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="432"/> - <source>&Quit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="433"/> - <source>&Options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="485"/> - <source>A&dd copy/moving</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="471"/> - <source>New version: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="471"/> - <source>Click here to go on download page</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="511"/> - <source>&Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="525"/> - <location filename="../../../SystrayIcon.cpp" line="539"/> - <source>&Transfer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="529"/> - <location filename="../../../SystrayIcon.cpp" line="543"/> - <source>&Move</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="560"/> - <location filename="../../../SystrayIcon.cpp" line="577"/> - <source>Add &copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="566"/> - <location filename="../../../SystrayIcon.cpp" line="583"/> - <source>Add &transfer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="570"/> - <location filename="../../../SystrayIcon.cpp" line="587"/> - <source>Add &move</source> - <translation type="unfinished"></translation> - </message> </context> </TS> diff --git a/plugins/Languages/no/informations.xml b/plugins/Languages/no/informations.xml index e1a0a1a..5cb447b 100644 --- a/plugins/Languages/no/informations.xml +++ b/plugins/Languages/no/informations.xml @@ -12,7 +12,7 @@ <!-- Detailed description --> <description xml:lang="en"><![CDATA[Translation of Ultracopier to norwegian. For more details see the web site.]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>1.2.3.6</version> + <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>no</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/no/translation.ts b/plugins/Languages/no/translation.ts index b02bb87..d364f81 100644 --- a/plugins/Languages/no/translation.ts +++ b/plugins/Languages/no/translation.ts @@ -1,86 +1,86 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>CliParser</name> <message> - <location filename="../../../CliParser.cpp" line="25"/> - <location filename="../../../CliParser.cpp" line="71"/> - <location filename="../../../CliParser.cpp" line="84"/> - <location filename="../../../CliParser.cpp" line="94"/> - <location filename="../../../CliParser.cpp" line="179"/> + <location filename="../../../CliParser.cpp" line="26"/> + <location filename="../../../CliParser.cpp" line="72"/> + <location filename="../../../CliParser.cpp" line="85"/> + <location filename="../../../CliParser.cpp" line="95"/> + <location filename="../../../CliParser.cpp" line="180"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="25"/> + <location filename="../../../CliParser.cpp" line="26"/> <source>Ultracopier is already running, right click on its system tray icon (near the clock) to use it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="71"/> + <location filename="../../../CliParser.cpp" line="72"/> <source>Problem reading file, or file size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="159"/> - <location filename="../../../CliParser.cpp" line="170"/> + <location filename="../../../CliParser.cpp" line="160"/> + <location filename="../../../CliParser.cpp" line="171"/> <source>The arguments possible are:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="161"/> - <location filename="../../../CliParser.cpp" line="172"/> + <location filename="../../../CliParser.cpp" line="162"/> + <location filename="../../../CliParser.cpp" line="173"/> <source>To display the options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="162"/> - <location filename="../../../CliParser.cpp" line="173"/> + <location filename="../../../CliParser.cpp" line="163"/> + <location filename="../../../CliParser.cpp" line="174"/> <source>To quit the other instances (if running)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="164"/> - <location filename="../../../CliParser.cpp" line="175"/> + <location filename="../../../CliParser.cpp" line="165"/> + <location filename="../../../CliParser.cpp" line="176"/> <source>To copy sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="165"/> - <location filename="../../../CliParser.cpp" line="176"/> + <location filename="../../../CliParser.cpp" line="166"/> + <location filename="../../../CliParser.cpp" line="177"/> <source>To move sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="169"/> + <location filename="../../../CliParser.cpp" line="170"/> <source>Command not valid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="84"/> + <location filename="../../../CliParser.cpp" line="85"/> <source>This file is not supported transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="94"/> + <location filename="../../../CliParser.cpp" line="95"/> <source>Unable to open the transfer list file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="160"/> - <location filename="../../../CliParser.cpp" line="171"/> + <location filename="../../../CliParser.cpp" line="161"/> + <location filename="../../../CliParser.cpp" line="172"/> <source>To display this help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="163"/> - <location filename="../../../CliParser.cpp" line="174"/> + <location filename="../../../CliParser.cpp" line="164"/> + <location filename="../../../CliParser.cpp" line="175"/> <source>Open transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="181"/> + <location filename="../../../CliParser.cpp" line="182"/> <source>Help</source> <translation type="unfinished"></translation> </message> @@ -88,30 +88,30 @@ <context> <name>CopyEngineManager</name> <message> - <location filename="../../../CopyEngineManager.cpp" line="229"/> - <location filename="../../../CopyEngineManager.cpp" line="234"/> - <location filename="../../../CopyEngineManager.cpp" line="257"/> - <location filename="../../../CopyEngineManager.cpp" line="271"/> + <location filename="../../../CopyEngineManager.cpp" line="231"/> + <location filename="../../../CopyEngineManager.cpp" line="236"/> + <location filename="../../../CopyEngineManager.cpp" line="259"/> + <location filename="../../../CopyEngineManager.cpp" line="273"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="229"/> + <location filename="../../../CopyEngineManager.cpp" line="231"/> <source>Cannot find any copy engine with move support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="257"/> + <location filename="../../../CopyEngineManager.cpp" line="259"/> <source>This copy engine does not support move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="234"/> + <location filename="../../../CopyEngineManager.cpp" line="236"/> <source>Cannot find any compatible engine!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="271"/> + <location filename="../../../CopyEngineManager.cpp" line="273"/> <source>Cannot find any engine with this name: %1</source> <translation type="unfinished"></translation> </message> @@ -119,12 +119,12 @@ <context> <name>CopyListener</name> <message> - <location filename="../../../CopyListener.cpp" line="158"/> + <location filename="../../../CopyListener.cpp" line="159"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyListener.cpp" line="158"/> + <location filename="../../../CopyListener.cpp" line="159"/> <source>Error during the reception of the copy/move list %1</source> <translation type="unfinished"></translation> @@ -133,70 +133,70 @@ <context> <name>Core</name> <message> - <location filename="../../../Core.cpp" line="45"/> - <location filename="../../../Core.cpp" line="116"/> - <location filename="../../../Core.cpp" line="142"/> - <location filename="../../../Core.cpp" line="157"/> - <location filename="../../../Core.cpp" line="177"/> - <location filename="../../../Core.cpp" line="191"/> - <location filename="../../../Core.cpp" line="200"/> - <location filename="../../../Core.cpp" line="209"/> - <location filename="../../../Core.cpp" line="216"/> - <location filename="../../../Core.cpp" line="250"/> - <location filename="../../../Core.cpp" line="387"/> - <location filename="../../../Core.cpp" line="392"/> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="117"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> + <location filename="../../../Core.cpp" line="217"/> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> + <location filename="../../../Core.cpp" line="393"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="45"/> - <location filename="../../../Core.cpp" line="142"/> - <location filename="../../../Core.cpp" line="157"/> - <location filename="../../../Core.cpp" line="177"/> - <location filename="../../../Core.cpp" line="191"/> - <location filename="../../../Core.cpp" line="200"/> - <location filename="../../../Core.cpp" line="209"/> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> <source>Unable to get a copy engine instance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="93"/> + <location filename="../../../Core.cpp" line="94"/> <source>Group window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="93"/> + <location filename="../../../Core.cpp" line="94"/> <source>Do you want group the transfer with another actual running transfer?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="116"/> + <location filename="../../../Core.cpp" line="117"/> <source>Unable to get a engine instance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="216"/> + <location filename="../../../Core.cpp" line="217"/> <source>The argument for the mode is not valid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="1133"/> + <location filename="../../../Core.cpp" line="1136"/> <source>Do you want to copy? If no, it will be moved.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="250"/> - <location filename="../../../Core.cpp" line="387"/> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> <source>Unable to load the interface, copy aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="392"/> + <location filename="../../../Core.cpp" line="393"/> <source>Unable to load the copy engine, copy aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="1133"/> + <location filename="../../../Core.cpp" line="1136"/> <source>Transfer mode</source> <translation type="unfinished"></translation> </message> @@ -204,12 +204,12 @@ <context> <name>EventDispatcher</name> <message> - <location filename="../../../EventDispatcher.cpp" line="155"/> + <location filename="../../../EventDispatcher.cpp" line="152"/> <source>Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../EventDispatcher.cpp" line="155"/> + <location filename="../../../EventDispatcher.cpp" line="152"/> <source>Give the key of this software, more information on <a href="http://ultracopier.first-world.info/">ultracopier.first-world.info</a></source> <translation type="unfinished"></translation> </message> @@ -217,257 +217,257 @@ <context> <name>FacilityEngine</name> <message> - <location filename="../../../FacilityEngine.cpp" line="43"/> + <location filename="../../../FacilityEngine.cpp" line="53"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="45"/> + <location filename="../../../FacilityEngine.cpp" line="55"/> <source>Copy</source> <extracomment>a copy</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="49"/> + <location filename="../../../FacilityEngine.cpp" line="59"/> <source>Move</source> <extracomment>a move</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="51"/> + <location filename="../../../FacilityEngine.cpp" line="61"/> <source>Pause</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="52"/> + <location filename="../../../FacilityEngine.cpp" line="62"/> <source>Resume</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="53"/> - <location filename="../../../FacilityEngine.cpp" line="67"/> + <location filename="../../../FacilityEngine.cpp" line="63"/> + <location filename="../../../FacilityEngine.cpp" line="77"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="54"/> + <location filename="../../../FacilityEngine.cpp" line="64"/> <source>Unlimited</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="27"/> + <location filename="../../../FacilityEngine.cpp" line="37"/> <source>s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="28"/> + <location filename="../../../FacilityEngine.cpp" line="38"/> <source>Too big</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="29"/> + <location filename="../../../FacilityEngine.cpp" line="39"/> <source>B</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="30"/> + <location filename="../../../FacilityEngine.cpp" line="40"/> <source>KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="31"/> + <location filename="../../../FacilityEngine.cpp" line="41"/> <source>MB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="32"/> + <location filename="../../../FacilityEngine.cpp" line="42"/> <source>GB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="33"/> + <location filename="../../../FacilityEngine.cpp" line="43"/> <source>TB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="34"/> + <location filename="../../../FacilityEngine.cpp" line="44"/> <source>PB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="35"/> + <location filename="../../../FacilityEngine.cpp" line="45"/> <source>EB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="36"/> + <location filename="../../../FacilityEngine.cpp" line="46"/> <source>ZB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="37"/> + <location filename="../../../FacilityEngine.cpp" line="47"/> <source>YB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="38"/> + <location filename="../../../FacilityEngine.cpp" line="48"/> <source>Less than %10 seconds</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="39"/> + <location filename="../../../FacilityEngine.cpp" line="49"/> <source>About %10 seconds remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="40"/> + <location filename="../../../FacilityEngine.cpp" line="50"/> <source>About %1 minutes remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="41"/> + <location filename="../../../FacilityEngine.cpp" line="51"/> <source>About %1 hours remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="47"/> + <location filename="../../../FacilityEngine.cpp" line="57"/> <source>Transfer</source> <extracomment>a transfer</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="50"/> + <location filename="../../../FacilityEngine.cpp" line="60"/> <source>Start</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="55"/> + <location filename="../../../FacilityEngine.cpp" line="65"/> <source>Source</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="56"/> + <location filename="../../../FacilityEngine.cpp" line="66"/> <source>Size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="57"/> + <location filename="../../../FacilityEngine.cpp" line="67"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="58"/> + <location filename="../../../FacilityEngine.cpp" line="68"/> <source>Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="59"/> + <location filename="../../../FacilityEngine.cpp" line="69"/> <source>Target</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="60"/> - <location filename="../../../FacilityEngine.cpp" line="64"/> + <location filename="../../../FacilityEngine.cpp" line="70"/> + <location filename="../../../FacilityEngine.cpp" line="74"/> <source>Time remaining:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="61"/> + <location filename="../../../FacilityEngine.cpp" line="71"/> <source>Listing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="62"/> + <location filename="../../../FacilityEngine.cpp" line="72"/> <source>Copying</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="63"/> + <location filename="../../../FacilityEngine.cpp" line="73"/> <source>Listing and copying</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="66"/> + <location filename="../../../FacilityEngine.cpp" line="76"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="68"/> + <location filename="../../../FacilityEngine.cpp" line="78"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="69"/> + <location filename="../../../FacilityEngine.cpp" line="79"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="70"/> + <location filename="../../../FacilityEngine.cpp" line="80"/> <source>Overwrite if the last modification dates are different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="71"/> + <location filename="../../../FacilityEngine.cpp" line="81"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="72"/> + <location filename="../../../FacilityEngine.cpp" line="82"/> <source>Put to the end of the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="73"/> + <location filename="../../../FacilityEngine.cpp" line="83"/> <source>Select source directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="74"/> + <location filename="../../../FacilityEngine.cpp" line="84"/> <source>Select destination directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="75"/> + <location filename="../../../FacilityEngine.cpp" line="85"/> <source>Internal error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="76"/> + <location filename="../../../FacilityEngine.cpp" line="86"/> <source>Select one or more files to open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="77"/> + <location filename="../../../FacilityEngine.cpp" line="87"/> <source>All files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="78"/> + <location filename="../../../FacilityEngine.cpp" line="88"/> <source>Save transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="79"/> + <location filename="../../../FacilityEngine.cpp" line="89"/> <source>Open transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="80"/> + <location filename="../../../FacilityEngine.cpp" line="90"/> <source>Transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="81"/> + <location filename="../../../FacilityEngine.cpp" line="91"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="82"/> + <location filename="../../../FacilityEngine.cpp" line="92"/> <source>Not supported on this platform</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="83"/> + <location filename="../../../FacilityEngine.cpp" line="93"/> <source>Completed in %1</source> <translation type="unfinished"></translation> </message> @@ -475,7 +475,7 @@ <context> <name>HelpDialog</name> <message> - <location filename="../../../HelpDialog.cpp" line="37"/> + <location filename="../../../HelpDialog.cpp" line="34"/> <source>About Ultracopier</source> <translation type="unfinished"></translation> </message> @@ -513,49 +513,42 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="35"/> - <source>About Supercopier</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../HelpDialog.cpp" line="80"/> + <location filename="../../../HelpDialog.cpp" line="73"/> <source>For http://portableapps.com/</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="83"/> + <location filename="../../../HelpDialog.cpp" line="76"/> <source>Portable and all in one version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="85"/> + <location filename="../../../HelpDialog.cpp" line="78"/> <source>Portable version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="90"/> + <location filename="../../../HelpDialog.cpp" line="83"/> <source>All in one version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="92"/> + <location filename="../../../HelpDialog.cpp" line="85"/> <source>Normal version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="110"/> - <location filename="../../../HelpDialog.cpp" line="112"/> - <location filename="../../../HelpDialog.cpp" line="123"/> + <location filename="../../../HelpDialog.cpp" line="102"/> <source>http://ultracopier.first-world.info/</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="120"/> + <location filename="../../../HelpDialog.cpp" line="109"/> <source>http://ultracopier.first-world.info/shop.html</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="125"/> + <location filename="../../../HelpDialog.cpp" line="111"/> <source>http://ultracopier.first-world.info/download.html</source> <translation type="unfinished"></translation> </message> @@ -569,12 +562,12 @@ This version is compiled as version: %1.</source> <context> <name>LocalListener</name> <message> - <location filename="../../../LocalListener.cpp" line="146"/> + <location filename="../../../LocalListener.cpp" line="160"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../LocalListener.cpp" line="146"/> + <location filename="../../../LocalListener.cpp" line="160"/> <source>Timeout while recomposing data from connected clients</source> <translation type="unfinished"></translation> </message> @@ -582,20 +575,20 @@ This version is compiled as version: %1.</source> <context> <name>LogThread</name> <message> - <location filename="../../../LogThread.cpp" line="106"/> - <location filename="../../../LogThread.cpp" line="115"/> - <location filename="../../../LogThread.cpp" line="125"/> + <location filename="../../../LogThread.cpp" line="107"/> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../LogThread.cpp" line="106"/> + <location filename="../../../LogThread.cpp" line="107"/> <source>Log file already open, error: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../LogThread.cpp" line="115"/> - <location filename="../../../LogThread.cpp" line="125"/> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> <source>Unable to open the log file, error: %1</source> <translation type="unfinished"></translation> </message> @@ -637,21 +630,6 @@ This version is compiled as version: %1.</source> <source>The replacement of default copy/move system should be not supported by the file manager.<br />Ask to the developer to support it.<br />You need do the copy/move manually.</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../../OSSpecific.cpp" line="32"/> - <source>Consider Supercopier as deprecated, prefer Ultracopier</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OSSpecific.cpp" line="35"/> - <source>This version use 100% of you graphic card/GPU (you computer can be noisy, or slow/buggy during the games) at exchange of free access to Ultimate version. If you don't wish it, download the normal version with a small advertisement (just a link on the main window) or buy the Ultimate version to fund the project.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OSSpecific.cpp" line="36"/> - <source>http://ultracopier.first-world.info/download.html</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>OptionDialog</name> @@ -674,7 +652,7 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="66"/> <location filename="../../../OptionDialog.ui" line="322"/> - <location filename="../../../OptionDialog.cpp" line="354"/> + <location filename="../../../OptionDialog.cpp" line="286"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> @@ -717,21 +695,21 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="71"/> <location filename="../../../OptionDialog.ui" line="335"/> - <location filename="../../../OptionDialog.cpp" line="355"/> + <location filename="../../../OptionDialog.cpp" line="287"/> <source>Listener</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="76"/> <location filename="../../../OptionDialog.ui" line="340"/> - <location filename="../../../OptionDialog.cpp" line="356"/> + <location filename="../../../OptionDialog.cpp" line="288"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="84"/> <location filename="../../../OptionDialog.ui" line="345"/> - <location filename="../../../OptionDialog.cpp" line="357"/> + <location filename="../../../OptionDialog.cpp" line="289"/> <source>Session loader</source> <translation type="unfinished"></translation> </message> @@ -863,95 +841,75 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="260"/> - <location filename="../../../OptionDialog.cpp" line="274"/> + <location filename="../../../OptionDialog.cpp" line="190"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="260"/> + <location filename="../../../OptionDialog.cpp" line="190"/> <source>Load the theme?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="274"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load the language?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="362"/> + <location filename="../../../OptionDialog.cpp" line="294"/> <source>Do nothing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="363"/> + <location filename="../../../OptionDialog.cpp" line="295"/> <source>Ask source as folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="364"/> + <location filename="../../../OptionDialog.cpp" line="296"/> <source>Ask sources as files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="365"/> + <location filename="../../../OptionDialog.cpp" line="297"/> <source>Never</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="366"/> + <location filename="../../../OptionDialog.cpp" line="298"/> <source>When source is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="367"/> + <location filename="../../../OptionDialog.cpp" line="299"/> <source>When destination is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="368"/> + <location filename="../../../OptionDialog.cpp" line="300"/> <source>When source and destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="369"/> + <location filename="../../../OptionDialog.cpp" line="301"/> <source>When source or destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="370"/> + <location filename="../../../OptionDialog.cpp" line="302"/> <source>Always</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="384"/> - <location filename="../../../OptionDialog.cpp" line="385"/> - <location filename="../../../OptionDialog.cpp" line="386"/> + <location filename="../../../OptionDialog.cpp" line="316"/> + <location filename="../../../OptionDialog.cpp" line="317"/> + <location filename="../../../OptionDialog.cpp" line="318"/> <source>The variables are %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="478"/> - <source>Allow the application</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="478"/> - <source>This Ultimate free version is only if %1 is allowed by your antivirus. Else you can get the normal free version</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="483"/> - <source>Enable the OpenCL</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="483"/> - <source>This Ultimate version is only if the OpenCL is installed with your graphic card drivers. Else you can get the normal free version</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="1591"/> + <location filename="../../../OptionDialog.cpp" line="948"/> <source>Save logs as: </source> <translation type="unfinished"></translation> </message> @@ -980,10 +938,10 @@ This version is compiled as version: %1.</source> <context> <name>OptionEngine</name> <message> - <location filename="../../../OptionEngine.cpp" line="161"/> - <location filename="../../../OptionEngine.cpp" line="165"/> - <location filename="../../../OptionEngine.cpp" line="202"/> - <location filename="../../../OptionEngine.cpp" line="206"/> + <location filename="../../../OptionEngine.cpp" line="162"/> + <location filename="../../../OptionEngine.cpp" line="169"/> + <location filename="../../../OptionEngine.cpp" line="211"/> + <location filename="../../../OptionEngine.cpp" line="215"/> <source>The variable was not found: %1 %2</source> <translation type="unfinished"></translation> </message> @@ -1026,42 +984,42 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="38"/> + <location filename="../../../PluginInformation.cpp" line="39"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="41"/> + <location filename="../../../PluginInformation.cpp" line="42"/> <source>Languages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="44"/> + <location filename="../../../PluginInformation.cpp" line="45"/> <source>Listener</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="47"/> + <location filename="../../../PluginInformation.cpp" line="48"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="50"/> + <location filename="../../../PluginInformation.cpp" line="51"/> <source>Session loader</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="53"/> + <location filename="../../../PluginInformation.cpp" line="54"/> <source>Themes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="57"/> + <location filename="../../../PluginInformation.cpp" line="58"/> <source>Unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="67"/> + <location filename="../../../PluginInformation.cpp" line="68"/> <source>Information about %1</source> <translation type="unfinished"></translation> </message> @@ -1079,140 +1037,140 @@ This version is compiled as version: %1.</source> <context> <name>PluginsManager</name> <message> - <location filename="../../../PluginsManager.cpp" line="221"/> + <location filename="../../../PluginsManager.cpp" line="224"/> <source>informations.xml is not accessible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="487"/> + <location filename="../../../PluginsManager.cpp" line="494"/> <source>Dependencies part is wrong</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="508"/> + <location filename="../../../PluginsManager.cpp" line="515"/> <source>Dependencies %1 are not satisfied, for plugin: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="665"/> + <location filename="../../../PluginsManager.cpp" line="672"/> <source>Remove %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="676"/> + <location filename="../../../PluginsManager.cpp" line="683"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="700"/> + <location filename="../../../PluginsManager.cpp" line="683"/> + <source>Error while the removing plugin, please check the rights on the folder: +%1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="707"/> <source>Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="253"/> + <location filename="../../../PluginsManager.cpp" line="256"/> <source>%1, parse error at line %2, column %3: %4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="227"/> + <location filename="../../../PluginsManager.cpp" line="230"/> <source>informations.xml not found for the plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="261"/> + <location filename="../../../PluginsManager.cpp" line="264"/> <source>"package" root tag not found for the xml file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="337"/> + <location filename="../../../PluginsManager.cpp" line="340"/> <source>Duplicated plugin found, already loaded!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="395"/> + <location filename="../../../PluginsManager.cpp" line="401"/> <source>English text missing in the informations.xml for the tag: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="403"/> + <location filename="../../../PluginsManager.cpp" line="409"/> <source>Tag not found: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="665"/> + <location filename="../../../PluginsManager.cpp" line="672"/> <source>Are you sure about removing "%1" in version %2?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="676"/> - <source>Error while the removing plugin, please check the rights on the folder: -%1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../PluginsManager.cpp" line="700"/> + <location filename="../../../PluginsManager.cpp" line="707"/> <source>Previous import is in progress...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="703"/> + <location filename="../../../PluginsManager.cpp" line="710"/> <source>Open Ultracopier plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="703"/> + <location filename="../../../PluginsManager.cpp" line="710"/> <source>Ultracopier plugin (*.urc)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="720"/> - <location filename="../../../PluginsManager.cpp" line="745"/> - <location filename="../../../PluginsManager.cpp" line="813"/> - <location filename="../../../PluginsManager.cpp" line="826"/> - <location filename="../../../PluginsManager.cpp" line="845"/> - <location filename="../../../PluginsManager.cpp" line="851"/> - <location filename="../../../PluginsManager.cpp" line="857"/> - <location filename="../../../PluginsManager.cpp" line="863"/> - <location filename="../../../PluginsManager.cpp" line="869"/> + <location filename="../../../PluginsManager.cpp" line="727"/> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="820"/> + <location filename="../../../PluginsManager.cpp" line="833"/> + <location filename="../../../PluginsManager.cpp" line="852"/> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="870"/> <location filename="../../../PluginsManager.cpp" line="876"/> + <location filename="../../../PluginsManager.cpp" line="883"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="720"/> + <location filename="../../../PluginsManager.cpp" line="727"/> <source>Unable to open the plugin: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="745"/> - <location filename="../../../PluginsManager.cpp" line="863"/> - <location filename="../../../PluginsManager.cpp" line="876"/> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="870"/> + <location filename="../../../PluginsManager.cpp" line="883"/> <source>Unable to load the plugin content, please check it: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="813"/> + <location filename="../../../PluginsManager.cpp" line="820"/> <source>Unable to create a folder to install the plugin: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="826"/> + <location filename="../../../PluginsManager.cpp" line="833"/> <source>Unable to create a file to install the plugin: %1 since:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="845"/> + <location filename="../../../PluginsManager.cpp" line="852"/> <source>Folder with same name is present, skip the plugin installation: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="851"/> - <location filename="../../../PluginsManager.cpp" line="857"/> - <location filename="../../../PluginsManager.cpp" line="869"/> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="876"/> <source>Unable to load the plugin content, please check it</source> <translation type="unfinished"></translation> </message> @@ -1265,119 +1223,34 @@ since:%2</source> <context> <name>SystrayIcon</name> <message> - <location filename="../../../SystrayIcon.cpp" line="163"/> + <location filename="../../../SystrayIcon.cpp" line="155"/> <source>No copy listener found. Do the copy manually by right click one the system tray icon.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="169"/> + <location filename="../../../SystrayIcon.cpp" line="161"/> <source>Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="187"/> + <location filename="../../../SystrayIcon.cpp" line="179"/> <source>Searching information...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="200"/> + <location filename="../../../SystrayIcon.cpp" line="192"/> <source>Do not replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="205"/> + <location filename="../../../SystrayIcon.cpp" line="197"/> <source>Semi replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="210"/> + <location filename="../../../SystrayIcon.cpp" line="202"/> <source>Replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="377"/> - <source>Warning</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="377"/> - <source>The action on the systray icon is unknown!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="425"/> - <source>&About/Debug report</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="427"/> - <source>&About</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="430"/> - <source>&Save bug report</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="432"/> - <source>&Quit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="433"/> - <source>&Options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="485"/> - <source>A&dd copy/moving</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="471"/> - <source>New version: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="471"/> - <source>Click here to go on download page</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="511"/> - <source>&Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="525"/> - <location filename="../../../SystrayIcon.cpp" line="539"/> - <source>&Transfer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="529"/> - <location filename="../../../SystrayIcon.cpp" line="543"/> - <source>&Move</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="560"/> - <location filename="../../../SystrayIcon.cpp" line="577"/> - <source>Add &copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="566"/> - <location filename="../../../SystrayIcon.cpp" line="583"/> - <source>Add &transfer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="570"/> - <location filename="../../../SystrayIcon.cpp" line="587"/> - <source>Add &move</source> - <translation type="unfinished"></translation> - </message> </context> </TS> diff --git a/plugins/Languages/pl/informations.xml b/plugins/Languages/pl/informations.xml index a9f04be..847ef03 100644 --- a/plugins/Languages/pl/informations.xml +++ b/plugins/Languages/pl/informations.xml @@ -12,7 +12,7 @@ <!-- Detailed description --> <description xml:lang="en"><![CDATA[Translation of Ultracopier to polish. For more details see the web site.]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>1.2.3.6</version> + <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>pl</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/pl/translation.ts b/plugins/Languages/pl/translation.ts index b02bb87..d364f81 100644 --- a/plugins/Languages/pl/translation.ts +++ b/plugins/Languages/pl/translation.ts @@ -1,86 +1,86 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>CliParser</name> <message> - <location filename="../../../CliParser.cpp" line="25"/> - <location filename="../../../CliParser.cpp" line="71"/> - <location filename="../../../CliParser.cpp" line="84"/> - <location filename="../../../CliParser.cpp" line="94"/> - <location filename="../../../CliParser.cpp" line="179"/> + <location filename="../../../CliParser.cpp" line="26"/> + <location filename="../../../CliParser.cpp" line="72"/> + <location filename="../../../CliParser.cpp" line="85"/> + <location filename="../../../CliParser.cpp" line="95"/> + <location filename="../../../CliParser.cpp" line="180"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="25"/> + <location filename="../../../CliParser.cpp" line="26"/> <source>Ultracopier is already running, right click on its system tray icon (near the clock) to use it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="71"/> + <location filename="../../../CliParser.cpp" line="72"/> <source>Problem reading file, or file size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="159"/> - <location filename="../../../CliParser.cpp" line="170"/> + <location filename="../../../CliParser.cpp" line="160"/> + <location filename="../../../CliParser.cpp" line="171"/> <source>The arguments possible are:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="161"/> - <location filename="../../../CliParser.cpp" line="172"/> + <location filename="../../../CliParser.cpp" line="162"/> + <location filename="../../../CliParser.cpp" line="173"/> <source>To display the options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="162"/> - <location filename="../../../CliParser.cpp" line="173"/> + <location filename="../../../CliParser.cpp" line="163"/> + <location filename="../../../CliParser.cpp" line="174"/> <source>To quit the other instances (if running)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="164"/> - <location filename="../../../CliParser.cpp" line="175"/> + <location filename="../../../CliParser.cpp" line="165"/> + <location filename="../../../CliParser.cpp" line="176"/> <source>To copy sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="165"/> - <location filename="../../../CliParser.cpp" line="176"/> + <location filename="../../../CliParser.cpp" line="166"/> + <location filename="../../../CliParser.cpp" line="177"/> <source>To move sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="169"/> + <location filename="../../../CliParser.cpp" line="170"/> <source>Command not valid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="84"/> + <location filename="../../../CliParser.cpp" line="85"/> <source>This file is not supported transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="94"/> + <location filename="../../../CliParser.cpp" line="95"/> <source>Unable to open the transfer list file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="160"/> - <location filename="../../../CliParser.cpp" line="171"/> + <location filename="../../../CliParser.cpp" line="161"/> + <location filename="../../../CliParser.cpp" line="172"/> <source>To display this help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="163"/> - <location filename="../../../CliParser.cpp" line="174"/> + <location filename="../../../CliParser.cpp" line="164"/> + <location filename="../../../CliParser.cpp" line="175"/> <source>Open transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="181"/> + <location filename="../../../CliParser.cpp" line="182"/> <source>Help</source> <translation type="unfinished"></translation> </message> @@ -88,30 +88,30 @@ <context> <name>CopyEngineManager</name> <message> - <location filename="../../../CopyEngineManager.cpp" line="229"/> - <location filename="../../../CopyEngineManager.cpp" line="234"/> - <location filename="../../../CopyEngineManager.cpp" line="257"/> - <location filename="../../../CopyEngineManager.cpp" line="271"/> + <location filename="../../../CopyEngineManager.cpp" line="231"/> + <location filename="../../../CopyEngineManager.cpp" line="236"/> + <location filename="../../../CopyEngineManager.cpp" line="259"/> + <location filename="../../../CopyEngineManager.cpp" line="273"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="229"/> + <location filename="../../../CopyEngineManager.cpp" line="231"/> <source>Cannot find any copy engine with move support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="257"/> + <location filename="../../../CopyEngineManager.cpp" line="259"/> <source>This copy engine does not support move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="234"/> + <location filename="../../../CopyEngineManager.cpp" line="236"/> <source>Cannot find any compatible engine!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="271"/> + <location filename="../../../CopyEngineManager.cpp" line="273"/> <source>Cannot find any engine with this name: %1</source> <translation type="unfinished"></translation> </message> @@ -119,12 +119,12 @@ <context> <name>CopyListener</name> <message> - <location filename="../../../CopyListener.cpp" line="158"/> + <location filename="../../../CopyListener.cpp" line="159"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyListener.cpp" line="158"/> + <location filename="../../../CopyListener.cpp" line="159"/> <source>Error during the reception of the copy/move list %1</source> <translation type="unfinished"></translation> @@ -133,70 +133,70 @@ <context> <name>Core</name> <message> - <location filename="../../../Core.cpp" line="45"/> - <location filename="../../../Core.cpp" line="116"/> - <location filename="../../../Core.cpp" line="142"/> - <location filename="../../../Core.cpp" line="157"/> - <location filename="../../../Core.cpp" line="177"/> - <location filename="../../../Core.cpp" line="191"/> - <location filename="../../../Core.cpp" line="200"/> - <location filename="../../../Core.cpp" line="209"/> - <location filename="../../../Core.cpp" line="216"/> - <location filename="../../../Core.cpp" line="250"/> - <location filename="../../../Core.cpp" line="387"/> - <location filename="../../../Core.cpp" line="392"/> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="117"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> + <location filename="../../../Core.cpp" line="217"/> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> + <location filename="../../../Core.cpp" line="393"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="45"/> - <location filename="../../../Core.cpp" line="142"/> - <location filename="../../../Core.cpp" line="157"/> - <location filename="../../../Core.cpp" line="177"/> - <location filename="../../../Core.cpp" line="191"/> - <location filename="../../../Core.cpp" line="200"/> - <location filename="../../../Core.cpp" line="209"/> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> <source>Unable to get a copy engine instance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="93"/> + <location filename="../../../Core.cpp" line="94"/> <source>Group window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="93"/> + <location filename="../../../Core.cpp" line="94"/> <source>Do you want group the transfer with another actual running transfer?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="116"/> + <location filename="../../../Core.cpp" line="117"/> <source>Unable to get a engine instance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="216"/> + <location filename="../../../Core.cpp" line="217"/> <source>The argument for the mode is not valid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="1133"/> + <location filename="../../../Core.cpp" line="1136"/> <source>Do you want to copy? If no, it will be moved.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="250"/> - <location filename="../../../Core.cpp" line="387"/> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> <source>Unable to load the interface, copy aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="392"/> + <location filename="../../../Core.cpp" line="393"/> <source>Unable to load the copy engine, copy aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="1133"/> + <location filename="../../../Core.cpp" line="1136"/> <source>Transfer mode</source> <translation type="unfinished"></translation> </message> @@ -204,12 +204,12 @@ <context> <name>EventDispatcher</name> <message> - <location filename="../../../EventDispatcher.cpp" line="155"/> + <location filename="../../../EventDispatcher.cpp" line="152"/> <source>Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../EventDispatcher.cpp" line="155"/> + <location filename="../../../EventDispatcher.cpp" line="152"/> <source>Give the key of this software, more information on <a href="http://ultracopier.first-world.info/">ultracopier.first-world.info</a></source> <translation type="unfinished"></translation> </message> @@ -217,257 +217,257 @@ <context> <name>FacilityEngine</name> <message> - <location filename="../../../FacilityEngine.cpp" line="43"/> + <location filename="../../../FacilityEngine.cpp" line="53"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="45"/> + <location filename="../../../FacilityEngine.cpp" line="55"/> <source>Copy</source> <extracomment>a copy</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="49"/> + <location filename="../../../FacilityEngine.cpp" line="59"/> <source>Move</source> <extracomment>a move</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="51"/> + <location filename="../../../FacilityEngine.cpp" line="61"/> <source>Pause</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="52"/> + <location filename="../../../FacilityEngine.cpp" line="62"/> <source>Resume</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="53"/> - <location filename="../../../FacilityEngine.cpp" line="67"/> + <location filename="../../../FacilityEngine.cpp" line="63"/> + <location filename="../../../FacilityEngine.cpp" line="77"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="54"/> + <location filename="../../../FacilityEngine.cpp" line="64"/> <source>Unlimited</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="27"/> + <location filename="../../../FacilityEngine.cpp" line="37"/> <source>s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="28"/> + <location filename="../../../FacilityEngine.cpp" line="38"/> <source>Too big</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="29"/> + <location filename="../../../FacilityEngine.cpp" line="39"/> <source>B</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="30"/> + <location filename="../../../FacilityEngine.cpp" line="40"/> <source>KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="31"/> + <location filename="../../../FacilityEngine.cpp" line="41"/> <source>MB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="32"/> + <location filename="../../../FacilityEngine.cpp" line="42"/> <source>GB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="33"/> + <location filename="../../../FacilityEngine.cpp" line="43"/> <source>TB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="34"/> + <location filename="../../../FacilityEngine.cpp" line="44"/> <source>PB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="35"/> + <location filename="../../../FacilityEngine.cpp" line="45"/> <source>EB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="36"/> + <location filename="../../../FacilityEngine.cpp" line="46"/> <source>ZB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="37"/> + <location filename="../../../FacilityEngine.cpp" line="47"/> <source>YB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="38"/> + <location filename="../../../FacilityEngine.cpp" line="48"/> <source>Less than %10 seconds</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="39"/> + <location filename="../../../FacilityEngine.cpp" line="49"/> <source>About %10 seconds remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="40"/> + <location filename="../../../FacilityEngine.cpp" line="50"/> <source>About %1 minutes remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="41"/> + <location filename="../../../FacilityEngine.cpp" line="51"/> <source>About %1 hours remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="47"/> + <location filename="../../../FacilityEngine.cpp" line="57"/> <source>Transfer</source> <extracomment>a transfer</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="50"/> + <location filename="../../../FacilityEngine.cpp" line="60"/> <source>Start</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="55"/> + <location filename="../../../FacilityEngine.cpp" line="65"/> <source>Source</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="56"/> + <location filename="../../../FacilityEngine.cpp" line="66"/> <source>Size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="57"/> + <location filename="../../../FacilityEngine.cpp" line="67"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="58"/> + <location filename="../../../FacilityEngine.cpp" line="68"/> <source>Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="59"/> + <location filename="../../../FacilityEngine.cpp" line="69"/> <source>Target</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="60"/> - <location filename="../../../FacilityEngine.cpp" line="64"/> + <location filename="../../../FacilityEngine.cpp" line="70"/> + <location filename="../../../FacilityEngine.cpp" line="74"/> <source>Time remaining:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="61"/> + <location filename="../../../FacilityEngine.cpp" line="71"/> <source>Listing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="62"/> + <location filename="../../../FacilityEngine.cpp" line="72"/> <source>Copying</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="63"/> + <location filename="../../../FacilityEngine.cpp" line="73"/> <source>Listing and copying</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="66"/> + <location filename="../../../FacilityEngine.cpp" line="76"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="68"/> + <location filename="../../../FacilityEngine.cpp" line="78"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="69"/> + <location filename="../../../FacilityEngine.cpp" line="79"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="70"/> + <location filename="../../../FacilityEngine.cpp" line="80"/> <source>Overwrite if the last modification dates are different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="71"/> + <location filename="../../../FacilityEngine.cpp" line="81"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="72"/> + <location filename="../../../FacilityEngine.cpp" line="82"/> <source>Put to the end of the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="73"/> + <location filename="../../../FacilityEngine.cpp" line="83"/> <source>Select source directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="74"/> + <location filename="../../../FacilityEngine.cpp" line="84"/> <source>Select destination directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="75"/> + <location filename="../../../FacilityEngine.cpp" line="85"/> <source>Internal error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="76"/> + <location filename="../../../FacilityEngine.cpp" line="86"/> <source>Select one or more files to open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="77"/> + <location filename="../../../FacilityEngine.cpp" line="87"/> <source>All files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="78"/> + <location filename="../../../FacilityEngine.cpp" line="88"/> <source>Save transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="79"/> + <location filename="../../../FacilityEngine.cpp" line="89"/> <source>Open transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="80"/> + <location filename="../../../FacilityEngine.cpp" line="90"/> <source>Transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="81"/> + <location filename="../../../FacilityEngine.cpp" line="91"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="82"/> + <location filename="../../../FacilityEngine.cpp" line="92"/> <source>Not supported on this platform</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="83"/> + <location filename="../../../FacilityEngine.cpp" line="93"/> <source>Completed in %1</source> <translation type="unfinished"></translation> </message> @@ -475,7 +475,7 @@ <context> <name>HelpDialog</name> <message> - <location filename="../../../HelpDialog.cpp" line="37"/> + <location filename="../../../HelpDialog.cpp" line="34"/> <source>About Ultracopier</source> <translation type="unfinished"></translation> </message> @@ -513,49 +513,42 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="35"/> - <source>About Supercopier</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../HelpDialog.cpp" line="80"/> + <location filename="../../../HelpDialog.cpp" line="73"/> <source>For http://portableapps.com/</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="83"/> + <location filename="../../../HelpDialog.cpp" line="76"/> <source>Portable and all in one version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="85"/> + <location filename="../../../HelpDialog.cpp" line="78"/> <source>Portable version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="90"/> + <location filename="../../../HelpDialog.cpp" line="83"/> <source>All in one version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="92"/> + <location filename="../../../HelpDialog.cpp" line="85"/> <source>Normal version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="110"/> - <location filename="../../../HelpDialog.cpp" line="112"/> - <location filename="../../../HelpDialog.cpp" line="123"/> + <location filename="../../../HelpDialog.cpp" line="102"/> <source>http://ultracopier.first-world.info/</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="120"/> + <location filename="../../../HelpDialog.cpp" line="109"/> <source>http://ultracopier.first-world.info/shop.html</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="125"/> + <location filename="../../../HelpDialog.cpp" line="111"/> <source>http://ultracopier.first-world.info/download.html</source> <translation type="unfinished"></translation> </message> @@ -569,12 +562,12 @@ This version is compiled as version: %1.</source> <context> <name>LocalListener</name> <message> - <location filename="../../../LocalListener.cpp" line="146"/> + <location filename="../../../LocalListener.cpp" line="160"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../LocalListener.cpp" line="146"/> + <location filename="../../../LocalListener.cpp" line="160"/> <source>Timeout while recomposing data from connected clients</source> <translation type="unfinished"></translation> </message> @@ -582,20 +575,20 @@ This version is compiled as version: %1.</source> <context> <name>LogThread</name> <message> - <location filename="../../../LogThread.cpp" line="106"/> - <location filename="../../../LogThread.cpp" line="115"/> - <location filename="../../../LogThread.cpp" line="125"/> + <location filename="../../../LogThread.cpp" line="107"/> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../LogThread.cpp" line="106"/> + <location filename="../../../LogThread.cpp" line="107"/> <source>Log file already open, error: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../LogThread.cpp" line="115"/> - <location filename="../../../LogThread.cpp" line="125"/> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> <source>Unable to open the log file, error: %1</source> <translation type="unfinished"></translation> </message> @@ -637,21 +630,6 @@ This version is compiled as version: %1.</source> <source>The replacement of default copy/move system should be not supported by the file manager.<br />Ask to the developer to support it.<br />You need do the copy/move manually.</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../../OSSpecific.cpp" line="32"/> - <source>Consider Supercopier as deprecated, prefer Ultracopier</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OSSpecific.cpp" line="35"/> - <source>This version use 100% of you graphic card/GPU (you computer can be noisy, or slow/buggy during the games) at exchange of free access to Ultimate version. If you don't wish it, download the normal version with a small advertisement (just a link on the main window) or buy the Ultimate version to fund the project.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OSSpecific.cpp" line="36"/> - <source>http://ultracopier.first-world.info/download.html</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>OptionDialog</name> @@ -674,7 +652,7 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="66"/> <location filename="../../../OptionDialog.ui" line="322"/> - <location filename="../../../OptionDialog.cpp" line="354"/> + <location filename="../../../OptionDialog.cpp" line="286"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> @@ -717,21 +695,21 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="71"/> <location filename="../../../OptionDialog.ui" line="335"/> - <location filename="../../../OptionDialog.cpp" line="355"/> + <location filename="../../../OptionDialog.cpp" line="287"/> <source>Listener</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="76"/> <location filename="../../../OptionDialog.ui" line="340"/> - <location filename="../../../OptionDialog.cpp" line="356"/> + <location filename="../../../OptionDialog.cpp" line="288"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="84"/> <location filename="../../../OptionDialog.ui" line="345"/> - <location filename="../../../OptionDialog.cpp" line="357"/> + <location filename="../../../OptionDialog.cpp" line="289"/> <source>Session loader</source> <translation type="unfinished"></translation> </message> @@ -863,95 +841,75 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="260"/> - <location filename="../../../OptionDialog.cpp" line="274"/> + <location filename="../../../OptionDialog.cpp" line="190"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="260"/> + <location filename="../../../OptionDialog.cpp" line="190"/> <source>Load the theme?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="274"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load the language?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="362"/> + <location filename="../../../OptionDialog.cpp" line="294"/> <source>Do nothing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="363"/> + <location filename="../../../OptionDialog.cpp" line="295"/> <source>Ask source as folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="364"/> + <location filename="../../../OptionDialog.cpp" line="296"/> <source>Ask sources as files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="365"/> + <location filename="../../../OptionDialog.cpp" line="297"/> <source>Never</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="366"/> + <location filename="../../../OptionDialog.cpp" line="298"/> <source>When source is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="367"/> + <location filename="../../../OptionDialog.cpp" line="299"/> <source>When destination is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="368"/> + <location filename="../../../OptionDialog.cpp" line="300"/> <source>When source and destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="369"/> + <location filename="../../../OptionDialog.cpp" line="301"/> <source>When source or destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="370"/> + <location filename="../../../OptionDialog.cpp" line="302"/> <source>Always</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="384"/> - <location filename="../../../OptionDialog.cpp" line="385"/> - <location filename="../../../OptionDialog.cpp" line="386"/> + <location filename="../../../OptionDialog.cpp" line="316"/> + <location filename="../../../OptionDialog.cpp" line="317"/> + <location filename="../../../OptionDialog.cpp" line="318"/> <source>The variables are %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="478"/> - <source>Allow the application</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="478"/> - <source>This Ultimate free version is only if %1 is allowed by your antivirus. Else you can get the normal free version</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="483"/> - <source>Enable the OpenCL</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="483"/> - <source>This Ultimate version is only if the OpenCL is installed with your graphic card drivers. Else you can get the normal free version</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="1591"/> + <location filename="../../../OptionDialog.cpp" line="948"/> <source>Save logs as: </source> <translation type="unfinished"></translation> </message> @@ -980,10 +938,10 @@ This version is compiled as version: %1.</source> <context> <name>OptionEngine</name> <message> - <location filename="../../../OptionEngine.cpp" line="161"/> - <location filename="../../../OptionEngine.cpp" line="165"/> - <location filename="../../../OptionEngine.cpp" line="202"/> - <location filename="../../../OptionEngine.cpp" line="206"/> + <location filename="../../../OptionEngine.cpp" line="162"/> + <location filename="../../../OptionEngine.cpp" line="169"/> + <location filename="../../../OptionEngine.cpp" line="211"/> + <location filename="../../../OptionEngine.cpp" line="215"/> <source>The variable was not found: %1 %2</source> <translation type="unfinished"></translation> </message> @@ -1026,42 +984,42 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="38"/> + <location filename="../../../PluginInformation.cpp" line="39"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="41"/> + <location filename="../../../PluginInformation.cpp" line="42"/> <source>Languages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="44"/> + <location filename="../../../PluginInformation.cpp" line="45"/> <source>Listener</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="47"/> + <location filename="../../../PluginInformation.cpp" line="48"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="50"/> + <location filename="../../../PluginInformation.cpp" line="51"/> <source>Session loader</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="53"/> + <location filename="../../../PluginInformation.cpp" line="54"/> <source>Themes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="57"/> + <location filename="../../../PluginInformation.cpp" line="58"/> <source>Unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="67"/> + <location filename="../../../PluginInformation.cpp" line="68"/> <source>Information about %1</source> <translation type="unfinished"></translation> </message> @@ -1079,140 +1037,140 @@ This version is compiled as version: %1.</source> <context> <name>PluginsManager</name> <message> - <location filename="../../../PluginsManager.cpp" line="221"/> + <location filename="../../../PluginsManager.cpp" line="224"/> <source>informations.xml is not accessible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="487"/> + <location filename="../../../PluginsManager.cpp" line="494"/> <source>Dependencies part is wrong</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="508"/> + <location filename="../../../PluginsManager.cpp" line="515"/> <source>Dependencies %1 are not satisfied, for plugin: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="665"/> + <location filename="../../../PluginsManager.cpp" line="672"/> <source>Remove %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="676"/> + <location filename="../../../PluginsManager.cpp" line="683"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="700"/> + <location filename="../../../PluginsManager.cpp" line="683"/> + <source>Error while the removing plugin, please check the rights on the folder: +%1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="707"/> <source>Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="253"/> + <location filename="../../../PluginsManager.cpp" line="256"/> <source>%1, parse error at line %2, column %3: %4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="227"/> + <location filename="../../../PluginsManager.cpp" line="230"/> <source>informations.xml not found for the plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="261"/> + <location filename="../../../PluginsManager.cpp" line="264"/> <source>"package" root tag not found for the xml file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="337"/> + <location filename="../../../PluginsManager.cpp" line="340"/> <source>Duplicated plugin found, already loaded!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="395"/> + <location filename="../../../PluginsManager.cpp" line="401"/> <source>English text missing in the informations.xml for the tag: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="403"/> + <location filename="../../../PluginsManager.cpp" line="409"/> <source>Tag not found: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="665"/> + <location filename="../../../PluginsManager.cpp" line="672"/> <source>Are you sure about removing "%1" in version %2?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="676"/> - <source>Error while the removing plugin, please check the rights on the folder: -%1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../PluginsManager.cpp" line="700"/> + <location filename="../../../PluginsManager.cpp" line="707"/> <source>Previous import is in progress...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="703"/> + <location filename="../../../PluginsManager.cpp" line="710"/> <source>Open Ultracopier plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="703"/> + <location filename="../../../PluginsManager.cpp" line="710"/> <source>Ultracopier plugin (*.urc)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="720"/> - <location filename="../../../PluginsManager.cpp" line="745"/> - <location filename="../../../PluginsManager.cpp" line="813"/> - <location filename="../../../PluginsManager.cpp" line="826"/> - <location filename="../../../PluginsManager.cpp" line="845"/> - <location filename="../../../PluginsManager.cpp" line="851"/> - <location filename="../../../PluginsManager.cpp" line="857"/> - <location filename="../../../PluginsManager.cpp" line="863"/> - <location filename="../../../PluginsManager.cpp" line="869"/> + <location filename="../../../PluginsManager.cpp" line="727"/> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="820"/> + <location filename="../../../PluginsManager.cpp" line="833"/> + <location filename="../../../PluginsManager.cpp" line="852"/> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="870"/> <location filename="../../../PluginsManager.cpp" line="876"/> + <location filename="../../../PluginsManager.cpp" line="883"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="720"/> + <location filename="../../../PluginsManager.cpp" line="727"/> <source>Unable to open the plugin: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="745"/> - <location filename="../../../PluginsManager.cpp" line="863"/> - <location filename="../../../PluginsManager.cpp" line="876"/> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="870"/> + <location filename="../../../PluginsManager.cpp" line="883"/> <source>Unable to load the plugin content, please check it: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="813"/> + <location filename="../../../PluginsManager.cpp" line="820"/> <source>Unable to create a folder to install the plugin: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="826"/> + <location filename="../../../PluginsManager.cpp" line="833"/> <source>Unable to create a file to install the plugin: %1 since:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="845"/> + <location filename="../../../PluginsManager.cpp" line="852"/> <source>Folder with same name is present, skip the plugin installation: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="851"/> - <location filename="../../../PluginsManager.cpp" line="857"/> - <location filename="../../../PluginsManager.cpp" line="869"/> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="876"/> <source>Unable to load the plugin content, please check it</source> <translation type="unfinished"></translation> </message> @@ -1265,119 +1223,34 @@ since:%2</source> <context> <name>SystrayIcon</name> <message> - <location filename="../../../SystrayIcon.cpp" line="163"/> + <location filename="../../../SystrayIcon.cpp" line="155"/> <source>No copy listener found. Do the copy manually by right click one the system tray icon.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="169"/> + <location filename="../../../SystrayIcon.cpp" line="161"/> <source>Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="187"/> + <location filename="../../../SystrayIcon.cpp" line="179"/> <source>Searching information...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="200"/> + <location filename="../../../SystrayIcon.cpp" line="192"/> <source>Do not replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="205"/> + <location filename="../../../SystrayIcon.cpp" line="197"/> <source>Semi replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="210"/> + <location filename="../../../SystrayIcon.cpp" line="202"/> <source>Replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="377"/> - <source>Warning</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="377"/> - <source>The action on the systray icon is unknown!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="425"/> - <source>&About/Debug report</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="427"/> - <source>&About</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="430"/> - <source>&Save bug report</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="432"/> - <source>&Quit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="433"/> - <source>&Options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="485"/> - <source>A&dd copy/moving</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="471"/> - <source>New version: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="471"/> - <source>Click here to go on download page</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="511"/> - <source>&Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="525"/> - <location filename="../../../SystrayIcon.cpp" line="539"/> - <source>&Transfer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="529"/> - <location filename="../../../SystrayIcon.cpp" line="543"/> - <source>&Move</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="560"/> - <location filename="../../../SystrayIcon.cpp" line="577"/> - <source>Add &copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="566"/> - <location filename="../../../SystrayIcon.cpp" line="583"/> - <source>Add &transfer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="570"/> - <location filename="../../../SystrayIcon.cpp" line="587"/> - <source>Add &move</source> - <translation type="unfinished"></translation> - </message> </context> </TS> diff --git a/plugins/Languages/pt/informations.xml b/plugins/Languages/pt/informations.xml index f7ed085..744ab32 100644 --- a/plugins/Languages/pt/informations.xml +++ b/plugins/Languages/pt/informations.xml @@ -12,7 +12,7 @@ <!-- Detailed description --> <description xml:lang="en"><![CDATA[Translation of Ultracopier to portuguese. For more details see the web site.]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>1.2.3.6</version> + <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>pt</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/pt/translation.ts b/plugins/Languages/pt/translation.ts index b02bb87..d364f81 100644 --- a/plugins/Languages/pt/translation.ts +++ b/plugins/Languages/pt/translation.ts @@ -1,86 +1,86 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>CliParser</name> <message> - <location filename="../../../CliParser.cpp" line="25"/> - <location filename="../../../CliParser.cpp" line="71"/> - <location filename="../../../CliParser.cpp" line="84"/> - <location filename="../../../CliParser.cpp" line="94"/> - <location filename="../../../CliParser.cpp" line="179"/> + <location filename="../../../CliParser.cpp" line="26"/> + <location filename="../../../CliParser.cpp" line="72"/> + <location filename="../../../CliParser.cpp" line="85"/> + <location filename="../../../CliParser.cpp" line="95"/> + <location filename="../../../CliParser.cpp" line="180"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="25"/> + <location filename="../../../CliParser.cpp" line="26"/> <source>Ultracopier is already running, right click on its system tray icon (near the clock) to use it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="71"/> + <location filename="../../../CliParser.cpp" line="72"/> <source>Problem reading file, or file size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="159"/> - <location filename="../../../CliParser.cpp" line="170"/> + <location filename="../../../CliParser.cpp" line="160"/> + <location filename="../../../CliParser.cpp" line="171"/> <source>The arguments possible are:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="161"/> - <location filename="../../../CliParser.cpp" line="172"/> + <location filename="../../../CliParser.cpp" line="162"/> + <location filename="../../../CliParser.cpp" line="173"/> <source>To display the options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="162"/> - <location filename="../../../CliParser.cpp" line="173"/> + <location filename="../../../CliParser.cpp" line="163"/> + <location filename="../../../CliParser.cpp" line="174"/> <source>To quit the other instances (if running)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="164"/> - <location filename="../../../CliParser.cpp" line="175"/> + <location filename="../../../CliParser.cpp" line="165"/> + <location filename="../../../CliParser.cpp" line="176"/> <source>To copy sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="165"/> - <location filename="../../../CliParser.cpp" line="176"/> + <location filename="../../../CliParser.cpp" line="166"/> + <location filename="../../../CliParser.cpp" line="177"/> <source>To move sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="169"/> + <location filename="../../../CliParser.cpp" line="170"/> <source>Command not valid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="84"/> + <location filename="../../../CliParser.cpp" line="85"/> <source>This file is not supported transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="94"/> + <location filename="../../../CliParser.cpp" line="95"/> <source>Unable to open the transfer list file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="160"/> - <location filename="../../../CliParser.cpp" line="171"/> + <location filename="../../../CliParser.cpp" line="161"/> + <location filename="../../../CliParser.cpp" line="172"/> <source>To display this help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="163"/> - <location filename="../../../CliParser.cpp" line="174"/> + <location filename="../../../CliParser.cpp" line="164"/> + <location filename="../../../CliParser.cpp" line="175"/> <source>Open transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="181"/> + <location filename="../../../CliParser.cpp" line="182"/> <source>Help</source> <translation type="unfinished"></translation> </message> @@ -88,30 +88,30 @@ <context> <name>CopyEngineManager</name> <message> - <location filename="../../../CopyEngineManager.cpp" line="229"/> - <location filename="../../../CopyEngineManager.cpp" line="234"/> - <location filename="../../../CopyEngineManager.cpp" line="257"/> - <location filename="../../../CopyEngineManager.cpp" line="271"/> + <location filename="../../../CopyEngineManager.cpp" line="231"/> + <location filename="../../../CopyEngineManager.cpp" line="236"/> + <location filename="../../../CopyEngineManager.cpp" line="259"/> + <location filename="../../../CopyEngineManager.cpp" line="273"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="229"/> + <location filename="../../../CopyEngineManager.cpp" line="231"/> <source>Cannot find any copy engine with move support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="257"/> + <location filename="../../../CopyEngineManager.cpp" line="259"/> <source>This copy engine does not support move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="234"/> + <location filename="../../../CopyEngineManager.cpp" line="236"/> <source>Cannot find any compatible engine!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="271"/> + <location filename="../../../CopyEngineManager.cpp" line="273"/> <source>Cannot find any engine with this name: %1</source> <translation type="unfinished"></translation> </message> @@ -119,12 +119,12 @@ <context> <name>CopyListener</name> <message> - <location filename="../../../CopyListener.cpp" line="158"/> + <location filename="../../../CopyListener.cpp" line="159"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyListener.cpp" line="158"/> + <location filename="../../../CopyListener.cpp" line="159"/> <source>Error during the reception of the copy/move list %1</source> <translation type="unfinished"></translation> @@ -133,70 +133,70 @@ <context> <name>Core</name> <message> - <location filename="../../../Core.cpp" line="45"/> - <location filename="../../../Core.cpp" line="116"/> - <location filename="../../../Core.cpp" line="142"/> - <location filename="../../../Core.cpp" line="157"/> - <location filename="../../../Core.cpp" line="177"/> - <location filename="../../../Core.cpp" line="191"/> - <location filename="../../../Core.cpp" line="200"/> - <location filename="../../../Core.cpp" line="209"/> - <location filename="../../../Core.cpp" line="216"/> - <location filename="../../../Core.cpp" line="250"/> - <location filename="../../../Core.cpp" line="387"/> - <location filename="../../../Core.cpp" line="392"/> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="117"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> + <location filename="../../../Core.cpp" line="217"/> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> + <location filename="../../../Core.cpp" line="393"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="45"/> - <location filename="../../../Core.cpp" line="142"/> - <location filename="../../../Core.cpp" line="157"/> - <location filename="../../../Core.cpp" line="177"/> - <location filename="../../../Core.cpp" line="191"/> - <location filename="../../../Core.cpp" line="200"/> - <location filename="../../../Core.cpp" line="209"/> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> <source>Unable to get a copy engine instance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="93"/> + <location filename="../../../Core.cpp" line="94"/> <source>Group window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="93"/> + <location filename="../../../Core.cpp" line="94"/> <source>Do you want group the transfer with another actual running transfer?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="116"/> + <location filename="../../../Core.cpp" line="117"/> <source>Unable to get a engine instance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="216"/> + <location filename="../../../Core.cpp" line="217"/> <source>The argument for the mode is not valid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="1133"/> + <location filename="../../../Core.cpp" line="1136"/> <source>Do you want to copy? If no, it will be moved.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="250"/> - <location filename="../../../Core.cpp" line="387"/> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> <source>Unable to load the interface, copy aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="392"/> + <location filename="../../../Core.cpp" line="393"/> <source>Unable to load the copy engine, copy aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="1133"/> + <location filename="../../../Core.cpp" line="1136"/> <source>Transfer mode</source> <translation type="unfinished"></translation> </message> @@ -204,12 +204,12 @@ <context> <name>EventDispatcher</name> <message> - <location filename="../../../EventDispatcher.cpp" line="155"/> + <location filename="../../../EventDispatcher.cpp" line="152"/> <source>Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../EventDispatcher.cpp" line="155"/> + <location filename="../../../EventDispatcher.cpp" line="152"/> <source>Give the key of this software, more information on <a href="http://ultracopier.first-world.info/">ultracopier.first-world.info</a></source> <translation type="unfinished"></translation> </message> @@ -217,257 +217,257 @@ <context> <name>FacilityEngine</name> <message> - <location filename="../../../FacilityEngine.cpp" line="43"/> + <location filename="../../../FacilityEngine.cpp" line="53"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="45"/> + <location filename="../../../FacilityEngine.cpp" line="55"/> <source>Copy</source> <extracomment>a copy</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="49"/> + <location filename="../../../FacilityEngine.cpp" line="59"/> <source>Move</source> <extracomment>a move</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="51"/> + <location filename="../../../FacilityEngine.cpp" line="61"/> <source>Pause</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="52"/> + <location filename="../../../FacilityEngine.cpp" line="62"/> <source>Resume</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="53"/> - <location filename="../../../FacilityEngine.cpp" line="67"/> + <location filename="../../../FacilityEngine.cpp" line="63"/> + <location filename="../../../FacilityEngine.cpp" line="77"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="54"/> + <location filename="../../../FacilityEngine.cpp" line="64"/> <source>Unlimited</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="27"/> + <location filename="../../../FacilityEngine.cpp" line="37"/> <source>s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="28"/> + <location filename="../../../FacilityEngine.cpp" line="38"/> <source>Too big</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="29"/> + <location filename="../../../FacilityEngine.cpp" line="39"/> <source>B</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="30"/> + <location filename="../../../FacilityEngine.cpp" line="40"/> <source>KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="31"/> + <location filename="../../../FacilityEngine.cpp" line="41"/> <source>MB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="32"/> + <location filename="../../../FacilityEngine.cpp" line="42"/> <source>GB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="33"/> + <location filename="../../../FacilityEngine.cpp" line="43"/> <source>TB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="34"/> + <location filename="../../../FacilityEngine.cpp" line="44"/> <source>PB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="35"/> + <location filename="../../../FacilityEngine.cpp" line="45"/> <source>EB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="36"/> + <location filename="../../../FacilityEngine.cpp" line="46"/> <source>ZB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="37"/> + <location filename="../../../FacilityEngine.cpp" line="47"/> <source>YB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="38"/> + <location filename="../../../FacilityEngine.cpp" line="48"/> <source>Less than %10 seconds</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="39"/> + <location filename="../../../FacilityEngine.cpp" line="49"/> <source>About %10 seconds remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="40"/> + <location filename="../../../FacilityEngine.cpp" line="50"/> <source>About %1 minutes remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="41"/> + <location filename="../../../FacilityEngine.cpp" line="51"/> <source>About %1 hours remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="47"/> + <location filename="../../../FacilityEngine.cpp" line="57"/> <source>Transfer</source> <extracomment>a transfer</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="50"/> + <location filename="../../../FacilityEngine.cpp" line="60"/> <source>Start</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="55"/> + <location filename="../../../FacilityEngine.cpp" line="65"/> <source>Source</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="56"/> + <location filename="../../../FacilityEngine.cpp" line="66"/> <source>Size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="57"/> + <location filename="../../../FacilityEngine.cpp" line="67"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="58"/> + <location filename="../../../FacilityEngine.cpp" line="68"/> <source>Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="59"/> + <location filename="../../../FacilityEngine.cpp" line="69"/> <source>Target</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="60"/> - <location filename="../../../FacilityEngine.cpp" line="64"/> + <location filename="../../../FacilityEngine.cpp" line="70"/> + <location filename="../../../FacilityEngine.cpp" line="74"/> <source>Time remaining:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="61"/> + <location filename="../../../FacilityEngine.cpp" line="71"/> <source>Listing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="62"/> + <location filename="../../../FacilityEngine.cpp" line="72"/> <source>Copying</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="63"/> + <location filename="../../../FacilityEngine.cpp" line="73"/> <source>Listing and copying</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="66"/> + <location filename="../../../FacilityEngine.cpp" line="76"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="68"/> + <location filename="../../../FacilityEngine.cpp" line="78"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="69"/> + <location filename="../../../FacilityEngine.cpp" line="79"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="70"/> + <location filename="../../../FacilityEngine.cpp" line="80"/> <source>Overwrite if the last modification dates are different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="71"/> + <location filename="../../../FacilityEngine.cpp" line="81"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="72"/> + <location filename="../../../FacilityEngine.cpp" line="82"/> <source>Put to the end of the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="73"/> + <location filename="../../../FacilityEngine.cpp" line="83"/> <source>Select source directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="74"/> + <location filename="../../../FacilityEngine.cpp" line="84"/> <source>Select destination directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="75"/> + <location filename="../../../FacilityEngine.cpp" line="85"/> <source>Internal error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="76"/> + <location filename="../../../FacilityEngine.cpp" line="86"/> <source>Select one or more files to open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="77"/> + <location filename="../../../FacilityEngine.cpp" line="87"/> <source>All files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="78"/> + <location filename="../../../FacilityEngine.cpp" line="88"/> <source>Save transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="79"/> + <location filename="../../../FacilityEngine.cpp" line="89"/> <source>Open transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="80"/> + <location filename="../../../FacilityEngine.cpp" line="90"/> <source>Transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="81"/> + <location filename="../../../FacilityEngine.cpp" line="91"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="82"/> + <location filename="../../../FacilityEngine.cpp" line="92"/> <source>Not supported on this platform</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="83"/> + <location filename="../../../FacilityEngine.cpp" line="93"/> <source>Completed in %1</source> <translation type="unfinished"></translation> </message> @@ -475,7 +475,7 @@ <context> <name>HelpDialog</name> <message> - <location filename="../../../HelpDialog.cpp" line="37"/> + <location filename="../../../HelpDialog.cpp" line="34"/> <source>About Ultracopier</source> <translation type="unfinished"></translation> </message> @@ -513,49 +513,42 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="35"/> - <source>About Supercopier</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../HelpDialog.cpp" line="80"/> + <location filename="../../../HelpDialog.cpp" line="73"/> <source>For http://portableapps.com/</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="83"/> + <location filename="../../../HelpDialog.cpp" line="76"/> <source>Portable and all in one version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="85"/> + <location filename="../../../HelpDialog.cpp" line="78"/> <source>Portable version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="90"/> + <location filename="../../../HelpDialog.cpp" line="83"/> <source>All in one version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="92"/> + <location filename="../../../HelpDialog.cpp" line="85"/> <source>Normal version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="110"/> - <location filename="../../../HelpDialog.cpp" line="112"/> - <location filename="../../../HelpDialog.cpp" line="123"/> + <location filename="../../../HelpDialog.cpp" line="102"/> <source>http://ultracopier.first-world.info/</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="120"/> + <location filename="../../../HelpDialog.cpp" line="109"/> <source>http://ultracopier.first-world.info/shop.html</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="125"/> + <location filename="../../../HelpDialog.cpp" line="111"/> <source>http://ultracopier.first-world.info/download.html</source> <translation type="unfinished"></translation> </message> @@ -569,12 +562,12 @@ This version is compiled as version: %1.</source> <context> <name>LocalListener</name> <message> - <location filename="../../../LocalListener.cpp" line="146"/> + <location filename="../../../LocalListener.cpp" line="160"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../LocalListener.cpp" line="146"/> + <location filename="../../../LocalListener.cpp" line="160"/> <source>Timeout while recomposing data from connected clients</source> <translation type="unfinished"></translation> </message> @@ -582,20 +575,20 @@ This version is compiled as version: %1.</source> <context> <name>LogThread</name> <message> - <location filename="../../../LogThread.cpp" line="106"/> - <location filename="../../../LogThread.cpp" line="115"/> - <location filename="../../../LogThread.cpp" line="125"/> + <location filename="../../../LogThread.cpp" line="107"/> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../LogThread.cpp" line="106"/> + <location filename="../../../LogThread.cpp" line="107"/> <source>Log file already open, error: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../LogThread.cpp" line="115"/> - <location filename="../../../LogThread.cpp" line="125"/> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> <source>Unable to open the log file, error: %1</source> <translation type="unfinished"></translation> </message> @@ -637,21 +630,6 @@ This version is compiled as version: %1.</source> <source>The replacement of default copy/move system should be not supported by the file manager.<br />Ask to the developer to support it.<br />You need do the copy/move manually.</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../../OSSpecific.cpp" line="32"/> - <source>Consider Supercopier as deprecated, prefer Ultracopier</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OSSpecific.cpp" line="35"/> - <source>This version use 100% of you graphic card/GPU (you computer can be noisy, or slow/buggy during the games) at exchange of free access to Ultimate version. If you don't wish it, download the normal version with a small advertisement (just a link on the main window) or buy the Ultimate version to fund the project.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OSSpecific.cpp" line="36"/> - <source>http://ultracopier.first-world.info/download.html</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>OptionDialog</name> @@ -674,7 +652,7 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="66"/> <location filename="../../../OptionDialog.ui" line="322"/> - <location filename="../../../OptionDialog.cpp" line="354"/> + <location filename="../../../OptionDialog.cpp" line="286"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> @@ -717,21 +695,21 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="71"/> <location filename="../../../OptionDialog.ui" line="335"/> - <location filename="../../../OptionDialog.cpp" line="355"/> + <location filename="../../../OptionDialog.cpp" line="287"/> <source>Listener</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="76"/> <location filename="../../../OptionDialog.ui" line="340"/> - <location filename="../../../OptionDialog.cpp" line="356"/> + <location filename="../../../OptionDialog.cpp" line="288"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="84"/> <location filename="../../../OptionDialog.ui" line="345"/> - <location filename="../../../OptionDialog.cpp" line="357"/> + <location filename="../../../OptionDialog.cpp" line="289"/> <source>Session loader</source> <translation type="unfinished"></translation> </message> @@ -863,95 +841,75 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="260"/> - <location filename="../../../OptionDialog.cpp" line="274"/> + <location filename="../../../OptionDialog.cpp" line="190"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="260"/> + <location filename="../../../OptionDialog.cpp" line="190"/> <source>Load the theme?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="274"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load the language?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="362"/> + <location filename="../../../OptionDialog.cpp" line="294"/> <source>Do nothing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="363"/> + <location filename="../../../OptionDialog.cpp" line="295"/> <source>Ask source as folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="364"/> + <location filename="../../../OptionDialog.cpp" line="296"/> <source>Ask sources as files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="365"/> + <location filename="../../../OptionDialog.cpp" line="297"/> <source>Never</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="366"/> + <location filename="../../../OptionDialog.cpp" line="298"/> <source>When source is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="367"/> + <location filename="../../../OptionDialog.cpp" line="299"/> <source>When destination is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="368"/> + <location filename="../../../OptionDialog.cpp" line="300"/> <source>When source and destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="369"/> + <location filename="../../../OptionDialog.cpp" line="301"/> <source>When source or destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="370"/> + <location filename="../../../OptionDialog.cpp" line="302"/> <source>Always</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="384"/> - <location filename="../../../OptionDialog.cpp" line="385"/> - <location filename="../../../OptionDialog.cpp" line="386"/> + <location filename="../../../OptionDialog.cpp" line="316"/> + <location filename="../../../OptionDialog.cpp" line="317"/> + <location filename="../../../OptionDialog.cpp" line="318"/> <source>The variables are %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="478"/> - <source>Allow the application</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="478"/> - <source>This Ultimate free version is only if %1 is allowed by your antivirus. Else you can get the normal free version</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="483"/> - <source>Enable the OpenCL</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="483"/> - <source>This Ultimate version is only if the OpenCL is installed with your graphic card drivers. Else you can get the normal free version</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="1591"/> + <location filename="../../../OptionDialog.cpp" line="948"/> <source>Save logs as: </source> <translation type="unfinished"></translation> </message> @@ -980,10 +938,10 @@ This version is compiled as version: %1.</source> <context> <name>OptionEngine</name> <message> - <location filename="../../../OptionEngine.cpp" line="161"/> - <location filename="../../../OptionEngine.cpp" line="165"/> - <location filename="../../../OptionEngine.cpp" line="202"/> - <location filename="../../../OptionEngine.cpp" line="206"/> + <location filename="../../../OptionEngine.cpp" line="162"/> + <location filename="../../../OptionEngine.cpp" line="169"/> + <location filename="../../../OptionEngine.cpp" line="211"/> + <location filename="../../../OptionEngine.cpp" line="215"/> <source>The variable was not found: %1 %2</source> <translation type="unfinished"></translation> </message> @@ -1026,42 +984,42 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="38"/> + <location filename="../../../PluginInformation.cpp" line="39"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="41"/> + <location filename="../../../PluginInformation.cpp" line="42"/> <source>Languages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="44"/> + <location filename="../../../PluginInformation.cpp" line="45"/> <source>Listener</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="47"/> + <location filename="../../../PluginInformation.cpp" line="48"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="50"/> + <location filename="../../../PluginInformation.cpp" line="51"/> <source>Session loader</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="53"/> + <location filename="../../../PluginInformation.cpp" line="54"/> <source>Themes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="57"/> + <location filename="../../../PluginInformation.cpp" line="58"/> <source>Unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="67"/> + <location filename="../../../PluginInformation.cpp" line="68"/> <source>Information about %1</source> <translation type="unfinished"></translation> </message> @@ -1079,140 +1037,140 @@ This version is compiled as version: %1.</source> <context> <name>PluginsManager</name> <message> - <location filename="../../../PluginsManager.cpp" line="221"/> + <location filename="../../../PluginsManager.cpp" line="224"/> <source>informations.xml is not accessible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="487"/> + <location filename="../../../PluginsManager.cpp" line="494"/> <source>Dependencies part is wrong</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="508"/> + <location filename="../../../PluginsManager.cpp" line="515"/> <source>Dependencies %1 are not satisfied, for plugin: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="665"/> + <location filename="../../../PluginsManager.cpp" line="672"/> <source>Remove %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="676"/> + <location filename="../../../PluginsManager.cpp" line="683"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="700"/> + <location filename="../../../PluginsManager.cpp" line="683"/> + <source>Error while the removing plugin, please check the rights on the folder: +%1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="707"/> <source>Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="253"/> + <location filename="../../../PluginsManager.cpp" line="256"/> <source>%1, parse error at line %2, column %3: %4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="227"/> + <location filename="../../../PluginsManager.cpp" line="230"/> <source>informations.xml not found for the plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="261"/> + <location filename="../../../PluginsManager.cpp" line="264"/> <source>"package" root tag not found for the xml file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="337"/> + <location filename="../../../PluginsManager.cpp" line="340"/> <source>Duplicated plugin found, already loaded!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="395"/> + <location filename="../../../PluginsManager.cpp" line="401"/> <source>English text missing in the informations.xml for the tag: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="403"/> + <location filename="../../../PluginsManager.cpp" line="409"/> <source>Tag not found: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="665"/> + <location filename="../../../PluginsManager.cpp" line="672"/> <source>Are you sure about removing "%1" in version %2?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="676"/> - <source>Error while the removing plugin, please check the rights on the folder: -%1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../PluginsManager.cpp" line="700"/> + <location filename="../../../PluginsManager.cpp" line="707"/> <source>Previous import is in progress...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="703"/> + <location filename="../../../PluginsManager.cpp" line="710"/> <source>Open Ultracopier plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="703"/> + <location filename="../../../PluginsManager.cpp" line="710"/> <source>Ultracopier plugin (*.urc)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="720"/> - <location filename="../../../PluginsManager.cpp" line="745"/> - <location filename="../../../PluginsManager.cpp" line="813"/> - <location filename="../../../PluginsManager.cpp" line="826"/> - <location filename="../../../PluginsManager.cpp" line="845"/> - <location filename="../../../PluginsManager.cpp" line="851"/> - <location filename="../../../PluginsManager.cpp" line="857"/> - <location filename="../../../PluginsManager.cpp" line="863"/> - <location filename="../../../PluginsManager.cpp" line="869"/> + <location filename="../../../PluginsManager.cpp" line="727"/> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="820"/> + <location filename="../../../PluginsManager.cpp" line="833"/> + <location filename="../../../PluginsManager.cpp" line="852"/> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="870"/> <location filename="../../../PluginsManager.cpp" line="876"/> + <location filename="../../../PluginsManager.cpp" line="883"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="720"/> + <location filename="../../../PluginsManager.cpp" line="727"/> <source>Unable to open the plugin: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="745"/> - <location filename="../../../PluginsManager.cpp" line="863"/> - <location filename="../../../PluginsManager.cpp" line="876"/> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="870"/> + <location filename="../../../PluginsManager.cpp" line="883"/> <source>Unable to load the plugin content, please check it: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="813"/> + <location filename="../../../PluginsManager.cpp" line="820"/> <source>Unable to create a folder to install the plugin: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="826"/> + <location filename="../../../PluginsManager.cpp" line="833"/> <source>Unable to create a file to install the plugin: %1 since:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="845"/> + <location filename="../../../PluginsManager.cpp" line="852"/> <source>Folder with same name is present, skip the plugin installation: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="851"/> - <location filename="../../../PluginsManager.cpp" line="857"/> - <location filename="../../../PluginsManager.cpp" line="869"/> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="876"/> <source>Unable to load the plugin content, please check it</source> <translation type="unfinished"></translation> </message> @@ -1265,119 +1223,34 @@ since:%2</source> <context> <name>SystrayIcon</name> <message> - <location filename="../../../SystrayIcon.cpp" line="163"/> + <location filename="../../../SystrayIcon.cpp" line="155"/> <source>No copy listener found. Do the copy manually by right click one the system tray icon.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="169"/> + <location filename="../../../SystrayIcon.cpp" line="161"/> <source>Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="187"/> + <location filename="../../../SystrayIcon.cpp" line="179"/> <source>Searching information...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="200"/> + <location filename="../../../SystrayIcon.cpp" line="192"/> <source>Do not replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="205"/> + <location filename="../../../SystrayIcon.cpp" line="197"/> <source>Semi replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="210"/> + <location filename="../../../SystrayIcon.cpp" line="202"/> <source>Replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="377"/> - <source>Warning</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="377"/> - <source>The action on the systray icon is unknown!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="425"/> - <source>&About/Debug report</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="427"/> - <source>&About</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="430"/> - <source>&Save bug report</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="432"/> - <source>&Quit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="433"/> - <source>&Options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="485"/> - <source>A&dd copy/moving</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="471"/> - <source>New version: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="471"/> - <source>Click here to go on download page</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="511"/> - <source>&Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="525"/> - <location filename="../../../SystrayIcon.cpp" line="539"/> - <source>&Transfer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="529"/> - <location filename="../../../SystrayIcon.cpp" line="543"/> - <source>&Move</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="560"/> - <location filename="../../../SystrayIcon.cpp" line="577"/> - <source>Add &copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="566"/> - <location filename="../../../SystrayIcon.cpp" line="583"/> - <source>Add &transfer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="570"/> - <location filename="../../../SystrayIcon.cpp" line="587"/> - <source>Add &move</source> - <translation type="unfinished"></translation> - </message> </context> </TS> diff --git a/plugins/Languages/ru/informations.xml b/plugins/Languages/ru/informations.xml index 6a8fb5b..f663205 100644 --- a/plugins/Languages/ru/informations.xml +++ b/plugins/Languages/ru/informations.xml @@ -12,7 +12,7 @@ <!-- Detailed description --> <description xml:lang="en"><![CDATA[Translation of Ultracopier to russian. For more details see the web site.]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>1.2.3.6</version> + <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>ru</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/ru/translation.ts b/plugins/Languages/ru/translation.ts index a8f30f0..444e5ab 100644 --- a/plugins/Languages/ru/translation.ts +++ b/plugins/Languages/ru/translation.ts @@ -1,102 +1,86 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0" language="ru" sourcelanguage="en"> +<TS version="2.1" language="ru" sourcelanguage="en"> <context> <name>CliParser</name> <message> - <location filename="../../../CliParser.cpp" line="25"/> - <location filename="../../../CliParser.cpp" line="71"/> - <location filename="../../../CliParser.cpp" line="84"/> - <location filename="../../../CliParser.cpp" line="94"/> - <location filename="../../../CliParser.cpp" line="179"/> + <location filename="../../../CliParser.cpp" line="26"/> + <location filename="../../../CliParser.cpp" line="72"/> + <location filename="../../../CliParser.cpp" line="85"/> + <location filename="../../../CliParser.cpp" line="95"/> + <location filename="../../../CliParser.cpp" line="180"/> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="25"/> + <location filename="../../../CliParser.cpp" line="26"/> <source>Ultracopier is already running, right click on its system tray icon (near the clock) to use it</source> <translation>Ultracopier уже запущен, щелкните правой кнопкой мыши на значок панели задач (рядом с часами), чтобы использовать его</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="71"/> + <location filename="../../../CliParser.cpp" line="72"/> <source>Problem reading file, or file size is 0</source> - <translation type="unfinished"></translation> + <translation>Проблема с чтением файла, или размер файла равен 0</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="159"/> - <location filename="../../../CliParser.cpp" line="170"/> + <location filename="../../../CliParser.cpp" line="160"/> + <location filename="../../../CliParser.cpp" line="171"/> <source>The arguments possible are:</source> - <translation type="unfinished"></translation> + <translation>Возможные аргументы:</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="161"/> - <location filename="../../../CliParser.cpp" line="172"/> + <location filename="../../../CliParser.cpp" line="162"/> + <location filename="../../../CliParser.cpp" line="173"/> <source>To display the options</source> - <translation type="unfinished"></translation> + <translation>Чтобы отобразить опции</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="164"/> - <location filename="../../../CliParser.cpp" line="175"/> + <location filename="../../../CliParser.cpp" line="165"/> + <location filename="../../../CliParser.cpp" line="176"/> <source>To copy sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> - <translation type="unfinished"></translation> + <translation>Чтобы копировать исходники в место назначения, разделенными пробелом. If destination is "?", ultracopier will ask the user</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="165"/> - <location filename="../../../CliParser.cpp" line="176"/> + <location filename="../../../CliParser.cpp" line="166"/> + <location filename="../../../CliParser.cpp" line="177"/> <source>To move sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="169"/> + <location filename="../../../CliParser.cpp" line="170"/> <source>Command not valid</source> <translation type="unfinished"></translation> </message> <message> - <source>Problem at the reading, or file size is null</source> - <translation type="obsolete">Проблема при чтении или размер файла нулевой</translation> - </message> - <message> - <location filename="../../../CliParser.cpp" line="84"/> + <location filename="../../../CliParser.cpp" line="85"/> <source>This file is not supported transfer list</source> <translation>Этот файл не поддерживается передача списка</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="94"/> + <location filename="../../../CliParser.cpp" line="95"/> <source>Unable to open the transfer list file</source> <translation>Не удается открыть файл трансфер</translation> </message> <message> - <source>The arguments possibles are:</source> - <translation type="obsolete">Аргументы possibles являются:</translation> - </message> - <message> - <location filename="../../../CliParser.cpp" line="160"/> - <location filename="../../../CliParser.cpp" line="171"/> + <location filename="../../../CliParser.cpp" line="161"/> + <location filename="../../../CliParser.cpp" line="172"/> <source>To display this help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="162"/> - <location filename="../../../CliParser.cpp" line="173"/> + <location filename="../../../CliParser.cpp" line="163"/> + <location filename="../../../CliParser.cpp" line="174"/> <source>To quit the other instances (if running)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="163"/> - <location filename="../../../CliParser.cpp" line="174"/> + <location filename="../../../CliParser.cpp" line="164"/> + <location filename="../../../CliParser.cpp" line="175"/> <source>Open transfer list</source> <translation type="unfinished">Откройте трансфер</translation> </message> <message> - <source>To quit the other instance running (if have)</source> - <translation type="obsolete">Для выхода из другой запущенный экземпляр (если есть)</translation> - </message> - <message> - <source>Command line not understand</source> - <translation type="obsolete">Командная строка не понимаю</translation> - </message> - <message> - <location filename="../../../CliParser.cpp" line="181"/> + <location filename="../../../CliParser.cpp" line="182"/> <source>Help</source> <translation>Помогите</translation> </message> @@ -104,38 +88,30 @@ <context> <name>CopyEngineManager</name> <message> - <location filename="../../../CopyEngineManager.cpp" line="229"/> - <location filename="../../../CopyEngineManager.cpp" line="234"/> - <location filename="../../../CopyEngineManager.cpp" line="257"/> - <location filename="../../../CopyEngineManager.cpp" line="271"/> + <location filename="../../../CopyEngineManager.cpp" line="231"/> + <location filename="../../../CopyEngineManager.cpp" line="236"/> + <location filename="../../../CopyEngineManager.cpp" line="259"/> + <location filename="../../../CopyEngineManager.cpp" line="273"/> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="229"/> + <location filename="../../../CopyEngineManager.cpp" line="231"/> <source>Cannot find any copy engine with move support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="257"/> + <location filename="../../../CopyEngineManager.cpp" line="259"/> <source>This copy engine does not support move</source> <translation type="unfinished"></translation> </message> <message> - <source>Cannot find any copy engine with motions support</source> - <translation type="obsolete">Не могу найти копию двигателя движения поддержки</translation> - </message> - <message> - <location filename="../../../CopyEngineManager.cpp" line="234"/> + <location filename="../../../CopyEngineManager.cpp" line="236"/> <source>Cannot find any compatible engine!</source> <translation>Не могу найти любой совместимый двигатель!</translation> </message> <message> - <source>This copy engine does not support motions</source> - <translation type="obsolete">Эта копия двигателя не поддерживает движение</translation> - </message> - <message> - <location filename="../../../CopyEngineManager.cpp" line="271"/> + <location filename="../../../CopyEngineManager.cpp" line="273"/> <source>Cannot find any engine with this name: %1</source> <translation>Не могу найти любой двигатель с таким именем: %1</translation> </message> @@ -143,12 +119,12 @@ <context> <name>CopyListener</name> <message> - <location filename="../../../CopyListener.cpp" line="158"/> + <location filename="../../../CopyListener.cpp" line="159"/> <source>Error</source> <translation type="unfinished">ошибка</translation> </message> <message> - <location filename="../../../CopyListener.cpp" line="158"/> + <location filename="../../../CopyListener.cpp" line="159"/> <source>Error during the reception of the copy/move list %1</source> <translation type="unfinished"></translation> @@ -157,74 +133,70 @@ <context> <name>Core</name> <message> - <location filename="../../../Core.cpp" line="45"/> - <location filename="../../../Core.cpp" line="116"/> - <location filename="../../../Core.cpp" line="142"/> - <location filename="../../../Core.cpp" line="157"/> - <location filename="../../../Core.cpp" line="177"/> - <location filename="../../../Core.cpp" line="191"/> - <location filename="../../../Core.cpp" line="200"/> - <location filename="../../../Core.cpp" line="209"/> - <location filename="../../../Core.cpp" line="216"/> - <location filename="../../../Core.cpp" line="250"/> - <location filename="../../../Core.cpp" line="387"/> - <location filename="../../../Core.cpp" line="392"/> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="117"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> + <location filename="../../../Core.cpp" line="217"/> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> + <location filename="../../../Core.cpp" line="393"/> <source>Error</source> <translation>ошибка</translation> </message> <message> - <location filename="../../../Core.cpp" line="45"/> - <location filename="../../../Core.cpp" line="142"/> - <location filename="../../../Core.cpp" line="157"/> - <location filename="../../../Core.cpp" line="177"/> - <location filename="../../../Core.cpp" line="191"/> - <location filename="../../../Core.cpp" line="200"/> - <location filename="../../../Core.cpp" line="209"/> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> <source>Unable to get a copy engine instance</source> <translation>Не удалось получить экземпляр копии двигателей</translation> </message> <message> - <location filename="../../../Core.cpp" line="93"/> + <location filename="../../../Core.cpp" line="94"/> <source>Group window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="93"/> + <location filename="../../../Core.cpp" line="94"/> <source>Do you want group the transfer with another actual running transfer?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="116"/> + <location filename="../../../Core.cpp" line="117"/> <source>Unable to get a engine instance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="216"/> + <location filename="../../../Core.cpp" line="217"/> <source>The argument for the mode is not valid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="1133"/> + <location filename="../../../Core.cpp" line="1136"/> <source>Do you want to copy? If no, it will be moved.</source> <translation type="unfinished"></translation> </message> <message> - <source>The argument for the mode is not understand</source> - <translation type="obsolete">Аргументом в пользу этого режима не понимаю</translation> - </message> - <message> - <location filename="../../../Core.cpp" line="250"/> - <location filename="../../../Core.cpp" line="387"/> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> <source>Unable to load the interface, copy aborted</source> <translation>Не удалось загрузить интерфейс, копирование прервана</translation> </message> <message> - <location filename="../../../Core.cpp" line="392"/> + <location filename="../../../Core.cpp" line="393"/> <source>Unable to load the copy engine, copy aborted</source> <translation>Не удается загрузить копию двигателя, скопируйте прервана</translation> </message> <message> - <location filename="../../../Core.cpp" line="1133"/> + <location filename="../../../Core.cpp" line="1136"/> <source>Transfer mode</source> <translation>режим передачи</translation> </message> @@ -232,12 +204,12 @@ <context> <name>EventDispatcher</name> <message> - <location filename="../../../EventDispatcher.cpp" line="155"/> + <location filename="../../../EventDispatcher.cpp" line="152"/> <source>Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../EventDispatcher.cpp" line="155"/> + <location filename="../../../EventDispatcher.cpp" line="152"/> <source>Give the key of this software, more information on <a href="http://ultracopier.first-world.info/">ultracopier.first-world.info</a></source> <translation type="unfinished"></translation> </message> @@ -245,261 +217,257 @@ <context> <name>FacilityEngine</name> <message> - <location filename="../../../FacilityEngine.cpp" line="43"/> + <location filename="../../../FacilityEngine.cpp" line="53"/> <source>Copy engine</source> <translation>Копировать двигатель</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="45"/> + <location filename="../../../FacilityEngine.cpp" line="55"/> <source>Copy</source> <extracomment>a copy</extracomment> <translation>копия</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="49"/> + <location filename="../../../FacilityEngine.cpp" line="59"/> <source>Move</source> <extracomment>a move</extracomment> <translation>двигаться</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="51"/> + <location filename="../../../FacilityEngine.cpp" line="61"/> <source>Pause</source> <translation>пауза</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="52"/> + <location filename="../../../FacilityEngine.cpp" line="62"/> <source>Resume</source> <translation>резюме</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="53"/> - <location filename="../../../FacilityEngine.cpp" line="67"/> + <location filename="../../../FacilityEngine.cpp" line="63"/> + <location filename="../../../FacilityEngine.cpp" line="77"/> <source>Skip</source> <translation>пропускать</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="54"/> + <location filename="../../../FacilityEngine.cpp" line="64"/> <source>Unlimited</source> <translation>неограниченный</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="27"/> + <location filename="../../../FacilityEngine.cpp" line="37"/> <source>s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="28"/> + <location filename="../../../FacilityEngine.cpp" line="38"/> <source>Too big</source> <translation>Слишком большой</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="29"/> + <location filename="../../../FacilityEngine.cpp" line="39"/> <source>B</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="30"/> + <location filename="../../../FacilityEngine.cpp" line="40"/> <source>KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="31"/> + <location filename="../../../FacilityEngine.cpp" line="41"/> <source>MB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="32"/> + <location filename="../../../FacilityEngine.cpp" line="42"/> <source>GB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="33"/> + <location filename="../../../FacilityEngine.cpp" line="43"/> <source>TB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="34"/> + <location filename="../../../FacilityEngine.cpp" line="44"/> <source>PB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="35"/> + <location filename="../../../FacilityEngine.cpp" line="45"/> <source>EB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="36"/> + <location filename="../../../FacilityEngine.cpp" line="46"/> <source>ZB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="37"/> + <location filename="../../../FacilityEngine.cpp" line="47"/> <source>YB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="38"/> + <location filename="../../../FacilityEngine.cpp" line="48"/> <source>Less than %10 seconds</source> <translation>Менее %10 секунд</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="39"/> + <location filename="../../../FacilityEngine.cpp" line="49"/> <source>About %10 seconds remaining</source> <translation>О %10 секунды осталось</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="40"/> + <location filename="../../../FacilityEngine.cpp" line="50"/> <source>About %1 minutes remaining</source> <translation>О %1 минуты до конца</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="41"/> + <location filename="../../../FacilityEngine.cpp" line="51"/> <source>About %1 hours remaining</source> <translation>О %1 часов, оставшихся</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="47"/> + <location filename="../../../FacilityEngine.cpp" line="57"/> <source>Transfer</source> <extracomment>a transfer</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="50"/> + <location filename="../../../FacilityEngine.cpp" line="60"/> <source>Start</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="55"/> + <location filename="../../../FacilityEngine.cpp" line="65"/> <source>Source</source> <translation>источник</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="56"/> + <location filename="../../../FacilityEngine.cpp" line="66"/> <source>Size</source> <translation>размер</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="57"/> + <location filename="../../../FacilityEngine.cpp" line="67"/> <source>Destination</source> <translation>назначение</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="58"/> + <location filename="../../../FacilityEngine.cpp" line="68"/> <source>Quit</source> <translation>выход</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="59"/> + <location filename="../../../FacilityEngine.cpp" line="69"/> <source>Target</source> <translation>цель</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="60"/> - <location filename="../../../FacilityEngine.cpp" line="64"/> + <location filename="../../../FacilityEngine.cpp" line="70"/> + <location filename="../../../FacilityEngine.cpp" line="74"/> <source>Time remaining:</source> <translation>Оставшееся время:</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="61"/> + <location filename="../../../FacilityEngine.cpp" line="71"/> <source>Listing</source> <translation>список</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="62"/> + <location filename="../../../FacilityEngine.cpp" line="72"/> <source>Copying</source> <translation>копирование</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="63"/> + <location filename="../../../FacilityEngine.cpp" line="73"/> <source>Listing and copying</source> <translation>Листинг и копирования</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="66"/> + <location filename="../../../FacilityEngine.cpp" line="76"/> <source>Ask</source> <translation>просить</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="68"/> + <location filename="../../../FacilityEngine.cpp" line="78"/> <source>Overwrite</source> <translation>переписывать</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="69"/> + <location filename="../../../FacilityEngine.cpp" line="79"/> <source>Overwrite if newer</source> <translation>Заменить, если новее</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="70"/> + <location filename="../../../FacilityEngine.cpp" line="80"/> <source>Overwrite if the last modification dates are different</source> <translation>Заменить, если последняя даты модификации отличаются</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="71"/> + <location filename="../../../FacilityEngine.cpp" line="81"/> <source>Rename</source> <translation>переименовать</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="72"/> + <location filename="../../../FacilityEngine.cpp" line="82"/> <source>Put to the end of the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="83"/> + <location filename="../../../FacilityEngine.cpp" line="93"/> <source>Completed in %1</source> <translation type="unfinished"></translation> </message> <message> - <source>Put to end of the list</source> - <translation type="obsolete">Положить в конец списка</translation> - </message> - <message> - <location filename="../../../FacilityEngine.cpp" line="73"/> + <location filename="../../../FacilityEngine.cpp" line="83"/> <source>Select source directory</source> <translation>Выберите исходный каталог</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="74"/> + <location filename="../../../FacilityEngine.cpp" line="84"/> <source>Select destination directory</source> <translation>Выберите папку назначения</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="75"/> + <location filename="../../../FacilityEngine.cpp" line="85"/> <source>Internal error</source> <translation>Внутренняя ошибка</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="76"/> + <location filename="../../../FacilityEngine.cpp" line="86"/> <source>Select one or more files to open</source> <translation>Выберите один или более файлов, чтобы открыть</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="77"/> + <location filename="../../../FacilityEngine.cpp" line="87"/> <source>All files</source> <translation>Все файлы</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="78"/> + <location filename="../../../FacilityEngine.cpp" line="88"/> <source>Save transfer list</source> <translation>Сохранить трансфер</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="79"/> + <location filename="../../../FacilityEngine.cpp" line="89"/> <source>Open transfer list</source> <translation>Откройте трансфер</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="80"/> + <location filename="../../../FacilityEngine.cpp" line="90"/> <source>Transfer list</source> <translation>Передача списка</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="81"/> + <location filename="../../../FacilityEngine.cpp" line="91"/> <source>Error</source> <translation>ошибка</translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="82"/> + <location filename="../../../FacilityEngine.cpp" line="92"/> <source>Not supported on this platform</source> <translation>Не поддерживается на этой платформе</translation> </message> @@ -507,7 +475,7 @@ <context> <name>HelpDialog</name> <message> - <location filename="../../../HelpDialog.cpp" line="37"/> + <location filename="../../../HelpDialog.cpp" line="34"/> <source>About Ultracopier</source> <translation type="unfinished"></translation> </message> @@ -545,49 +513,42 @@ This version is compiled as version: %1.</source> <translation>закрывать</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="35"/> - <source>About Supercopier</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../HelpDialog.cpp" line="80"/> + <location filename="../../../HelpDialog.cpp" line="73"/> <source>For http://portableapps.com/</source> <translation>для http://portableapps.com/</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="83"/> + <location filename="../../../HelpDialog.cpp" line="76"/> <source>Portable and all in one version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="85"/> + <location filename="../../../HelpDialog.cpp" line="78"/> <source>Portable version</source> <translation>Портативная версия</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="90"/> + <location filename="../../../HelpDialog.cpp" line="83"/> <source>All in one version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="92"/> + <location filename="../../../HelpDialog.cpp" line="85"/> <source>Normal version</source> <translation>Нормальная версия</translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="110"/> - <location filename="../../../HelpDialog.cpp" line="112"/> - <location filename="../../../HelpDialog.cpp" line="123"/> + <location filename="../../../HelpDialog.cpp" line="102"/> <source>http://ultracopier.first-world.info/</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="120"/> + <location filename="../../../HelpDialog.cpp" line="109"/> <source>http://ultracopier.first-world.info/shop.html</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="125"/> + <location filename="../../../HelpDialog.cpp" line="111"/> <source>http://ultracopier.first-world.info/download.html</source> <translation type="unfinished"></translation> </message> @@ -601,12 +562,12 @@ This version is compiled as version: %1.</source> <context> <name>LocalListener</name> <message> - <location filename="../../../LocalListener.cpp" line="146"/> + <location filename="../../../LocalListener.cpp" line="160"/> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> - <location filename="../../../LocalListener.cpp" line="146"/> + <location filename="../../../LocalListener.cpp" line="160"/> <source>Timeout while recomposing data from connected clients</source> <translation>Тайм-аут в то время как композицию кадра данных из подключенных клиентов</translation> </message> @@ -614,27 +575,23 @@ This version is compiled as version: %1.</source> <context> <name>LogThread</name> <message> - <location filename="../../../LogThread.cpp" line="106"/> - <location filename="../../../LogThread.cpp" line="115"/> - <location filename="../../../LogThread.cpp" line="125"/> + <location filename="../../../LogThread.cpp" line="107"/> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> <source>Error</source> <translation>ошибка</translation> </message> <message> - <location filename="../../../LogThread.cpp" line="106"/> + <location filename="../../../LogThread.cpp" line="107"/> <source>Log file already open, error: %1</source> <translation>Лог-файл уже открыт, ошибки: %1</translation> </message> <message> - <location filename="../../../LogThread.cpp" line="115"/> - <location filename="../../../LogThread.cpp" line="125"/> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> <source>Unable to open the log file, error: %1</source> <translation type="unfinished"></translation> </message> - <message> - <source>Unable to open file to keep the log file, error: %1</source> - <translation type="obsolete">Не удается открыть файл сохранить файл журнала, ошибка: %1</translation> - </message> </context> <context> <name>OSSpecific</name> @@ -673,21 +630,6 @@ This version is compiled as version: %1.</source> <source>The replacement of default copy/move system should be not supported by the file manager.<br />Ask to the developer to support it.<br />You need do the copy/move manually.</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../../OSSpecific.cpp" line="32"/> - <source>Consider Supercopier as deprecated, prefer Ultracopier</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OSSpecific.cpp" line="35"/> - <source>This version use 100% of you graphic card/GPU (you computer can be noisy, or slow/buggy during the games) at exchange of free access to Ultimate version. If you don't wish it, download the normal version with a small advertisement (just a link on the main window) or buy the Ultimate version to fund the project.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OSSpecific.cpp" line="36"/> - <source>http://ultracopier.first-world.info/download.html</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>OptionDialog</name> @@ -710,7 +652,7 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="66"/> <location filename="../../../OptionDialog.ui" line="322"/> - <location filename="../../../OptionDialog.cpp" line="354"/> + <location filename="../../../OptionDialog.cpp" line="286"/> <source>Copy engine</source> <translation>Копировать двигатель</translation> </message> @@ -726,10 +668,6 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <source>Load at the session loading:</source> - <translation type="obsolete">Загрузить на заседании загрузки:</translation> - </message> - <message> <location filename="../../../OptionDialog.ui" line="222"/> <source>Confirm to group the windows</source> <translation type="unfinished"></translation> @@ -757,21 +695,21 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="71"/> <location filename="../../../OptionDialog.ui" line="335"/> - <location filename="../../../OptionDialog.cpp" line="355"/> + <location filename="../../../OptionDialog.cpp" line="287"/> <source>Listener</source> <translation>слушатель</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="76"/> <location filename="../../../OptionDialog.ui" line="340"/> - <location filename="../../../OptionDialog.cpp" line="356"/> + <location filename="../../../OptionDialog.cpp" line="288"/> <source>Plugin loader</source> <translation>плагин погрузчика</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="84"/> <location filename="../../../OptionDialog.ui" line="345"/> - <location filename="../../../OptionDialog.cpp" line="357"/> + <location filename="../../../OptionDialog.cpp" line="289"/> <source>Session loader</source> <translation>сессия погрузчика</translation> </message> @@ -903,111 +841,75 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <source>Write the transfers:</source> - <translation type="obsolete">Запись передач:</translation> - </message> - <message> - <source>Write the errors:</source> - <translation type="obsolete">Пишите ошибки:</translation> - </message> - <message> - <source>Write the folder operations:</source> - <translation type="obsolete">Write the folder operations:</translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="260"/> - <location filename="../../../OptionDialog.cpp" line="274"/> + <location filename="../../../OptionDialog.cpp" line="190"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="260"/> + <location filename="../../../OptionDialog.cpp" line="190"/> <source>Load the theme?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="274"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load the language?</source> <translation type="unfinished"></translation> </message> <message> - <source>Disabled because you have any SessionLoader plugin</source> - <translation type="obsolete">Отключено, потому что у вас есть плагин SessionLoader</translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="362"/> + <location filename="../../../OptionDialog.cpp" line="294"/> <source>Do nothing</source> <translation>ничего не делать</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="363"/> + <location filename="../../../OptionDialog.cpp" line="295"/> <source>Ask source as folder</source> <translation>Спросите источника папку</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="364"/> + <location filename="../../../OptionDialog.cpp" line="296"/> <source>Ask sources as files</source> <translation>Спросите источников в виде файлов</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="365"/> + <location filename="../../../OptionDialog.cpp" line="297"/> <source>Never</source> <translation>никогда</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="366"/> + <location filename="../../../OptionDialog.cpp" line="298"/> <source>When source is same</source> <translation>Когда же источник</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="367"/> + <location filename="../../../OptionDialog.cpp" line="299"/> <source>When destination is same</source> <translation>Когда же назначения</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="368"/> + <location filename="../../../OptionDialog.cpp" line="300"/> <source>When source and destination are same</source> <translation>Когда источника и назначения те же</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="369"/> + <location filename="../../../OptionDialog.cpp" line="301"/> <source>When source or destination are same</source> <translation>Когда источника или назначения те же</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="370"/> + <location filename="../../../OptionDialog.cpp" line="302"/> <source>Always</source> <translation>всегда</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="384"/> - <location filename="../../../OptionDialog.cpp" line="385"/> - <location filename="../../../OptionDialog.cpp" line="386"/> + <location filename="../../../OptionDialog.cpp" line="316"/> + <location filename="../../../OptionDialog.cpp" line="317"/> + <location filename="../../../OptionDialog.cpp" line="318"/> <source>The variables are %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="478"/> - <source>Allow the application</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="478"/> - <source>This Ultimate free version is only if %1 is allowed by your antivirus. Else you can get the normal free version</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="483"/> - <source>Enable the OpenCL</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="483"/> - <source>This Ultimate version is only if the OpenCL is installed with your graphic card drivers. Else you can get the normal free version</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="1591"/> + <location filename="../../../OptionDialog.cpp" line="948"/> <source>Save logs as: </source> <translation>Сохранить журналы, как: </translation> </message> @@ -1017,14 +919,6 @@ This version is compiled as version: %1.</source> <translation>Синхронное журнала</translation> </message> <message> - <source>When manual open:</source> - <translation type="obsolete">Когда руководство открыто:</translation> - </message> - <message> - <source>Group the windows when:</source> - <translation type="obsolete">Группа окна, когда:</translation> - </message> - <message> <location filename="../../../OptionDialog.ui" line="666"/> <source>No option for this plugin</source> <translation>Нет опции для этого плагина</translation> @@ -1044,10 +938,10 @@ This version is compiled as version: %1.</source> <context> <name>OptionEngine</name> <message> - <location filename="../../../OptionEngine.cpp" line="161"/> - <location filename="../../../OptionEngine.cpp" line="165"/> - <location filename="../../../OptionEngine.cpp" line="202"/> - <location filename="../../../OptionEngine.cpp" line="206"/> + <location filename="../../../OptionEngine.cpp" line="162"/> + <location filename="../../../OptionEngine.cpp" line="169"/> + <location filename="../../../OptionEngine.cpp" line="211"/> + <location filename="../../../OptionEngine.cpp" line="215"/> <source>The variable was not found: %1 %2</source> <translation type="unfinished"></translation> </message> @@ -1090,42 +984,42 @@ This version is compiled as version: %1.</source> <translation>Версия:</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="38"/> + <location filename="../../../PluginInformation.cpp" line="39"/> <source>Copy engine</source> <translation type="unfinished">Копировать двигатель</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="41"/> + <location filename="../../../PluginInformation.cpp" line="42"/> <source>Languages</source> <translation>Языки</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="44"/> + <location filename="../../../PluginInformation.cpp" line="45"/> <source>Listener</source> <translation>слушатель</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="47"/> + <location filename="../../../PluginInformation.cpp" line="48"/> <source>Plugin loader</source> <translation type="unfinished">плагин погрузчика</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="50"/> + <location filename="../../../PluginInformation.cpp" line="51"/> <source>Session loader</source> <translation type="unfinished">сессия погрузчика</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="53"/> + <location filename="../../../PluginInformation.cpp" line="54"/> <source>Themes</source> <translation>Темы</translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="57"/> + <location filename="../../../PluginInformation.cpp" line="58"/> <source>Unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="67"/> + <location filename="../../../PluginInformation.cpp" line="68"/> <source>Information about %1</source> <translation>Информация о %1</translation> </message> @@ -1143,135 +1037,126 @@ This version is compiled as version: %1.</source> <context> <name>PluginsManager</name> <message> - <location filename="../../../PluginsManager.cpp" line="221"/> + <location filename="../../../PluginsManager.cpp" line="224"/> <source>informations.xml is not accessible</source> <translation>informations.xml не доступен</translation> </message> <message> - <source>informations.xml not found into the plugin</source> - <translation type="obsolete">informations.xml не нашел в плагине</translation> - </message> - <message> - <location filename="../../../PluginsManager.cpp" line="487"/> + <location filename="../../../PluginsManager.cpp" line="494"/> <source>Dependencies part is wrong</source> <translation>Зависимости часть неправильно</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="508"/> + <location filename="../../../PluginsManager.cpp" line="515"/> <source>Dependencies %1 are not satisfied, for plugin: %2</source> <translation>Зависимости %1 не выполняется, для плагина: %2</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="665"/> + <location filename="../../../PluginsManager.cpp" line="672"/> <source>Remove %1</source> <translation>удаление: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="676"/> + <location filename="../../../PluginsManager.cpp" line="683"/> <source>Error</source> <translation>ошибка</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="700"/> + <location filename="../../../PluginsManager.cpp" line="683"/> + <source>Error while the removing plugin, please check the rights on the folder: +%1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="707"/> <source>Information</source> <translation>информация</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="253"/> + <location filename="../../../PluginsManager.cpp" line="256"/> <source>%1, parse error at line %2, column %3: %4</source> <translation>%1, вызовет ошибку в строке %2, столбце %3: %4</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="227"/> + <location filename="../../../PluginsManager.cpp" line="230"/> <source>informations.xml not found for the plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="261"/> + <location filename="../../../PluginsManager.cpp" line="264"/> <source>"package" root tag not found for the xml file</source> <translation>"package" Корневой тег не найден для XML-файла</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="337"/> + <location filename="../../../PluginsManager.cpp" line="340"/> <source>Duplicated plugin found, already loaded!</source> <translation>Дублированный плагин нашел, уже загружены!</translation> </message> <message> - <source>English text missing into the informations.xml for the tag: %1</source> - <translation type="obsolete">Английский текст отсутствует в informations.xml для тега: %1</translation> - </message> - <message> - <location filename="../../../PluginsManager.cpp" line="395"/> + <location filename="../../../PluginsManager.cpp" line="401"/> <source>English text missing in the informations.xml for the tag: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="403"/> + <location filename="../../../PluginsManager.cpp" line="409"/> <source>Tag not found: %1</source> <translation>Тег не найден: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="665"/> + <location filename="../../../PluginsManager.cpp" line="672"/> <source>Are you sure about removing "%1" in version %2?</source> <translation>Вы уверены, что об удалении "%1" в версии %2?</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="676"/> - <source>Error while the removing plugin, please check the rights on the folder: -%1</source> - <translation>Ошибка при удалении плагина, пожалуйста, проверьте права на папку: -%1</translation> - </message> - <message> - <location filename="../../../PluginsManager.cpp" line="700"/> + <location filename="../../../PluginsManager.cpp" line="707"/> <source>Previous import is in progress...</source> <translation>Предыдущая импорта идет ...</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="703"/> + <location filename="../../../PluginsManager.cpp" line="710"/> <source>Open Ultracopier plugin</source> <translation>Открытое плагин Ultracopier</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="703"/> + <location filename="../../../PluginsManager.cpp" line="710"/> <source>Ultracopier plugin (*.urc)</source> <translation>Ultracopier плагина (*.urc)</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="720"/> - <location filename="../../../PluginsManager.cpp" line="745"/> - <location filename="../../../PluginsManager.cpp" line="813"/> - <location filename="../../../PluginsManager.cpp" line="826"/> - <location filename="../../../PluginsManager.cpp" line="845"/> - <location filename="../../../PluginsManager.cpp" line="851"/> - <location filename="../../../PluginsManager.cpp" line="857"/> - <location filename="../../../PluginsManager.cpp" line="863"/> - <location filename="../../../PluginsManager.cpp" line="869"/> + <location filename="../../../PluginsManager.cpp" line="727"/> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="820"/> + <location filename="../../../PluginsManager.cpp" line="833"/> + <location filename="../../../PluginsManager.cpp" line="852"/> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="870"/> <location filename="../../../PluginsManager.cpp" line="876"/> + <location filename="../../../PluginsManager.cpp" line="883"/> <source>Plugin loader</source> <translation>плагин погрузчика</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="720"/> + <location filename="../../../PluginsManager.cpp" line="727"/> <source>Unable to open the plugin: %1</source> <translation>Невозможно открыть плагин: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="745"/> - <location filename="../../../PluginsManager.cpp" line="863"/> - <location filename="../../../PluginsManager.cpp" line="876"/> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="870"/> + <location filename="../../../PluginsManager.cpp" line="883"/> <source>Unable to load the plugin content, please check it: %1</source> <translation>Не удается загрузить плагин содержания, пожалуйста, проверьте его: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="813"/> + <location filename="../../../PluginsManager.cpp" line="820"/> <source>Unable to create a folder to install the plugin: %1</source> <translation>Невозможно создать папку для установки плагина: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="826"/> + <location filename="../../../PluginsManager.cpp" line="833"/> <source>Unable to create a file to install the plugin: %1 since:%2</source> @@ -1280,16 +1165,16 @@ since:%2</source> С: %2</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="845"/> + <location filename="../../../PluginsManager.cpp" line="852"/> <source>Folder with same name is present, skip the plugin installation: %1</source> <translation>Папка с таким же именем существует, пропустить установки плагина: %1</translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="851"/> - <location filename="../../../PluginsManager.cpp" line="857"/> - <location filename="../../../PluginsManager.cpp" line="869"/> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="876"/> <source>Unable to load the plugin content, please check it</source> <translation>Не удается загрузить плагин содержания, пожалуйста, проверьте его</translation> </message> @@ -1342,119 +1227,34 @@ since:%2</source> <context> <name>SystrayIcon</name> <message> - <location filename="../../../SystrayIcon.cpp" line="163"/> + <location filename="../../../SystrayIcon.cpp" line="155"/> <source>No copy listener found. Do the copy manually by right click one the system tray icon.</source> <translation type="unfinished">Нет копии слушатель найдено. Сделайте копию вручную, щелкните правой кнопкой мыши один из иконки в системном трее.</translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="169"/> + <location filename="../../../SystrayIcon.cpp" line="161"/> <source>Information</source> <translation type="unfinished">информация</translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="187"/> + <location filename="../../../SystrayIcon.cpp" line="179"/> <source>Searching information...</source> <translation type="unfinished">Поиск информации ...</translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="200"/> + <location filename="../../../SystrayIcon.cpp" line="192"/> <source>Do not replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="205"/> + <location filename="../../../SystrayIcon.cpp" line="197"/> <source>Semi replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="210"/> + <location filename="../../../SystrayIcon.cpp" line="202"/> <source>Replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="377"/> - <source>Warning</source> - <translation type="unfinished">Предупреждение</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="377"/> - <source>The action on the systray icon is unknown!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="425"/> - <source>&About/Debug report</source> - <translation type="unfinished">О компании/Debug отчет</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="427"/> - <source>&About</source> - <translation type="unfinished">о</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="430"/> - <source>&Save bug report</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="432"/> - <source>&Quit</source> - <translation type="unfinished">выход</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="433"/> - <source>&Options</source> - <translation type="unfinished">опции</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="485"/> - <source>A&dd copy/moving</source> - <translation type="unfinished">Добавить копирования/перемещения</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="471"/> - <source>New version: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="471"/> - <source>Click here to go on download page</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="511"/> - <source>&Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="525"/> - <location filename="../../../SystrayIcon.cpp" line="539"/> - <source>&Transfer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="529"/> - <location filename="../../../SystrayIcon.cpp" line="543"/> - <source>&Move</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="560"/> - <location filename="../../../SystrayIcon.cpp" line="577"/> - <source>Add &copy</source> - <translation type="unfinished">Добавить копию</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="566"/> - <location filename="../../../SystrayIcon.cpp" line="583"/> - <source>Add &transfer</source> - <translation type="unfinished">Добавить перевод</translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="570"/> - <location filename="../../../SystrayIcon.cpp" line="587"/> - <source>Add &move</source> - <translation type="unfinished">Добавить двигаться</translation> - </message> </context> </TS> diff --git a/plugins/Languages/th/informations.xml b/plugins/Languages/th/informations.xml index 1615a99..4bd5bb9 100644 --- a/plugins/Languages/th/informations.xml +++ b/plugins/Languages/th/informations.xml @@ -12,7 +12,7 @@ <!-- Detailed description --> <description xml:lang="en"><![CDATA[Translation of Ultracopier to thai. For more details see the web site.]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>1.2.3.6</version> + <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>th</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/th/translation.ts b/plugins/Languages/th/translation.ts index b02bb87..d364f81 100644 --- a/plugins/Languages/th/translation.ts +++ b/plugins/Languages/th/translation.ts @@ -1,86 +1,86 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>CliParser</name> <message> - <location filename="../../../CliParser.cpp" line="25"/> - <location filename="../../../CliParser.cpp" line="71"/> - <location filename="../../../CliParser.cpp" line="84"/> - <location filename="../../../CliParser.cpp" line="94"/> - <location filename="../../../CliParser.cpp" line="179"/> + <location filename="../../../CliParser.cpp" line="26"/> + <location filename="../../../CliParser.cpp" line="72"/> + <location filename="../../../CliParser.cpp" line="85"/> + <location filename="../../../CliParser.cpp" line="95"/> + <location filename="../../../CliParser.cpp" line="180"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="25"/> + <location filename="../../../CliParser.cpp" line="26"/> <source>Ultracopier is already running, right click on its system tray icon (near the clock) to use it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="71"/> + <location filename="../../../CliParser.cpp" line="72"/> <source>Problem reading file, or file size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="159"/> - <location filename="../../../CliParser.cpp" line="170"/> + <location filename="../../../CliParser.cpp" line="160"/> + <location filename="../../../CliParser.cpp" line="171"/> <source>The arguments possible are:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="161"/> - <location filename="../../../CliParser.cpp" line="172"/> + <location filename="../../../CliParser.cpp" line="162"/> + <location filename="../../../CliParser.cpp" line="173"/> <source>To display the options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="162"/> - <location filename="../../../CliParser.cpp" line="173"/> + <location filename="../../../CliParser.cpp" line="163"/> + <location filename="../../../CliParser.cpp" line="174"/> <source>To quit the other instances (if running)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="164"/> - <location filename="../../../CliParser.cpp" line="175"/> + <location filename="../../../CliParser.cpp" line="165"/> + <location filename="../../../CliParser.cpp" line="176"/> <source>To copy sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="165"/> - <location filename="../../../CliParser.cpp" line="176"/> + <location filename="../../../CliParser.cpp" line="166"/> + <location filename="../../../CliParser.cpp" line="177"/> <source>To move sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="169"/> + <location filename="../../../CliParser.cpp" line="170"/> <source>Command not valid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="84"/> + <location filename="../../../CliParser.cpp" line="85"/> <source>This file is not supported transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="94"/> + <location filename="../../../CliParser.cpp" line="95"/> <source>Unable to open the transfer list file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="160"/> - <location filename="../../../CliParser.cpp" line="171"/> + <location filename="../../../CliParser.cpp" line="161"/> + <location filename="../../../CliParser.cpp" line="172"/> <source>To display this help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="163"/> - <location filename="../../../CliParser.cpp" line="174"/> + <location filename="../../../CliParser.cpp" line="164"/> + <location filename="../../../CliParser.cpp" line="175"/> <source>Open transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="181"/> + <location filename="../../../CliParser.cpp" line="182"/> <source>Help</source> <translation type="unfinished"></translation> </message> @@ -88,30 +88,30 @@ <context> <name>CopyEngineManager</name> <message> - <location filename="../../../CopyEngineManager.cpp" line="229"/> - <location filename="../../../CopyEngineManager.cpp" line="234"/> - <location filename="../../../CopyEngineManager.cpp" line="257"/> - <location filename="../../../CopyEngineManager.cpp" line="271"/> + <location filename="../../../CopyEngineManager.cpp" line="231"/> + <location filename="../../../CopyEngineManager.cpp" line="236"/> + <location filename="../../../CopyEngineManager.cpp" line="259"/> + <location filename="../../../CopyEngineManager.cpp" line="273"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="229"/> + <location filename="../../../CopyEngineManager.cpp" line="231"/> <source>Cannot find any copy engine with move support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="257"/> + <location filename="../../../CopyEngineManager.cpp" line="259"/> <source>This copy engine does not support move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="234"/> + <location filename="../../../CopyEngineManager.cpp" line="236"/> <source>Cannot find any compatible engine!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="271"/> + <location filename="../../../CopyEngineManager.cpp" line="273"/> <source>Cannot find any engine with this name: %1</source> <translation type="unfinished"></translation> </message> @@ -119,12 +119,12 @@ <context> <name>CopyListener</name> <message> - <location filename="../../../CopyListener.cpp" line="158"/> + <location filename="../../../CopyListener.cpp" line="159"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyListener.cpp" line="158"/> + <location filename="../../../CopyListener.cpp" line="159"/> <source>Error during the reception of the copy/move list %1</source> <translation type="unfinished"></translation> @@ -133,70 +133,70 @@ <context> <name>Core</name> <message> - <location filename="../../../Core.cpp" line="45"/> - <location filename="../../../Core.cpp" line="116"/> - <location filename="../../../Core.cpp" line="142"/> - <location filename="../../../Core.cpp" line="157"/> - <location filename="../../../Core.cpp" line="177"/> - <location filename="../../../Core.cpp" line="191"/> - <location filename="../../../Core.cpp" line="200"/> - <location filename="../../../Core.cpp" line="209"/> - <location filename="../../../Core.cpp" line="216"/> - <location filename="../../../Core.cpp" line="250"/> - <location filename="../../../Core.cpp" line="387"/> - <location filename="../../../Core.cpp" line="392"/> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="117"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> + <location filename="../../../Core.cpp" line="217"/> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> + <location filename="../../../Core.cpp" line="393"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="45"/> - <location filename="../../../Core.cpp" line="142"/> - <location filename="../../../Core.cpp" line="157"/> - <location filename="../../../Core.cpp" line="177"/> - <location filename="../../../Core.cpp" line="191"/> - <location filename="../../../Core.cpp" line="200"/> - <location filename="../../../Core.cpp" line="209"/> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> <source>Unable to get a copy engine instance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="93"/> + <location filename="../../../Core.cpp" line="94"/> <source>Group window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="93"/> + <location filename="../../../Core.cpp" line="94"/> <source>Do you want group the transfer with another actual running transfer?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="116"/> + <location filename="../../../Core.cpp" line="117"/> <source>Unable to get a engine instance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="216"/> + <location filename="../../../Core.cpp" line="217"/> <source>The argument for the mode is not valid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="1133"/> + <location filename="../../../Core.cpp" line="1136"/> <source>Do you want to copy? If no, it will be moved.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="250"/> - <location filename="../../../Core.cpp" line="387"/> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> <source>Unable to load the interface, copy aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="392"/> + <location filename="../../../Core.cpp" line="393"/> <source>Unable to load the copy engine, copy aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="1133"/> + <location filename="../../../Core.cpp" line="1136"/> <source>Transfer mode</source> <translation type="unfinished"></translation> </message> @@ -204,12 +204,12 @@ <context> <name>EventDispatcher</name> <message> - <location filename="../../../EventDispatcher.cpp" line="155"/> + <location filename="../../../EventDispatcher.cpp" line="152"/> <source>Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../EventDispatcher.cpp" line="155"/> + <location filename="../../../EventDispatcher.cpp" line="152"/> <source>Give the key of this software, more information on <a href="http://ultracopier.first-world.info/">ultracopier.first-world.info</a></source> <translation type="unfinished"></translation> </message> @@ -217,257 +217,257 @@ <context> <name>FacilityEngine</name> <message> - <location filename="../../../FacilityEngine.cpp" line="43"/> + <location filename="../../../FacilityEngine.cpp" line="53"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="45"/> + <location filename="../../../FacilityEngine.cpp" line="55"/> <source>Copy</source> <extracomment>a copy</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="49"/> + <location filename="../../../FacilityEngine.cpp" line="59"/> <source>Move</source> <extracomment>a move</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="51"/> + <location filename="../../../FacilityEngine.cpp" line="61"/> <source>Pause</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="52"/> + <location filename="../../../FacilityEngine.cpp" line="62"/> <source>Resume</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="53"/> - <location filename="../../../FacilityEngine.cpp" line="67"/> + <location filename="../../../FacilityEngine.cpp" line="63"/> + <location filename="../../../FacilityEngine.cpp" line="77"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="54"/> + <location filename="../../../FacilityEngine.cpp" line="64"/> <source>Unlimited</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="27"/> + <location filename="../../../FacilityEngine.cpp" line="37"/> <source>s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="28"/> + <location filename="../../../FacilityEngine.cpp" line="38"/> <source>Too big</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="29"/> + <location filename="../../../FacilityEngine.cpp" line="39"/> <source>B</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="30"/> + <location filename="../../../FacilityEngine.cpp" line="40"/> <source>KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="31"/> + <location filename="../../../FacilityEngine.cpp" line="41"/> <source>MB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="32"/> + <location filename="../../../FacilityEngine.cpp" line="42"/> <source>GB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="33"/> + <location filename="../../../FacilityEngine.cpp" line="43"/> <source>TB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="34"/> + <location filename="../../../FacilityEngine.cpp" line="44"/> <source>PB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="35"/> + <location filename="../../../FacilityEngine.cpp" line="45"/> <source>EB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="36"/> + <location filename="../../../FacilityEngine.cpp" line="46"/> <source>ZB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="37"/> + <location filename="../../../FacilityEngine.cpp" line="47"/> <source>YB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="38"/> + <location filename="../../../FacilityEngine.cpp" line="48"/> <source>Less than %10 seconds</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="39"/> + <location filename="../../../FacilityEngine.cpp" line="49"/> <source>About %10 seconds remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="40"/> + <location filename="../../../FacilityEngine.cpp" line="50"/> <source>About %1 minutes remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="41"/> + <location filename="../../../FacilityEngine.cpp" line="51"/> <source>About %1 hours remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="47"/> + <location filename="../../../FacilityEngine.cpp" line="57"/> <source>Transfer</source> <extracomment>a transfer</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="50"/> + <location filename="../../../FacilityEngine.cpp" line="60"/> <source>Start</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="55"/> + <location filename="../../../FacilityEngine.cpp" line="65"/> <source>Source</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="56"/> + <location filename="../../../FacilityEngine.cpp" line="66"/> <source>Size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="57"/> + <location filename="../../../FacilityEngine.cpp" line="67"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="58"/> + <location filename="../../../FacilityEngine.cpp" line="68"/> <source>Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="59"/> + <location filename="../../../FacilityEngine.cpp" line="69"/> <source>Target</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="60"/> - <location filename="../../../FacilityEngine.cpp" line="64"/> + <location filename="../../../FacilityEngine.cpp" line="70"/> + <location filename="../../../FacilityEngine.cpp" line="74"/> <source>Time remaining:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="61"/> + <location filename="../../../FacilityEngine.cpp" line="71"/> <source>Listing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="62"/> + <location filename="../../../FacilityEngine.cpp" line="72"/> <source>Copying</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="63"/> + <location filename="../../../FacilityEngine.cpp" line="73"/> <source>Listing and copying</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="66"/> + <location filename="../../../FacilityEngine.cpp" line="76"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="68"/> + <location filename="../../../FacilityEngine.cpp" line="78"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="69"/> + <location filename="../../../FacilityEngine.cpp" line="79"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="70"/> + <location filename="../../../FacilityEngine.cpp" line="80"/> <source>Overwrite if the last modification dates are different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="71"/> + <location filename="../../../FacilityEngine.cpp" line="81"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="72"/> + <location filename="../../../FacilityEngine.cpp" line="82"/> <source>Put to the end of the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="73"/> + <location filename="../../../FacilityEngine.cpp" line="83"/> <source>Select source directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="74"/> + <location filename="../../../FacilityEngine.cpp" line="84"/> <source>Select destination directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="75"/> + <location filename="../../../FacilityEngine.cpp" line="85"/> <source>Internal error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="76"/> + <location filename="../../../FacilityEngine.cpp" line="86"/> <source>Select one or more files to open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="77"/> + <location filename="../../../FacilityEngine.cpp" line="87"/> <source>All files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="78"/> + <location filename="../../../FacilityEngine.cpp" line="88"/> <source>Save transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="79"/> + <location filename="../../../FacilityEngine.cpp" line="89"/> <source>Open transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="80"/> + <location filename="../../../FacilityEngine.cpp" line="90"/> <source>Transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="81"/> + <location filename="../../../FacilityEngine.cpp" line="91"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="82"/> + <location filename="../../../FacilityEngine.cpp" line="92"/> <source>Not supported on this platform</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="83"/> + <location filename="../../../FacilityEngine.cpp" line="93"/> <source>Completed in %1</source> <translation type="unfinished"></translation> </message> @@ -475,7 +475,7 @@ <context> <name>HelpDialog</name> <message> - <location filename="../../../HelpDialog.cpp" line="37"/> + <location filename="../../../HelpDialog.cpp" line="34"/> <source>About Ultracopier</source> <translation type="unfinished"></translation> </message> @@ -513,49 +513,42 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="35"/> - <source>About Supercopier</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../HelpDialog.cpp" line="80"/> + <location filename="../../../HelpDialog.cpp" line="73"/> <source>For http://portableapps.com/</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="83"/> + <location filename="../../../HelpDialog.cpp" line="76"/> <source>Portable and all in one version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="85"/> + <location filename="../../../HelpDialog.cpp" line="78"/> <source>Portable version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="90"/> + <location filename="../../../HelpDialog.cpp" line="83"/> <source>All in one version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="92"/> + <location filename="../../../HelpDialog.cpp" line="85"/> <source>Normal version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="110"/> - <location filename="../../../HelpDialog.cpp" line="112"/> - <location filename="../../../HelpDialog.cpp" line="123"/> + <location filename="../../../HelpDialog.cpp" line="102"/> <source>http://ultracopier.first-world.info/</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="120"/> + <location filename="../../../HelpDialog.cpp" line="109"/> <source>http://ultracopier.first-world.info/shop.html</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="125"/> + <location filename="../../../HelpDialog.cpp" line="111"/> <source>http://ultracopier.first-world.info/download.html</source> <translation type="unfinished"></translation> </message> @@ -569,12 +562,12 @@ This version is compiled as version: %1.</source> <context> <name>LocalListener</name> <message> - <location filename="../../../LocalListener.cpp" line="146"/> + <location filename="../../../LocalListener.cpp" line="160"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../LocalListener.cpp" line="146"/> + <location filename="../../../LocalListener.cpp" line="160"/> <source>Timeout while recomposing data from connected clients</source> <translation type="unfinished"></translation> </message> @@ -582,20 +575,20 @@ This version is compiled as version: %1.</source> <context> <name>LogThread</name> <message> - <location filename="../../../LogThread.cpp" line="106"/> - <location filename="../../../LogThread.cpp" line="115"/> - <location filename="../../../LogThread.cpp" line="125"/> + <location filename="../../../LogThread.cpp" line="107"/> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../LogThread.cpp" line="106"/> + <location filename="../../../LogThread.cpp" line="107"/> <source>Log file already open, error: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../LogThread.cpp" line="115"/> - <location filename="../../../LogThread.cpp" line="125"/> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> <source>Unable to open the log file, error: %1</source> <translation type="unfinished"></translation> </message> @@ -637,21 +630,6 @@ This version is compiled as version: %1.</source> <source>The replacement of default copy/move system should be not supported by the file manager.<br />Ask to the developer to support it.<br />You need do the copy/move manually.</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../../OSSpecific.cpp" line="32"/> - <source>Consider Supercopier as deprecated, prefer Ultracopier</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OSSpecific.cpp" line="35"/> - <source>This version use 100% of you graphic card/GPU (you computer can be noisy, or slow/buggy during the games) at exchange of free access to Ultimate version. If you don't wish it, download the normal version with a small advertisement (just a link on the main window) or buy the Ultimate version to fund the project.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OSSpecific.cpp" line="36"/> - <source>http://ultracopier.first-world.info/download.html</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>OptionDialog</name> @@ -674,7 +652,7 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="66"/> <location filename="../../../OptionDialog.ui" line="322"/> - <location filename="../../../OptionDialog.cpp" line="354"/> + <location filename="../../../OptionDialog.cpp" line="286"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> @@ -717,21 +695,21 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="71"/> <location filename="../../../OptionDialog.ui" line="335"/> - <location filename="../../../OptionDialog.cpp" line="355"/> + <location filename="../../../OptionDialog.cpp" line="287"/> <source>Listener</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="76"/> <location filename="../../../OptionDialog.ui" line="340"/> - <location filename="../../../OptionDialog.cpp" line="356"/> + <location filename="../../../OptionDialog.cpp" line="288"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="84"/> <location filename="../../../OptionDialog.ui" line="345"/> - <location filename="../../../OptionDialog.cpp" line="357"/> + <location filename="../../../OptionDialog.cpp" line="289"/> <source>Session loader</source> <translation type="unfinished"></translation> </message> @@ -863,95 +841,75 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="260"/> - <location filename="../../../OptionDialog.cpp" line="274"/> + <location filename="../../../OptionDialog.cpp" line="190"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="260"/> + <location filename="../../../OptionDialog.cpp" line="190"/> <source>Load the theme?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="274"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load the language?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="362"/> + <location filename="../../../OptionDialog.cpp" line="294"/> <source>Do nothing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="363"/> + <location filename="../../../OptionDialog.cpp" line="295"/> <source>Ask source as folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="364"/> + <location filename="../../../OptionDialog.cpp" line="296"/> <source>Ask sources as files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="365"/> + <location filename="../../../OptionDialog.cpp" line="297"/> <source>Never</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="366"/> + <location filename="../../../OptionDialog.cpp" line="298"/> <source>When source is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="367"/> + <location filename="../../../OptionDialog.cpp" line="299"/> <source>When destination is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="368"/> + <location filename="../../../OptionDialog.cpp" line="300"/> <source>When source and destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="369"/> + <location filename="../../../OptionDialog.cpp" line="301"/> <source>When source or destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="370"/> + <location filename="../../../OptionDialog.cpp" line="302"/> <source>Always</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="384"/> - <location filename="../../../OptionDialog.cpp" line="385"/> - <location filename="../../../OptionDialog.cpp" line="386"/> + <location filename="../../../OptionDialog.cpp" line="316"/> + <location filename="../../../OptionDialog.cpp" line="317"/> + <location filename="../../../OptionDialog.cpp" line="318"/> <source>The variables are %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="478"/> - <source>Allow the application</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="478"/> - <source>This Ultimate free version is only if %1 is allowed by your antivirus. Else you can get the normal free version</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="483"/> - <source>Enable the OpenCL</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="483"/> - <source>This Ultimate version is only if the OpenCL is installed with your graphic card drivers. Else you can get the normal free version</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="1591"/> + <location filename="../../../OptionDialog.cpp" line="948"/> <source>Save logs as: </source> <translation type="unfinished"></translation> </message> @@ -980,10 +938,10 @@ This version is compiled as version: %1.</source> <context> <name>OptionEngine</name> <message> - <location filename="../../../OptionEngine.cpp" line="161"/> - <location filename="../../../OptionEngine.cpp" line="165"/> - <location filename="../../../OptionEngine.cpp" line="202"/> - <location filename="../../../OptionEngine.cpp" line="206"/> + <location filename="../../../OptionEngine.cpp" line="162"/> + <location filename="../../../OptionEngine.cpp" line="169"/> + <location filename="../../../OptionEngine.cpp" line="211"/> + <location filename="../../../OptionEngine.cpp" line="215"/> <source>The variable was not found: %1 %2</source> <translation type="unfinished"></translation> </message> @@ -1026,42 +984,42 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="38"/> + <location filename="../../../PluginInformation.cpp" line="39"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="41"/> + <location filename="../../../PluginInformation.cpp" line="42"/> <source>Languages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="44"/> + <location filename="../../../PluginInformation.cpp" line="45"/> <source>Listener</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="47"/> + <location filename="../../../PluginInformation.cpp" line="48"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="50"/> + <location filename="../../../PluginInformation.cpp" line="51"/> <source>Session loader</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="53"/> + <location filename="../../../PluginInformation.cpp" line="54"/> <source>Themes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="57"/> + <location filename="../../../PluginInformation.cpp" line="58"/> <source>Unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="67"/> + <location filename="../../../PluginInformation.cpp" line="68"/> <source>Information about %1</source> <translation type="unfinished"></translation> </message> @@ -1079,140 +1037,140 @@ This version is compiled as version: %1.</source> <context> <name>PluginsManager</name> <message> - <location filename="../../../PluginsManager.cpp" line="221"/> + <location filename="../../../PluginsManager.cpp" line="224"/> <source>informations.xml is not accessible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="487"/> + <location filename="../../../PluginsManager.cpp" line="494"/> <source>Dependencies part is wrong</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="508"/> + <location filename="../../../PluginsManager.cpp" line="515"/> <source>Dependencies %1 are not satisfied, for plugin: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="665"/> + <location filename="../../../PluginsManager.cpp" line="672"/> <source>Remove %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="676"/> + <location filename="../../../PluginsManager.cpp" line="683"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="700"/> + <location filename="../../../PluginsManager.cpp" line="683"/> + <source>Error while the removing plugin, please check the rights on the folder: +%1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="707"/> <source>Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="253"/> + <location filename="../../../PluginsManager.cpp" line="256"/> <source>%1, parse error at line %2, column %3: %4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="227"/> + <location filename="../../../PluginsManager.cpp" line="230"/> <source>informations.xml not found for the plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="261"/> + <location filename="../../../PluginsManager.cpp" line="264"/> <source>"package" root tag not found for the xml file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="337"/> + <location filename="../../../PluginsManager.cpp" line="340"/> <source>Duplicated plugin found, already loaded!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="395"/> + <location filename="../../../PluginsManager.cpp" line="401"/> <source>English text missing in the informations.xml for the tag: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="403"/> + <location filename="../../../PluginsManager.cpp" line="409"/> <source>Tag not found: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="665"/> + <location filename="../../../PluginsManager.cpp" line="672"/> <source>Are you sure about removing "%1" in version %2?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="676"/> - <source>Error while the removing plugin, please check the rights on the folder: -%1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../PluginsManager.cpp" line="700"/> + <location filename="../../../PluginsManager.cpp" line="707"/> <source>Previous import is in progress...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="703"/> + <location filename="../../../PluginsManager.cpp" line="710"/> <source>Open Ultracopier plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="703"/> + <location filename="../../../PluginsManager.cpp" line="710"/> <source>Ultracopier plugin (*.urc)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="720"/> - <location filename="../../../PluginsManager.cpp" line="745"/> - <location filename="../../../PluginsManager.cpp" line="813"/> - <location filename="../../../PluginsManager.cpp" line="826"/> - <location filename="../../../PluginsManager.cpp" line="845"/> - <location filename="../../../PluginsManager.cpp" line="851"/> - <location filename="../../../PluginsManager.cpp" line="857"/> - <location filename="../../../PluginsManager.cpp" line="863"/> - <location filename="../../../PluginsManager.cpp" line="869"/> + <location filename="../../../PluginsManager.cpp" line="727"/> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="820"/> + <location filename="../../../PluginsManager.cpp" line="833"/> + <location filename="../../../PluginsManager.cpp" line="852"/> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="870"/> <location filename="../../../PluginsManager.cpp" line="876"/> + <location filename="../../../PluginsManager.cpp" line="883"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="720"/> + <location filename="../../../PluginsManager.cpp" line="727"/> <source>Unable to open the plugin: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="745"/> - <location filename="../../../PluginsManager.cpp" line="863"/> - <location filename="../../../PluginsManager.cpp" line="876"/> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="870"/> + <location filename="../../../PluginsManager.cpp" line="883"/> <source>Unable to load the plugin content, please check it: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="813"/> + <location filename="../../../PluginsManager.cpp" line="820"/> <source>Unable to create a folder to install the plugin: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="826"/> + <location filename="../../../PluginsManager.cpp" line="833"/> <source>Unable to create a file to install the plugin: %1 since:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="845"/> + <location filename="../../../PluginsManager.cpp" line="852"/> <source>Folder with same name is present, skip the plugin installation: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="851"/> - <location filename="../../../PluginsManager.cpp" line="857"/> - <location filename="../../../PluginsManager.cpp" line="869"/> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="876"/> <source>Unable to load the plugin content, please check it</source> <translation type="unfinished"></translation> </message> @@ -1265,119 +1223,34 @@ since:%2</source> <context> <name>SystrayIcon</name> <message> - <location filename="../../../SystrayIcon.cpp" line="163"/> + <location filename="../../../SystrayIcon.cpp" line="155"/> <source>No copy listener found. Do the copy manually by right click one the system tray icon.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="169"/> + <location filename="../../../SystrayIcon.cpp" line="161"/> <source>Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="187"/> + <location filename="../../../SystrayIcon.cpp" line="179"/> <source>Searching information...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="200"/> + <location filename="../../../SystrayIcon.cpp" line="192"/> <source>Do not replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="205"/> + <location filename="../../../SystrayIcon.cpp" line="197"/> <source>Semi replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="210"/> + <location filename="../../../SystrayIcon.cpp" line="202"/> <source>Replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="377"/> - <source>Warning</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="377"/> - <source>The action on the systray icon is unknown!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="425"/> - <source>&About/Debug report</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="427"/> - <source>&About</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="430"/> - <source>&Save bug report</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="432"/> - <source>&Quit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="433"/> - <source>&Options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="485"/> - <source>A&dd copy/moving</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="471"/> - <source>New version: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="471"/> - <source>Click here to go on download page</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="511"/> - <source>&Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="525"/> - <location filename="../../../SystrayIcon.cpp" line="539"/> - <source>&Transfer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="529"/> - <location filename="../../../SystrayIcon.cpp" line="543"/> - <source>&Move</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="560"/> - <location filename="../../../SystrayIcon.cpp" line="577"/> - <source>Add &copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="566"/> - <location filename="../../../SystrayIcon.cpp" line="583"/> - <source>Add &transfer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="570"/> - <location filename="../../../SystrayIcon.cpp" line="587"/> - <source>Add &move</source> - <translation type="unfinished"></translation> - </message> </context> </TS> diff --git a/plugins/Languages/tr/informations.xml b/plugins/Languages/tr/informations.xml index c264d3c..f1620ec 100644 --- a/plugins/Languages/tr/informations.xml +++ b/plugins/Languages/tr/informations.xml @@ -12,7 +12,7 @@ <!-- Detailed description --> <description xml:lang="en"><![CDATA[Translation of Ultracopier to turkish. For more details see the web site.]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>1.2.3.6</version> + <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>tr</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/tr/translation.ts b/plugins/Languages/tr/translation.ts index b02bb87..d364f81 100644 --- a/plugins/Languages/tr/translation.ts +++ b/plugins/Languages/tr/translation.ts @@ -1,86 +1,86 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>CliParser</name> <message> - <location filename="../../../CliParser.cpp" line="25"/> - <location filename="../../../CliParser.cpp" line="71"/> - <location filename="../../../CliParser.cpp" line="84"/> - <location filename="../../../CliParser.cpp" line="94"/> - <location filename="../../../CliParser.cpp" line="179"/> + <location filename="../../../CliParser.cpp" line="26"/> + <location filename="../../../CliParser.cpp" line="72"/> + <location filename="../../../CliParser.cpp" line="85"/> + <location filename="../../../CliParser.cpp" line="95"/> + <location filename="../../../CliParser.cpp" line="180"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="25"/> + <location filename="../../../CliParser.cpp" line="26"/> <source>Ultracopier is already running, right click on its system tray icon (near the clock) to use it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="71"/> + <location filename="../../../CliParser.cpp" line="72"/> <source>Problem reading file, or file size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="159"/> - <location filename="../../../CliParser.cpp" line="170"/> + <location filename="../../../CliParser.cpp" line="160"/> + <location filename="../../../CliParser.cpp" line="171"/> <source>The arguments possible are:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="161"/> - <location filename="../../../CliParser.cpp" line="172"/> + <location filename="../../../CliParser.cpp" line="162"/> + <location filename="../../../CliParser.cpp" line="173"/> <source>To display the options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="162"/> - <location filename="../../../CliParser.cpp" line="173"/> + <location filename="../../../CliParser.cpp" line="163"/> + <location filename="../../../CliParser.cpp" line="174"/> <source>To quit the other instances (if running)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="164"/> - <location filename="../../../CliParser.cpp" line="175"/> + <location filename="../../../CliParser.cpp" line="165"/> + <location filename="../../../CliParser.cpp" line="176"/> <source>To copy sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="165"/> - <location filename="../../../CliParser.cpp" line="176"/> + <location filename="../../../CliParser.cpp" line="166"/> + <location filename="../../../CliParser.cpp" line="177"/> <source>To move sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="169"/> + <location filename="../../../CliParser.cpp" line="170"/> <source>Command not valid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="84"/> + <location filename="../../../CliParser.cpp" line="85"/> <source>This file is not supported transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="94"/> + <location filename="../../../CliParser.cpp" line="95"/> <source>Unable to open the transfer list file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="160"/> - <location filename="../../../CliParser.cpp" line="171"/> + <location filename="../../../CliParser.cpp" line="161"/> + <location filename="../../../CliParser.cpp" line="172"/> <source>To display this help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="163"/> - <location filename="../../../CliParser.cpp" line="174"/> + <location filename="../../../CliParser.cpp" line="164"/> + <location filename="../../../CliParser.cpp" line="175"/> <source>Open transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="181"/> + <location filename="../../../CliParser.cpp" line="182"/> <source>Help</source> <translation type="unfinished"></translation> </message> @@ -88,30 +88,30 @@ <context> <name>CopyEngineManager</name> <message> - <location filename="../../../CopyEngineManager.cpp" line="229"/> - <location filename="../../../CopyEngineManager.cpp" line="234"/> - <location filename="../../../CopyEngineManager.cpp" line="257"/> - <location filename="../../../CopyEngineManager.cpp" line="271"/> + <location filename="../../../CopyEngineManager.cpp" line="231"/> + <location filename="../../../CopyEngineManager.cpp" line="236"/> + <location filename="../../../CopyEngineManager.cpp" line="259"/> + <location filename="../../../CopyEngineManager.cpp" line="273"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="229"/> + <location filename="../../../CopyEngineManager.cpp" line="231"/> <source>Cannot find any copy engine with move support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="257"/> + <location filename="../../../CopyEngineManager.cpp" line="259"/> <source>This copy engine does not support move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="234"/> + <location filename="../../../CopyEngineManager.cpp" line="236"/> <source>Cannot find any compatible engine!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="271"/> + <location filename="../../../CopyEngineManager.cpp" line="273"/> <source>Cannot find any engine with this name: %1</source> <translation type="unfinished"></translation> </message> @@ -119,12 +119,12 @@ <context> <name>CopyListener</name> <message> - <location filename="../../../CopyListener.cpp" line="158"/> + <location filename="../../../CopyListener.cpp" line="159"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyListener.cpp" line="158"/> + <location filename="../../../CopyListener.cpp" line="159"/> <source>Error during the reception of the copy/move list %1</source> <translation type="unfinished"></translation> @@ -133,70 +133,70 @@ <context> <name>Core</name> <message> - <location filename="../../../Core.cpp" line="45"/> - <location filename="../../../Core.cpp" line="116"/> - <location filename="../../../Core.cpp" line="142"/> - <location filename="../../../Core.cpp" line="157"/> - <location filename="../../../Core.cpp" line="177"/> - <location filename="../../../Core.cpp" line="191"/> - <location filename="../../../Core.cpp" line="200"/> - <location filename="../../../Core.cpp" line="209"/> - <location filename="../../../Core.cpp" line="216"/> - <location filename="../../../Core.cpp" line="250"/> - <location filename="../../../Core.cpp" line="387"/> - <location filename="../../../Core.cpp" line="392"/> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="117"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> + <location filename="../../../Core.cpp" line="217"/> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> + <location filename="../../../Core.cpp" line="393"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="45"/> - <location filename="../../../Core.cpp" line="142"/> - <location filename="../../../Core.cpp" line="157"/> - <location filename="../../../Core.cpp" line="177"/> - <location filename="../../../Core.cpp" line="191"/> - <location filename="../../../Core.cpp" line="200"/> - <location filename="../../../Core.cpp" line="209"/> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> <source>Unable to get a copy engine instance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="93"/> + <location filename="../../../Core.cpp" line="94"/> <source>Group window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="93"/> + <location filename="../../../Core.cpp" line="94"/> <source>Do you want group the transfer with another actual running transfer?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="116"/> + <location filename="../../../Core.cpp" line="117"/> <source>Unable to get a engine instance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="216"/> + <location filename="../../../Core.cpp" line="217"/> <source>The argument for the mode is not valid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="1133"/> + <location filename="../../../Core.cpp" line="1136"/> <source>Do you want to copy? If no, it will be moved.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="250"/> - <location filename="../../../Core.cpp" line="387"/> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> <source>Unable to load the interface, copy aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="392"/> + <location filename="../../../Core.cpp" line="393"/> <source>Unable to load the copy engine, copy aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="1133"/> + <location filename="../../../Core.cpp" line="1136"/> <source>Transfer mode</source> <translation type="unfinished"></translation> </message> @@ -204,12 +204,12 @@ <context> <name>EventDispatcher</name> <message> - <location filename="../../../EventDispatcher.cpp" line="155"/> + <location filename="../../../EventDispatcher.cpp" line="152"/> <source>Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../EventDispatcher.cpp" line="155"/> + <location filename="../../../EventDispatcher.cpp" line="152"/> <source>Give the key of this software, more information on <a href="http://ultracopier.first-world.info/">ultracopier.first-world.info</a></source> <translation type="unfinished"></translation> </message> @@ -217,257 +217,257 @@ <context> <name>FacilityEngine</name> <message> - <location filename="../../../FacilityEngine.cpp" line="43"/> + <location filename="../../../FacilityEngine.cpp" line="53"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="45"/> + <location filename="../../../FacilityEngine.cpp" line="55"/> <source>Copy</source> <extracomment>a copy</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="49"/> + <location filename="../../../FacilityEngine.cpp" line="59"/> <source>Move</source> <extracomment>a move</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="51"/> + <location filename="../../../FacilityEngine.cpp" line="61"/> <source>Pause</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="52"/> + <location filename="../../../FacilityEngine.cpp" line="62"/> <source>Resume</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="53"/> - <location filename="../../../FacilityEngine.cpp" line="67"/> + <location filename="../../../FacilityEngine.cpp" line="63"/> + <location filename="../../../FacilityEngine.cpp" line="77"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="54"/> + <location filename="../../../FacilityEngine.cpp" line="64"/> <source>Unlimited</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="27"/> + <location filename="../../../FacilityEngine.cpp" line="37"/> <source>s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="28"/> + <location filename="../../../FacilityEngine.cpp" line="38"/> <source>Too big</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="29"/> + <location filename="../../../FacilityEngine.cpp" line="39"/> <source>B</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="30"/> + <location filename="../../../FacilityEngine.cpp" line="40"/> <source>KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="31"/> + <location filename="../../../FacilityEngine.cpp" line="41"/> <source>MB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="32"/> + <location filename="../../../FacilityEngine.cpp" line="42"/> <source>GB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="33"/> + <location filename="../../../FacilityEngine.cpp" line="43"/> <source>TB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="34"/> + <location filename="../../../FacilityEngine.cpp" line="44"/> <source>PB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="35"/> + <location filename="../../../FacilityEngine.cpp" line="45"/> <source>EB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="36"/> + <location filename="../../../FacilityEngine.cpp" line="46"/> <source>ZB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="37"/> + <location filename="../../../FacilityEngine.cpp" line="47"/> <source>YB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="38"/> + <location filename="../../../FacilityEngine.cpp" line="48"/> <source>Less than %10 seconds</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="39"/> + <location filename="../../../FacilityEngine.cpp" line="49"/> <source>About %10 seconds remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="40"/> + <location filename="../../../FacilityEngine.cpp" line="50"/> <source>About %1 minutes remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="41"/> + <location filename="../../../FacilityEngine.cpp" line="51"/> <source>About %1 hours remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="47"/> + <location filename="../../../FacilityEngine.cpp" line="57"/> <source>Transfer</source> <extracomment>a transfer</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="50"/> + <location filename="../../../FacilityEngine.cpp" line="60"/> <source>Start</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="55"/> + <location filename="../../../FacilityEngine.cpp" line="65"/> <source>Source</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="56"/> + <location filename="../../../FacilityEngine.cpp" line="66"/> <source>Size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="57"/> + <location filename="../../../FacilityEngine.cpp" line="67"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="58"/> + <location filename="../../../FacilityEngine.cpp" line="68"/> <source>Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="59"/> + <location filename="../../../FacilityEngine.cpp" line="69"/> <source>Target</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="60"/> - <location filename="../../../FacilityEngine.cpp" line="64"/> + <location filename="../../../FacilityEngine.cpp" line="70"/> + <location filename="../../../FacilityEngine.cpp" line="74"/> <source>Time remaining:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="61"/> + <location filename="../../../FacilityEngine.cpp" line="71"/> <source>Listing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="62"/> + <location filename="../../../FacilityEngine.cpp" line="72"/> <source>Copying</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="63"/> + <location filename="../../../FacilityEngine.cpp" line="73"/> <source>Listing and copying</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="66"/> + <location filename="../../../FacilityEngine.cpp" line="76"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="68"/> + <location filename="../../../FacilityEngine.cpp" line="78"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="69"/> + <location filename="../../../FacilityEngine.cpp" line="79"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="70"/> + <location filename="../../../FacilityEngine.cpp" line="80"/> <source>Overwrite if the last modification dates are different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="71"/> + <location filename="../../../FacilityEngine.cpp" line="81"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="72"/> + <location filename="../../../FacilityEngine.cpp" line="82"/> <source>Put to the end of the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="73"/> + <location filename="../../../FacilityEngine.cpp" line="83"/> <source>Select source directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="74"/> + <location filename="../../../FacilityEngine.cpp" line="84"/> <source>Select destination directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="75"/> + <location filename="../../../FacilityEngine.cpp" line="85"/> <source>Internal error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="76"/> + <location filename="../../../FacilityEngine.cpp" line="86"/> <source>Select one or more files to open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="77"/> + <location filename="../../../FacilityEngine.cpp" line="87"/> <source>All files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="78"/> + <location filename="../../../FacilityEngine.cpp" line="88"/> <source>Save transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="79"/> + <location filename="../../../FacilityEngine.cpp" line="89"/> <source>Open transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="80"/> + <location filename="../../../FacilityEngine.cpp" line="90"/> <source>Transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="81"/> + <location filename="../../../FacilityEngine.cpp" line="91"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="82"/> + <location filename="../../../FacilityEngine.cpp" line="92"/> <source>Not supported on this platform</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="83"/> + <location filename="../../../FacilityEngine.cpp" line="93"/> <source>Completed in %1</source> <translation type="unfinished"></translation> </message> @@ -475,7 +475,7 @@ <context> <name>HelpDialog</name> <message> - <location filename="../../../HelpDialog.cpp" line="37"/> + <location filename="../../../HelpDialog.cpp" line="34"/> <source>About Ultracopier</source> <translation type="unfinished"></translation> </message> @@ -513,49 +513,42 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="35"/> - <source>About Supercopier</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../HelpDialog.cpp" line="80"/> + <location filename="../../../HelpDialog.cpp" line="73"/> <source>For http://portableapps.com/</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="83"/> + <location filename="../../../HelpDialog.cpp" line="76"/> <source>Portable and all in one version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="85"/> + <location filename="../../../HelpDialog.cpp" line="78"/> <source>Portable version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="90"/> + <location filename="../../../HelpDialog.cpp" line="83"/> <source>All in one version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="92"/> + <location filename="../../../HelpDialog.cpp" line="85"/> <source>Normal version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="110"/> - <location filename="../../../HelpDialog.cpp" line="112"/> - <location filename="../../../HelpDialog.cpp" line="123"/> + <location filename="../../../HelpDialog.cpp" line="102"/> <source>http://ultracopier.first-world.info/</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="120"/> + <location filename="../../../HelpDialog.cpp" line="109"/> <source>http://ultracopier.first-world.info/shop.html</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="125"/> + <location filename="../../../HelpDialog.cpp" line="111"/> <source>http://ultracopier.first-world.info/download.html</source> <translation type="unfinished"></translation> </message> @@ -569,12 +562,12 @@ This version is compiled as version: %1.</source> <context> <name>LocalListener</name> <message> - <location filename="../../../LocalListener.cpp" line="146"/> + <location filename="../../../LocalListener.cpp" line="160"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../LocalListener.cpp" line="146"/> + <location filename="../../../LocalListener.cpp" line="160"/> <source>Timeout while recomposing data from connected clients</source> <translation type="unfinished"></translation> </message> @@ -582,20 +575,20 @@ This version is compiled as version: %1.</source> <context> <name>LogThread</name> <message> - <location filename="../../../LogThread.cpp" line="106"/> - <location filename="../../../LogThread.cpp" line="115"/> - <location filename="../../../LogThread.cpp" line="125"/> + <location filename="../../../LogThread.cpp" line="107"/> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../LogThread.cpp" line="106"/> + <location filename="../../../LogThread.cpp" line="107"/> <source>Log file already open, error: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../LogThread.cpp" line="115"/> - <location filename="../../../LogThread.cpp" line="125"/> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> <source>Unable to open the log file, error: %1</source> <translation type="unfinished"></translation> </message> @@ -637,21 +630,6 @@ This version is compiled as version: %1.</source> <source>The replacement of default copy/move system should be not supported by the file manager.<br />Ask to the developer to support it.<br />You need do the copy/move manually.</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../../OSSpecific.cpp" line="32"/> - <source>Consider Supercopier as deprecated, prefer Ultracopier</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OSSpecific.cpp" line="35"/> - <source>This version use 100% of you graphic card/GPU (you computer can be noisy, or slow/buggy during the games) at exchange of free access to Ultimate version. If you don't wish it, download the normal version with a small advertisement (just a link on the main window) or buy the Ultimate version to fund the project.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OSSpecific.cpp" line="36"/> - <source>http://ultracopier.first-world.info/download.html</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>OptionDialog</name> @@ -674,7 +652,7 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="66"/> <location filename="../../../OptionDialog.ui" line="322"/> - <location filename="../../../OptionDialog.cpp" line="354"/> + <location filename="../../../OptionDialog.cpp" line="286"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> @@ -717,21 +695,21 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="71"/> <location filename="../../../OptionDialog.ui" line="335"/> - <location filename="../../../OptionDialog.cpp" line="355"/> + <location filename="../../../OptionDialog.cpp" line="287"/> <source>Listener</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="76"/> <location filename="../../../OptionDialog.ui" line="340"/> - <location filename="../../../OptionDialog.cpp" line="356"/> + <location filename="../../../OptionDialog.cpp" line="288"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="84"/> <location filename="../../../OptionDialog.ui" line="345"/> - <location filename="../../../OptionDialog.cpp" line="357"/> + <location filename="../../../OptionDialog.cpp" line="289"/> <source>Session loader</source> <translation type="unfinished"></translation> </message> @@ -863,95 +841,75 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="260"/> - <location filename="../../../OptionDialog.cpp" line="274"/> + <location filename="../../../OptionDialog.cpp" line="190"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="260"/> + <location filename="../../../OptionDialog.cpp" line="190"/> <source>Load the theme?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="274"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load the language?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="362"/> + <location filename="../../../OptionDialog.cpp" line="294"/> <source>Do nothing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="363"/> + <location filename="../../../OptionDialog.cpp" line="295"/> <source>Ask source as folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="364"/> + <location filename="../../../OptionDialog.cpp" line="296"/> <source>Ask sources as files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="365"/> + <location filename="../../../OptionDialog.cpp" line="297"/> <source>Never</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="366"/> + <location filename="../../../OptionDialog.cpp" line="298"/> <source>When source is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="367"/> + <location filename="../../../OptionDialog.cpp" line="299"/> <source>When destination is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="368"/> + <location filename="../../../OptionDialog.cpp" line="300"/> <source>When source and destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="369"/> + <location filename="../../../OptionDialog.cpp" line="301"/> <source>When source or destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="370"/> + <location filename="../../../OptionDialog.cpp" line="302"/> <source>Always</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="384"/> - <location filename="../../../OptionDialog.cpp" line="385"/> - <location filename="../../../OptionDialog.cpp" line="386"/> + <location filename="../../../OptionDialog.cpp" line="316"/> + <location filename="../../../OptionDialog.cpp" line="317"/> + <location filename="../../../OptionDialog.cpp" line="318"/> <source>The variables are %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="478"/> - <source>Allow the application</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="478"/> - <source>This Ultimate free version is only if %1 is allowed by your antivirus. Else you can get the normal free version</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="483"/> - <source>Enable the OpenCL</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="483"/> - <source>This Ultimate version is only if the OpenCL is installed with your graphic card drivers. Else you can get the normal free version</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="1591"/> + <location filename="../../../OptionDialog.cpp" line="948"/> <source>Save logs as: </source> <translation type="unfinished"></translation> </message> @@ -980,10 +938,10 @@ This version is compiled as version: %1.</source> <context> <name>OptionEngine</name> <message> - <location filename="../../../OptionEngine.cpp" line="161"/> - <location filename="../../../OptionEngine.cpp" line="165"/> - <location filename="../../../OptionEngine.cpp" line="202"/> - <location filename="../../../OptionEngine.cpp" line="206"/> + <location filename="../../../OptionEngine.cpp" line="162"/> + <location filename="../../../OptionEngine.cpp" line="169"/> + <location filename="../../../OptionEngine.cpp" line="211"/> + <location filename="../../../OptionEngine.cpp" line="215"/> <source>The variable was not found: %1 %2</source> <translation type="unfinished"></translation> </message> @@ -1026,42 +984,42 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="38"/> + <location filename="../../../PluginInformation.cpp" line="39"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="41"/> + <location filename="../../../PluginInformation.cpp" line="42"/> <source>Languages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="44"/> + <location filename="../../../PluginInformation.cpp" line="45"/> <source>Listener</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="47"/> + <location filename="../../../PluginInformation.cpp" line="48"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="50"/> + <location filename="../../../PluginInformation.cpp" line="51"/> <source>Session loader</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="53"/> + <location filename="../../../PluginInformation.cpp" line="54"/> <source>Themes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="57"/> + <location filename="../../../PluginInformation.cpp" line="58"/> <source>Unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="67"/> + <location filename="../../../PluginInformation.cpp" line="68"/> <source>Information about %1</source> <translation type="unfinished"></translation> </message> @@ -1079,140 +1037,140 @@ This version is compiled as version: %1.</source> <context> <name>PluginsManager</name> <message> - <location filename="../../../PluginsManager.cpp" line="221"/> + <location filename="../../../PluginsManager.cpp" line="224"/> <source>informations.xml is not accessible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="487"/> + <location filename="../../../PluginsManager.cpp" line="494"/> <source>Dependencies part is wrong</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="508"/> + <location filename="../../../PluginsManager.cpp" line="515"/> <source>Dependencies %1 are not satisfied, for plugin: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="665"/> + <location filename="../../../PluginsManager.cpp" line="672"/> <source>Remove %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="676"/> + <location filename="../../../PluginsManager.cpp" line="683"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="700"/> + <location filename="../../../PluginsManager.cpp" line="683"/> + <source>Error while the removing plugin, please check the rights on the folder: +%1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="707"/> <source>Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="253"/> + <location filename="../../../PluginsManager.cpp" line="256"/> <source>%1, parse error at line %2, column %3: %4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="227"/> + <location filename="../../../PluginsManager.cpp" line="230"/> <source>informations.xml not found for the plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="261"/> + <location filename="../../../PluginsManager.cpp" line="264"/> <source>"package" root tag not found for the xml file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="337"/> + <location filename="../../../PluginsManager.cpp" line="340"/> <source>Duplicated plugin found, already loaded!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="395"/> + <location filename="../../../PluginsManager.cpp" line="401"/> <source>English text missing in the informations.xml for the tag: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="403"/> + <location filename="../../../PluginsManager.cpp" line="409"/> <source>Tag not found: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="665"/> + <location filename="../../../PluginsManager.cpp" line="672"/> <source>Are you sure about removing "%1" in version %2?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="676"/> - <source>Error while the removing plugin, please check the rights on the folder: -%1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../PluginsManager.cpp" line="700"/> + <location filename="../../../PluginsManager.cpp" line="707"/> <source>Previous import is in progress...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="703"/> + <location filename="../../../PluginsManager.cpp" line="710"/> <source>Open Ultracopier plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="703"/> + <location filename="../../../PluginsManager.cpp" line="710"/> <source>Ultracopier plugin (*.urc)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="720"/> - <location filename="../../../PluginsManager.cpp" line="745"/> - <location filename="../../../PluginsManager.cpp" line="813"/> - <location filename="../../../PluginsManager.cpp" line="826"/> - <location filename="../../../PluginsManager.cpp" line="845"/> - <location filename="../../../PluginsManager.cpp" line="851"/> - <location filename="../../../PluginsManager.cpp" line="857"/> - <location filename="../../../PluginsManager.cpp" line="863"/> - <location filename="../../../PluginsManager.cpp" line="869"/> + <location filename="../../../PluginsManager.cpp" line="727"/> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="820"/> + <location filename="../../../PluginsManager.cpp" line="833"/> + <location filename="../../../PluginsManager.cpp" line="852"/> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="870"/> <location filename="../../../PluginsManager.cpp" line="876"/> + <location filename="../../../PluginsManager.cpp" line="883"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="720"/> + <location filename="../../../PluginsManager.cpp" line="727"/> <source>Unable to open the plugin: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="745"/> - <location filename="../../../PluginsManager.cpp" line="863"/> - <location filename="../../../PluginsManager.cpp" line="876"/> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="870"/> + <location filename="../../../PluginsManager.cpp" line="883"/> <source>Unable to load the plugin content, please check it: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="813"/> + <location filename="../../../PluginsManager.cpp" line="820"/> <source>Unable to create a folder to install the plugin: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="826"/> + <location filename="../../../PluginsManager.cpp" line="833"/> <source>Unable to create a file to install the plugin: %1 since:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="845"/> + <location filename="../../../PluginsManager.cpp" line="852"/> <source>Folder with same name is present, skip the plugin installation: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="851"/> - <location filename="../../../PluginsManager.cpp" line="857"/> - <location filename="../../../PluginsManager.cpp" line="869"/> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="876"/> <source>Unable to load the plugin content, please check it</source> <translation type="unfinished"></translation> </message> @@ -1265,119 +1223,34 @@ since:%2</source> <context> <name>SystrayIcon</name> <message> - <location filename="../../../SystrayIcon.cpp" line="163"/> + <location filename="../../../SystrayIcon.cpp" line="155"/> <source>No copy listener found. Do the copy manually by right click one the system tray icon.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="169"/> + <location filename="../../../SystrayIcon.cpp" line="161"/> <source>Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="187"/> + <location filename="../../../SystrayIcon.cpp" line="179"/> <source>Searching information...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="200"/> + <location filename="../../../SystrayIcon.cpp" line="192"/> <source>Do not replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="205"/> + <location filename="../../../SystrayIcon.cpp" line="197"/> <source>Semi replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="210"/> + <location filename="../../../SystrayIcon.cpp" line="202"/> <source>Replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="377"/> - <source>Warning</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="377"/> - <source>The action on the systray icon is unknown!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="425"/> - <source>&About/Debug report</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="427"/> - <source>&About</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="430"/> - <source>&Save bug report</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="432"/> - <source>&Quit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="433"/> - <source>&Options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="485"/> - <source>A&dd copy/moving</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="471"/> - <source>New version: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="471"/> - <source>Click here to go on download page</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="511"/> - <source>&Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="525"/> - <location filename="../../../SystrayIcon.cpp" line="539"/> - <source>&Transfer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="529"/> - <location filename="../../../SystrayIcon.cpp" line="543"/> - <source>&Move</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="560"/> - <location filename="../../../SystrayIcon.cpp" line="577"/> - <source>Add &copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="566"/> - <location filename="../../../SystrayIcon.cpp" line="583"/> - <source>Add &transfer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="570"/> - <location filename="../../../SystrayIcon.cpp" line="587"/> - <source>Add &move</source> - <translation type="unfinished"></translation> - </message> </context> </TS> diff --git a/plugins/Languages/zh/informations.xml b/plugins/Languages/zh/informations.xml index 151e854..853da7c 100644 --- a/plugins/Languages/zh/informations.xml +++ b/plugins/Languages/zh/informations.xml @@ -12,7 +12,7 @@ <!-- Detailed description --> <description xml:lang="en"><![CDATA[Translation of Ultracopier to chinese. For more details see the web site.]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>1.2.3.6</version> + <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>ch</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/zh/translation.ts b/plugins/Languages/zh/translation.ts index 8a6d55f..4172800 100644 --- a/plugins/Languages/zh/translation.ts +++ b/plugins/Languages/zh/translation.ts @@ -1,86 +1,86 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>CliParser</name> <message> - <location filename="../../../CliParser.cpp" line="25"/> - <location filename="../../../CliParser.cpp" line="71"/> - <location filename="../../../CliParser.cpp" line="84"/> - <location filename="../../../CliParser.cpp" line="94"/> - <location filename="../../../CliParser.cpp" line="179"/> + <location filename="../../../CliParser.cpp" line="26"/> + <location filename="../../../CliParser.cpp" line="72"/> + <location filename="../../../CliParser.cpp" line="85"/> + <location filename="../../../CliParser.cpp" line="95"/> + <location filename="../../../CliParser.cpp" line="180"/> <source>Warning</source> - <translation type="unfinished"></translation> + <translation type="unfinished">警告</translation> </message> <message> - <location filename="../../../CliParser.cpp" line="25"/> + <location filename="../../../CliParser.cpp" line="26"/> <source>Ultracopier is already running, right click on its system tray icon (near the clock) to use it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="71"/> + <location filename="../../../CliParser.cpp" line="72"/> <source>Problem reading file, or file size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="159"/> - <location filename="../../../CliParser.cpp" line="170"/> + <location filename="../../../CliParser.cpp" line="160"/> + <location filename="../../../CliParser.cpp" line="171"/> <source>The arguments possible are:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="161"/> - <location filename="../../../CliParser.cpp" line="172"/> + <location filename="../../../CliParser.cpp" line="162"/> + <location filename="../../../CliParser.cpp" line="173"/> <source>To display the options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="162"/> - <location filename="../../../CliParser.cpp" line="173"/> + <location filename="../../../CliParser.cpp" line="163"/> + <location filename="../../../CliParser.cpp" line="174"/> <source>To quit the other instances (if running)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="164"/> - <location filename="../../../CliParser.cpp" line="175"/> + <location filename="../../../CliParser.cpp" line="165"/> + <location filename="../../../CliParser.cpp" line="176"/> <source>To copy sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="165"/> - <location filename="../../../CliParser.cpp" line="176"/> + <location filename="../../../CliParser.cpp" line="166"/> + <location filename="../../../CliParser.cpp" line="177"/> <source>To move sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="169"/> + <location filename="../../../CliParser.cpp" line="170"/> <source>Command not valid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="84"/> + <location filename="../../../CliParser.cpp" line="85"/> <source>This file is not supported transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="94"/> + <location filename="../../../CliParser.cpp" line="95"/> <source>Unable to open the transfer list file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="160"/> - <location filename="../../../CliParser.cpp" line="171"/> + <location filename="../../../CliParser.cpp" line="161"/> + <location filename="../../../CliParser.cpp" line="172"/> <source>To display this help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="163"/> - <location filename="../../../CliParser.cpp" line="174"/> + <location filename="../../../CliParser.cpp" line="164"/> + <location filename="../../../CliParser.cpp" line="175"/> <source>Open transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CliParser.cpp" line="181"/> + <location filename="../../../CliParser.cpp" line="182"/> <source>Help</source> <translation type="unfinished"></translation> </message> @@ -88,30 +88,30 @@ <context> <name>CopyEngineManager</name> <message> - <location filename="../../../CopyEngineManager.cpp" line="229"/> - <location filename="../../../CopyEngineManager.cpp" line="234"/> - <location filename="../../../CopyEngineManager.cpp" line="257"/> - <location filename="../../../CopyEngineManager.cpp" line="271"/> + <location filename="../../../CopyEngineManager.cpp" line="231"/> + <location filename="../../../CopyEngineManager.cpp" line="236"/> + <location filename="../../../CopyEngineManager.cpp" line="259"/> + <location filename="../../../CopyEngineManager.cpp" line="273"/> <source>Warning</source> - <translation type="unfinished"></translation> + <translation>警告</translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="229"/> + <location filename="../../../CopyEngineManager.cpp" line="231"/> <source>Cannot find any copy engine with move support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="257"/> + <location filename="../../../CopyEngineManager.cpp" line="259"/> <source>This copy engine does not support move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="234"/> + <location filename="../../../CopyEngineManager.cpp" line="236"/> <source>Cannot find any compatible engine!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyEngineManager.cpp" line="271"/> + <location filename="../../../CopyEngineManager.cpp" line="273"/> <source>Cannot find any engine with this name: %1</source> <translation type="unfinished"></translation> </message> @@ -119,12 +119,12 @@ <context> <name>CopyListener</name> <message> - <location filename="../../../CopyListener.cpp" line="158"/> + <location filename="../../../CopyListener.cpp" line="159"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../CopyListener.cpp" line="158"/> + <location filename="../../../CopyListener.cpp" line="159"/> <source>Error during the reception of the copy/move list %1</source> <translation type="unfinished"></translation> @@ -133,70 +133,70 @@ <context> <name>Core</name> <message> - <location filename="../../../Core.cpp" line="45"/> - <location filename="../../../Core.cpp" line="116"/> - <location filename="../../../Core.cpp" line="142"/> - <location filename="../../../Core.cpp" line="157"/> - <location filename="../../../Core.cpp" line="177"/> - <location filename="../../../Core.cpp" line="191"/> - <location filename="../../../Core.cpp" line="200"/> - <location filename="../../../Core.cpp" line="209"/> - <location filename="../../../Core.cpp" line="216"/> - <location filename="../../../Core.cpp" line="250"/> - <location filename="../../../Core.cpp" line="387"/> - <location filename="../../../Core.cpp" line="392"/> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="117"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> + <location filename="../../../Core.cpp" line="217"/> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> + <location filename="../../../Core.cpp" line="393"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="45"/> - <location filename="../../../Core.cpp" line="142"/> - <location filename="../../../Core.cpp" line="157"/> - <location filename="../../../Core.cpp" line="177"/> - <location filename="../../../Core.cpp" line="191"/> - <location filename="../../../Core.cpp" line="200"/> - <location filename="../../../Core.cpp" line="209"/> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> <source>Unable to get a copy engine instance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="93"/> + <location filename="../../../Core.cpp" line="94"/> <source>Group window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="93"/> + <location filename="../../../Core.cpp" line="94"/> <source>Do you want group the transfer with another actual running transfer?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="116"/> + <location filename="../../../Core.cpp" line="117"/> <source>Unable to get a engine instance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="216"/> + <location filename="../../../Core.cpp" line="217"/> <source>The argument for the mode is not valid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="1133"/> + <location filename="../../../Core.cpp" line="1136"/> <source>Do you want to copy? If no, it will be moved.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="250"/> - <location filename="../../../Core.cpp" line="387"/> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> <source>Unable to load the interface, copy aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="392"/> + <location filename="../../../Core.cpp" line="393"/> <source>Unable to load the copy engine, copy aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../Core.cpp" line="1133"/> + <location filename="../../../Core.cpp" line="1136"/> <source>Transfer mode</source> <translation type="unfinished"></translation> </message> @@ -204,12 +204,12 @@ <context> <name>EventDispatcher</name> <message> - <location filename="../../../EventDispatcher.cpp" line="155"/> + <location filename="../../../EventDispatcher.cpp" line="152"/> <source>Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../EventDispatcher.cpp" line="155"/> + <location filename="../../../EventDispatcher.cpp" line="152"/> <source>Give the key of this software, more information on <a href="http://ultracopier.first-world.info/">ultracopier.first-world.info</a></source> <translation type="unfinished"></translation> </message> @@ -217,257 +217,257 @@ <context> <name>FacilityEngine</name> <message> - <location filename="../../../FacilityEngine.cpp" line="43"/> + <location filename="../../../FacilityEngine.cpp" line="53"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="45"/> + <location filename="../../../FacilityEngine.cpp" line="55"/> <source>Copy</source> <extracomment>a copy</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="49"/> + <location filename="../../../FacilityEngine.cpp" line="59"/> <source>Move</source> <extracomment>a move</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="51"/> + <location filename="../../../FacilityEngine.cpp" line="61"/> <source>Pause</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="52"/> + <location filename="../../../FacilityEngine.cpp" line="62"/> <source>Resume</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="53"/> - <location filename="../../../FacilityEngine.cpp" line="67"/> + <location filename="../../../FacilityEngine.cpp" line="63"/> + <location filename="../../../FacilityEngine.cpp" line="77"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="54"/> + <location filename="../../../FacilityEngine.cpp" line="64"/> <source>Unlimited</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="27"/> + <location filename="../../../FacilityEngine.cpp" line="37"/> <source>s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="28"/> + <location filename="../../../FacilityEngine.cpp" line="38"/> <source>Too big</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="29"/> + <location filename="../../../FacilityEngine.cpp" line="39"/> <source>B</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="30"/> + <location filename="../../../FacilityEngine.cpp" line="40"/> <source>KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="31"/> + <location filename="../../../FacilityEngine.cpp" line="41"/> <source>MB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="32"/> + <location filename="../../../FacilityEngine.cpp" line="42"/> <source>GB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="33"/> + <location filename="../../../FacilityEngine.cpp" line="43"/> <source>TB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="34"/> + <location filename="../../../FacilityEngine.cpp" line="44"/> <source>PB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="35"/> + <location filename="../../../FacilityEngine.cpp" line="45"/> <source>EB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="36"/> + <location filename="../../../FacilityEngine.cpp" line="46"/> <source>ZB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="37"/> + <location filename="../../../FacilityEngine.cpp" line="47"/> <source>YB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="38"/> + <location filename="../../../FacilityEngine.cpp" line="48"/> <source>Less than %10 seconds</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="39"/> + <location filename="../../../FacilityEngine.cpp" line="49"/> <source>About %10 seconds remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="40"/> + <location filename="../../../FacilityEngine.cpp" line="50"/> <source>About %1 minutes remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="41"/> + <location filename="../../../FacilityEngine.cpp" line="51"/> <source>About %1 hours remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="47"/> + <location filename="../../../FacilityEngine.cpp" line="57"/> <source>Transfer</source> <extracomment>a transfer</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="50"/> + <location filename="../../../FacilityEngine.cpp" line="60"/> <source>Start</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="55"/> + <location filename="../../../FacilityEngine.cpp" line="65"/> <source>Source</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="56"/> + <location filename="../../../FacilityEngine.cpp" line="66"/> <source>Size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="57"/> + <location filename="../../../FacilityEngine.cpp" line="67"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="58"/> + <location filename="../../../FacilityEngine.cpp" line="68"/> <source>Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="59"/> + <location filename="../../../FacilityEngine.cpp" line="69"/> <source>Target</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="60"/> - <location filename="../../../FacilityEngine.cpp" line="64"/> + <location filename="../../../FacilityEngine.cpp" line="70"/> + <location filename="../../../FacilityEngine.cpp" line="74"/> <source>Time remaining:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="61"/> + <location filename="../../../FacilityEngine.cpp" line="71"/> <source>Listing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="62"/> + <location filename="../../../FacilityEngine.cpp" line="72"/> <source>Copying</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="63"/> + <location filename="../../../FacilityEngine.cpp" line="73"/> <source>Listing and copying</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="66"/> + <location filename="../../../FacilityEngine.cpp" line="76"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="68"/> + <location filename="../../../FacilityEngine.cpp" line="78"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="69"/> + <location filename="../../../FacilityEngine.cpp" line="79"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="70"/> + <location filename="../../../FacilityEngine.cpp" line="80"/> <source>Overwrite if the last modification dates are different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="71"/> + <location filename="../../../FacilityEngine.cpp" line="81"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="72"/> + <location filename="../../../FacilityEngine.cpp" line="82"/> <source>Put to the end of the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="73"/> + <location filename="../../../FacilityEngine.cpp" line="83"/> <source>Select source directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="74"/> + <location filename="../../../FacilityEngine.cpp" line="84"/> <source>Select destination directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="75"/> + <location filename="../../../FacilityEngine.cpp" line="85"/> <source>Internal error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="76"/> + <location filename="../../../FacilityEngine.cpp" line="86"/> <source>Select one or more files to open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="77"/> + <location filename="../../../FacilityEngine.cpp" line="87"/> <source>All files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="78"/> + <location filename="../../../FacilityEngine.cpp" line="88"/> <source>Save transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="79"/> + <location filename="../../../FacilityEngine.cpp" line="89"/> <source>Open transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="80"/> + <location filename="../../../FacilityEngine.cpp" line="90"/> <source>Transfer list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="81"/> + <location filename="../../../FacilityEngine.cpp" line="91"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="82"/> + <location filename="../../../FacilityEngine.cpp" line="92"/> <source>Not supported on this platform</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../FacilityEngine.cpp" line="83"/> + <location filename="../../../FacilityEngine.cpp" line="93"/> <source>Completed in %1</source> <translation type="unfinished"></translation> </message> @@ -475,7 +475,7 @@ <context> <name>HelpDialog</name> <message> - <location filename="../../../HelpDialog.cpp" line="37"/> + <location filename="../../../HelpDialog.cpp" line="34"/> <source>About Ultracopier</source> <translation type="unfinished"></translation> </message> @@ -519,49 +519,42 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="35"/> - <source>About Supercopier</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../HelpDialog.cpp" line="80"/> + <location filename="../../../HelpDialog.cpp" line="73"/> <source>For http://portableapps.com/</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="83"/> + <location filename="../../../HelpDialog.cpp" line="76"/> <source>Portable and all in one version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="85"/> + <location filename="../../../HelpDialog.cpp" line="78"/> <source>Portable version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="90"/> + <location filename="../../../HelpDialog.cpp" line="83"/> <source>All in one version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="92"/> + <location filename="../../../HelpDialog.cpp" line="85"/> <source>Normal version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="110"/> - <location filename="../../../HelpDialog.cpp" line="112"/> - <location filename="../../../HelpDialog.cpp" line="123"/> + <location filename="../../../HelpDialog.cpp" line="102"/> <source>http://ultracopier.first-world.info/</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="120"/> + <location filename="../../../HelpDialog.cpp" line="109"/> <source>http://ultracopier.first-world.info/shop.html</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../HelpDialog.cpp" line="125"/> + <location filename="../../../HelpDialog.cpp" line="111"/> <source>http://ultracopier.first-world.info/download.html</source> <translation type="unfinished"></translation> </message> @@ -569,12 +562,12 @@ This version is compiled as version: %1.</source> <context> <name>LocalListener</name> <message> - <location filename="../../../LocalListener.cpp" line="146"/> + <location filename="../../../LocalListener.cpp" line="160"/> <source>Warning</source> - <translation type="unfinished"></translation> + <translation type="unfinished">警告</translation> </message> <message> - <location filename="../../../LocalListener.cpp" line="146"/> + <location filename="../../../LocalListener.cpp" line="160"/> <source>Timeout while recomposing data from connected clients</source> <translation type="unfinished"></translation> </message> @@ -582,20 +575,20 @@ This version is compiled as version: %1.</source> <context> <name>LogThread</name> <message> - <location filename="../../../LogThread.cpp" line="106"/> - <location filename="../../../LogThread.cpp" line="115"/> - <location filename="../../../LogThread.cpp" line="125"/> + <location filename="../../../LogThread.cpp" line="107"/> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../LogThread.cpp" line="106"/> + <location filename="../../../LogThread.cpp" line="107"/> <source>Log file already open, error: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../LogThread.cpp" line="115"/> - <location filename="../../../LogThread.cpp" line="125"/> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> <source>Unable to open the log file, error: %1</source> <translation type="unfinished"></translation> </message> @@ -605,7 +598,7 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OSSpecific.ui" line="26"/> <source>Warning</source> - <translation type="unfinished"></translation> + <translation type="unfinished">警告</translation> </message> <message> <location filename="../../../OSSpecific.ui" line="58"/> @@ -637,21 +630,6 @@ This version is compiled as version: %1.</source> <source>The replacement of default copy/move system should be not supported by the file manager.<br />Ask to the developer to support it.<br />You need do the copy/move manually.</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../../OSSpecific.cpp" line="32"/> - <source>Consider Supercopier as deprecated, prefer Ultracopier</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OSSpecific.cpp" line="35"/> - <source>This version use 100% of you graphic card/GPU (you computer can be noisy, or slow/buggy during the games) at exchange of free access to Ultimate version. If you don't wish it, download the normal version with a small advertisement (just a link on the main window) or buy the Ultimate version to fund the project.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OSSpecific.cpp" line="36"/> - <source>http://ultracopier.first-world.info/download.html</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>OptionDialog</name> @@ -674,7 +652,7 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="66"/> <location filename="../../../OptionDialog.ui" line="322"/> - <location filename="../../../OptionDialog.cpp" line="354"/> + <location filename="../../../OptionDialog.cpp" line="286"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> @@ -723,21 +701,21 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="71"/> <location filename="../../../OptionDialog.ui" line="335"/> - <location filename="../../../OptionDialog.cpp" line="355"/> + <location filename="../../../OptionDialog.cpp" line="287"/> <source>Listener</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="76"/> <location filename="../../../OptionDialog.ui" line="340"/> - <location filename="../../../OptionDialog.cpp" line="356"/> + <location filename="../../../OptionDialog.cpp" line="288"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="84"/> <location filename="../../../OptionDialog.ui" line="345"/> - <location filename="../../../OptionDialog.cpp" line="357"/> + <location filename="../../../OptionDialog.cpp" line="289"/> <source>Session loader</source> <translation type="unfinished"></translation> </message> @@ -879,95 +857,75 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="260"/> - <location filename="../../../OptionDialog.cpp" line="274"/> + <location filename="../../../OptionDialog.cpp" line="190"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="260"/> + <location filename="../../../OptionDialog.cpp" line="190"/> <source>Load the theme?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="274"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load the language?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="362"/> + <location filename="../../../OptionDialog.cpp" line="294"/> <source>Do nothing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="363"/> + <location filename="../../../OptionDialog.cpp" line="295"/> <source>Ask source as folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="364"/> + <location filename="../../../OptionDialog.cpp" line="296"/> <source>Ask sources as files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="365"/> + <location filename="../../../OptionDialog.cpp" line="297"/> <source>Never</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="366"/> + <location filename="../../../OptionDialog.cpp" line="298"/> <source>When source is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="367"/> + <location filename="../../../OptionDialog.cpp" line="299"/> <source>When destination is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="368"/> + <location filename="../../../OptionDialog.cpp" line="300"/> <source>When source and destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="369"/> + <location filename="../../../OptionDialog.cpp" line="301"/> <source>When source or destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="370"/> + <location filename="../../../OptionDialog.cpp" line="302"/> <source>Always</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="384"/> - <location filename="../../../OptionDialog.cpp" line="385"/> - <location filename="../../../OptionDialog.cpp" line="386"/> + <location filename="../../../OptionDialog.cpp" line="316"/> + <location filename="../../../OptionDialog.cpp" line="317"/> + <location filename="../../../OptionDialog.cpp" line="318"/> <source>The variables are %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="478"/> - <source>Allow the application</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="478"/> - <source>This Ultimate free version is only if %1 is allowed by your antivirus. Else you can get the normal free version</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="483"/> - <source>Enable the OpenCL</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="483"/> - <source>This Ultimate version is only if the OpenCL is installed with your graphic card drivers. Else you can get the normal free version</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../OptionDialog.cpp" line="1591"/> + <location filename="../../../OptionDialog.cpp" line="948"/> <source>Save logs as: </source> <translation type="unfinished"></translation> </message> @@ -980,10 +938,10 @@ This version is compiled as version: %1.</source> <context> <name>OptionEngine</name> <message> - <location filename="../../../OptionEngine.cpp" line="161"/> - <location filename="../../../OptionEngine.cpp" line="165"/> - <location filename="../../../OptionEngine.cpp" line="202"/> - <location filename="../../../OptionEngine.cpp" line="206"/> + <location filename="../../../OptionEngine.cpp" line="162"/> + <location filename="../../../OptionEngine.cpp" line="169"/> + <location filename="../../../OptionEngine.cpp" line="211"/> + <location filename="../../../OptionEngine.cpp" line="215"/> <source>The variable was not found: %1 %2</source> <translation type="unfinished"></translation> </message> @@ -1026,42 +984,42 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="38"/> + <location filename="../../../PluginInformation.cpp" line="39"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="41"/> + <location filename="../../../PluginInformation.cpp" line="42"/> <source>Languages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="44"/> + <location filename="../../../PluginInformation.cpp" line="45"/> <source>Listener</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="47"/> + <location filename="../../../PluginInformation.cpp" line="48"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="50"/> + <location filename="../../../PluginInformation.cpp" line="51"/> <source>Session loader</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="53"/> + <location filename="../../../PluginInformation.cpp" line="54"/> <source>Themes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="57"/> + <location filename="../../../PluginInformation.cpp" line="58"/> <source>Unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginInformation.cpp" line="67"/> + <location filename="../../../PluginInformation.cpp" line="68"/> <source>Information about %1</source> <translation type="unfinished"></translation> </message> @@ -1079,140 +1037,140 @@ This version is compiled as version: %1.</source> <context> <name>PluginsManager</name> <message> - <location filename="../../../PluginsManager.cpp" line="221"/> + <location filename="../../../PluginsManager.cpp" line="224"/> <source>informations.xml is not accessible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="487"/> + <location filename="../../../PluginsManager.cpp" line="494"/> <source>Dependencies part is wrong</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="508"/> + <location filename="../../../PluginsManager.cpp" line="515"/> <source>Dependencies %1 are not satisfied, for plugin: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="665"/> + <location filename="../../../PluginsManager.cpp" line="672"/> <source>Remove %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="676"/> + <location filename="../../../PluginsManager.cpp" line="683"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="700"/> + <location filename="../../../PluginsManager.cpp" line="707"/> <source>Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="253"/> + <location filename="../../../PluginsManager.cpp" line="256"/> <source>%1, parse error at line %2, column %3: %4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="227"/> + <location filename="../../../PluginsManager.cpp" line="230"/> <source>informations.xml not found for the plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="261"/> + <location filename="../../../PluginsManager.cpp" line="264"/> <source>"package" root tag not found for the xml file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="337"/> + <location filename="../../../PluginsManager.cpp" line="340"/> <source>Duplicated plugin found, already loaded!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="395"/> + <location filename="../../../PluginsManager.cpp" line="401"/> <source>English text missing in the informations.xml for the tag: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="403"/> + <location filename="../../../PluginsManager.cpp" line="409"/> <source>Tag not found: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="665"/> + <location filename="../../../PluginsManager.cpp" line="672"/> <source>Are you sure about removing "%1" in version %2?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="676"/> + <location filename="../../../PluginsManager.cpp" line="683"/> <source>Error while the removing plugin, please check the rights on the folder: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="700"/> + <location filename="../../../PluginsManager.cpp" line="707"/> <source>Previous import is in progress...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="703"/> + <location filename="../../../PluginsManager.cpp" line="710"/> <source>Open Ultracopier plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="703"/> + <location filename="../../../PluginsManager.cpp" line="710"/> <source>Ultracopier plugin (*.urc)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="720"/> - <location filename="../../../PluginsManager.cpp" line="745"/> - <location filename="../../../PluginsManager.cpp" line="813"/> - <location filename="../../../PluginsManager.cpp" line="826"/> - <location filename="../../../PluginsManager.cpp" line="845"/> - <location filename="../../../PluginsManager.cpp" line="851"/> - <location filename="../../../PluginsManager.cpp" line="857"/> - <location filename="../../../PluginsManager.cpp" line="863"/> - <location filename="../../../PluginsManager.cpp" line="869"/> + <location filename="../../../PluginsManager.cpp" line="727"/> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="820"/> + <location filename="../../../PluginsManager.cpp" line="833"/> + <location filename="../../../PluginsManager.cpp" line="852"/> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="870"/> <location filename="../../../PluginsManager.cpp" line="876"/> + <location filename="../../../PluginsManager.cpp" line="883"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="720"/> + <location filename="../../../PluginsManager.cpp" line="727"/> <source>Unable to open the plugin: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="745"/> - <location filename="../../../PluginsManager.cpp" line="863"/> - <location filename="../../../PluginsManager.cpp" line="876"/> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="870"/> + <location filename="../../../PluginsManager.cpp" line="883"/> <source>Unable to load the plugin content, please check it: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="813"/> + <location filename="../../../PluginsManager.cpp" line="820"/> <source>Unable to create a folder to install the plugin: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="826"/> + <location filename="../../../PluginsManager.cpp" line="833"/> <source>Unable to create a file to install the plugin: %1 since:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="845"/> + <location filename="../../../PluginsManager.cpp" line="852"/> <source>Folder with same name is present, skip the plugin installation: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../PluginsManager.cpp" line="851"/> - <location filename="../../../PluginsManager.cpp" line="857"/> - <location filename="../../../PluginsManager.cpp" line="869"/> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="876"/> <source>Unable to load the plugin content, please check it</source> <translation type="unfinished"></translation> </message> @@ -1265,119 +1223,34 @@ since:%2</source> <context> <name>SystrayIcon</name> <message> - <location filename="../../../SystrayIcon.cpp" line="163"/> + <location filename="../../../SystrayIcon.cpp" line="155"/> <source>No copy listener found. Do the copy manually by right click one the system tray icon.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="169"/> + <location filename="../../../SystrayIcon.cpp" line="161"/> <source>Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="187"/> + <location filename="../../../SystrayIcon.cpp" line="179"/> <source>Searching information...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="200"/> + <location filename="../../../SystrayIcon.cpp" line="192"/> <source>Do not replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="205"/> + <location filename="../../../SystrayIcon.cpp" line="197"/> <source>Semi replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../SystrayIcon.cpp" line="210"/> + <location filename="../../../SystrayIcon.cpp" line="202"/> <source>Replace the explorer copy/move</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="377"/> - <source>Warning</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="377"/> - <source>The action on the systray icon is unknown!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="425"/> - <source>&About/Debug report</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="427"/> - <source>&About</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="430"/> - <source>&Save bug report</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="432"/> - <source>&Quit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="433"/> - <source>&Options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="485"/> - <source>A&dd copy/moving</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="471"/> - <source>New version: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="471"/> - <source>Click here to go on download page</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="511"/> - <source>&Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="525"/> - <location filename="../../../SystrayIcon.cpp" line="539"/> - <source>&Transfer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="529"/> - <location filename="../../../SystrayIcon.cpp" line="543"/> - <source>&Move</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="560"/> - <location filename="../../../SystrayIcon.cpp" line="577"/> - <source>Add &copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="566"/> - <location filename="../../../SystrayIcon.cpp" line="583"/> - <source>Add &transfer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../SystrayIcon.cpp" line="570"/> - <location filename="../../../SystrayIcon.cpp" line="587"/> - <source>Add &move</source> - <translation type="unfinished"></translation> - </message> </context> </TS> diff --git a/plugins/Languages/zh_TW/flag.png b/plugins/Languages/zh_TW/flag.png Binary files differnew file mode 100644 index 0000000..4f00c2d --- /dev/null +++ b/plugins/Languages/zh_TW/flag.png diff --git a/plugins/Languages/zh_TW/informations.xml b/plugins/Languages/zh_TW/informations.xml new file mode 100644 index 0000000..fc37a1e --- /dev/null +++ b/plugins/Languages/zh_TW/informations.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<package> + <title xml:lang="en"><![CDATA[Translation of Ultracopier to chinese traditional]]></title><!-- english is required --> + <!-- What kind of plugin this is --> + <category>Languages</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> + <!-- Detailed description --> + <description xml:lang="en"><![CDATA[Translation of Ultracopier to chinese traditional. For more details see the web site.]]></description> + <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> + <version>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>zh_tw</name> + <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> + <dependencies><![CDATA[ + ]]></dependencies> + <!-- Additional information that is specific to the category (in this case Language). --> + <categorySpecific> + <!-- The full name in the language we're translating to. --> + <fullName><![CDATA[台灣]]></fullName> + <!-- Short name, language name in English --> + <shortName><![CDATA[Chinese Traditional]]></shortName> + <!-- Short name, language ISO code --> + <shortName mainCode="true"><![CDATA[zh_TW]]></shortName> + <!-- Short name, language ISO country code --> + <shortName><![CDATA[zh_TW]]></shortName> + </categorySpecific> +</package> diff --git a/plugins/Languages/zh_TW/translation.ts b/plugins/Languages/zh_TW/translation.ts new file mode 100644 index 0000000..cfe9ac3 --- /dev/null +++ b/plugins/Languages/zh_TW/translation.ts @@ -0,0 +1,1256 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="zh_TW"> +<context> + <name>CliParser</name> + <message> + <location filename="../../../CliParser.cpp" line="26"/> + <location filename="../../../CliParser.cpp" line="72"/> + <location filename="../../../CliParser.cpp" line="85"/> + <location filename="../../../CliParser.cpp" line="95"/> + <location filename="../../../CliParser.cpp" line="180"/> + <source>Warning</source> + <translation>警告</translation> + </message> + <message> + <location filename="../../../CliParser.cpp" line="26"/> + <source>Ultracopier is already running, right click on its system tray icon (near the clock) to use it</source> + <translation type="unfinished">Ultracopier 正在執行中，right click on its system tray icon (near the clock) to use it</translation> + </message> + <message> + <location filename="../../../CliParser.cpp" line="72"/> + <source>Problem reading file, or file size is 0</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../CliParser.cpp" line="160"/> + <location filename="../../../CliParser.cpp" line="171"/> + <source>The arguments possible are:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../CliParser.cpp" line="162"/> + <location filename="../../../CliParser.cpp" line="173"/> + <source>To display the options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../CliParser.cpp" line="163"/> + <location filename="../../../CliParser.cpp" line="174"/> + <source>To quit the other instances (if running)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../CliParser.cpp" line="165"/> + <location filename="../../../CliParser.cpp" line="176"/> + <source>To copy sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../CliParser.cpp" line="166"/> + <location filename="../../../CliParser.cpp" line="177"/> + <source>To move sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../CliParser.cpp" line="170"/> + <source>Command not valid</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../CliParser.cpp" line="85"/> + <source>This file is not supported transfer list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../CliParser.cpp" line="95"/> + <source>Unable to open the transfer list file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../CliParser.cpp" line="161"/> + <location filename="../../../CliParser.cpp" line="172"/> + <source>To display this help</source> + <translation>顯示幫助</translation> + </message> + <message> + <location filename="../../../CliParser.cpp" line="164"/> + <location filename="../../../CliParser.cpp" line="175"/> + <source>Open transfer list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../CliParser.cpp" line="182"/> + <source>Help</source> + <translation>幫助</translation> + </message> +</context> +<context> + <name>CopyEngineManager</name> + <message> + <location filename="../../../CopyEngineManager.cpp" line="231"/> + <location filename="../../../CopyEngineManager.cpp" line="236"/> + <location filename="../../../CopyEngineManager.cpp" line="259"/> + <location filename="../../../CopyEngineManager.cpp" line="273"/> + <source>Warning</source> + <translation>警告</translation> + </message> + <message> + <location filename="../../../CopyEngineManager.cpp" line="231"/> + <source>Cannot find any copy engine with move support</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../CopyEngineManager.cpp" line="259"/> + <source>This copy engine does not support move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../CopyEngineManager.cpp" line="236"/> + <source>Cannot find any compatible engine!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../CopyEngineManager.cpp" line="273"/> + <source>Cannot find any engine with this name: %1</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>CopyListener</name> + <message> + <location filename="../../../CopyListener.cpp" line="159"/> + <source>Error</source> + <translation>錯誤</translation> + </message> + <message> + <location filename="../../../CopyListener.cpp" line="159"/> + <source>Error during the reception of the copy/move list +%1</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>Core</name> + <message> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="117"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> + <location filename="../../../Core.cpp" line="217"/> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> + <location filename="../../../Core.cpp" line="393"/> + <source>Error</source> + <translation>錯誤</translation> + </message> + <message> + <location filename="../../../Core.cpp" line="46"/> + <location filename="../../../Core.cpp" line="143"/> + <location filename="../../../Core.cpp" line="158"/> + <location filename="../../../Core.cpp" line="178"/> + <location filename="../../../Core.cpp" line="192"/> + <location filename="../../../Core.cpp" line="201"/> + <location filename="../../../Core.cpp" line="210"/> + <source>Unable to get a copy engine instance</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../Core.cpp" line="94"/> + <source>Group window</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../Core.cpp" line="94"/> + <source>Do you want group the transfer with another actual running transfer?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../Core.cpp" line="117"/> + <source>Unable to get a engine instance</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../Core.cpp" line="217"/> + <source>The argument for the mode is not valid</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../Core.cpp" line="1136"/> + <source>Do you want to copy? If no, it will be moved.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../Core.cpp" line="251"/> + <location filename="../../../Core.cpp" line="388"/> + <source>Unable to load the interface, copy aborted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../Core.cpp" line="393"/> + <source>Unable to load the copy engine, copy aborted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../Core.cpp" line="1136"/> + <source>Transfer mode</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>EventDispatcher</name> + <message> + <location filename="../../../EventDispatcher.cpp" line="152"/> + <source>Key</source> + <translation>金鑰</translation> + </message> + <message> + <location filename="../../../EventDispatcher.cpp" line="152"/> + <source>Give the key of this software, more information on <a href="http://ultracopier.first-world.info/">ultracopier.first-world.info</a></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>FacilityEngine</name> + <message> + <location filename="../../../FacilityEngine.cpp" line="53"/> + <source>Copy engine</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="55"/> + <source>Copy</source> + <extracomment>a copy</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="59"/> + <source>Move</source> + <extracomment>a move</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="61"/> + <source>Pause</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="62"/> + <source>Resume</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="63"/> + <location filename="../../../FacilityEngine.cpp" line="77"/> + <source>Skip</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="64"/> + <source>Unlimited</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="37"/> + <source>s</source> + <translation>秒</translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="38"/> + <source>Too big</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="39"/> + <source>B</source> + <translation></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="40"/> + <source>KB</source> + <translation></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="41"/> + <source>MB</source> + <translation></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="42"/> + <source>GB</source> + <translation></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="43"/> + <source>TB</source> + <translation></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="44"/> + <source>PB</source> + <translation></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="45"/> + <source>EB</source> + <translation></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="46"/> + <source>ZB</source> + <translation></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="47"/> + <source>YB</source> + <translation></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="48"/> + <source>Less than %10 seconds</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="49"/> + <source>About %10 seconds remaining</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="50"/> + <source>About %1 minutes remaining</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="51"/> + <source>About %1 hours remaining</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="57"/> + <source>Transfer</source> + <extracomment>a transfer</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="60"/> + <source>Start</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="65"/> + <source>Source</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="66"/> + <source>Size</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="67"/> + <source>Destination</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="68"/> + <source>Quit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="69"/> + <source>Target</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="70"/> + <location filename="../../../FacilityEngine.cpp" line="74"/> + <source>Time remaining:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="71"/> + <source>Listing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="72"/> + <source>Copying</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="73"/> + <source>Listing and copying</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="76"/> + <source>Ask</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="78"/> + <source>Overwrite</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="79"/> + <source>Overwrite if newer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="80"/> + <source>Overwrite if the last modification dates are different</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="81"/> + <source>Rename</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="82"/> + <source>Put to the end of the list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="83"/> + <source>Select source directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="84"/> + <source>Select destination directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="85"/> + <source>Internal error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="86"/> + <source>Select one or more files to open</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="87"/> + <source>All files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="88"/> + <source>Save transfer list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="89"/> + <source>Open transfer list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="90"/> + <source>Transfer list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="91"/> + <source>Error</source> + <translation type="unfinished">錯誤</translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="92"/> + <source>Not supported on this platform</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../FacilityEngine.cpp" line="93"/> + <source>Completed in %1</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HelpDialog</name> + <message> + <location filename="../../../HelpDialog.cpp" line="34"/> + <source>About Ultracopier</source> + <translation>關於 Ultracopier</translation> + </message> + <message> + <location filename="../../../HelpDialog.ui" line="67"/> + <source>Based on Qt. Advanced utility to copy files under GPL3 license. +This version is compiled as version: %1.</source> + <extracomment>%1 will be replaced by a variable content (normal, debug, ...)</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../HelpDialog.ui" line="75"/> + <source><html><head/><body><p>For more information see the website <a href="%1"><span style=" text-decoration: underline; color:#0057ae;">%1</span></a></p></body></html></source> + <extracomment>%1 will be remplaced by the website into the corresponding languages</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../HelpDialog.ui" line="85"/> + <source>Platform: %1</source> + <extracomment>%1 will be replaced by the platform (windows, mac, linux, ...)</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../HelpDialog.ui" line="121"/> + <source>About Qt</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../HelpDialog.ui" line="141"/> + <source>Do a crash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../HelpDialog.ui" line="148"/> + <source>Save bug report</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../HelpDialog.ui" line="155"/> + <source>Close</source> + <translation>關閉</translation> + </message> + <message> + <location filename="../../../HelpDialog.cpp" line="73"/> + <source>For http://portableapps.com/</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../HelpDialog.cpp" line="76"/> + <source>Portable and all in one version</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../HelpDialog.cpp" line="78"/> + <source>Portable version</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../HelpDialog.cpp" line="83"/> + <source>All in one version</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../HelpDialog.cpp" line="85"/> + <source>Normal version</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../HelpDialog.cpp" line="102"/> + <source>http://ultracopier.first-world.info/</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../HelpDialog.cpp" line="109"/> + <source>http://ultracopier.first-world.info/shop.html</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../HelpDialog.cpp" line="111"/> + <source>http://ultracopier.first-world.info/download.html</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>LocalListener</name> + <message> + <location filename="../../../LocalListener.cpp" line="160"/> + <source>Warning</source> + <translation>警告</translation> + </message> + <message> + <location filename="../../../LocalListener.cpp" line="160"/> + <source>Timeout while recomposing data from connected clients</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>LogThread</name> + <message> + <location filename="../../../LogThread.cpp" line="107"/> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> + <source>Error</source> + <translation>錯誤</translation> + </message> + <message> + <location filename="../../../LogThread.cpp" line="107"/> + <source>Log file already open, error: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../LogThread.cpp" line="116"/> + <location filename="../../../LogThread.cpp" line="126"/> + <source>Unable to open the log file, error: %1</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>OSSpecific</name> + <message> + <location filename="../../../OSSpecific.ui" line="26"/> + <source>Warning</source> + <translation>警告</translation> + </message> + <message> + <location filename="../../../OSSpecific.ui" line="58"/> + <source>Don't show again</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OSSpecific.ui" line="83"/> + <source>Ok</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OSSpecific.cpp" line="23"/> + <source>The replacement of default copy/move system is not supported by the file manager (Dolphin, Nautilus, ...).<br />Ask the developer to support it.<br />You need do the copy/move manually.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OSSpecific.cpp" line="25"/> + <source>Reboot the system if previously had similar software installed (like Teracopy, Supercopier or an earlier version of Ultracopier).</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OSSpecific.cpp" line="27"/> + <source>The replacement of default copy/move system is not supported and blocked by finder of Mac OS X.<br />You need do the copy/move manually by right clicking on the system tray icon near the clock (not the dock icon).</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OSSpecific.cpp" line="29"/> + <source>The replacement of default copy/move system should be not supported by the file manager.<br />Ask to the developer to support it.<br />You need do the copy/move manually.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>OptionDialog</name> + <message> + <location filename="../../../OptionDialog.ui" line="14"/> + <location filename="../../../OptionDialog.ui" line="51"/> + <source>Options</source> + <translation type="unfinished">選項</translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="56"/> + <source>General</source> + <translation>一般</translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="61"/> + <source>Plugins</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="66"/> + <location filename="../../../OptionDialog.ui" line="322"/> + <location filename="../../../OptionDialog.cpp" line="286"/> + <source>Copy engine</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="92"/> + <location filename="../../../OptionDialog.ui" line="350"/> + <source>Themes</source> + <translation>佈景</translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="97"/> + <source>Log</source> + <translation>紀錄</translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="312"/> + <source>Name</source> + <translation>名稱</translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="317"/> + <source>Version</source> + <translation>版本</translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="327"/> + <source>Language</source> + <translation>語言</translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="498"/> + <source>Client connected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="801"/> + <source>Write the folder operations</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="811"/> + <source>The variables are %path%, %operation%</source> + <extracomment>%path%, %operation% should not be translated</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="71"/> + <location filename="../../../OptionDialog.ui" line="335"/> + <location filename="../../../OptionDialog.cpp" line="287"/> + <source>Listener</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="76"/> + <location filename="../../../OptionDialog.ui" line="340"/> + <location filename="../../../OptionDialog.cpp" line="288"/> + <source>Plugin loader</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="84"/> + <location filename="../../../OptionDialog.ui" line="345"/> + <location filename="../../../OptionDialog.cpp" line="289"/> + <source>Session loader</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="117"/> + <source>Force the language</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="127"/> + <source>Replace the default copy and move system</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="141"/> + <source>Load at the session loading</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="155"/> + <source>When manual open</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="181"/> + <source>Group the windows when</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="222"/> + <source>Confirm to group the windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="229"/> + <source>Display the OS warning</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="245"/> + <source>Check for updates</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="255"/> + <source>Give GPU time to fund the development</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="262"/> + <source>Remaining time algorithm</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="270"/> + <source>Traditional</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="275"/> + <source>Logarithmic</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="358"/> + <source>Plugin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="377"/> + <source>Add</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="390"/> + <source>Remove</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="400"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="427"/> + <source>Copy engine by order of preference:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="554"/> + <source>Themes:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="616"/> + <source>Unable to load the themes plugin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="666"/> + <source>No option for this plugin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="716"/> + <source>Browse</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="728"/> + <source>Write directly to the file when it receive a new entry (can produce 50% of lost of performance)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="741"/> + <source>Write the transfers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="748"/> + <source>The variables are %time%, %source%, %size%, %destination%</source> + <extracomment>%time%, %source%, %size%, %destination% should not be translated</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="771"/> + <source>Write the errors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="778"/> + <source>The variables are %time%, %path%, %size%, %mtime%, %error%</source> + <extracomment>%time%, %path%, %size%, %mtime%, %error% should not be translated</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="697"/> + <source>Write the log file into:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.cpp" line="190"/> + <location filename="../../../OptionDialog.cpp" line="204"/> + <source>Load</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.cpp" line="190"/> + <source>Load the theme?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.cpp" line="204"/> + <source>Load the language?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.cpp" line="294"/> + <source>Do nothing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.cpp" line="295"/> + <source>Ask source as folder</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.cpp" line="296"/> + <source>Ask sources as files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.cpp" line="297"/> + <source>Never</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.cpp" line="298"/> + <source>When source is same</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.cpp" line="299"/> + <source>When destination is same</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.cpp" line="300"/> + <source>When source and destination are same</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.cpp" line="301"/> + <source>When source or destination are same</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.cpp" line="302"/> + <source>Always</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.cpp" line="316"/> + <location filename="../../../OptionDialog.cpp" line="317"/> + <location filename="../../../OptionDialog.cpp" line="318"/> + <source>The variables are %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.cpp" line="948"/> + <source>Save logs as: </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../OptionDialog.ui" line="731"/> + <source>Synchronized log</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>OptionEngine</name> + <message> + <location filename="../../../OptionEngine.cpp" line="162"/> + <location filename="../../../OptionEngine.cpp" line="169"/> + <location filename="../../../OptionEngine.cpp" line="211"/> + <location filename="../../../OptionEngine.cpp" line="215"/> + <source>The variable was not found: %1 %2</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>PluginInformation</name> + <message> + <location filename="../../../PluginInformation.ui" line="14"/> + <source>About this plugin</source> + <translation type="unfinished">關於這的插件</translation> + </message> + <message> + <location filename="../../../PluginInformation.ui" line="23"/> + <source>Name:</source> + <translation>名稱:</translation> + </message> + <message> + <location filename="../../../PluginInformation.ui" line="37"/> + <source>Category:</source> + <translation>分類:</translation> + </message> + <message> + <location filename="../../../PluginInformation.ui" line="51"/> + <source>Author:</source> + <translation>作者:</translation> + </message> + <message> + <location filename="../../../PluginInformation.ui" line="79"/> + <source>Date:</source> + <translation>日期:</translation> + </message> + <message> + <location filename="../../../PluginInformation.ui" line="93"/> + <source>Description:</source> + <translation>描述:</translation> + </message> + <message> + <location filename="../../../PluginInformation.ui" line="107"/> + <source>Version:</source> + <translation>版本:</translation> + </message> + <message> + <location filename="../../../PluginInformation.cpp" line="39"/> + <source>Copy engine</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginInformation.cpp" line="42"/> + <source>Languages</source> + <translation>語言</translation> + </message> + <message> + <location filename="../../../PluginInformation.cpp" line="45"/> + <source>Listener</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginInformation.cpp" line="48"/> + <source>Plugin loader</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginInformation.cpp" line="51"/> + <source>Session loader</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginInformation.cpp" line="54"/> + <source>Themes</source> + <translation>佈景</translation> + </message> + <message> + <location filename="../../../PluginInformation.cpp" line="58"/> + <source>Unknown</source> + <translation>未知</translation> + </message> + <message> + <location filename="../../../PluginInformation.cpp" line="68"/> + <source>Information about %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginInformation.ui" line="65"/> + <source>Website:</source> + <translation>網站:</translation> + </message> + <message> + <location filename="../../../PluginInformation.ui" line="121"/> + <source>Title:</source> + <translation>標題:</translation> + </message> +</context> +<context> + <name>PluginsManager</name> + <message> + <location filename="../../../PluginsManager.cpp" line="224"/> + <source>informations.xml is not accessible</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="494"/> + <source>Dependencies part is wrong</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="515"/> + <source>Dependencies %1 are not satisfied, for plugin: %2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="672"/> + <source>Remove %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="683"/> + <source>Error</source> + <translation type="unfinished">錯誤</translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="683"/> + <source>Error while the removing plugin, please check the rights on the folder: +%1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="707"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="256"/> + <source>%1, parse error at line %2, column %3: %4</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="230"/> + <source>informations.xml not found for the plugin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="264"/> + <source>"package" root tag not found for the xml file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="340"/> + <source>Duplicated plugin found, already loaded!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="401"/> + <source>English text missing in the informations.xml for the tag: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="409"/> + <source>Tag not found: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="672"/> + <source>Are you sure about removing "%1" in version %2?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="707"/> + <source>Previous import is in progress...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="710"/> + <source>Open Ultracopier plugin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="710"/> + <source>Ultracopier plugin (*.urc)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="727"/> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="820"/> + <location filename="../../../PluginsManager.cpp" line="833"/> + <location filename="../../../PluginsManager.cpp" line="852"/> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="870"/> + <location filename="../../../PluginsManager.cpp" line="876"/> + <location filename="../../../PluginsManager.cpp" line="883"/> + <source>Plugin loader</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="727"/> + <source>Unable to open the plugin: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="752"/> + <location filename="../../../PluginsManager.cpp" line="870"/> + <location filename="../../../PluginsManager.cpp" line="883"/> + <source>Unable to load the plugin content, please check it: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="820"/> + <source>Unable to create a folder to install the plugin: +%1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="833"/> + <source>Unable to create a file to install the plugin: +%1 +since:%2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="852"/> + <source>Folder with same name is present, skip the plugin installation: +%1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../PluginsManager.cpp" line="858"/> + <location filename="../../../PluginsManager.cpp" line="864"/> + <location filename="../../../PluginsManager.cpp" line="876"/> + <source>Unable to load the plugin content, please check it</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QXzDecode</name> + <message> + <location filename="../../../lib/qt-tar-xz/QXzDecode.cpp" line="38"/> + <location filename="../../../lib/qt-tar-xz/QXzDecode.cpp" line="93"/> + <source>Memory allocation failed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../lib/qt-tar-xz/QXzDecode.cpp" line="64"/> + <location filename="../../../lib/qt-tar-xz/QXzDecode.cpp" line="82"/> + <source>Write error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../lib/qt-tar-xz/QXzDecode.cpp" line="97"/> + <source>Memory usage limit reached</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../lib/qt-tar-xz/QXzDecode.cpp" line="101"/> + <source>Not a .xz file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../lib/qt-tar-xz/QXzDecode.cpp" line="105"/> + <source>Unsupported options in the .xz headers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../lib/qt-tar-xz/QXzDecode.cpp" line="110"/> + <source>The file is corrupted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../lib/qt-tar-xz/QXzDecode.cpp" line="114"/> + <source>Bug!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../lib/qt-tar-xz/QXzDecode.cpp" line="124"/> + <source>The input data is too short</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>SystrayIcon</name> + <message> + <location filename="../../../SystrayIcon.cpp" line="155"/> + <source>No copy listener found. Do the copy manually by right click one the system tray icon.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../SystrayIcon.cpp" line="161"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../SystrayIcon.cpp" line="179"/> + <source>Searching information...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../SystrayIcon.cpp" line="192"/> + <source>Do not replace the explorer copy/move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../SystrayIcon.cpp" line="197"/> + <source>Semi replace the explorer copy/move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../SystrayIcon.cpp" line="202"/> + <source>Replace the explorer copy/move</source> + <translation type="unfinished"></translation> + </message> +</context> +</TS> diff --git a/plugins/Listener/catchcopy-v0002/catchcopy-api-0002/ClientCatchcopy.cpp b/plugins/Listener/catchcopy-v0002/catchcopy-api-0002/ClientCatchcopy.cpp index d7492d0..c466630 100644 --- a/plugins/Listener/catchcopy-v0002/catchcopy-api-0002/ClientCatchcopy.cpp +++ b/plugins/Listener/catchcopy-v0002/catchcopy-api-0002/ClientCatchcopy.cpp @@ -10,370 +10,370 @@ ClientCatchcopy::ClientCatchcopy() { - disconnectedFromSocket(); - error_string="Unknown error"; - detectTimeOut.setSingleShot(true); - detectTimeOut.setInterval(CATCHCOPY_COMMUNICATION_TIMEOUT); // the max time to without send packet - connect(&socket, SIGNAL(connected()), this, SIGNAL(connected())); - connect(&socket, SIGNAL(disconnected()), this, SIGNAL(disconnected())); - connect(&socket, SIGNAL(disconnected()), this, SLOT(disconnectedFromSocket())); - connect(&socket, SIGNAL(stateChanged(QLocalSocket::LocalSocketState)), this, SIGNAL(stateChanged(QLocalSocket::LocalSocketState))); - connect(&socket, SIGNAL(error(QLocalSocket::LocalSocketError)), this, SIGNAL(errorSocket(QLocalSocket::LocalSocketError))); - connect(&socket, SIGNAL(readyRead()), this, SLOT(readyRead())); - connect(&detectTimeOut, SIGNAL(timeout()), this, SLOT(checkTimeOut())); - connect(&socket, SIGNAL(connected()), this, SLOT(socketIsConnected())); + disconnectedFromSocket(); + error_string="Unknown error"; + detectTimeOut.setSingleShot(true); + detectTimeOut.setInterval(CATCHCOPY_COMMUNICATION_TIMEOUT); // the max time to without send packet + connect(&socket, SIGNAL(connected()), this, SIGNAL(connected())); + connect(&socket, SIGNAL(disconnected()), this, SIGNAL(disconnected())); + connect(&socket, SIGNAL(disconnected()), this, SLOT(disconnectedFromSocket())); + connect(&socket, SIGNAL(stateChanged(QLocalSocket::LocalSocketState)), this, SIGNAL(stateChanged(QLocalSocket::LocalSocketState))); + connect(&socket, SIGNAL(error(QLocalSocket::LocalSocketError)), this, SIGNAL(errorSocket(QLocalSocket::LocalSocketError))); + connect(&socket, SIGNAL(readyRead()), this, SLOT(readyRead())); + connect(&detectTimeOut, SIGNAL(timeout()), this, SLOT(checkTimeOut())); + connect(&socket, SIGNAL(connected()), this, SLOT(socketIsConnected())); } void ClientCatchcopy::checkTimeOut() { - if(haveData) - { - error_string="The server is too long to send the next part of the reply"; - emit error(error_string); - disconnectFromServer(); - } + if(haveData) + { + error_string="The server is too long to send the next part of the reply"; + emit error(error_string); + disconnectFromServer(); + } } const QString ClientCatchcopy::errorString() { - return error_string; + return error_string; } void ClientCatchcopy::socketIsConnected() { - orderIdFirstSendProtocol=sendProtocol(); + orderIdFirstSendProtocol=sendProtocol(); } void ClientCatchcopy::connectToServer() { - socket.connectToServer(ExtraSocketCatchcopy::pathSocket()); + socket.connectToServer(QString::fromStdString(ExtraSocketCatchcopy::pathSocket())); } void ClientCatchcopy::disconnectFromServer() { - socket.abort(); - socket.disconnectFromServer(); + socket.abort(); + socket.disconnectFromServer(); } const QString ClientCatchcopy::errorStringSocket() { - return socket.errorString(); + return socket.errorString(); } /// \brief to send stream of string list quint32 ClientCatchcopy::sendRawOrderList(const QStringList & order) { - if(!socket.isValid()) - { - error_string="Socket is not valid, try send: "+order.join(";"); - emit error(error_string); - return -1; - } - if(socket.state()!=QLocalSocket::ConnectedState) - { - error_string="Socket is not connected "+QString::number(socket.state()); - emit error(error_string); - return -1; - } - do - { - idNextOrder++; - if(idNextOrder>2000000000) - idNextOrder=0; - } while(notRepliedQuery.contains(idNextOrder)); - notRepliedQuery << idNextOrder; - QByteArray block; - QDataStream out(&block, QIODevice::WriteOnly); - out.setVersion(QDataStream::Qt_4_4); - out << int(0); - out << idNextOrder; - out << order; - out.device()->seek(0); - out << block.size(); - if(idNextOrder!=1) // drop if internal protocol send - { - emit dataSend(idNextOrder,block); - emit dataSend(idNextOrder,order); - } - do //cut string list and send it as block of 32KB - { - QByteArray blockToSend; - int byteWriten; - blockToSend=block.left(32*1024);//32KB - block.remove(0,blockToSend.size()); - byteWriten = socket.write(blockToSend); - if(!socket.isValid()) - { - error_string="Socket is not valid"; - emit error(error_string); - return -1; - } - if(socket.errorString()!="Unknown error" && socket.errorString()!="") - { - error_string=socket.errorString(); - emit error(error_string); - return -1; - } - if(blockToSend.size()!=byteWriten) - { - error_string="All the bytes have not be written"; - emit error(error_string); - return -1; - } - } - while(block.size()); - return idNextOrder; + if(!socket.isValid()) + { + error_string="Socket is not valid, try send: "+order.join(";"); + emit error(error_string); + return -1; + } + if(socket.state()!=QLocalSocket::ConnectedState) + { + error_string="Socket is not connected "+QString::number(socket.state()); + emit error(error_string); + return -1; + } + do + { + idNextOrder++; + if(idNextOrder>2000000000) + idNextOrder=0; + } while(notRepliedQuery.contains(idNextOrder)); + notRepliedQuery << idNextOrder; + QByteArray block; + QDataStream out(&block, QIODevice::WriteOnly); + out.setVersion(QDataStream::Qt_4_4); + out << int(0); + out << idNextOrder; + out << order; + out.device()->seek(0); + out << block.size(); + if(idNextOrder!=1) // drop if internal protocol send + { + emit dataSend(idNextOrder,block); + emit dataSend(idNextOrder,order); + } + do //cut string list and send it as block of 32KB + { + QByteArray blockToSend; + int byteWriten; + blockToSend=block.left(32*1024);//32KB + block.remove(0,blockToSend.size()); + byteWriten = socket.write(blockToSend); + if(!socket.isValid()) + { + error_string="Socket is not valid"; + emit error(error_string); + return -1; + } + if(socket.errorString()!="Unknown error" && socket.errorString()!="") + { + error_string=socket.errorString(); + emit error(error_string); + return -1; + } + if(blockToSend.size()!=byteWriten) + { + error_string="All the bytes have not be written"; + emit error(error_string); + return -1; + } + } + while(block.size()); + return idNextOrder; } void ClientCatchcopy::readyRead() { - while(socket.bytesAvailable()>0) - { - if(!haveData) - { - if(socket.bytesAvailable()<(int)sizeof(int))//int of size cuted - { - /* error_string="Bytes available is not sufficient to do a int"; - emit error(error_string); - disconnectFromServer();*/ - return; - } - QDataStream in(&socket); - in.setVersion(QDataStream::Qt_4_4); - in >> dataSize; - dataSize-=sizeof(int); - if(dataSize>64*1024*1024) // 64MB - { - error_string="Reply size is >64MB, seam corrupted"; - emit error(error_string); - disconnectFromServer(); - return; - } - if(dataSize<(int)(sizeof(int) //orderId - + sizeof(quint32) //returnCode - + sizeof(quint32) //string list size - )) - { - error_string="Reply size is too small to have correct code"; - emit error(error_string); - disconnectFromServer(); - return; - } - } - if(dataSize<(data.size()+socket.bytesAvailable())) - data.append(socket.read(dataSize-data.size())); - else - data.append(socket.readAll()); - if(dataSize==data.size()) - { - if(!checkDataIntegrity(data)) - { - data.clear(); - qWarning() << "Data of the reply is wrong"; - return; - } - QStringList returnList; - quint32 orderId; - quint32 returnCode; - QDataStream in(data); - in.setVersion(QDataStream::Qt_4_4); - in >> orderId; - in >> returnCode; - in >> returnList; - data.clear(); - if(orderId!=orderIdFirstSendProtocol) - { - if(!notRepliedQuery.contains(orderId)) - qWarning() << "Unknown query not replied:" << orderId; - else - { - if(!parseReply(orderId,returnCode,returnList)) - emit unknowReply(orderId); - emit newReply(orderId,returnCode,returnList); - } - } - else - { - if(!sendProtocolReplied) - { - sendProtocolReplied=true; - if(returnCode!=1000) - { - error_string="Protocol not supported"; - emit error(error_string); - disconnectFromServer(); - return; - } - } - else - { - error_string=QStringLiteral("First send protocol send with the query id %1 have been already previously replied").arg(orderIdFirstSendProtocol); - emit error(error_string); - disconnectFromServer(); - return; - } - } - } - } - if(haveData) - detectTimeOut.start(); - else - detectTimeOut.stop(); + while(socket.bytesAvailable()>0) + { + if(!haveData) + { + if(socket.bytesAvailable()<(int)sizeof(int))//int of size cuted + { + /* error_string="Bytes available is not sufficient to do a int"; + emit error(error_string); + disconnectFromServer();*/ + return; + } + QDataStream in(&socket); + in.setVersion(QDataStream::Qt_4_4); + in >> dataSize; + dataSize-=sizeof(int); + if(dataSize>64*1024*1024) // 64MB + { + error_string="Reply size is >64MB, seam corrupted"; + emit error(error_string); + disconnectFromServer(); + return; + } + if(dataSize<(int)(sizeof(int) //orderId + + sizeof(quint32) //returnCode + + sizeof(quint32) //string list size + )) + { + error_string="Reply size is too small to have correct code"; + emit error(error_string); + disconnectFromServer(); + return; + } + } + if(dataSize<(data.size()+socket.bytesAvailable())) + data.append(socket.read(dataSize-data.size())); + else + data.append(socket.readAll()); + if(dataSize==data.size()) + { + if(!checkDataIntegrity(data)) + { + data.clear(); + qWarning() << "Data of the reply is wrong"; + return; + } + QStringList returnList; + quint32 orderId; + quint32 returnCode; + QDataStream in(data); + in.setVersion(QDataStream::Qt_4_4); + in >> orderId; + in >> returnCode; + in >> returnList; + data.clear(); + if(orderId!=orderIdFirstSendProtocol) + { + if(!notRepliedQuery.contains(orderId)) + qWarning() << "Unknown query not replied:" << orderId; + else + { + if(!parseReply(orderId,returnCode,returnList)) + emit unknowReply(orderId); + emit newReply(orderId,returnCode,returnList); + } + } + else + { + if(!sendProtocolReplied) + { + sendProtocolReplied=true; + if(returnCode!=1000) + { + error_string="Protocol not supported"; + emit error(error_string); + disconnectFromServer(); + return; + } + } + else + { + error_string=QStringLiteral("First send protocol send with the query id %1 have been already previously replied").arg(orderIdFirstSendProtocol); + emit error(error_string); + disconnectFromServer(); + return; + } + } + } + } + if(haveData) + detectTimeOut.start(); + else + detectTimeOut.stop(); } bool ClientCatchcopy::checkDataIntegrity(QByteArray data) { - quint32 orderId; - qint32 replyCode; - qint32 listSize; - QDataStream in(data); - in.setVersion(QDataStream::Qt_4_4); - in >> orderId; - in >> replyCode; - in >> listSize; - if(listSize>65535) - { - emit error("List size is wrong"); - qWarning() << "List size is wrong"; - return false; - } - int index=0; - while(index<listSize) - { - qint32 stringSize; - in >> stringSize; - if(stringSize>65535) - { - emit error("String size is wrong"); - qWarning() << "String size is wrong"; - return false; - } - if(stringSize>(in.device()->size()-in.device()->pos())) - { - emit error(QStringLiteral("String size is greater than the data: %1>(%2-%3)").arg(stringSize).arg(in.device()->size()).arg(in.device()->pos())); - qWarning() << QStringLiteral("String size is greater than the data: %1>(%2-%3)").arg(stringSize).arg(in.device()->size()).arg(in.device()->pos()); - return false; - } - in.device()->seek(in.device()->pos()+stringSize); - index++; - } - if(in.device()->size()!=in.device()->pos()) - { - emit error("Remaining data after string list parsing"); - qWarning() << "Remaining data after string list parsing"; - return false; - } - return true; + quint32 orderId; + qint32 replyCode; + qint32 listSize; + QDataStream in(data); + in.setVersion(QDataStream::Qt_4_4); + in >> orderId; + in >> replyCode; + in >> listSize; + if(listSize>65535) + { + emit error("List size is wrong"); + qWarning() << "List size is wrong"; + return false; + } + int index=0; + while(index<listSize) + { + qint32 stringSize; + in >> stringSize; + if(stringSize>65535) + { + emit error("String size is wrong"); + qWarning() << "String size is wrong"; + return false; + } + if(stringSize>(in.device()->size()-in.device()->pos())) + { + emit error(QStringLiteral("String size is greater than the data: %1>(%2-%3)").arg(stringSize).arg(in.device()->size()).arg(in.device()->pos())); + qWarning() << QStringLiteral("String size is greater than the data: %1>(%2-%3)").arg(stringSize).arg(in.device()->size()).arg(in.device()->pos()); + return false; + } + in.device()->seek(in.device()->pos()+stringSize); + index++; + } + if(in.device()->size()!=in.device()->pos()) + { + emit error("Remaining data after string list parsing"); + qWarning() << "Remaining data after string list parsing"; + return false; + } + return true; } QLocalSocket::LocalSocketState ClientCatchcopy::state() { - return socket.state(); + return socket.state(); } void ClientCatchcopy::disconnectedFromSocket() { - haveData = false; - orderIdFirstSendProtocol= 0; - idNextOrder = 0; - sendProtocolReplied = false; - notRepliedQuery.clear(); + haveData = false; + orderIdFirstSendProtocol= 0; + idNextOrder = 0; + sendProtocolReplied = false; + notRepliedQuery.clear(); } /// \brief to send the protocol version used quint32 ClientCatchcopy::sendProtocol() { - return sendRawOrderList(QStringList() << "protocol" << CATCHCOPY_PROTOCOL_VERSION); + return sendRawOrderList(QStringList() << "protocol" << CATCHCOPY_PROTOCOL_VERSION); } quint32 ClientCatchcopy::askServerName() { - return sendRawOrderList(QStringList() << "server" << "name?"); + return sendRawOrderList(QStringList() << "server" << "name?"); } quint32 ClientCatchcopy::setClientName(const QString & name) { - return sendRawOrderList(QStringList() << "client" << name); + return sendRawOrderList(QStringList() << "client" << name); } quint32 ClientCatchcopy::checkProtocolExtension(const QString & name) { - return sendRawOrderList(QStringList() << "protocol extension" << name); + return sendRawOrderList(QStringList() << "protocol extension" << name); } quint32 ClientCatchcopy::checkProtocolExtension(const QString & name,const QString & version) { - return sendRawOrderList(QStringList() << "protocol extension" << name << version); + return sendRawOrderList(QStringList() << "protocol extension" << name << version); } quint32 ClientCatchcopy::addCopyWithDestination(const QStringList & sources,const QString & destination) { - return sendRawOrderList(QStringList() << "cp" << sources << destination); + return sendRawOrderList(QStringList() << "cp" << sources << destination); } quint32 ClientCatchcopy::addCopyWithoutDestination(const QStringList & sources) { - return sendRawOrderList(QStringList() << "cp-?" << sources); + return sendRawOrderList(QStringList() << "cp-?" << sources); } quint32 ClientCatchcopy::addMoveWithDestination(const QStringList & sources,const QString & destination) { - return sendRawOrderList(QStringList() << "mv" << sources << destination); + return sendRawOrderList(QStringList() << "mv" << sources << destination); } quint32 ClientCatchcopy::addMoveWithoutDestination(const QStringList & sources) { - return sendRawOrderList(QStringList() << "mv-?" << sources); + return sendRawOrderList(QStringList() << "mv-?" << sources); } bool ClientCatchcopy::parseReply(quint32 orderId,quint32 returnCode,QStringList returnList) { - switch(returnCode) - { - case 1000: - emit protocolSupported(orderId); - break; - case 1001: - case 1002: - if(returnCode==1001) - emit protocolExtensionSupported(orderId,true); - else - emit protocolExtensionSupported(orderId,false); - break; - case 1003: - emit clientRegistered(orderId); - break; - case 1004: - if(returnList.size()!=1) - emit unknowOrder(orderId); - else - emit serverName(orderId,returnList.last()); - break; - case 1005: - case 1006: - if(returnCode==1005) - emit copyFinished(orderId,false); - else - emit copyFinished(orderId,true); - break; - case 1007: - emit copyCanceled(orderId); - break; - case 5000: - emit incorrectArgumentListSize(orderId); - break; - case 5001: - emit incorrectArgument(orderId); - break; - case 5002: - emit unknowOrder(orderId); //the server have not understand the order - break; - case 5003: - emit protocolNotSupported(orderId); - break; - default: - return false; - } - return true; + switch(returnCode) + { + case 1000: + emit protocolSupported(orderId); + break; + case 1001: + case 1002: + if(returnCode==1001) + emit protocolExtensionSupported(orderId,true); + else + emit protocolExtensionSupported(orderId,false); + break; + case 1003: + emit clientRegistered(orderId); + break; + case 1004: + if(returnList.size()!=1) + emit unknowOrder(orderId); + else + emit serverName(orderId,returnList.last()); + break; + case 1005: + case 1006: + if(returnCode==1005) + emit copyFinished(orderId,false); + else + emit copyFinished(orderId,true); + break; + case 1007: + emit copyCanceled(orderId); + break; + case 5000: + emit incorrectArgumentListSize(orderId); + break; + case 5001: + emit incorrectArgument(orderId); + break; + case 5002: + emit unknowOrder(orderId); //the server have not understand the order + break; + case 5003: + emit protocolNotSupported(orderId); + break; + default: + return false; + } + return true; } diff --git a/plugins/Listener/catchcopy-v0002/catchcopy-api-0002/ExtraSocketCatchcopy.cpp b/plugins/Listener/catchcopy-v0002/catchcopy-api-0002/ExtraSocketCatchcopy.cpp index 5330492..9cd8373 100644 --- a/plugins/Listener/catchcopy-v0002/catchcopy-api-0002/ExtraSocketCatchcopy.cpp +++ b/plugins/Listener/catchcopy-v0002/catchcopy-api-0002/ExtraSocketCatchcopy.cpp @@ -6,17 +6,17 @@ #include <stdio.h> -const QString ExtraSocketCatchcopy::pathSocket() +const std::string ExtraSocketCatchcopy::pathSocket() { #ifdef Q_OS_UNIX - return "advanced-copier-"+QString::number(getuid()); + return "advanced-copier-"+std::to_string(getuid()); #else QString userName; char uname[1024]; DWORD len=1023; if(GetUserNameA(uname, &len)!=FALSE) userName=QString::fromLatin1(toHex(uname)); - return "advanced-copier-"+userName; + return "advanced-copier-"+userName.toStdString(); #endif } diff --git a/plugins/Listener/catchcopy-v0002/catchcopy-api-0002/ExtraSocketCatchcopy.h b/plugins/Listener/catchcopy-v0002/catchcopy-api-0002/ExtraSocketCatchcopy.h index 59c8f93..fb4201c 100644 --- a/plugins/Listener/catchcopy-v0002/catchcopy-api-0002/ExtraSocketCatchcopy.h +++ b/plugins/Listener/catchcopy-v0002/catchcopy-api-0002/ExtraSocketCatchcopy.h @@ -6,6 +6,7 @@ #ifndef EXTRASOCKETCATCHCOPY_H #define EXTRASOCKETCATCHCOPY_H +#include <string> #include <QString> #ifdef Q_OS_UNIX @@ -23,7 +24,7 @@ class ExtraSocketCatchcopy { public: /// \brief to get the socket path - static const QString pathSocket(); + static const std::string pathSocket(); static char * toHex(const char *str); }; diff --git a/plugins/Listener/catchcopy-v0002/catchcopy-api-0002/ServerCatchcopy.cpp b/plugins/Listener/catchcopy-v0002/catchcopy-api-0002/ServerCatchcopy.cpp index 83c8790..6fd1172 100644 --- a/plugins/Listener/catchcopy-v0002/catchcopy-api-0002/ServerCatchcopy.cpp +++ b/plugins/Listener/catchcopy-v0002/catchcopy-api-0002/ServerCatchcopy.cpp @@ -8,6 +8,22 @@ #include <QFile> #include <QDataStream> +#include <queue> +#include <vector> +#include <string> + +std::string stringimplode2(const std::vector<std::string>& elems, const std::string &delim) +{ + std::string newString; + for (std::vector<std::string>::const_iterator ii = elems.begin(); ii != elems.cend(); ++ii) + { + newString += (*ii); + if ( ii + 1 != elems.end() ) { + newString += delim; + } + } + return newString; +} ServerCatchcopy::ServerCatchcopy() { @@ -27,25 +43,25 @@ bool ServerCatchcopy::isListening() const return server.isListening(); } -void ServerCatchcopy::setName(const QString & name) +void ServerCatchcopy::setName(const std::string & name) { this->name=name; } -QString ServerCatchcopy::getName() const +std::string ServerCatchcopy::getName() const { return name; } /// \brief to get a client list -QStringList ServerCatchcopy::clientsList() const +std::vector<std::string> ServerCatchcopy::clientsList() const { - QStringList clients; + std::vector<std::string> clients; int index=0; int size=clientList.size(); while(index<size) { - clients << clientList[index].name; + clients.push_back(clientList[index].name); index++; } return clients; @@ -55,7 +71,7 @@ bool ServerCatchcopy::listen() { QLocalSocket socketTestConnection; pathSocket=ExtraSocketCatchcopy::pathSocket(); - socketTestConnection.connectToServer(pathSocket); + socketTestConnection.connectToServer(QString::fromStdString(pathSocket)); if(socketTestConnection.waitForConnected(CATCHCOPY_COMMUNICATION_TIMEOUT)) { error_string="Other server is listening"; @@ -64,7 +80,7 @@ bool ServerCatchcopy::listen() } else { - if(!server.removeServer(pathSocket)) + if(!server.removeServer(QString::fromStdString(pathSocket))) { error_string="Unable to remove the old server"; emit error(error_string); @@ -72,11 +88,11 @@ bool ServerCatchcopy::listen() #ifndef Q_OS_MAC server.setSocketOptions(QLocalServer::UserAccessOption); #endif - if(server.listen(pathSocket)) + if(server.listen(QString::fromStdString(pathSocket))) return true; else { - error_string=QStringLiteral("Unable to listen %1: %2").arg(pathSocket).arg(server.errorString()); + error_string=QStringLiteral("Unable to listen %1: %2").arg(QString::fromStdString(pathSocket)).arg(server.errorString()).toStdString(); emit error(error_string); return false; } @@ -94,7 +110,7 @@ void ServerCatchcopy::close() index++; } server.close(); - if(!server.removeServer(pathSocket)) + if(!server.removeServer(QString::fromStdString(pathSocket))) { error_string="Unable to remove the old server"; emit error(error_string); @@ -102,12 +118,12 @@ void ServerCatchcopy::close() } } -const QString ServerCatchcopy::errorStringServer() const +const std::string ServerCatchcopy::errorStringServer() const { - return server.errorString(); + return server.errorString().toStdString(); } -const QString ServerCatchcopy::errorString() const +const std::string ServerCatchcopy::errorString() const { return error_string; } @@ -145,7 +161,7 @@ void ServerCatchcopy::newConnection() } } -bool ServerCatchcopy::clientIdFound(const quint32 &id) const +bool ServerCatchcopy::clientIdFound(const uint32_t &id) const { int index=0; while(index<clientList.size()) @@ -195,7 +211,7 @@ void ServerCatchcopy::disconnected() { if(clientList.at(index).socket==socket) { - const quint32 &id=clientList.at(index).id; + const uint32_t &id=clientList.at(index).id; //ClientList.at(index).socket->disconnectFromServer();//already disconnected delete clientList.at(index).detectTimeOut; clientList.at(index).socket->deleteLater(); @@ -208,7 +224,7 @@ void ServerCatchcopy::disconnected() qWarning() << "Unlocated client!"; } -void ServerCatchcopy::disconnectClient(const quint32 &id) +void ServerCatchcopy::disconnectClient(const uint32_t &id) { int index=0; while(index<clientList.size()) @@ -259,8 +275,8 @@ void ServerCatchcopy::readyRead() return; } if(clientList.at(index).dataSize<(int)(sizeof(int) //orderId - + sizeof(quint32) //returnCode - + sizeof(quint32) //string list size + + sizeof(uint32_t) //returnCode + + sizeof(uint32_t) //string list size )) { error_string="Reply size is too small to have correct code"; @@ -274,22 +290,31 @@ void ServerCatchcopy::readyRead() clientList[index].data.append(socket->read(clientList.at(index).dataSize-clientList.at(index).data.size())); else clientList[index].data.append(socket->readAll()); - if(clientList.at(index).dataSize==(quint32)clientList.at(index).data.size()) + if(clientList.at(index).dataSize==(uint32_t)clientList.at(index).data.size()) { if(!checkDataIntegrity(clientList.at(index).data)) { - emit communicationError("Data integrity wrong: "+QString(clientList.at(index).data.toHex())); + emit communicationError("Data integrity wrong: "+QString(clientList.at(index).data.toHex()).toStdString()); clientList[index].data.clear(); clientList[index].haveData=false; qWarning() << "Data integrity wrong"; return; } - QStringList returnList; - quint32 orderId; + std::vector<std::string> returnList; + QStringList returnListQt; + uint32_t orderId; QDataStream in(clientList.at(index).data); in.setVersion(QDataStream::Qt_4_4); in >> orderId; - in >> returnList; + in >> returnListQt; + { + int index=0; + while(index<returnListQt.size()) + { + returnList.push_back(returnListQt.at(index).toStdString()); + index++; + } + } clientList[index].data.clear(); clientList[index].haveData=false; if(clientList.at(index).queryNoReplied.contains(orderId)) @@ -299,10 +324,10 @@ void ServerCatchcopy::readyRead() return; } clientList[index].queryNoReplied << orderId; - if(!clientList.at(index).firstProtocolReplied && returnList.size()==2 && returnList.first()=="protocol") + if(!clientList.at(index).firstProtocolReplied && returnList.size()==2 && returnList.front()=="protocol") { clientList[index].firstProtocolReplied=true; - protocolSupported(clientList.at(index).id,orderId,(returnList.last()==CATCHCOPY_PROTOCOL_VERSION)); + protocolSupported(clientList.at(index).id,orderId,(returnList.back()==CATCHCOPY_PROTOCOL_VERSION)); } else parseInput(clientList.at(index).id,orderId,returnList); @@ -322,7 +347,7 @@ void ServerCatchcopy::readyRead() bool ServerCatchcopy::checkDataIntegrity(const QByteArray &data) { - quint32 orderId; + uint32_t orderId; qint32 listSize; QDataStream in(data); in.setVersion(QDataStream::Qt_4_4); @@ -346,7 +371,7 @@ bool ServerCatchcopy::checkDataIntegrity(const QByteArray &data) } if(stringSize>(in.device()->size()-in.device()->pos())) { - emit error(QStringLiteral("String size is greater than the data: %1>(%2-%3)").arg(stringSize).arg(in.device()->size()).arg(in.device()->pos())); + emit error(QStringLiteral("String size is greater than the data: %1>(%2-%3)").arg(stringSize).arg(in.device()->size()).arg(in.device()->pos()).toStdString()); return false; } in.device()->seek(in.device()->pos()+stringSize); @@ -360,7 +385,7 @@ bool ServerCatchcopy::checkDataIntegrity(const QByteArray &data) return true; } -void ServerCatchcopy::parseInput(const quint32 &client,const quint32 &orderId,const QStringList &returnList) +void ServerCatchcopy::parseInput(const uint32_t &client,const uint32_t &orderId,const std::vector<std::string> &returnList) { const ServerCatchcopy::inputReturnType returnVal=parseInputCurrentProtocol(client,orderId,returnList); switch(returnVal) @@ -380,24 +405,24 @@ void ServerCatchcopy::parseInput(const quint32 &client,const quint32 &orderId,co incorrectArgumentListSize(client,orderId); break; case UnknowOrder: - emit error("Unknown query: "+QString::number(returnVal)+", with client: "+QString::number(client)+", orderId: "+QString::number(orderId)+", returnList: "+returnList.join(", ")); + emit error("Unknown query: "+std::to_string(returnVal)+", with client: "+std::to_string(client)+", orderId: "+std::to_string(orderId)+", returnList: "+stringimplode2(returnList,", ")); qWarning() << "Unknown query"; unknowOrder(client,orderId); break; } } -ServerCatchcopy::inputReturnType ServerCatchcopy::parseInputCurrentProtocol(const quint32 &client,const quint32 &orderId,const QStringList &returnList) +ServerCatchcopy::inputReturnType ServerCatchcopy::parseInputCurrentProtocol(const uint32_t &client,const uint32_t &orderId,const std::vector<std::string> &returnList) { if(returnList.size()==0) return WrongArgumentListSize; //if is supported - QString firstArgument=returnList.first(); + std::string firstArgument=returnList.front(); if(firstArgument=="protocol") { if(returnList.size()!=2) return WrongArgumentListSize; - emit askProtocolCompatibility(client,orderId,returnList.last()); + emit askProtocolCompatibility(client,orderId,returnList.back()); return Ok; } else if(firstArgument=="protocol extension") @@ -416,12 +441,12 @@ ServerCatchcopy::inputReturnType ServerCatchcopy::parseInputCurrentProtocol(cons { if(clientList.at(index).id==client) { - clientList[index].name=returnList.last(); + clientList[index].name=returnList.back(); break; } index++; } - emit clientName(client,returnList.last()); + emit clientName(client,returnList.back()); clientRegistered(client,orderId); return Replied; } @@ -429,7 +454,7 @@ ServerCatchcopy::inputReturnType ServerCatchcopy::parseInputCurrentProtocol(cons { if(returnList.size()!=2) return WrongArgumentListSize; - if(returnList.last()!="name?") + if(returnList.back()!="name?") return WrongArgument; serverName(client,orderId,name); return Replied; @@ -438,18 +463,18 @@ ServerCatchcopy::inputReturnType ServerCatchcopy::parseInputCurrentProtocol(cons { if(returnList.size()<3) return WrongArgumentListSize; - QStringList sourceList=returnList; - sourceList.removeFirst(); - sourceList.removeLast(); - emitNewCopy(client,orderId,sourceList,returnList.last()); + std::vector<std::string> sourceList=returnList; + sourceList.erase(sourceList.cbegin()); + sourceList.pop_back(); + emitNewCopy(client,orderId,sourceList,returnList.back()); return Ok; } else if(firstArgument=="cp-?") { if(returnList.size()<2) return WrongArgumentListSize; - QStringList sourceList=returnList; - sourceList.removeFirst(); + std::vector<std::string> sourceList=returnList; + sourceList.erase(sourceList.cbegin()); emitNewCopyWithoutDestination(client,orderId,sourceList); return Ok; } @@ -457,18 +482,18 @@ ServerCatchcopy::inputReturnType ServerCatchcopy::parseInputCurrentProtocol(cons { if(returnList.size()<3) return WrongArgumentListSize; - QStringList sourceList=returnList; - sourceList.removeFirst(); - sourceList.removeLast(); - emitNewMove(client,orderId,sourceList,returnList.last()); + std::vector<std::string> sourceList=returnList; + sourceList.erase(sourceList.cbegin()); + sourceList.pop_back(); + emitNewMove(client,orderId,sourceList,returnList.back()); return Ok; } else if(firstArgument=="mv-?") { if(returnList.size()<2) return WrongArgumentListSize; - QStringList sourceList=returnList; - sourceList.removeFirst(); + std::vector<std::string> sourceList=returnList; + sourceList.erase(sourceList.cbegin()); emitNewMoveWithoutDestination(client,orderId,sourceList); return Ok; } @@ -476,7 +501,7 @@ ServerCatchcopy::inputReturnType ServerCatchcopy::parseInputCurrentProtocol(cons return UnknowOrder; } -void ServerCatchcopy::emitNewCopyWithoutDestination(const quint32 &client,const quint32 &orderId,const QStringList &sources) +void ServerCatchcopy::emitNewCopyWithoutDestination(const uint32_t &client,const uint32_t &orderId,const std::vector<std::string> &sources) { LinkGlobalToLocalClient newAssociation; newAssociation.idClient=client; @@ -486,7 +511,7 @@ void ServerCatchcopy::emitNewCopyWithoutDestination(const quint32 &client,const emit newCopyWithoutDestination(newAssociation.globalOrderId,sources); } -void ServerCatchcopy::emitNewCopy(const quint32 &client,const quint32 &orderId,const QStringList &sources,const QString &destination) +void ServerCatchcopy::emitNewCopy(const uint32_t &client,const uint32_t &orderId,const std::vector<std::string> &sources,const std::string &destination) { LinkGlobalToLocalClient newAssociation; newAssociation.idClient=client; @@ -496,7 +521,7 @@ void ServerCatchcopy::emitNewCopy(const quint32 &client,const quint32 &orderId,c emit newCopy(newAssociation.globalOrderId,sources,destination); } -void ServerCatchcopy::emitNewMoveWithoutDestination(const quint32 &client,const quint32 &orderId,const QStringList &sources) +void ServerCatchcopy::emitNewMoveWithoutDestination(const uint32_t &client,const uint32_t &orderId,const std::vector<std::string> &sources) { LinkGlobalToLocalClient newAssociation; newAssociation.idClient=client; @@ -506,7 +531,7 @@ void ServerCatchcopy::emitNewMoveWithoutDestination(const quint32 &client,const emit newMoveWithoutDestination(newAssociation.globalOrderId,sources); } -void ServerCatchcopy::emitNewMove(const quint32 &client,const quint32 &orderId,const QStringList &sources,const QString &destination) +void ServerCatchcopy::emitNewMove(const uint32_t &client,const uint32_t &orderId,const std::vector<std::string> &sources,const std::string &destination) { LinkGlobalToLocalClient newAssociation; newAssociation.idClient=client; @@ -516,7 +541,7 @@ void ServerCatchcopy::emitNewMove(const quint32 &client,const quint32 &orderId,c emit newMove(newAssociation.globalOrderId,sources,destination); } -void ServerCatchcopy::copyFinished(const quint32 &globalOrderId,const bool &withError) +void ServerCatchcopy::copyFinished(const uint32_t &globalOrderId,const bool &withError) { int index=0; while(index<LinkGlobalToLocalClientList.size()) @@ -532,7 +557,7 @@ void ServerCatchcopy::copyFinished(const quint32 &globalOrderId,const bool &with } } -void ServerCatchcopy::copyCanceled(const quint32 &globalOrderId) +void ServerCatchcopy::copyCanceled(const uint32_t &globalOrderId) { int index=0; while(index<LinkGlobalToLocalClientList.size()) @@ -548,12 +573,14 @@ void ServerCatchcopy::copyCanceled(const quint32 &globalOrderId) } } -void ServerCatchcopy::reply(const quint32 &client,const quint32 &orderId,const quint32 &returnCode,const QString &returnString) +void ServerCatchcopy::reply(const uint32_t &client,const uint32_t &orderId,const uint32_t &returnCode,const std::string &returnString) { - reply(client,orderId,returnCode,QStringList() << returnString); + std::vector<std::string> returnList; + returnList.push_back(returnString); + reply(client,orderId,returnCode,returnList); } -void ServerCatchcopy::reply(const quint32 &client,const quint32 &orderId,const quint32 &returnCode,const QStringList &returnList) +void ServerCatchcopy::reply(const uint32_t &client,const uint32_t &orderId,const uint32_t &returnCode,const std::vector<std::string> &returnList) { int index=0; while(index<clientList.size()) @@ -575,7 +602,16 @@ void ServerCatchcopy::reply(const quint32 &client,const quint32 &orderId,const q out << int(0); out << orderId; out << returnCode; - out << returnList; + QStringList returnListQt; + { + unsigned int index=0; + while(index<returnList.size()) + { + returnListQt << QString::fromStdString(returnList.at(index)); + index++; + } + } + out << returnListQt; out.device()->seek(0); out << block.size(); do @@ -593,7 +629,7 @@ void ServerCatchcopy::reply(const quint32 &client,const quint32 &orderId,const q } if(clientList[index].socket->error()!=QLocalSocket::UnknownSocketError && clientList[index].socket->error()!=QLocalSocket::PeerClosedError) { - error_string="Error with socket: "+clientList[index].socket->errorString(); + error_string="Error with socket: "+clientList[index].socket->errorString().toStdString(); emit error(error_string); return; } @@ -618,7 +654,7 @@ void ServerCatchcopy::reply(const quint32 &client,const quint32 &orderId,const q qWarning() << "Client id not found:" << client; } -void ServerCatchcopy::protocolSupported(const quint32 &client,const quint32 &orderId,const bool &value) +void ServerCatchcopy::protocolSupported(const uint32_t &client,const uint32_t &orderId,const bool &value) { if(value) reply(client,orderId,1000,"protocol supported"); @@ -626,27 +662,27 @@ void ServerCatchcopy::protocolSupported(const quint32 &client,const quint32 &ord reply(client,orderId,5003,"protocol not supported"); } -void ServerCatchcopy::incorrectArgumentListSize(const quint32 &client,const quint32 &orderId) +void ServerCatchcopy::incorrectArgumentListSize(const uint32_t &client,const uint32_t &orderId) { reply(client,orderId,5000,"incorrect argument list size"); } -void ServerCatchcopy::incorrectArgument(const quint32 &client,const quint32 &orderId) +void ServerCatchcopy::incorrectArgument(const uint32_t &client,const uint32_t &orderId) { reply(client,orderId,5001,"incorrect argument"); } -void ServerCatchcopy::clientRegistered(const quint32 &client,const quint32 &orderId) +void ServerCatchcopy::clientRegistered(const uint32_t &client,const uint32_t &orderId) { reply(client,orderId,1003,"client registered"); } -void ServerCatchcopy::serverName(const quint32 &client,const quint32 &orderId,const QString &name) +void ServerCatchcopy::serverName(const uint32_t &client,const uint32_t &orderId,const std::string &name) { reply(client,orderId,1004,name); } -void ServerCatchcopy::copyFinished(const quint32 &client,const quint32 &orderId,const bool &withError) +void ServerCatchcopy::copyFinished(const uint32_t &client,const uint32_t &orderId,const bool &withError) { if(!withError) reply(client,orderId,1005,"finished"); @@ -654,12 +690,12 @@ void ServerCatchcopy::copyFinished(const quint32 &client,const quint32 &orderId, reply(client,orderId,1006,"finished with error(s)"); } -void ServerCatchcopy::copyCanceled(const quint32 &client,const quint32 &orderId) +void ServerCatchcopy::copyCanceled(const uint32_t &client,const uint32_t &orderId) { reply(client,orderId,1007,"canceled"); } -void ServerCatchcopy::unknowOrder(const quint32 &client,const quint32 &orderId) +void ServerCatchcopy::unknowOrder(const uint32_t &client,const uint32_t &orderId) { reply(client,orderId,5002,"unknown order"); } @@ -680,7 +716,7 @@ void ServerCatchcopy::checkTimeOut() clientList.at(index).detectTimeOut->stop(); if(clientList.at(index).haveData) { - error_string="The client is too long to send the next part of the reply: "+clientList.at(index).data; + error_string="The client is too long to send the next part of the reply: "+QString(clientList.at(index).data.toHex()).toStdString(); clientList[index].haveData=false; clientList[index].data.clear(); clientList.at(index).socket->disconnectFromServer(); @@ -692,7 +728,7 @@ void ServerCatchcopy::checkTimeOut() } } -quint32 ServerCatchcopy::incrementOrderId() +uint32_t ServerCatchcopy::incrementOrderId() { do { diff --git a/plugins/Listener/catchcopy-v0002/catchcopy-api-0002/ServerCatchcopy.h b/plugins/Listener/catchcopy-v0002/catchcopy-api-0002/ServerCatchcopy.h index 1314d73..85acff9 100644 --- a/plugins/Listener/catchcopy-v0002/catchcopy-api-0002/ServerCatchcopy.h +++ b/plugins/Listener/catchcopy-v0002/catchcopy-api-0002/ServerCatchcopy.h @@ -9,8 +9,8 @@ #include <QObject> #include <QLocalSocket> #include <QLocalServer> -#include <QStringList> -#include <QString> +#include <vector> +#include <string> #include <QByteArray> #include <QTimer> @@ -28,54 +28,54 @@ class ServerCatchcopy : public QObject /// \brief try close the server void close(); /// \brief get the error string on the QLocalServer - const QString errorStringServer() const; + const std::string errorStringServer() const; /// \brief get the general error string - const QString errorString() const; + const std::string errorString() const; /// \brief set the name of the server - void setName(const QString & name); + void setName(const std::string & name); /// \brief get the name - QString getName() const; + std::string getName() const; /// \brief to get a client list - QStringList clientsList() const; + std::vector<std::string> clientsList() const; private: - QString pathSocket; - QString name; - QString error_string; + std::string pathSocket; + std::string name; + std::string error_string; QLocalServer server; - quint32 idNextClient; + uint32_t idNextClient; struct Client { - quint32 id; + uint32_t id; QLocalSocket *socket; QByteArray data; bool haveData; - quint32 dataSize; + uint32_t dataSize; bool firstProtocolReplied; - QList<quint32> queryNoReplied; + QList<uint32_t> queryNoReplied; QTimer *detectTimeOut; - QString name; + std::string name; }; QList<Client> clientList; struct LinkGlobalToLocalClient { - quint32 idClient; - quint32 orderId; - quint32 globalOrderId; + uint32_t idClient; + uint32_t orderId; + uint32_t globalOrderId; }; QList<LinkGlobalToLocalClient> LinkGlobalToLocalClientList; enum inputReturnType{Ok,Replied,ExtensionWrong,WrongArgument,WrongArgumentListSize,UnknowOrder}; - inputReturnType parseInputCurrentProtocol(const quint32 &client,const quint32 &orderId,const QStringList &returnList); - bool clientIdFound(const quint32 &id) const; - quint32 nextOrderId; - QList<quint32> orderList; - quint32 incrementOrderId(); - void emitNewCopyWithoutDestination(const quint32 &client,const quint32 &orderId,const QStringList &sources); - void emitNewCopy(const quint32 &client,const quint32 &orderId,const QStringList &sources,const QString &destination); - void emitNewMoveWithoutDestination(const quint32 &client,const quint32 &orderId,const QStringList &sources); - void emitNewMove(const quint32 &client,const quint32 &orderId,const QStringList &sources,const QString &destination); + inputReturnType parseInputCurrentProtocol(const uint32_t &client,const uint32_t &orderId,const std::vector<std::string> &returnList); + bool clientIdFound(const uint32_t &id) const; + uint32_t nextOrderId; + QList<uint32_t> orderList; + uint32_t incrementOrderId(); + void emitNewCopyWithoutDestination(const uint32_t &client,const uint32_t &orderId,const std::vector<std::string> &sources); + void emitNewCopy(const uint32_t &client,const uint32_t &orderId,const std::vector<std::string> &sources,const std::string &destination); + void emitNewMoveWithoutDestination(const uint32_t &client,const uint32_t &orderId,const std::vector<std::string> &sources); + void emitNewMove(const uint32_t &client,const uint32_t &orderId,const std::vector<std::string> &sources,const std::string &destination); bool checkDataIntegrity(const QByteArray &data); protected: - void parseInput(const quint32 &client,const quint32 &orderId,const QStringList &returnList); + void parseInput(const uint32_t &client,const uint32_t &orderId,const std::vector<std::string> &returnList); private slots: void newConnection(); void connectionError(const QLocalSocket::LocalSocketError &error); @@ -84,61 +84,61 @@ class ServerCatchcopy : public QObject void checkTimeOut(); public slots: /// \brief disconnect one client - void disconnectClient(const quint32 &id); - /// \brief reply to a client with QStringList - void reply(const quint32 &client,const quint32 &orderId,const quint32 &returnCode,const QStringList &returnList); + void disconnectClient(const uint32_t &id); + /// \brief reply to a client with std::vector<std::string> + void reply(const uint32_t &client,const uint32_t &orderId,const uint32_t &returnCode,const std::vector<std::string> &returnList); /// \brief reply to a client - void reply(const quint32 &client,const quint32 &orderId,const quint32 &returnCode,const QString &returnString); + void reply(const uint32_t &client,const uint32_t &orderId,const uint32_t &returnCode,const std::string &returnString); //reply /// \brief send if the protocol is supported - void protocolSupported(const quint32 &client,const quint32 &orderId,const bool &value); + void protocolSupported(const uint32_t &client,const uint32_t &orderId,const bool &value); /// \brief send incorrect arguement list size - void incorrectArgumentListSize(const quint32 &client,const quint32 &orderId); + void incorrectArgumentListSize(const uint32_t &client,const uint32_t &orderId); /// \brief send incorrect arguement - void incorrectArgument(const quint32 &client,const quint32 &orderId); + void incorrectArgument(const uint32_t &client,const uint32_t &orderId); /// \brief the client is registred - void clientRegistered(const quint32 &client,const quint32 &orderId); + void clientRegistered(const uint32_t &client,const uint32_t &orderId); /// \brief send the server name - void serverName(const quint32 &client,const quint32 &orderId,const QString &name); + void serverName(const uint32_t &client,const uint32_t &orderId,const std::string &name); /// \brief send the copy is finished - void copyFinished(const quint32 &client,const quint32 &orderId,const bool &withError); + void copyFinished(const uint32_t &client,const uint32_t &orderId,const bool &withError); /// \brief send the copy is canceled - void copyCanceled(const quint32 &client,const quint32 &orderId); + void copyCanceled(const uint32_t &client,const uint32_t &orderId); /// \brief send the copy is finished by global is order - void copyFinished(const quint32 &globalOrderId,const bool &withError); + void copyFinished(const uint32_t &globalOrderId,const bool &withError); /// \brief send copy cancel by global is order - void copyCanceled(const quint32 &globalOrderId); + void copyCanceled(const uint32_t &globalOrderId); /// \brief send the unknow order - void unknowOrder(const quint32 &client,const quint32 &orderId); + void unknowOrder(const uint32_t &client,const uint32_t &orderId); signals: /// \brief send connected client - void connectedClient(const quint32 &id); + void connectedClient(const uint32_t &id); /// \brief send disconnect client - void disconnectedClient(const quint32 &id); + void disconnectedClient(const uint32_t &id); /// \brief have new query - void newQuery(const quint32 &client,const quint32 &orderId,const QStringList &returnList); + void newQuery(const uint32_t &client,const uint32_t &orderId,const std::vector<std::string> &returnList); /// \brief have new error - void error(const QString &error); - void communicationError(const QString &error); + void error(const std::string &error); + void communicationError(const std::string &error); //query /// \brief ask the protocol compatility - void askProtocolCompatibility(const quint32 &client,const quint32 &orderId,const QString &version); + void askProtocolCompatibility(const uint32_t &client,const uint32_t &orderId,const std::string &version); /// \brief ask protocol extension - void askProtocolExtension(const quint32 &client,const quint32 &orderId,const QString &extension); + void askProtocolExtension(const uint32_t &client,const uint32_t &orderId,const std::string &extension); /// \brief ask protocol extension with version - void askProtocolExtension(const quint32 &client,const quint32 &orderId,const QString &extension,const QString &version); + void askProtocolExtension(const uint32_t &client,const uint32_t &orderId,const std::string &extension,const std::string &version); /// \brief send the client name, without query id - void clientName(const quint32 &client,const QString &name); + void clientName(const uint32_t &client,const std::string &name); /// \brief send the client have ask the server name - void askServerName(const quint32 &client,const quint32 &orderId); + void askServerName(const uint32_t &client,const uint32_t &orderId); /// \brief copy is send, by globalOrderId, without destination - void newCopyWithoutDestination(const quint32 &globalOrderId,const QStringList &sources); + void newCopyWithoutDestination(const uint32_t &globalOrderId,const std::vector<std::string> &sources); /// \brief copy is send, by globalOrderId, with destination - void newCopy(const quint32 &globalOrderId,const QStringList &sources,const QString &destination); + void newCopy(const uint32_t &globalOrderId,const std::vector<std::string> &sources,const std::string &destination); /// \brief move is send, by globalOrderId, without destination - void newMoveWithoutDestination(const quint32 &globalOrderId,const QStringList &sources); + void newMoveWithoutDestination(const uint32_t &globalOrderId,const std::vector<std::string> &sources); /// \brief move is send, by globalOrderId, with destination - void newMove(const quint32 &globalOrderId,const QStringList &sources,const QString &destination); + void newMove(const uint32_t &globalOrderId,const std::vector<std::string> &sources,const std::string &destination); }; #endif // SERVERCATCHCOPY_H diff --git a/plugins/Listener/catchcopy-v0002/documentation.dox b/plugins/Listener/catchcopy-v0002/documentation.dox index b143ecc..51aa937 100644 --- a/plugins/Listener/catchcopy-v0002/documentation.dox +++ b/plugins/Listener/catchcopy-v0002/documentation.dox @@ -20,7 +20,7 @@ \section mainpage_downloads Downloads - You can found link on <a href="http://ultracopier.first-world.info/">Ultracopier (Supercopier/Teracopy)</a> project page, via git, snapshot sources, ... + You can find the link on <a href="http://ultracopier.first-world.info/">Ultracopier</a> project page, via git, snapshot sources, ... \section mainpage_algorithm Protocol @@ -30,4 +30,3 @@ The code source is under GPL3. The image is extacted from Oxygen icon pack of KDE4. */ - diff --git a/plugins/Listener/catchcopy-v0002/informations.xml b/plugins/Listener/catchcopy-v0002/informations.xml index bc0efc6..b98adc2 100644 --- a/plugins/Listener/catchcopy-v0002/informations.xml +++ b/plugins/Listener/catchcopy-v0002/informations.xml @@ -17,7 +17,7 @@ <description xml:lang="en"><![CDATA[Listener for catchcopy v0002. Allow to receive copy list from plugin/explorer compatible with catchcopy.]]></description> <description xml:lang="fr"><![CDATA[Écouteur pour catchcopy v0002. Permet de recevoir un liste de copie venant d'un plugin/explorateur avec catchcopy.]]></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.2.3.6</version> + <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>catchcopy-v0002</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Listener/catchcopy-v0002/listener.cpp b/plugins/Listener/catchcopy-v0002/listener.cpp index 55c254b..e45a08b 100644 --- a/plugins/Listener/catchcopy-v0002/listener.cpp +++ b/plugins/Listener/catchcopy-v0002/listener.cpp @@ -1,9 +1,10 @@ #include "listener.h" #include "catchcopy-api-0002/ExtraSocketCatchcopy.h" +#include "../../../cpp11addition.h" Listener::Listener() { - server.setName(tr("Ultracopier")); + server.setName(tr("Ultracopier").toStdString()); connect(&server,&ServerCatchcopy::newCopyWithoutDestination, this,&Listener::copyWithoutDestination); connect(&server,&ServerCatchcopy::newCopy, this,&Listener::copy); connect(&server,&ServerCatchcopy::newMoveWithoutDestination, this,&Listener::moveWithoutDestination); @@ -19,7 +20,7 @@ Listener::Listener() void Listener::listen() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start: %1").arg(ExtraSocketCatchcopy::pathSocket())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start: "+ExtraSocketCatchcopy::pathSocket()); if(server.listen()) emit newState(Ultracopier::FullListening); else @@ -32,12 +33,12 @@ void Listener::close() emit newState(Ultracopier::NotListening); } -const QString Listener::errorString() const +const std::string Listener::errorString() const { return server.errorString(); } -void Listener::setResources(OptionInterface * options,const QString &writePath,const QString &pluginPath,const bool &portableVersion) +void Listener::setResources(OptionInterface * options, const std::string &writePath, const std::string &pluginPath, const bool &portableVersion) { Q_UNUSED(options); Q_UNUSED(writePath); @@ -52,20 +53,20 @@ QWidget * Listener::options() } /// \brief to get a client list -QStringList Listener::clientsList() const +std::vector<std::string> Listener::clientsList() const { return server.clientsList(); } -void Listener::transferFinished(const quint32 &orderId,const bool &withError) +void Listener::transferFinished(const uint32_t &orderId, const bool &withError) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start, orderId: "+QString::number(orderId)+", withError: "+QString::number(withError)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start, orderId: "+std::to_string(orderId)+", withError: "+std::to_string(withError)); server.copyFinished(orderId,withError); } -void Listener::transferCanceled(const quint32 &orderId) +void Listener::transferCanceled(const uint32_t &orderId) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start, orderId: "+QString::number(orderId)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start, orderId: "+std::to_string(orderId)); server.copyCanceled(orderId); } @@ -74,45 +75,49 @@ void Listener::newLanguageLoaded() { } -void Listener::errorInternal(const QString &string) +void Listener::errorInternal(const std::string &string) { Q_UNUSED(string); ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"warning emited from Catchcopy lib: "+string); } -void Listener::communicationErrorInternal(const QString &string) +void Listener::communicationErrorInternal(const std::string &string) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"warning emited from Catchcopy lib: "+string); emit error(string); } -void Listener::clientName(quint32 client,QString name) +void Listener::clientName(uint32_t client,std::string name) { Q_UNUSED(client); Q_UNUSED(name); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,QStringLiteral("clientName: %1, for the id: %2").arg(name).arg(client)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,QStringLiteral("clientName: %1, for the id: %2").arg(QString::fromStdString(name)).arg(client).toStdString()); } -void Listener::copyWithoutDestination(const quint32 &orderId,const QStringList &sources) +void Listener::copyWithoutDestination(const uint32_t &orderId,const std::vector<std::string> &sources) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,QStringLiteral("copyWithoutDestination(%1,%2)").arg(orderId).arg(sources.join(";"))); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,QStringLiteral("copyWithoutDestination(%1,%2)") + .arg(orderId) + .arg(QString::fromStdString(stringimplode(sources,";"))) + .toStdString() + ); emit newCopyWithoutDestination(orderId,sources); } -void Listener::copy(const quint32 &orderId,const QStringList &sources,const QString &destination) +void Listener::copy(const uint32_t &orderId,const std::vector<std::string> &sources,const std::string &destination) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,QStringLiteral("copy(%1,%2,%3)").arg(orderId).arg(sources.join(";")).arg(destination)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,QStringLiteral("copy(%1,%2,%3)").arg(orderId).arg(QString::fromStdString(stringimplode(sources,";")).arg(QString::fromStdString(destination))).toStdString()); emit newCopy(orderId,sources,destination); } -void Listener::moveWithoutDestination(const quint32 &orderId,const QStringList &sources) +void Listener::moveWithoutDestination(const uint32_t &orderId,const std::vector<std::string> &sources) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,QStringLiteral("moveWithoutDestination(%1,%2)").arg(orderId).arg(sources.join(";"))); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,QStringLiteral("moveWithoutDestination(%1,%2)").arg(orderId).arg(QString::fromStdString(stringimplode(sources,";"))).toStdString()); emit newMoveWithoutDestination(orderId,sources); } -void Listener::move(const quint32 &orderId,const QStringList &sources,const QString &destination) +void Listener::move(const uint32_t &orderId,const std::vector<std::string> &sources,const std::string &destination) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,QStringLiteral("move(%1,%2,%3)").arg(orderId).arg(sources.join(";")).arg(destination)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,QStringLiteral("move(%1,%2,%3)").arg(orderId).arg(QString::fromStdString(stringimplode(sources,";")).arg(QString::fromStdString(destination))).toStdString()); emit newMove(orderId,sources,destination); } diff --git a/plugins/Listener/catchcopy-v0002/listener.h b/plugins/Listener/catchcopy-v0002/listener.h index 8956abc..8cab248 100644 --- a/plugins/Listener/catchcopy-v0002/listener.h +++ b/plugins/Listener/catchcopy-v0002/listener.h @@ -6,7 +6,7 @@ #ifndef SERVER_H #define SERVER_H -#include <QString> +#include <string> #ifndef ULTRACOPIER_PLUGIN_ALL_IN_ONE_DIRECT #include <QtPlugin> #endif @@ -30,30 +30,30 @@ public: /// \brief stop listen to copy/move void close(); /// \brief return the error strong - const QString errorString() const; + const std::string errorString() const; /// \brief set resources for this plugins - void setResources(OptionInterface * options,const QString &writePath,const QString &pluginPath,const bool &portableVersion); + void setResources(OptionInterface * options,const std::string &writePath,const std::string &pluginPath,const bool &portableVersion); /// \brief to get the options widget, NULL if not have QWidget * options(); /// \brief to get a client list - QStringList clientsList() const; + std::vector<std::string> clientsList() const; public slots: /// \brief say to the client that's the copy/move is finished - void transferFinished(const quint32 &orderId,const bool &withError); + void transferFinished(const uint32_t &orderId,const bool &withError); /// \brief say to the client that's the copy/move is finished - void transferCanceled(const quint32 &orderId); + void transferCanceled(const uint32_t &orderId); /// \brief to reload the translation, because the new language have been loaded void newLanguageLoaded(); private: ServerCatchcopy server; private slots: - void errorInternal(const QString &string); - void communicationErrorInternal(const QString &string); - void clientName(quint32 client,QString name); - void copyWithoutDestination(const quint32 &orderId,const QStringList &sources); - void copy(const quint32 &orderId,const QStringList &sources,const QString &destination); - void moveWithoutDestination(const quint32 &orderId,const QStringList &sources); - void move(const quint32 &orderId,const QStringList &sources,const QString &destination); + void errorInternal(const std::string &string); + void communicationErrorInternal(const std::string &string); + void clientName(uint32_t client,std::string name); + void copyWithoutDestination(const uint32_t &orderId,const std::vector<std::string> &sources); + void copy(const uint32_t &orderId,const std::vector<std::string> &sources,const std::string &destination); + void moveWithoutDestination(const uint32_t &orderId,const std::vector<std::string> &sources); + void move(const uint32_t &orderId,const std::vector<std::string> &sources,const std::string &destination); }; #endif // SERVER_H diff --git a/plugins/Listener/catchcopy-v0002/listener.pro b/plugins/Listener/catchcopy-v0002/listener.pro index f1706c5..b21289a 100644 --- a/plugins/Listener/catchcopy-v0002/listener.pro +++ b/plugins/Listener/catchcopy-v0002/listener.pro @@ -6,16 +6,21 @@ TEMPLATE = lib CONFIG += plugin QT += network win32:LIBS += -ladvapi32 -HEADERS = listener.h \ - catchcopy-api-0002/VariablesCatchcopy.h \ - catchcopy-api-0002/ServerCatchcopy.h \ - catchcopy-api-0002/ExtraSocketCatchcopy.h \ - Environment.h \ - Variable.h \ - DebugEngineMacro.h \ - StructEnumDefinition.h \ - ../../../interface/PluginInterface_Listener.h -SOURCES = listener.cpp \ - catchcopy-api-0002/ServerCatchcopy.cpp \ - catchcopy-api-0002/ExtraSocketCatchcopy.cpp +HEADERS = \ + $$PWD/listener.h \ + $$PWD/catchcopy-api-0002/VariablesCatchcopy.h \ + $$PWD/catchcopy-api-0002/ServerCatchcopy.h \ + $$PWD/catchcopy-api-0002/ExtraSocketCatchcopy.h \ + $$PWD/Environment.h \ + $$PWD/Variable.h \ + $$PWD/DebugEngineMacro.h \ + $$PWD/StructEnumDefinition.h \ + $$PWD/../../../interface/PluginInterface_Listener.h \ + $$PWD/../../../cpp11addition.h +SOURCES = \ + $$PWD/listener.cpp \ + $$PWD/catchcopy-api-0002/ServerCatchcopy.cpp \ + $$PWD/catchcopy-api-0002/ExtraSocketCatchcopy.cpp \ + $$PWD/../../../cpp11addition.cpp \ + $$PWD/../../../cpp11additionstringtointcpp.cpp TARGET = $$qtLibraryTarget(listener) diff --git a/plugins/Listener/dbus/Catchcopy.cpp b/plugins/Listener/dbus/Catchcopy.cpp deleted file mode 100644 index 6c46af2..0000000 --- a/plugins/Listener/dbus/Catchcopy.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#include "Catchcopy.h" - -#include <QCoreApplication> - -Catchcopy::Catchcopy() -{ -} - -void Catchcopy::copy(const QStringList &sources,const QString &destination) -{ - emit newCopy(0,sources,destination); -} - -void Catchcopy::move(const QStringList &sources,const QString &destination) -{ - emit newMove(0,sources,destination); -} diff --git a/plugins/Listener/dbus/Catchcopy.h b/plugins/Listener/dbus/Catchcopy.h deleted file mode 100644 index d28a253..0000000 --- a/plugins/Listener/dbus/Catchcopy.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef CATCHCOPY_H -#define CATCHCOPY_H - -#include <QObject> -#include <QStringList> - -class Catchcopy : public QObject -{ - Q_OBJECT -public: - explicit Catchcopy(); -signals: - void newCopy(const quint32 &id,const QStringList &sources,const QString &destination); - void newMove(const quint32 &id,const QStringList &sources,const QString &destination); -public slots: - Q_SCRIPTABLE void copy(const QStringList &sources,const QString &destination); - Q_SCRIPTABLE void move(const QStringList &sources,const QString &destination); -}; - -#endif // CATCHCOPY_H diff --git a/plugins/Listener/dbus/DebugEngineMacro.h b/plugins/Listener/dbus/DebugEngineMacro.h deleted file mode 100644 index 4582010..0000000 --- a/plugins/Listener/dbus/DebugEngineMacro.h +++ /dev/null @@ -1,28 +0,0 @@ -/** \file DebugEngineMacro.h -\brief Define the macro for the debug -\author alpha_one_x86 -\licence GPL3, see the file COPYING */ - -#ifndef DEBUGENGINEMACRO_H -#define DEBUGENGINEMACRO_H - -#ifdef WIN32 -# define __func__ __FUNCTION__ -#endif - -/// \brief Macro for the debug log -#ifdef ULTRACOPIER_PLUGIN_DEBUG - #if defined (__FILE__) && defined (__LINE__) - #define ULTRACOPIER_DEBUGCONSOLE(a,b) emit debugInformation(a,__func__,b,__FILE__,__LINE__) - #else - #define ULTRACOPIER_DEBUGCONSOLE(a,b) emit debugInformation(a,__func__,b) - #endif -#else // ULTRACOPIER_DEBUG - #define ULTRACOPIER_DEBUGCONSOLE(a,b) void() -#endif // ULTRACOPIER_DEBUG - -#endif // DEBUGENGINEMACRO_H - - - - diff --git a/plugins/Listener/dbus/Environment.h b/plugins/Listener/dbus/Environment.h deleted file mode 100644 index 265a5a6..0000000 --- a/plugins/Listener/dbus/Environment.h +++ /dev/null @@ -1,10 +0,0 @@ -/** \file Environment.h
-\brief Define the environment variable and global function
-\author alpha_one_x86
-\licence GPL3, see the file COPYING */
-
-#include "Variable.h"
-/// \brief The global include
-#include "StructEnumDefinition.h"
-#include "DebugEngineMacro.h"
-
diff --git a/plugins/Listener/dbus/StructEnumDefinition.h b/plugins/Listener/dbus/StructEnumDefinition.h deleted file mode 100644 index c1758f4..0000000 --- a/plugins/Listener/dbus/StructEnumDefinition.h +++ /dev/null @@ -1 +0,0 @@ -#include "../../../StructEnumDefinition.h" diff --git a/plugins/Listener/dbus/Variable.h b/plugins/Listener/dbus/Variable.h deleted file mode 100644 index 963d0c8..0000000 --- a/plugins/Listener/dbus/Variable.h +++ /dev/null @@ -1,15 +0,0 @@ -/** \file Variable.h
-\brief Define the environment variable
-\author alpha_one_x86
-\licence GPL3, see the file COPYING */
-
-#ifndef VARIABLE_H
-#define VARIABLE_H
-
-//Un-comment this next line to put ultracopier plugin in debug mode
-#define ULTRACOPIER_PLUGIN_DEBUG
-
-#endif // VARIABLE_H
-
-
-
diff --git a/plugins/Listener/dbus/documentation.dox b/plugins/Listener/dbus/documentation.dox deleted file mode 100644 index 3cda8ec..0000000 --- a/plugins/Listener/dbus/documentation.dox +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- mode: C++ ; c-file-style: "stroustrup" -*- **/ - -/* - This file contains NO source code, just some documentation for doxygen to - parse. -*/ - -/*! - \mainpage dbus - - \section mainpage_overview Overview - - It's alternative listener for linux, it's very more simpler. You send just your copy/move, no more. No return.\n - More informations on <a href="http://ultracopier-wiki.first-world.info/">the wiki of ultracopier</a>. - - \section mainpage_platforms Platforms - - Ultracopier might be usable in all environments where you find Qt 5.\n - Ultracopier requires Qt 5.0 or newer. Tested on Qt 5.0. - - \section mainpage_downloads Downloads - - You can found link on <a href="http://ultracopier.first-world.info/">Ultracopier (Supercopier/Teracopy)</a> project page, via git, snapshot sources, ... - - \section mainpage_algorithm Dbus method - - you have this method exported to dbus: - <ul> - <li>void copy(const QStringList &sources,const QString &destination)</li> - <li>void move(const QStringList &sources,const QString &destination)</li> - </ul> - - \section license GPL Version 3 - The code source is under GPL3. The image is extacted from Oxygen icon pack of KDE4. - -*/ - diff --git a/plugins/Listener/dbus/listener.cpp b/plugins/Listener/dbus/listener.cpp deleted file mode 100644 index 50ed196..0000000 --- a/plugins/Listener/dbus/listener.cpp +++ /dev/null @@ -1,85 +0,0 @@ -#include "listener.h" - -Listener::Listener() -{ - connect(&catchcopy,&Catchcopy::newCopy, this,&Listener::newCopy); - connect(&catchcopy,&Catchcopy::newMove, this,&Listener::newMove); -} - -void Listener::listen() -{ - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); - if (!QDBusConnection::sessionBus().isConnected()) - { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); - emit newState(Ultracopier::NotListening); - return; - } - if (!QDBusConnection::sessionBus().registerService("info.first-world.catchcopy")) - { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QDBusConnection::sessionBus().lastError().message()); - emit newState(Ultracopier::NotListening); - return; - } - if(!QDBusConnection::sessionBus().registerObject("/", &catchcopy, QDBusConnection::ExportAllSlots)) - { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QDBusConnection::sessionBus().lastError().message()); - emit newState(Ultracopier::NotListening); - return; - } - emit newState(Ultracopier::FullListening); -} - -void Listener::close() -{ - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); - QDBusConnection::sessionBus().unregisterObject("/"); - QDBusConnection::sessionBus().unregisterService("info.first-world.catchcopy"); - emit newState(Ultracopier::NotListening); -} - -const QString Listener::errorString() const -{ - return "Unknow error"; -} - -void Listener::setResources(OptionInterface * options,const QString &writePath,const QString &pluginPath,const bool &portableVersion) -{ - Q_UNUSED(options); - Q_UNUSED(writePath); - Q_UNUSED(pluginPath); - Q_UNUSED(portableVersion); -} - -/// \brief to get the options widget, NULL if not have -QWidget * Listener::options() -{ - return NULL; -} - -void Listener::transferFinished(const quint32 &orderId,const bool &withError) -{ - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start, orderId: "+QString::number(orderId)+", withError: "+QString::number(withError)); -} - -void Listener::transferCanceled(const quint32 &orderId) -{ - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start, orderId: "+QString::number(orderId)); -} - -/// \brief to reload the translation, because the new language have been loaded -void Listener::newLanguageLoaded() -{ -} - -void Listener::error(QString error) -{ - Q_UNUSED(error); -} - -void Listener::clientName(quint32 client,QString name) -{ - Q_UNUSED(client); - Q_UNUSED(name); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,QStringLiteral("clientName: %1, for the id: %2").arg(name).arg(client)); -} diff --git a/plugins/Listener/dbus/listener.h b/plugins/Listener/dbus/listener.h deleted file mode 100644 index fcb95cd..0000000 --- a/plugins/Listener/dbus/listener.h +++ /dev/null @@ -1,49 +0,0 @@ -/** \file listener.h -\brief Define the server compatible with Ultracopier interface -\author alpha_one_x86 -\licence GPL3, see the file COPYING */ - -#ifndef SERVER_H -#define SERVER_H - -#include <QObject> -#include <QtDBus/QtDBus> -#include <QtDBus/QDBusConnection> - -#include "Catchcopy.h" -#include "Environment.h" -#include "../../../interface/PluginInterface_Listener.h" - -/// \brief Define the server compatible with Ultracopier interface -class Listener : public PluginInterface_Listener -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID "first-world.info.ultracopier.PluginInterface.Listener/1.0.0.0" FILE "plugin.json") - Q_INTERFACES(PluginInterface_Listener) -public: - Listener(); - /// \brief try listen the copy/move - void listen(); - /// \brief stop listen to copy/move - void close(); - /// \brief return the error strong - const QString errorString() const; - /// \brief set resources for this plugins - void setResources(OptionInterface * options,const QString &writePath,const QString &pluginPath,const bool &portableVersion); - /// \brief to get the options widget, NULL if not have - QWidget * options(); -public slots: - /// \brief say to the client that's the copy/move is finished - void transferFinished(const quint32 &orderId,const bool &withError); - /// \brief say to the client that's the copy/move is finished - void transferCanceled(const quint32 &orderId); - /// \brief to reload the translation, because the new language have been loaded - void newLanguageLoaded(); -private: - Catchcopy catchcopy; -private slots: - void error(QString error); - void clientName(quint32 client,QString name); -}; - -#endif // SERVER_H diff --git a/plugins/Listener/dbus/listener.pro b/plugins/Listener/dbus/listener.pro deleted file mode 100644 index 59abd12..0000000 --- a/plugins/Listener/dbus/listener.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = lib -CONFIG += plugin -QT += network dbus -HEADERS = listener.h \ - Environment.h \ - Variable.h \ - DebugEngineMacro.h \ - StructEnumDefinition.h \ - ../../../interface/PluginInterface_Listener.h \ - Catchcopy.h -SOURCES = listener.cpp \ - Catchcopy.cpp -TARGET = $$qtLibraryTarget(listener) diff --git a/plugins/Listener/dbus/plugin.json b/plugins/Listener/dbus/plugin.json deleted file mode 100644 index 9e26dfe..0000000 --- a/plugins/Listener/dbus/plugin.json +++ /dev/null @@ -1 +0,0 @@ -{}
\ No newline at end of file diff --git a/plugins/PluginLoader/catchcopy-v0002/documentation.dox b/plugins/PluginLoader/catchcopy-v0002/documentation.dox index 08ccc4a..b9c9d13 100644 --- a/plugins/PluginLoader/catchcopy-v0002/documentation.dox +++ b/plugins/PluginLoader/catchcopy-v0002/documentation.dox @@ -20,7 +20,7 @@ \section mainpage_downloads Downloads - You can found link on <a href="http://ultracopier.first-world.info/">Ultracopier (Supercopier/Teracopy)</a> project page, via git, snapshot sources, ... + You can find the link on <a href="http://ultracopier.first-world.info/">Ultracopier</a> project page, via git, snapshot sources, ... \section mainpage_algorithm Requirements @@ -31,4 +31,3 @@ The code source is under GPL3. */ - diff --git a/plugins/PluginLoader/catchcopy-v0002/informations.xml b/plugins/PluginLoader/catchcopy-v0002/informations.xml index 0b62f30..9257d3a 100644 --- a/plugins/PluginLoader/catchcopy-v0002/informations.xml +++ b/plugins/PluginLoader/catchcopy-v0002/informations.xml @@ -17,7 +17,7 @@ <description xml:lang="en"><![CDATA[Plugin loader for catchcopy v0002. Allow to receive copy list from plugin/explorer compatible with catchcopy.]]></description> <description xml:lang="fr"><![CDATA[Chargeur de plugin pour catchcopy v0002. Permet de recevoir un liste de copie venant d'un plugin/explorateur avec catchcopy.]]></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.2.3.6</version> + <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>catchcopy-v0002</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/PluginLoader/catchcopy-v0002/pluginLoader.cpp b/plugins/PluginLoader/catchcopy-v0002/pluginLoader.cpp index 2009e0a..363f372 100644 --- a/plugins/PluginLoader/catchcopy-v0002/pluginLoader.cpp +++ b/plugins/PluginLoader/catchcopy-v0002/pluginLoader.cpp @@ -4,6 +4,7 @@ #include "pluginLoader.h" #include "PlatformMacro.h" +#include "../../../cpp11addition.h" #include <QFile> #include <QDir> @@ -74,7 +75,7 @@ void WindowsExplorerLoader::setEnabled(const bool &needBeRegistred) } if(this->needBeRegistred==needBeRegistred) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("Double event dropped: %1").arg(needBeRegistred)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("Double event dropped: %1").arg(needBeRegistred).toStdString()); if(needBeRegistred) emit newState(Ultracopier::Caught); else @@ -82,14 +83,14 @@ void WindowsExplorerLoader::setEnabled(const bool &needBeRegistred) return; } this->needBeRegistred=needBeRegistred; - int index=0; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start, needBeRegistred: %1, allDllIsImportant: %2").arg(needBeRegistred).arg(allDllIsImportant)); + unsigned int index=0; + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start, needBeRegistred: %1, allDllIsImportant: %2").arg(needBeRegistred).arg(allDllIsImportant).toStdString()); bool oneHaveFound=false; index=0; while(index<importantDll.size()) { - if(QFile::exists(pluginPath+importantDll.at(index))) + if(QFile::exists(QString::fromStdString(pluginPath+importantDll.at(index)))) { oneHaveFound=true; break; @@ -101,7 +102,7 @@ void WindowsExplorerLoader::setEnabled(const bool &needBeRegistred) index=0; while(index<secondDll.size()) { - if(QFile::exists(pluginPath+secondDll.at(index))) + if(QFile::exists(QString::fromStdString(pluginPath+secondDll.at(index)))) { oneHaveFound=true; break; @@ -111,7 +112,7 @@ void WindowsExplorerLoader::setEnabled(const bool &needBeRegistred) } if(!oneHaveFound) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("No dll have found")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"No dll have found"); emit newState(Ultracopier::Uncaught); if(!needBeRegistred) correctlyLoaded.clear(); @@ -128,7 +129,7 @@ void WindowsExplorerLoader::setEnabled(const bool &needBeRegistred) !( (needBeRegistred) || - (!needBeRegistred && correctlyLoaded.contains(importantDll.at(index))) + (!needBeRegistred && correctlyLoaded.find(importantDll.at(index))!=correctlyLoaded.cend()) ) )) { @@ -155,7 +156,7 @@ void WindowsExplorerLoader::setEnabled(const bool &needBeRegistred) !( (needBeRegistred && allDllIsImportant) || - (!needBeRegistred && correctlyLoaded.contains(secondDll.at(index))) + (!needBeRegistred && correctlyLoaded.find(secondDll.at(index))!=correctlyLoaded.cend()) ) )) { @@ -234,25 +235,29 @@ bool WindowsExplorerLoader::checkExistsDll() if(is64Bits) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"64Bits is important"); - importantDll << CATCHCOPY_DLL_64; - secondDll << CATCHCOPY_DLL_32; + importantDll.push_back(CATCHCOPY_DLL_64); + secondDll.push_back(CATCHCOPY_DLL_32); } else { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"32Bits is important"); - importantDll << CATCHCOPY_DLL_32; - secondDll << CATCHCOPY_DLL_64; + importantDll.push_back(CATCHCOPY_DLL_32); + secondDll.push_back(CATCHCOPY_DLL_64); } - int index=0; + unsigned int index=0; while(index<importantDll.size()) { - if(!QFile::exists(pluginPath+importantDll.at(index)+NORMAL_EXT)) + if(!QFile::exists(QString::fromStdString(pluginPath+importantDll.at(index)+NORMAL_EXT))) { - if(!QFile::exists(pluginPath+importantDll.at(index)+SECOND_EXT)) + if(!QFile::exists(QString::fromStdString(pluginPath+importantDll.at(index)+SECOND_EXT))) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("file not found, drop to the list: %1 and %2").arg(pluginPath+importantDll.at(index)+NORMAL_EXT).arg(pluginPath+importantDll.at(index)+SECOND_EXT)); - importantDll.removeAt(index); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"file not found, drop to the list: "+ + pluginPath+importantDll.at(index)+NORMAL_EXT+ + " and "+ + pluginPath+importantDll.at(index)+SECOND_EXT + ); + importantDll.erase(importantDll.cbegin()+index); index--; } else @@ -265,12 +270,15 @@ bool WindowsExplorerLoader::checkExistsDll() index=0; while(index<secondDll.size()) { - if(!QFile::exists(pluginPath+secondDll.at(index)+NORMAL_EXT)) + if(!QFile::exists(QString::fromStdString(pluginPath+secondDll.at(index)+NORMAL_EXT))) { - if(!QFile::exists(pluginPath+secondDll.at(index)+SECOND_EXT)) + if(!QFile::exists(QString::fromStdString(pluginPath+secondDll.at(index)+SECOND_EXT))) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("file not found, drop to the list: %1 and %2").arg(pluginPath+secondDll.at(index)+NORMAL_EXT).arg(pluginPath+secondDll.at(index)+SECOND_EXT)); - secondDll.removeAt(index); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning, + "file not found, drop to the list: "+pluginPath+secondDll.at(index)+NORMAL_EXT+ + " and "+pluginPath+secondDll.at(index)+SECOND_EXT + ); + secondDll.erase(secondDll.cbegin()+index); index--; } else @@ -286,49 +294,49 @@ bool WindowsExplorerLoader::checkExistsDll() return false; } -void WindowsExplorerLoader::setResources(OptionInterface * options,const QString &writePath,const QString &pluginPath,const bool &portableVersion) +void WindowsExplorerLoader::setResources(OptionInterface * options, const std::string &writePath, const std::string &pluginPath, const bool &portableVersion) { Q_UNUSED(options); Q_UNUSED(writePath); Q_UNUSED(pluginPath); Q_UNUSED(portableVersion); #ifdef ULTRACOPIER_PLUGIN_ALL_IN_ONE - this->pluginPath=QCoreApplication::applicationDirPath()+"/"; + this->pluginPath=QCoreApplication::applicationDirPath().toStdString()+"/"; #else this->pluginPath=pluginPath; #endif this->optionsEngine=options; if(optionsEngine!=NULL) { - QList<QPair<QString, QVariant> > KeysList; - KeysList.append(qMakePair(QStringLiteral("allDllIsImportant"),QVariant(false))); - KeysList.append(qMakePair(QStringLiteral("Debug"),QVariant(false))); + std::vector<std::pair<std::string, std::string> > KeysList; + KeysList.push_back(std::pair<std::string, std::string>("allDllIsImportant","false")); + KeysList.push_back(std::pair<std::string, std::string>("Debug","false")); optionsEngine->addOptionGroup(KeysList); - allDllIsImportant=optionsEngine->getOptionValue("allDllIsImportant").toBool(); - Debug=optionsEngine->getOptionValue("Debug").toBool(); + allDllIsImportant=stringtobool(optionsEngine->getOptionValue("allDllIsImportant")); + Debug=stringtobool(optionsEngine->getOptionValue("Debug")); optionsWidget->setAllDllIsImportant(allDllIsImportant); optionsWidget->setDebug(Debug); } } -bool WindowsExplorerLoader::RegisterShellExtDll(const QString &dllPath, const bool &bRegister,const bool &quiet) +bool WindowsExplorerLoader::RegisterShellExtDll(const std::string &dllPath, const bool &bRegister, const bool &quiet) { if(Debug) { - QString message; + std::string message; if(bRegister) - message+=QStringLiteral("Try load the dll: %1, and ").arg(dllPath); + message+="Try load the dll: %1, and "+dllPath; else - message+=QStringLiteral("Try unload the dll: %1, and ").arg(dllPath); + message+="Try unload the dll: %1, and "+dllPath; if(quiet) - message+=QStringLiteral("don't open the UAC"); + message+="don't open the UAC"; else - message+=QStringLiteral("open the UAC if needed"); - QMessageBox::information(NULL,"Debug",message); + message+="open the UAC if needed"; + QMessageBox::information(NULL,"Debug",QString::fromStdString(message)); } - if(bRegister && correctlyLoaded.contains(dllPath)) + if(bRegister && correctlyLoaded.find(dllPath)!=correctlyLoaded.cend()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("Try dual load: %1").arg(dllPath)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Try dual load: "+dllPath); return false; } ////////////////////////////// First way to load ////////////////////////////// @@ -337,8 +345,8 @@ bool WindowsExplorerLoader::RegisterShellExtDll(const QString &dllPath, const bo arguments.append("/s"); if(!bRegister) arguments.append("/u"); - arguments.append(dllPath); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start: regsvr32 "+arguments.join(" ")); + arguments.append(QString::fromStdString(dllPath)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start: regsvr32 "+arguments.join(" ").toStdString()); int result; #ifdef Q_OS_WIN32 QProcess process; @@ -353,9 +361,9 @@ bool WindowsExplorerLoader::RegisterShellExtDll(const QString &dllPath, const bo QString out=QString::fromLocal8Bit(process.readAllStandardOutput()); QString outError=QString::fromLocal8Bit(process.readAllStandardError()); if(!out.isEmpty()) - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"regsvr32 output: "+out); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"regsvr32 output: "+out.toStdString()); if(!outError.isEmpty()) - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"regsvr32 error output: "+outError); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"regsvr32 error output: "+outError.toStdString()); } #else result=0; @@ -364,14 +372,14 @@ bool WindowsExplorerLoader::RegisterShellExtDll(const QString &dllPath, const bo if(result==0) { if(bRegister) - correctlyLoaded << dllPath; + correctlyLoaded.insert(dllPath); ok=true; } #if ! defined(_M_X64) if(result==999 && !changeOfArchDetected)//code of wrong arch for the dll { changeOfArchDetected=true; - QStringList temp; + std::vector<std::string> temp; temp = importantDll; secondDll = importantDll; importantDll = temp; @@ -380,7 +388,7 @@ bool WindowsExplorerLoader::RegisterShellExtDll(const QString &dllPath, const bo #endif if(result==5) { - if(!quiet || (!bRegister && correctlyLoaded.contains(dllPath))) + if(!quiet || (!bRegister && correctlyLoaded.find(dllPath)!=correctlyLoaded.cend())) { arguments.last()=QStringLiteral("\"%1\"").arg(arguments.last()); ////////////////////////////// Last way to load ////////////////////////////// @@ -398,7 +406,7 @@ bool WindowsExplorerLoader::RegisterShellExtDll(const QString &dllPath, const bo sei.fMask = SEE_MASK_UNICODE; sei.lpVerb = TEXT("runas"); sei.lpFile = TEXT("regsvr32.exe"); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"in win32 mode: arrayArg: "+QString::fromWCharArray(arrayArg,size_lenght)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"in win32 mode: arrayArg: "+QString::fromWCharArray(arrayArg,size_lenght).toStdString()); sei.lpParameters = arrayArg; sei.nShow = SW_SHOW; ok=ShellExecuteEx(&sei); @@ -406,15 +414,15 @@ bool WindowsExplorerLoader::RegisterShellExtDll(const QString &dllPath, const bo ok=true; #endif if(ok && bRegister) - correctlyLoaded << dllPath; + correctlyLoaded.insert(dllPath); } else ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"not try because need be quiet: "+dllPath); } else - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("regsvr32 terminated with: %1").arg(result)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"regsvr32 terminated with: "+std::to_string(result)); if(!bRegister) - correctlyLoaded.remove(dllPath); + correctlyLoaded.erase(dllPath); return ok; } @@ -432,11 +440,11 @@ void WindowsExplorerLoader::newLanguageLoaded() void WindowsExplorerLoader::setAllDllIsImportant(bool allDllIsImportant) { this->allDllIsImportant=allDllIsImportant; - optionsEngine->setOptionValue("allDllIsImportant",allDllIsImportant); + optionsEngine->setOptionValue("allDllIsImportant",std::to_string(allDllIsImportant)); } void WindowsExplorerLoader::setDebug(bool Debug) { this->Debug=Debug; - optionsEngine->setOptionValue("Debug",Debug); + optionsEngine->setOptionValue("Debug",std::to_string(Debug)); } diff --git a/plugins/PluginLoader/catchcopy-v0002/pluginLoader.h b/plugins/PluginLoader/catchcopy-v0002/pluginLoader.h index 0246cd1..d18248d 100644 --- a/plugins/PluginLoader/catchcopy-v0002/pluginLoader.h +++ b/plugins/PluginLoader/catchcopy-v0002/pluginLoader.h @@ -8,6 +8,7 @@ #include <QObject> #include <QMessageBox> +#include <unordered_set> #include <QString> #include <QStringList> @@ -29,7 +30,7 @@ class WindowsExplorerLoader : public PluginInterface_PluginLoader { Q_OBJECT - Q_PLUGIN_METADATA(IID "first-world.info.ultracopier.PluginInterface.PluginLoader/1.0.0.0" FILE "plugin.json") + Q_PLUGIN_METADATA(IID "first-world.info.ultracopier.PluginInterface.PluginLoader/1.2.4.0" FILE "plugin.json") Q_INTERFACES(PluginInterface_PluginLoader) public: WindowsExplorerLoader(); @@ -37,17 +38,17 @@ public: /// \brief try enable/disable the catching void setEnabled(const bool &needBeRegistred); /// \brief to set resources, writePath can be empty if read only mode - void setResources(OptionInterface * options,const QString &writePath,const QString &pluginPath,const bool &portableVersion); + void setResources(OptionInterface * options,const std::string &writePath,const std::string &pluginPath,const bool &portableVersion); /// \brief to get the options widget, NULL if not have QWidget * options(); public slots: /// \brief to reload the translation, because the new language have been loaded void newLanguageLoaded(); private: - QString pluginPath; - QStringList importantDll,secondDll; - QSet<QString> correctlyLoaded; - bool RegisterShellExtDll(const QString &dllPath, const bool &bRegister,const bool &quiet); + std::string pluginPath; + std::vector<std::string> importantDll,secondDll; + std::unordered_set<std::string> correctlyLoaded; + bool RegisterShellExtDll(const std::string &dllPath, const bool &bRegister,const bool &quiet); bool checkExistsDll(); bool dllChecked; bool needBeRegistred; diff --git a/plugins/PluginLoader/catchcopy-v0002/pluginLoader.pro b/plugins/PluginLoader/catchcopy-v0002/pluginLoader.pro index 0d11721..40d5e5e 100644 --- a/plugins/PluginLoader/catchcopy-v0002/pluginLoader.pro +++ b/plugins/PluginLoader/catchcopy-v0002/pluginLoader.pro @@ -6,45 +6,48 @@ QT += widgets TEMPLATE = lib
CONFIG += plugin
HEADERS = \
- StructEnumDefinition.h \
- pluginLoader.h \
- DebugEngineMacro.h \
- Environment.h \
- Variable.h \
- PlatformMacro.h \
- ../../../interface/PluginInterface_PluginLoader.h \
- OptionsWidget.h
+ $$PWD/StructEnumDefinition.h \
+ $$PWD/pluginLoader.h \
+ $$PWD/DebugEngineMacro.h \
+ $$PWD/Environment.h \
+ $$PWD/Variable.h \
+ $$PWD/PlatformMacro.h \
+ $$PWD/../../../interface/PluginInterface_PluginLoader.h \
+ $$PWD/../../../cpp11addition.h \
+ $$PWD/OptionsWidget.h
SOURCES = \
- pluginLoader.cpp \
- OptionsWidget.cpp
+ $$PWD/pluginLoader.cpp \
+ $$PWD/OptionsWidget.cpp \
+ $$PWD/../../../cpp11addition.cpp \
+ $$PWD/../../../cpp11additionstringtointcpp.cpp
TARGET = $$qtLibraryTarget(pluginLoader)
-TRANSLATIONS += Languages/ar/translation.ts \
- Languages/de/translation.ts \
- Languages/el/translation.ts \
- Languages/en/translation.ts \
- Languages/es/translation.ts \
- Languages/fr/translation.ts \
- Languages/hi/translation.ts \
- Languages/hu/translation.ts \
- Languages/id/translation.ts \
- Languages/it/translation.ts \
- Languages/ja/translation.ts \
- Languages/ko/translation.ts \
- Languages/nl/translation.ts \
- Languages/no/translation.ts \
- Languages/pl/translation.ts \
- Languages/pt/translation.ts \
- Languages/ru/translation.ts \
- Languages/th/translation.ts \
- Languages/tr/translation.ts \
- 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
win32:LIBS += -lole32 -lshell32
FORMS += \
- OptionsWidget.ui
+ $$PWD/OptionsWidget.ui
CONFIG(static, static|shared) {
DEFINES += ULTRACOPIER_PLUGIN_ALL_IN_ONE
}
-
diff --git a/plugins/SessionLoader/KDE4/DebugEngineMacro.h b/plugins/SessionLoader/KDE4/DebugEngineMacro.h deleted file mode 100644 index 4582010..0000000 --- a/plugins/SessionLoader/KDE4/DebugEngineMacro.h +++ /dev/null @@ -1,28 +0,0 @@ -/** \file DebugEngineMacro.h -\brief Define the macro for the debug -\author alpha_one_x86 -\licence GPL3, see the file COPYING */ - -#ifndef DEBUGENGINEMACRO_H -#define DEBUGENGINEMACRO_H - -#ifdef WIN32 -# define __func__ __FUNCTION__ -#endif - -/// \brief Macro for the debug log -#ifdef ULTRACOPIER_PLUGIN_DEBUG - #if defined (__FILE__) && defined (__LINE__) - #define ULTRACOPIER_DEBUGCONSOLE(a,b) emit debugInformation(a,__func__,b,__FILE__,__LINE__) - #else - #define ULTRACOPIER_DEBUGCONSOLE(a,b) emit debugInformation(a,__func__,b) - #endif -#else // ULTRACOPIER_DEBUG - #define ULTRACOPIER_DEBUGCONSOLE(a,b) void() -#endif // ULTRACOPIER_DEBUG - -#endif // DEBUGENGINEMACRO_H - - - - diff --git a/plugins/SessionLoader/KDE4/Environment.h b/plugins/SessionLoader/KDE4/Environment.h deleted file mode 100644 index 265a5a6..0000000 --- a/plugins/SessionLoader/KDE4/Environment.h +++ /dev/null @@ -1,10 +0,0 @@ -/** \file Environment.h
-\brief Define the environment variable and global function
-\author alpha_one_x86
-\licence GPL3, see the file COPYING */
-
-#include "Variable.h"
-/// \brief The global include
-#include "StructEnumDefinition.h"
-#include "DebugEngineMacro.h"
-
diff --git a/plugins/SessionLoader/KDE4/StructEnumDefinition.h b/plugins/SessionLoader/KDE4/StructEnumDefinition.h deleted file mode 100644 index c1758f4..0000000 --- a/plugins/SessionLoader/KDE4/StructEnumDefinition.h +++ /dev/null @@ -1 +0,0 @@ -#include "../../../StructEnumDefinition.h" diff --git a/plugins/SessionLoader/KDE4/Variable.h b/plugins/SessionLoader/KDE4/Variable.h deleted file mode 100644 index 963d0c8..0000000 --- a/plugins/SessionLoader/KDE4/Variable.h +++ /dev/null @@ -1,15 +0,0 @@ -/** \file Variable.h
-\brief Define the environment variable
-\author alpha_one_x86
-\licence GPL3, see the file COPYING */
-
-#ifndef VARIABLE_H
-#define VARIABLE_H
-
-//Un-comment this next line to put ultracopier plugin in debug mode
-#define ULTRACOPIER_PLUGIN_DEBUG
-
-#endif // VARIABLE_H
-
-
-
diff --git a/plugins/SessionLoader/KDE4/documentation.dox b/plugins/SessionLoader/KDE4/documentation.dox deleted file mode 100644 index 98ed23f..0000000 --- a/plugins/SessionLoader/KDE4/documentation.dox +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- mode: C++ ; c-file-style: "stroustrup" -*- **/ - -/* - This file contains NO source code, just some documentation for doxygen to - parse. -*/ - -/*! - \mainpage KDE4 - - \section mainpage_overview Overview - - It control if it loaded with the session.\n - More informations on <a href="http://ultracopier-wiki.first-world.info/">the wiki of ultracopier</a>. - - \section mainpage_platforms Platforms - - Ultracopier might be usable in all environments where you find Qt 5.\n - Ultracopier requires Qt 5.0 or newer. Tested on Qt 5.0. - - \section mainpage_downloads Downloads - - You can found link on <a href="http://ultracopier.first-world.info/">Ultracopier (Supercopier/Teracopy)</a> project page, via git, snapshot sources, ... - - \section mainpage_algorithm Method - - It pass by ~/.kde4/Autostart/ultracopier.sh to set/get it. - - \section license GPL Version 3 - The code source is under GPL3. The image is extacted from Oxygen icon pack of KDE4. - -*/ - diff --git a/plugins/SessionLoader/KDE4/plugin.json b/plugins/SessionLoader/KDE4/plugin.json deleted file mode 100644 index 9e26dfe..0000000 --- a/plugins/SessionLoader/KDE4/plugin.json +++ /dev/null @@ -1 +0,0 @@ -{}
\ No newline at end of file diff --git a/plugins/SessionLoader/KDE4/sessionLoader.cpp b/plugins/SessionLoader/KDE4/sessionLoader.cpp deleted file mode 100644 index 8024264..0000000 --- a/plugins/SessionLoader/KDE4/sessionLoader.cpp +++ /dev/null @@ -1,58 +0,0 @@ -/** \file session-loader.cpp -\brief Define the session plugin loader test -\author alpha_one_x86 -*/ - -#include <QFile> -#include <QDir> -#include <QCoreApplication> - -#include "sessionLoader.h" -void KDESessionLoader::setEnabled(const bool &enabled) -{ - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start, enabled: "+QString::number(enabled)); - QFile link(QDir::homePath()+"/.kde4/Autostart/ultracopier.sh"); - if(!enabled) - { - if(link.exists() && !link.remove()) - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"unable to remove from the startup: "+link.errorString()); - } - else - { - if(link.open(QIODevice::WriteOnly)) - { - link.write(QStringLiteral("#!/bin/bash\n").toLocal8Bit()); - link.write(QString(QCoreApplication::applicationFilePath()).toLocal8Bit()); - link.close(); - if(!link.setPermissions(QFile::ExeOwner|QFile::WriteOwner|QFile::ReadOwner)) - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"unable to set permissions: "+link.errorString()); - } - else - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"unable to open in writing the file: "+link.errorString()); - } -} - -bool KDESessionLoader::getEnabled() const -{ - //return the value into the variable - return QFile::exists(QDir::homePath()+"/.kde4/Autostart/ultracopier.sh"); -} - -void KDESessionLoader::setResources(OptionInterface * options,const QString &writePath,const QString &pluginPath,const bool &portableVersion) -{ - Q_UNUSED(options); - Q_UNUSED(writePath); - Q_UNUSED(pluginPath); - Q_UNUSED(portableVersion); -} - -/// \brief to get the options widget, NULL if not have -QWidget * KDESessionLoader::options() -{ - return NULL; -} - -/// \brief to reload the translation, because the new language have been loaded -void KDESessionLoader::newLanguageLoaded() -{ -} diff --git a/plugins/SessionLoader/KDE4/sessionLoader.h b/plugins/SessionLoader/KDE4/sessionLoader.h deleted file mode 100644 index b037da7..0000000 --- a/plugins/SessionLoader/KDE4/sessionLoader.h +++ /dev/null @@ -1,33 +0,0 @@ -/** \file sessionLoader.h -\brief Define the session loader -\author alpha_one_x86 -\licence GPL3, see the file COPYING */ - -#ifndef SESSION_LOADER_PLUGIN_H -#define SESSION_LOADER_PLUGIN_H - -#include <QObject> -#include "Environment.h" -#include "../../../interface/PluginInterface_SessionLoader.h" - -/// \brief Define the session loader -class KDESessionLoader : public PluginInterface_SessionLoader -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID "first-world.info.ultracopier.PluginInterface.SessionLoader/1.0.0.0" FILE "plugin.json") - Q_INTERFACES(PluginInterface_SessionLoader) -public: - /// \brief to set if it's enabled or not - void setEnabled(const bool &enabled); - /// \brief to get if is enabled - bool getEnabled() const; - /// \brief set the resources for the plugins - void setResources(OptionInterface * options,const QString &writePath,const QString &pluginPath,const bool &portableVersion); - /// \brief to get the options widget, NULL if not have - QWidget * options(); -public slots: - /// \brief to reload the translation, because the new language have been loaded - void newLanguageLoaded(); -}; - -#endif // SESSION_LOADER_PLUGIN_H diff --git a/plugins/SessionLoader/KDE4/sessionLoader.pro b/plugins/SessionLoader/KDE4/sessionLoader.pro deleted file mode 100644 index 4398dfe..0000000 --- a/plugins/SessionLoader/KDE4/sessionLoader.pro +++ /dev/null @@ -1,14 +0,0 @@ -CONFIG += c++11 -QMAKE_CXXFLAGS+="-std=c++0x -Wall -Wextra" -mac:QMAKE_CXXFLAGS+="-stdlib=libc++" - -TEMPLATE = lib -CONFIG += plugin -HEADERS = sessionLoader.h \ - StructEnumDefinition.h \ - Variable.h \ - Environment.h \ - DebugEngineMacro.h \ - ../../../interface/PluginInterface_SessionLoader.h -SOURCES = sessionLoader.cpp -TARGET = $$qtLibraryTarget(sessionLoader) diff --git a/plugins/SessionLoader/KDE4/sessionLoader.pro.user.2.7pre1 b/plugins/SessionLoader/KDE4/sessionLoader.pro.user.2.7pre1 deleted file mode 100644 index 7741b0d..0000000 --- a/plugins/SessionLoader/KDE4/sessionLoader.pro.user.2.7pre1 +++ /dev/null @@ -1,208 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE QtCreatorProject> -<!-- Written by Qt Creator 2.6.2, 2013-03-18T13:36:56. --> -<qtcreator> - <data> - <variable>ProjectExplorer.Project.ActiveTarget</variable> - <value type="int">0</value> - </data> - <data> - <variable>ProjectExplorer.Project.EditorSettings</variable> - <valuemap type="QVariantMap"> - <value type="bool" key="EditorConfiguration.AutoIndent">true</value> - <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value> - <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value> - <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0"> - <value type="QString" key="language">Cpp</value> - <valuemap type="QVariantMap" key="value"> - <value type="QString" key="CurrentPreferences">CppGlobal</value> - </valuemap> - </valuemap> - <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1"> - <value type="QString" key="language">QmlJS</value> - <valuemap type="QVariantMap" key="value"> - <value type="QString" key="CurrentPreferences">QmlJSGlobal</value> - </valuemap> - </valuemap> - <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value> - <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value> - <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value> - <value type="int" key="EditorConfiguration.IndentSize">4</value> - <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value> - <value type="bool" key="EditorConfiguration.MouseNavigation">true</value> - <value type="int" key="EditorConfiguration.PaddingMode">1</value> - <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value> - <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value> - <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value> - <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value> - <value type="int" key="EditorConfiguration.TabSize">8</value> - <value type="bool" key="EditorConfiguration.UseGlobal">true</value> - <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value> - <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value> - <value type="bool" key="EditorConfiguration.cleanIndentation">true</value> - <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value> - <value type="bool" key="EditorConfiguration.inEntireDocument">true</value> - </valuemap> - </data> - <data> - <variable>ProjectExplorer.Project.PluginSettings</variable> - <valuemap type="QVariantMap"/> - </data> - <data> - <variable>ProjectExplorer.Project.Target.0</variable> - <valuemap type="QVariantMap"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop-Qt 5.01 (qt5-linux)</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop-Qt 5.01 (qt5-linux)</value> - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">{55d7d977-66a3-4d72-9331-2ae779c6252a}</value> - <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> - <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> - <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value> - <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> - <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> - <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/user/Desktop/ultracopier/sources/plugins/SessionLoader/sessionLoader-build-Desktop_Qt_5_01_qt5_linux-Debug</value> - <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value> - <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> - <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> - <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/user/Desktop/ultracopier/sources/plugins/SessionLoader/sessionLoader-build-Desktop_Qt_5_01_qt5_linux-Release</value> - <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> - </valuemap> - <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy locally</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> - </valuemap> - <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> - <value type="bool" key="Analyzer.Project.UseGlobal">true</value> - <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Arguments"></value> - <value type="int" key="ProjectExplorer.CustomExecutableRunConfiguration.BaseEnvironmentBase">2</value> - <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Executable"></value> - <value type="bool" key="ProjectExplorer.CustomExecutableRunConfiguration.UseTerminal">false</value> - <valuelist type="QVariantList" key="ProjectExplorer.CustomExecutableRunConfiguration.UserEnvironmentChanges"/> - <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.WorkingDirectory">%{buildDir}</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Custom Executable</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value> - <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> - <value type="bool" key="RunConfiguration.UseCppDebugger">true</value> - <value type="bool" key="RunConfiguration.UseMultiProcess">false</value> - <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> - <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> - </valuemap> - <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> - </valuemap> - </data> - <data> - <variable>ProjectExplorer.Project.TargetCount</variable> - <value type="int">1</value> - </data> - <data> - <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable> - <value type="QString">{74ab603f-f657-4135-92cf-c93af71b2f91}</value> - </data> - <data> - <variable>ProjectExplorer.Project.Updater.FileVersion</variable> - <value type="int">12</value> - </data> -</qtcreator> diff --git a/plugins/SessionLoader/Windows/documentation.dox b/plugins/SessionLoader/Windows/documentation.dox index 67ea43f..bfe77f3 100644 --- a/plugins/SessionLoader/Windows/documentation.dox +++ b/plugins/SessionLoader/Windows/documentation.dox @@ -20,7 +20,7 @@ \section mainpage_downloads Downloads - You can found link on <a href="http://ultracopier.first-world.info/">Ultracopier (Supercopier/Teracopy)</a> project page, via git, snapshot sources, ... + You can find the link on <a href="http://ultracopier.first-world.info/">Ultracopier</a> project page, via git, snapshot sources, ... \section mainpage_algorithm Method @@ -30,4 +30,3 @@ The code source is under GPL3. The image is extacted from Oxygen icon pack of KDE4. */ - diff --git a/plugins/SessionLoader/Windows/informations.xml b/plugins/SessionLoader/Windows/informations.xml index b91bd28..1042f96 100644 --- a/plugins/SessionLoader/Windows/informations.xml +++ b/plugins/SessionLoader/Windows/informations.xml @@ -17,7 +17,7 @@ <description xml:lang="en"><![CDATA[This plugin allow Ultracopier to be loaded at the session opening under windows]]></description> <description xml:lang="fr"><![CDATA[Ce plugin permet de charger Ultracopier à l'ouverture de la sessions sous windows]]></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.2.3.6</version> + <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>Windows</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/SessionLoader/Windows/sessionLoader.cpp b/plugins/SessionLoader/Windows/sessionLoader.cpp index 5080bdc..121bae0 100644 --- a/plugins/SessionLoader/Windows/sessionLoader.cpp +++ b/plugins/SessionLoader/Windows/sessionLoader.cpp @@ -17,7 +17,7 @@ void WindowsSessionLoader::setEnabled(const bool &newValue) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start, newValue: "+QString::number(newValue)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start, newValue: "+std::to_string(newValue)); //set value into the variable HKEY ultracopier_regkey; //for autostart @@ -30,12 +30,12 @@ void WindowsSessionLoader::setEnabled(const bool &newValue) if(newValue) { if(RegSetValueEx(ultracopier_regkey, TEXT("ultracopier"), 0, REG_SZ, (BYTE*)windowsString, runStringApp.length()*2)!=ERROR_SUCCESS) - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"newValue: "+QString::number(newValue)+" failed"); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"newValue: "+std::to_string(newValue)+" failed"); } else { if(RegDeleteValue(ultracopier_regkey, TEXT("ultracopier"))!=ERROR_SUCCESS) - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"newValue: "+QString::number(newValue)+" failed"); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"newValue: "+std::to_string(newValue)+" failed"); } RegCloseKey(ultracopier_regkey); } @@ -60,7 +60,7 @@ bool WindowsSessionLoader::getEnabled() const return temp; } -void WindowsSessionLoader::setResources(OptionInterface * options,const QString &writePath,const QString &pluginPath,const bool &portableVersion) +void WindowsSessionLoader::setResources(OptionInterface * options,const std::string &writePath,const std::string &pluginPath,const bool &portableVersion) { Q_UNUSED(options); Q_UNUSED(writePath); diff --git a/plugins/SessionLoader/Windows/sessionLoader.h b/plugins/SessionLoader/Windows/sessionLoader.h index bc8615e..b064e50 100644 --- a/plugins/SessionLoader/Windows/sessionLoader.h +++ b/plugins/SessionLoader/Windows/sessionLoader.h @@ -22,7 +22,7 @@ public: /// \brief to get if is enabled bool getEnabled() const; /// \brief set the resources for the plugins - void setResources(OptionInterface * options,const QString &writePath,const QString &pluginPath,const bool &portableVersion); + void setResources(OptionInterface * options,const std::string &writePath,const std::string &pluginPath,const bool &portableVersion); /// \brief to get the options widget, NULL if not have QWidget * options(); public slots: diff --git a/plugins/SessionLoader/Windows/sessionLoader.pro b/plugins/SessionLoader/Windows/sessionLoader.pro index 071db7e..1059692 100644 --- a/plugins/SessionLoader/Windows/sessionLoader.pro +++ b/plugins/SessionLoader/Windows/sessionLoader.pro @@ -5,12 +5,12 @@ mac:QMAKE_CXXFLAGS+="-stdlib=libc++" TEMPLATE = lib CONFIG += plugin LIBS += -ladvapi32 -HEADERS = sessionLoader.h \ - StructEnumDefinition.h \ - Variable.h \ - Environment.h \ - DebugEngineMacro.h \ - ../../../interface/PluginInterface_SessionLoader.h +HEADERS = \ + $$PWD/sessionLoader.h \ + $$PWD/StructEnumDefinition.h \ + $$PWD/Variable.h \ + $$PWD/Environment.h \ + $$PWD/DebugEngineMacro.h \ + $$PWD/../../../interface/PluginInterface_SessionLoader.h SOURCES = sessionLoader.cpp TARGET = $$qtLibraryTarget(sessionLoader) - diff --git a/plugins/Themes/Oxygen/Languages/ar/translation.ts b/plugins/Themes/Oxygen/Languages/ar/translation.ts index ae86b54..483e140 100644 --- a/plugins/Themes/Oxygen/Languages/ar/translation.ts +++ b/plugins/Themes/Oxygen/Languages/ar/translation.ts @@ -4,56 +4,62 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="240"/> + <location filename="../../interface.cpp" line="298"/> + <location filename="../../interface.cpp" line="309"/> + <source>%1 is deprecated, Use %2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../interface.cpp" line="311"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="310"/> + <location filename="../../interface.cpp" line="396"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="524"/> + <location filename="../../interface.cpp" line="630"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="526"/> + <location filename="../../interface.cpp" line="632"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="947"/> + <location filename="../../interface.cpp" line="1053"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="948"/> + <location filename="../../interface.cpp" line="1054"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="949"/> + <location filename="../../interface.cpp" line="1055"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="951"/> + <location filename="../../interface.cpp" line="1057"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1134"/> - <location filename="../../interface.cpp" line="1146"/> - <location filename="../../interface.cpp" line="1158"/> + <location filename="../../interface.cpp" line="1244"/> + <location filename="../../interface.cpp" line="1256"/> + <location filename="../../interface.cpp" line="1268"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1233"/> - <location filename="../../interface.cpp" line="1237"/> - <location filename="../../interface.cpp" line="1239"/> + <location filename="../../interface.cpp" line="1343"/> + <location filename="../../interface.cpp" line="1347"/> + <location filename="../../interface.cpp" line="1349"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -61,24 +67,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="223"/> + <location filename="../../ThemesFactory.cpp" line="224"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="224"/> + <location filename="../../ThemesFactory.cpp" line="225"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="225"/> + <location filename="../../ThemesFactory.cpp" line="226"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="421"/> - <location filename="../../ThemesFactory.cpp" line="436"/> - <location filename="../../ThemesFactory.cpp" line="451"/> + <location filename="../../ThemesFactory.cpp" line="422"/> + <location filename="../../ThemesFactory.cpp" line="437"/> + <location filename="../../ThemesFactory.cpp" line="452"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/Themes/Oxygen/Languages/de/translation.ts b/plugins/Themes/Oxygen/Languages/de/translation.ts index 34c8bef..74d215d 100644 --- a/plugins/Themes/Oxygen/Languages/de/translation.ts +++ b/plugins/Themes/Oxygen/Languages/de/translation.ts @@ -4,56 +4,62 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="240"/> + <location filename="../../interface.cpp" line="298"/> + <location filename="../../interface.cpp" line="309"/> + <source>%1 is deprecated, Use %2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../interface.cpp" line="311"/> <source>Buy the Ultimate version to fund development</source> <translation>Kaufe die Ultimate Version um die Entwicklung zu finanzieren</translation> </message> <message> - <location filename="../../interface.cpp" line="310"/> + <location filename="../../interface.cpp" line="396"/> <source>File %1/%2, size: %3/%4</source> <translation>Datei %1/%2, Größe:%3/%4</translation> </message> <message> - <location filename="../../interface.cpp" line="524"/> + <location filename="../../interface.cpp" line="630"/> <source>Copy list</source> <translation>Zu kopierende Dateien</translation> </message> <message> - <location filename="../../interface.cpp" line="526"/> + <location filename="../../interface.cpp" line="632"/> <source>Move list</source> <translation>Zu verschiebende Dateien</translation> </message> <message> - <location filename="../../interface.cpp" line="947"/> + <location filename="../../interface.cpp" line="1053"/> <source>Don't close if errors are found</source> <translation>Nicht schließen, wenn Fehler aufgetreten sind</translation> </message> <message> - <location filename="../../interface.cpp" line="948"/> + <location filename="../../interface.cpp" line="1054"/> <source>Never close</source> <translation>Niemals schließen</translation> </message> <message> - <location filename="../../interface.cpp" line="949"/> + <location filename="../../interface.cpp" line="1055"/> <source>Always close</source> <translation>Immer schließen</translation> </message> <message> - <location filename="../../interface.cpp" line="951"/> + <location filename="../../interface.cpp" line="1057"/> <source>File Name, 0KB</source> <translation>Dateiname, 0KB</translation> </message> <message> - <location filename="../../interface.cpp" line="1134"/> - <location filename="../../interface.cpp" line="1146"/> - <location filename="../../interface.cpp" line="1158"/> + <location filename="../../interface.cpp" line="1244"/> + <location filename="../../interface.cpp" line="1256"/> + <location filename="../../interface.cpp" line="1268"/> <source>Select a color</source> <translation>Farbe auswählen</translation> </message> <message> - <location filename="../../interface.cpp" line="1233"/> - <location filename="../../interface.cpp" line="1237"/> - <location filename="../../interface.cpp" line="1239"/> + <location filename="../../interface.cpp" line="1343"/> + <location filename="../../interface.cpp" line="1347"/> + <location filename="../../interface.cpp" line="1349"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -61,24 +67,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="223"/> + <location filename="../../ThemesFactory.cpp" line="224"/> <source>Don't close if errors are found</source> <translation>Nicht schließen, wenn Fehler aufgetreten sind</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="224"/> + <location filename="../../ThemesFactory.cpp" line="225"/> <source>Never close</source> <translation>Niemals schließen</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="225"/> + <location filename="../../ThemesFactory.cpp" line="226"/> <source>Always close</source> <translation>Immer schließen</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="421"/> - <location filename="../../ThemesFactory.cpp" line="436"/> - <location filename="../../ThemesFactory.cpp" line="451"/> + <location filename="../../ThemesFactory.cpp" line="422"/> + <location filename="../../ThemesFactory.cpp" line="437"/> + <location filename="../../ThemesFactory.cpp" line="452"/> <source>Select a color</source> <translation>Wählen Sie eine Farbe</translation> </message> @@ -116,10 +122,6 @@ <translation>Abbrechen (&C)</translation> </message> <message> - <source>Limit copy speed at:</source> - <translation type="obsolete">Kopiergeschwindigkeit begrenzen bei:</translation> - </message> - <message> <location filename="../../interface.ui" line="329"/> <source>Transfer list</source> <translation>Dateiliste</translation> @@ -295,14 +297,6 @@ <translation>Zum Bearbeiten der Farbe klicken</translation> </message> <message> - <source>At the end of the copy: </source> - <translation type="obsolete">Am Ende der Kopie: </translation> - </message> - <message> - <source>Limit copy speed at:</source> - <translation type="obsolete">Kopiergeschwindigkeit begrenzen bei:</translation> - </message> - <message> <location filename="../../themesOptions.ui" line="147"/> <source> KB/s</source> <translation> KB/s</translation> diff --git a/plugins/Themes/Oxygen/Languages/el/translation.ts b/plugins/Themes/Oxygen/Languages/el/translation.ts index ae86b54..483e140 100644 --- a/plugins/Themes/Oxygen/Languages/el/translation.ts +++ b/plugins/Themes/Oxygen/Languages/el/translation.ts @@ -4,56 +4,62 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="240"/> + <location filename="../../interface.cpp" line="298"/> + <location filename="../../interface.cpp" line="309"/> + <source>%1 is deprecated, Use %2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../interface.cpp" line="311"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="310"/> + <location filename="../../interface.cpp" line="396"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="524"/> + <location filename="../../interface.cpp" line="630"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="526"/> + <location filename="../../interface.cpp" line="632"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="947"/> + <location filename="../../interface.cpp" line="1053"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="948"/> + <location filename="../../interface.cpp" line="1054"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="949"/> + <location filename="../../interface.cpp" line="1055"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="951"/> + <location filename="../../interface.cpp" line="1057"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1134"/> - <location filename="../../interface.cpp" line="1146"/> - <location filename="../../interface.cpp" line="1158"/> + <location filename="../../interface.cpp" line="1244"/> + <location filename="../../interface.cpp" line="1256"/> + <location filename="../../interface.cpp" line="1268"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1233"/> - <location filename="../../interface.cpp" line="1237"/> - <location filename="../../interface.cpp" line="1239"/> + <location filename="../../interface.cpp" line="1343"/> + <location filename="../../interface.cpp" line="1347"/> + <location filename="../../interface.cpp" line="1349"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -61,24 +67,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="223"/> + <location filename="../../ThemesFactory.cpp" line="224"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="224"/> + <location filename="../../ThemesFactory.cpp" line="225"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="225"/> + <location filename="../../ThemesFactory.cpp" line="226"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="421"/> - <location filename="../../ThemesFactory.cpp" line="436"/> - <location filename="../../ThemesFactory.cpp" line="451"/> + <location filename="../../ThemesFactory.cpp" line="422"/> + <location filename="../../ThemesFactory.cpp" line="437"/> + <location filename="../../ThemesFactory.cpp" line="452"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/Themes/Oxygen/Languages/en/translation.ts b/plugins/Themes/Oxygen/Languages/en/translation.ts index 717ea08..6cbd884 100644 --- a/plugins/Themes/Oxygen/Languages/en/translation.ts +++ b/plugins/Themes/Oxygen/Languages/en/translation.ts @@ -4,56 +4,62 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="240"/> + <location filename="../../interface.cpp" line="298"/> + <location filename="../../interface.cpp" line="309"/> + <source>%1 is deprecated, Use %2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../interface.cpp" line="311"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="310"/> + <location filename="../../interface.cpp" line="396"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="524"/> + <location filename="../../interface.cpp" line="630"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="526"/> + <location filename="../../interface.cpp" line="632"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="947"/> + <location filename="../../interface.cpp" line="1053"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="948"/> + <location filename="../../interface.cpp" line="1054"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="949"/> + <location filename="../../interface.cpp" line="1055"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="951"/> + <location filename="../../interface.cpp" line="1057"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1134"/> - <location filename="../../interface.cpp" line="1146"/> - <location filename="../../interface.cpp" line="1158"/> + <location filename="../../interface.cpp" line="1244"/> + <location filename="../../interface.cpp" line="1256"/> + <location filename="../../interface.cpp" line="1268"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1233"/> - <location filename="../../interface.cpp" line="1237"/> - <location filename="../../interface.cpp" line="1239"/> + <location filename="../../interface.cpp" line="1343"/> + <location filename="../../interface.cpp" line="1347"/> + <location filename="../../interface.cpp" line="1349"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -61,24 +67,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="223"/> + <location filename="../../ThemesFactory.cpp" line="224"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="224"/> + <location filename="../../ThemesFactory.cpp" line="225"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="225"/> + <location filename="../../ThemesFactory.cpp" line="226"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="421"/> - <location filename="../../ThemesFactory.cpp" line="436"/> - <location filename="../../ThemesFactory.cpp" line="451"/> + <location filename="../../ThemesFactory.cpp" line="422"/> + <location filename="../../ThemesFactory.cpp" line="437"/> + <location filename="../../ThemesFactory.cpp" line="452"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/Themes/Oxygen/Languages/es/translation.ts b/plugins/Themes/Oxygen/Languages/es/translation.ts index a6ded18..46b67a9 100644 --- a/plugins/Themes/Oxygen/Languages/es/translation.ts +++ b/plugins/Themes/Oxygen/Languages/es/translation.ts @@ -4,56 +4,62 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="240"/> + <location filename="../../interface.cpp" line="298"/> + <location filename="../../interface.cpp" line="309"/> + <source>%1 is deprecated, Use %2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../interface.cpp" line="311"/> <source>Buy the Ultimate version to fund development</source> <translation>Comprar la versión Ultimate para financiar el desarrollo</translation> </message> <message> - <location filename="../../interface.cpp" line="310"/> + <location filename="../../interface.cpp" line="396"/> <source>File %1/%2, size: %3/%4</source> <translation>El archivo %1/%2, el tamaño: %3/%4</translation> </message> <message> - <location filename="../../interface.cpp" line="524"/> + <location filename="../../interface.cpp" line="630"/> <source>Copy list</source> <translation>Lista de copia</translation> </message> <message> - <location filename="../../interface.cpp" line="526"/> + <location filename="../../interface.cpp" line="632"/> <source>Move list</source> <translation>Lista de movimiento</translation> </message> <message> - <location filename="../../interface.cpp" line="947"/> + <location filename="../../interface.cpp" line="1053"/> <source>Don't close if errors are found</source> <translation>No cierre si se encuentran errores</translation> </message> <message> - <location filename="../../interface.cpp" line="948"/> + <location filename="../../interface.cpp" line="1054"/> <source>Never close</source> <translation>Nunca cierre</translation> </message> <message> - <location filename="../../interface.cpp" line="949"/> + <location filename="../../interface.cpp" line="1055"/> <source>Always close</source> <translation>Siempre cerrar</translation> </message> <message> - <location filename="../../interface.cpp" line="951"/> + <location filename="../../interface.cpp" line="1057"/> <source>File Name, 0KB</source> <translation>Nombre de archivo, 0KB</translation> </message> <message> - <location filename="../../interface.cpp" line="1134"/> - <location filename="../../interface.cpp" line="1146"/> - <location filename="../../interface.cpp" line="1158"/> + <location filename="../../interface.cpp" line="1244"/> + <location filename="../../interface.cpp" line="1256"/> + <location filename="../../interface.cpp" line="1268"/> <source>Select a color</source> <translation>Seleccione un color</translation> </message> <message> - <location filename="../../interface.cpp" line="1233"/> - <location filename="../../interface.cpp" line="1237"/> - <location filename="../../interface.cpp" line="1239"/> + <location filename="../../interface.cpp" line="1343"/> + <location filename="../../interface.cpp" line="1347"/> + <location filename="../../interface.cpp" line="1349"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -61,24 +67,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="223"/> + <location filename="../../ThemesFactory.cpp" line="224"/> <source>Don't close if errors are found</source> <translation>No cierre si se encuentran errores</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="224"/> + <location filename="../../ThemesFactory.cpp" line="225"/> <source>Never close</source> <translation>Nunca cierre</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="225"/> + <location filename="../../ThemesFactory.cpp" line="226"/> <source>Always close</source> <translation>Siempre cerrar</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="421"/> - <location filename="../../ThemesFactory.cpp" line="436"/> - <location filename="../../ThemesFactory.cpp" line="451"/> + <location filename="../../ThemesFactory.cpp" line="422"/> + <location filename="../../ThemesFactory.cpp" line="437"/> + <location filename="../../ThemesFactory.cpp" line="452"/> <source>Select a color</source> <translation>Seleccione un color</translation> </message> @@ -96,10 +102,6 @@ <translation>Para:</translation> </message> <message> - <source>Close at the end of the transfers</source> - <translation type="obsolete">Cerca al final de las transferencias</translation> - </message> - <message> <location filename="../../interface.ui" line="226"/> <source>&More</source> <translation>&Más</translation> @@ -120,10 +122,6 @@ <translation>&Cancelar</translation> </message> <message> - <source>Limit copy speed at:</source> - <translation type="obsolete">Limitar la velocidad de copia en:</translation> - </message> - <message> <location filename="../../interface.ui" line="118"/> <source>Close on transfer completion</source> <translation>Cerca de finalización de transferencia</translation> @@ -299,14 +297,6 @@ <translation>Haga clic para editar el color</translation> </message> <message> - <source>At the end of the copy: </source> - <translation type="obsolete">Al final de la copia: </translation> - </message> - <message> - <source>Limit copy speed at:</source> - <translation type="obsolete">Limitar la velocidad de copia en:</translation> - </message> - <message> <location filename="../../themesOptions.ui" line="147"/> <source> KB/s</source> <translation> KB/s</translation> diff --git a/plugins/Themes/Oxygen/Languages/fr/translation.ts b/plugins/Themes/Oxygen/Languages/fr/translation.ts index 628347d..9a89964 100644 --- a/plugins/Themes/Oxygen/Languages/fr/translation.ts +++ b/plugins/Themes/Oxygen/Languages/fr/translation.ts @@ -4,17 +4,23 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="+240"/> + <location filename="../../interface.cpp" line="+298"/> + <location line="+11"/> + <source>%1 is deprecated, Use %2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> <source>Buy the Ultimate version to fund development</source> <translation>Achetez la version Ultimate pour financer le développement</translation> </message> <message> - <location line="+70"/> + <location line="+85"/> <source>File %1/%2, size: %3/%4</source> <translation>Fichier %1/%2, taille: %3/%4</translation> </message> <message> - <location line="+214"/> + <location line="+234"/> <source>Copy list</source> <translation>Liste de copies</translation> </message> @@ -44,7 +50,7 @@ <translation>Nom de fichier, 0Ko</translation> </message> <message> - <location line="+183"/> + <location line="+187"/> <location line="+12"/> <location line="+12"/> <source>Select a color</source> @@ -61,7 +67,7 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="+223"/> + <location filename="../../ThemesFactory.cpp" line="+224"/> <source>Don't close if errors are found</source> <translation>Garder ouvert s'il y a des erreurs</translation> </message> @@ -96,10 +102,6 @@ <translation>Vers:</translation> </message> <message> - <source>Close at the end of the transfers</source> - <translation type="obsolete">Fermer à la fin des transferts</translation> - </message> - <message> <location line="+161"/> <source>&More</source> <translation>Pl&us</translation> @@ -120,10 +122,6 @@ <translation>&Annuler</translation> </message> <message> - <source>Limit copy speed at:</source> - <translation type="obsolete">Limiter la vitesse de copie à:</translation> - </message> - <message> <location line="-153"/> <source>Close on transfer completion</source> <translation>Fermer à la fin des transferts</translation> @@ -299,18 +297,6 @@ <translation>Cliquer pour éditer la couleur</translation> </message> <message> - <source>At the end of the copy: </source> - <translation type="obsolete">À la fin de la copie:</translation> - </message> - <message> - <source>Limit copy speed at:</source> - <translation type="obsolete">Limiter la vitesse de copie à:</translation> - </message> - <message> - <source>Limit copy speed to:</source> - <translation type="obsolete">Limiter la vitesse de copie à:</translation> - </message> - <message> <location line="-145"/> <source> KB/s</source> <translation> Ko/s</translation> diff --git a/plugins/Themes/Oxygen/Languages/hi/translation.ts b/plugins/Themes/Oxygen/Languages/hi/translation.ts index ae86b54..483e140 100644 --- a/plugins/Themes/Oxygen/Languages/hi/translation.ts +++ b/plugins/Themes/Oxygen/Languages/hi/translation.ts @@ -4,56 +4,62 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="240"/> + <location filename="../../interface.cpp" line="298"/> + <location filename="../../interface.cpp" line="309"/> + <source>%1 is deprecated, Use %2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../interface.cpp" line="311"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="310"/> + <location filename="../../interface.cpp" line="396"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="524"/> + <location filename="../../interface.cpp" line="630"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="526"/> + <location filename="../../interface.cpp" line="632"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="947"/> + <location filename="../../interface.cpp" line="1053"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="948"/> + <location filename="../../interface.cpp" line="1054"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="949"/> + <location filename="../../interface.cpp" line="1055"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="951"/> + <location filename="../../interface.cpp" line="1057"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1134"/> - <location filename="../../interface.cpp" line="1146"/> - <location filename="../../interface.cpp" line="1158"/> + <location filename="../../interface.cpp" line="1244"/> + <location filename="../../interface.cpp" line="1256"/> + <location filename="../../interface.cpp" line="1268"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1233"/> - <location filename="../../interface.cpp" line="1237"/> - <location filename="../../interface.cpp" line="1239"/> + <location filename="../../interface.cpp" line="1343"/> + <location filename="../../interface.cpp" line="1347"/> + <location filename="../../interface.cpp" line="1349"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -61,24 +67,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="223"/> + <location filename="../../ThemesFactory.cpp" line="224"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="224"/> + <location filename="../../ThemesFactory.cpp" line="225"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="225"/> + <location filename="../../ThemesFactory.cpp" line="226"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="421"/> - <location filename="../../ThemesFactory.cpp" line="436"/> - <location filename="../../ThemesFactory.cpp" line="451"/> + <location filename="../../ThemesFactory.cpp" line="422"/> + <location filename="../../ThemesFactory.cpp" line="437"/> + <location filename="../../ThemesFactory.cpp" line="452"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/Themes/Oxygen/Languages/hu/translation.ts b/plugins/Themes/Oxygen/Languages/hu/translation.ts index ce37a23..ecf3eb5 100644 --- a/plugins/Themes/Oxygen/Languages/hu/translation.ts +++ b/plugins/Themes/Oxygen/Languages/hu/translation.ts @@ -4,56 +4,62 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="240"/> + <location filename="../../interface.cpp" line="298"/> + <location filename="../../interface.cpp" line="309"/> + <source>%1 is deprecated, Use %2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../interface.cpp" line="311"/> <source>Buy the Ultimate version to fund development</source> <translation>Vásárold meg az Ultimate verziót a fejlesztés támogatásához</translation> </message> <message> - <location filename="../../interface.cpp" line="310"/> + <location filename="../../interface.cpp" line="396"/> <source>File %1/%2, size: %3/%4</source> <translation>Fájl %1/%2, méret: %3/%4</translation> </message> <message> - <location filename="../../interface.cpp" line="524"/> + <location filename="../../interface.cpp" line="630"/> <source>Copy list</source> <translation>Lista másolása</translation> </message> <message> - <location filename="../../interface.cpp" line="526"/> + <location filename="../../interface.cpp" line="632"/> <source>Move list</source> <translation>Lista mozgatása</translation> </message> <message> - <location filename="../../interface.cpp" line="947"/> + <location filename="../../interface.cpp" line="1053"/> <source>Don't close if errors are found</source> <translation>Ne zárja be, ha hiba történik</translation> </message> <message> - <location filename="../../interface.cpp" line="948"/> + <location filename="../../interface.cpp" line="1054"/> <source>Never close</source> <translation>Sose zárja be</translation> </message> <message> - <location filename="../../interface.cpp" line="949"/> + <location filename="../../interface.cpp" line="1055"/> <source>Always close</source> <translation>Mindig zárja be</translation> </message> <message> - <location filename="../../interface.cpp" line="951"/> + <location filename="../../interface.cpp" line="1057"/> <source>File Name, 0KB</source> <translation>Fájlnév, 0KB</translation> </message> <message> - <location filename="../../interface.cpp" line="1134"/> - <location filename="../../interface.cpp" line="1146"/> - <location filename="../../interface.cpp" line="1158"/> + <location filename="../../interface.cpp" line="1244"/> + <location filename="../../interface.cpp" line="1256"/> + <location filename="../../interface.cpp" line="1268"/> <source>Select a color</source> <translation>Válassz egy színt</translation> </message> <message> - <location filename="../../interface.cpp" line="1233"/> - <location filename="../../interface.cpp" line="1237"/> - <location filename="../../interface.cpp" line="1239"/> + <location filename="../../interface.cpp" line="1343"/> + <location filename="../../interface.cpp" line="1347"/> + <location filename="../../interface.cpp" line="1349"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -61,24 +67,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="223"/> + <location filename="../../ThemesFactory.cpp" line="224"/> <source>Don't close if errors are found</source> <translation>Ne zárja be, ha hiba történik</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="224"/> + <location filename="../../ThemesFactory.cpp" line="225"/> <source>Never close</source> <translation>Sose zárja be</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="225"/> + <location filename="../../ThemesFactory.cpp" line="226"/> <source>Always close</source> <translation>Mindig zárja be</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="421"/> - <location filename="../../ThemesFactory.cpp" line="436"/> - <location filename="../../ThemesFactory.cpp" line="451"/> + <location filename="../../ThemesFactory.cpp" line="422"/> + <location filename="../../ThemesFactory.cpp" line="437"/> + <location filename="../../ThemesFactory.cpp" line="452"/> <source>Select a color</source> <translation>Válassz egy színt</translation> </message> diff --git a/plugins/Themes/Oxygen/Languages/id/translation.ts b/plugins/Themes/Oxygen/Languages/id/translation.ts index ae86b54..483e140 100644 --- a/plugins/Themes/Oxygen/Languages/id/translation.ts +++ b/plugins/Themes/Oxygen/Languages/id/translation.ts @@ -4,56 +4,62 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="240"/> + <location filename="../../interface.cpp" line="298"/> + <location filename="../../interface.cpp" line="309"/> + <source>%1 is deprecated, Use %2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../interface.cpp" line="311"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="310"/> + <location filename="../../interface.cpp" line="396"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="524"/> + <location filename="../../interface.cpp" line="630"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="526"/> + <location filename="../../interface.cpp" line="632"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="947"/> + <location filename="../../interface.cpp" line="1053"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="948"/> + <location filename="../../interface.cpp" line="1054"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="949"/> + <location filename="../../interface.cpp" line="1055"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="951"/> + <location filename="../../interface.cpp" line="1057"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1134"/> - <location filename="../../interface.cpp" line="1146"/> - <location filename="../../interface.cpp" line="1158"/> + <location filename="../../interface.cpp" line="1244"/> + <location filename="../../interface.cpp" line="1256"/> + <location filename="../../interface.cpp" line="1268"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1233"/> - <location filename="../../interface.cpp" line="1237"/> - <location filename="../../interface.cpp" line="1239"/> + <location filename="../../interface.cpp" line="1343"/> + <location filename="../../interface.cpp" line="1347"/> + <location filename="../../interface.cpp" line="1349"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -61,24 +67,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="223"/> + <location filename="../../ThemesFactory.cpp" line="224"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="224"/> + <location filename="../../ThemesFactory.cpp" line="225"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="225"/> + <location filename="../../ThemesFactory.cpp" line="226"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="421"/> - <location filename="../../ThemesFactory.cpp" line="436"/> - <location filename="../../ThemesFactory.cpp" line="451"/> + <location filename="../../ThemesFactory.cpp" line="422"/> + <location filename="../../ThemesFactory.cpp" line="437"/> + <location filename="../../ThemesFactory.cpp" line="452"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/Themes/Oxygen/Languages/it/translation.ts b/plugins/Themes/Oxygen/Languages/it/translation.ts index d9e20f0..5ca6a07 100644 --- a/plugins/Themes/Oxygen/Languages/it/translation.ts +++ b/plugins/Themes/Oxygen/Languages/it/translation.ts @@ -4,56 +4,62 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="240"/> + <location filename="../../interface.cpp" line="298"/> + <location filename="../../interface.cpp" line="309"/> + <source>%1 is deprecated, Use %2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../interface.cpp" line="311"/> <source>Buy the Ultimate version to fund development</source> <translation>Acquista la versione Ultimate per finanziare lo sviluppo del programma</translation> </message> <message> - <location filename="../../interface.cpp" line="310"/> + <location filename="../../interface.cpp" line="396"/> <source>File %1/%2, size: %3/%4</source> <translation>File %1/%2, dimensione: %3/%4</translation> </message> <message> - <location filename="../../interface.cpp" line="524"/> + <location filename="../../interface.cpp" line="630"/> <source>Copy list</source> <translation>Lista della copia</translation> </message> <message> - <location filename="../../interface.cpp" line="526"/> + <location filename="../../interface.cpp" line="632"/> <source>Move list</source> <translation>Lista dello spostamento</translation> </message> <message> - <location filename="../../interface.cpp" line="947"/> + <location filename="../../interface.cpp" line="1053"/> <source>Don't close if errors are found</source> <translation>Non chiudere se vengono rilevati errori</translation> </message> <message> - <location filename="../../interface.cpp" line="948"/> + <location filename="../../interface.cpp" line="1054"/> <source>Never close</source> <translation>Non chiudere mai</translation> </message> <message> - <location filename="../../interface.cpp" line="949"/> + <location filename="../../interface.cpp" line="1055"/> <source>Always close</source> <translation>Chiudere sempre</translation> </message> <message> - <location filename="../../interface.cpp" line="951"/> + <location filename="../../interface.cpp" line="1057"/> <source>File Name, 0KB</source> <translation>Nome del file, 0KB</translation> </message> <message> - <location filename="../../interface.cpp" line="1134"/> - <location filename="../../interface.cpp" line="1146"/> - <location filename="../../interface.cpp" line="1158"/> + <location filename="../../interface.cpp" line="1244"/> + <location filename="../../interface.cpp" line="1256"/> + <location filename="../../interface.cpp" line="1268"/> <source>Select a color</source> <translation>Scegliere un colore</translation> </message> <message> - <location filename="../../interface.cpp" line="1233"/> - <location filename="../../interface.cpp" line="1237"/> - <location filename="../../interface.cpp" line="1239"/> + <location filename="../../interface.cpp" line="1343"/> + <location filename="../../interface.cpp" line="1347"/> + <location filename="../../interface.cpp" line="1349"/> <source>%1 %2% of %3</source> <translation>%1 %2% di %3</translation> </message> @@ -61,24 +67,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="223"/> + <location filename="../../ThemesFactory.cpp" line="224"/> <source>Don't close if errors are found</source> <translation>Non chiudere se vengono rilevati errori</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="224"/> + <location filename="../../ThemesFactory.cpp" line="225"/> <source>Never close</source> <translation>Non chiudere mai</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="225"/> + <location filename="../../ThemesFactory.cpp" line="226"/> <source>Always close</source> <translation>Chiudere sempre</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="421"/> - <location filename="../../ThemesFactory.cpp" line="436"/> - <location filename="../../ThemesFactory.cpp" line="451"/> + <location filename="../../ThemesFactory.cpp" line="422"/> + <location filename="../../ThemesFactory.cpp" line="437"/> + <location filename="../../ThemesFactory.cpp" line="452"/> <source>Select a color</source> <translation>Scegliere un colore</translation> </message> @@ -96,10 +102,6 @@ <translation>a:</translation> </message> <message> - <source>Close at the end of the transfers</source> - <translation type="obsolete">Chiudi alla fine dei trasferimenti</translation> - </message> - <message> <location filename="../../interface.ui" line="226"/> <source>&More</source> <translation>Altr&o</translation> @@ -120,10 +122,6 @@ <translation>&Annulla</translation> </message> <message> - <source>Limit copy speed at:</source> - <translation type="obsolete">Ridurre la velocità di copia a:</translation> - </message> - <message> <location filename="../../interface.ui" line="118"/> <source>Close on transfer completion</source> <translation>Arresta il sistema a trasferimento comletato</translation> @@ -299,14 +297,6 @@ <translation>Clicca per modificare il colore</translation> </message> <message> - <source>At the end of the copy: </source> - <translation type="obsolete">Alla fine della copia: </translation> - </message> - <message> - <source>Limit copy speed at:</source> - <translation type="obsolete">Ridurre la velocità di copia a:</translation> - </message> - <message> <location filename="../../themesOptions.ui" line="147"/> <source> KB/s</source> <translation> KB/s</translation> diff --git a/plugins/Themes/Oxygen/Languages/ja/translation.ts b/plugins/Themes/Oxygen/Languages/ja/translation.ts index 1ee75a9..facdce1 100644 --- a/plugins/Themes/Oxygen/Languages/ja/translation.ts +++ b/plugins/Themes/Oxygen/Languages/ja/translation.ts @@ -4,56 +4,62 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="240"/> + <location filename="../../interface.cpp" line="298"/> + <location filename="../../interface.cpp" line="309"/> + <source>%1 is deprecated, Use %2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../interface.cpp" line="311"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="310"/> + <location filename="../../interface.cpp" line="396"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="524"/> + <location filename="../../interface.cpp" line="630"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="526"/> + <location filename="../../interface.cpp" line="632"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="947"/> + <location filename="../../interface.cpp" line="1053"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="948"/> + <location filename="../../interface.cpp" line="1054"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="949"/> + <location filename="../../interface.cpp" line="1055"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="951"/> + <location filename="../../interface.cpp" line="1057"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1134"/> - <location filename="../../interface.cpp" line="1146"/> - <location filename="../../interface.cpp" line="1158"/> + <location filename="../../interface.cpp" line="1244"/> + <location filename="../../interface.cpp" line="1256"/> + <location filename="../../interface.cpp" line="1268"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1233"/> - <location filename="../../interface.cpp" line="1237"/> - <location filename="../../interface.cpp" line="1239"/> + <location filename="../../interface.cpp" line="1343"/> + <location filename="../../interface.cpp" line="1347"/> + <location filename="../../interface.cpp" line="1349"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -61,24 +67,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="223"/> + <location filename="../../ThemesFactory.cpp" line="224"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="224"/> + <location filename="../../ThemesFactory.cpp" line="225"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="225"/> + <location filename="../../ThemesFactory.cpp" line="226"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="421"/> - <location filename="../../ThemesFactory.cpp" line="436"/> - <location filename="../../ThemesFactory.cpp" line="451"/> + <location filename="../../ThemesFactory.cpp" line="422"/> + <location filename="../../ThemesFactory.cpp" line="437"/> + <location filename="../../ThemesFactory.cpp" line="452"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/Themes/Oxygen/Languages/ko/translation.ts b/plugins/Themes/Oxygen/Languages/ko/translation.ts index 2d9b2f8..86a2b04 100644 --- a/plugins/Themes/Oxygen/Languages/ko/translation.ts +++ b/plugins/Themes/Oxygen/Languages/ko/translation.ts @@ -4,17 +4,23 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="+240"/> + <location filename="../../interface.cpp" line="+298"/> + <location line="+11"/> + <source>%1 is deprecated, Use %2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location line="+70"/> + <location line="+85"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished">파일 %1/%2, 크기: %3/%4</translation> </message> <message> - <location line="+214"/> + <location line="+234"/> <source>Copy list</source> <translation type="unfinished">복사 목록</translation> </message> @@ -44,7 +50,7 @@ <translation type="unfinished">파일명, 0KB</translation> </message> <message> - <location line="+183"/> + <location line="+187"/> <location line="+12"/> <location line="+12"/> <source>Select a color</source> @@ -61,7 +67,7 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="+223"/> + <location filename="../../ThemesFactory.cpp" line="+224"/> <source>Don't close if errors are found</source> <translation type="unfinished">오류 발견시 종료 안함</translation> </message> @@ -116,10 +122,6 @@ <translation type="unfinished">&취소</translation> </message> <message> - <source>Limit copy speed at:</source> - <translation type="obsolete">복사 속도 제한:</translation> - </message> - <message> <location line="+58"/> <source>Transfer list</source> <translation type="unfinished"></translation> @@ -295,14 +297,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>At the end of the copy: </source> - <translation type="obsolete">복사 종료시:</translation> - </message> - <message> - <source>Limit copy speed at:</source> - <translation type="obsolete">복사 속도 제한:</translation> - </message> - <message> <location line="-145"/> <source> KB/s</source> <translation type="unfinished"> KB/초</translation> diff --git a/plugins/Themes/Oxygen/Languages/nl/translation.ts b/plugins/Themes/Oxygen/Languages/nl/translation.ts index ae86b54..483e140 100644 --- a/plugins/Themes/Oxygen/Languages/nl/translation.ts +++ b/plugins/Themes/Oxygen/Languages/nl/translation.ts @@ -4,56 +4,62 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="240"/> + <location filename="../../interface.cpp" line="298"/> + <location filename="../../interface.cpp" line="309"/> + <source>%1 is deprecated, Use %2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../interface.cpp" line="311"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="310"/> + <location filename="../../interface.cpp" line="396"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="524"/> + <location filename="../../interface.cpp" line="630"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="526"/> + <location filename="../../interface.cpp" line="632"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="947"/> + <location filename="../../interface.cpp" line="1053"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="948"/> + <location filename="../../interface.cpp" line="1054"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="949"/> + <location filename="../../interface.cpp" line="1055"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="951"/> + <location filename="../../interface.cpp" line="1057"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1134"/> - <location filename="../../interface.cpp" line="1146"/> - <location filename="../../interface.cpp" line="1158"/> + <location filename="../../interface.cpp" line="1244"/> + <location filename="../../interface.cpp" line="1256"/> + <location filename="../../interface.cpp" line="1268"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1233"/> - <location filename="../../interface.cpp" line="1237"/> - <location filename="../../interface.cpp" line="1239"/> + <location filename="../../interface.cpp" line="1343"/> + <location filename="../../interface.cpp" line="1347"/> + <location filename="../../interface.cpp" line="1349"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -61,24 +67,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="223"/> + <location filename="../../ThemesFactory.cpp" line="224"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="224"/> + <location filename="../../ThemesFactory.cpp" line="225"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="225"/> + <location filename="../../ThemesFactory.cpp" line="226"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="421"/> - <location filename="../../ThemesFactory.cpp" line="436"/> - <location filename="../../ThemesFactory.cpp" line="451"/> + <location filename="../../ThemesFactory.cpp" line="422"/> + <location filename="../../ThemesFactory.cpp" line="437"/> + <location filename="../../ThemesFactory.cpp" line="452"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/Themes/Oxygen/Languages/no/translation.ts b/plugins/Themes/Oxygen/Languages/no/translation.ts index ae86b54..483e140 100644 --- a/plugins/Themes/Oxygen/Languages/no/translation.ts +++ b/plugins/Themes/Oxygen/Languages/no/translation.ts @@ -4,56 +4,62 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="240"/> + <location filename="../../interface.cpp" line="298"/> + <location filename="../../interface.cpp" line="309"/> + <source>%1 is deprecated, Use %2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../interface.cpp" line="311"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="310"/> + <location filename="../../interface.cpp" line="396"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="524"/> + <location filename="../../interface.cpp" line="630"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="526"/> + <location filename="../../interface.cpp" line="632"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="947"/> + <location filename="../../interface.cpp" line="1053"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="948"/> + <location filename="../../interface.cpp" line="1054"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="949"/> + <location filename="../../interface.cpp" line="1055"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="951"/> + <location filename="../../interface.cpp" line="1057"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1134"/> - <location filename="../../interface.cpp" line="1146"/> - <location filename="../../interface.cpp" line="1158"/> + <location filename="../../interface.cpp" line="1244"/> + <location filename="../../interface.cpp" line="1256"/> + <location filename="../../interface.cpp" line="1268"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1233"/> - <location filename="../../interface.cpp" line="1237"/> - <location filename="../../interface.cpp" line="1239"/> + <location filename="../../interface.cpp" line="1343"/> + <location filename="../../interface.cpp" line="1347"/> + <location filename="../../interface.cpp" line="1349"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -61,24 +67,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="223"/> + <location filename="../../ThemesFactory.cpp" line="224"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="224"/> + <location filename="../../ThemesFactory.cpp" line="225"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="225"/> + <location filename="../../ThemesFactory.cpp" line="226"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="421"/> - <location filename="../../ThemesFactory.cpp" line="436"/> - <location filename="../../ThemesFactory.cpp" line="451"/> + <location filename="../../ThemesFactory.cpp" line="422"/> + <location filename="../../ThemesFactory.cpp" line="437"/> + <location filename="../../ThemesFactory.cpp" line="452"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/Themes/Oxygen/Languages/pl/translation.ts b/plugins/Themes/Oxygen/Languages/pl/translation.ts index ae86b54..483e140 100644 --- a/plugins/Themes/Oxygen/Languages/pl/translation.ts +++ b/plugins/Themes/Oxygen/Languages/pl/translation.ts @@ -4,56 +4,62 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="240"/> + <location filename="../../interface.cpp" line="298"/> + <location filename="../../interface.cpp" line="309"/> + <source>%1 is deprecated, Use %2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../interface.cpp" line="311"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="310"/> + <location filename="../../interface.cpp" line="396"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="524"/> + <location filename="../../interface.cpp" line="630"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="526"/> + <location filename="../../interface.cpp" line="632"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="947"/> + <location filename="../../interface.cpp" line="1053"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="948"/> + <location filename="../../interface.cpp" line="1054"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="949"/> + <location filename="../../interface.cpp" line="1055"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="951"/> + <location filename="../../interface.cpp" line="1057"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1134"/> - <location filename="../../interface.cpp" line="1146"/> - <location filename="../../interface.cpp" line="1158"/> + <location filename="../../interface.cpp" line="1244"/> + <location filename="../../interface.cpp" line="1256"/> + <location filename="../../interface.cpp" line="1268"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1233"/> - <location filename="../../interface.cpp" line="1237"/> - <location filename="../../interface.cpp" line="1239"/> + <location filename="../../interface.cpp" line="1343"/> + <location filename="../../interface.cpp" line="1347"/> + <location filename="../../interface.cpp" line="1349"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -61,24 +67,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="223"/> + <location filename="../../ThemesFactory.cpp" line="224"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="224"/> + <location filename="../../ThemesFactory.cpp" line="225"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="225"/> + <location filename="../../ThemesFactory.cpp" line="226"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="421"/> - <location filename="../../ThemesFactory.cpp" line="436"/> - <location filename="../../ThemesFactory.cpp" line="451"/> + <location filename="../../ThemesFactory.cpp" line="422"/> + <location filename="../../ThemesFactory.cpp" line="437"/> + <location filename="../../ThemesFactory.cpp" line="452"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/Themes/Oxygen/Languages/pt/translation.ts b/plugins/Themes/Oxygen/Languages/pt/translation.ts index ae86b54..483e140 100644 --- a/plugins/Themes/Oxygen/Languages/pt/translation.ts +++ b/plugins/Themes/Oxygen/Languages/pt/translation.ts @@ -4,56 +4,62 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="240"/> + <location filename="../../interface.cpp" line="298"/> + <location filename="../../interface.cpp" line="309"/> + <source>%1 is deprecated, Use %2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../interface.cpp" line="311"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="310"/> + <location filename="../../interface.cpp" line="396"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="524"/> + <location filename="../../interface.cpp" line="630"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="526"/> + <location filename="../../interface.cpp" line="632"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="947"/> + <location filename="../../interface.cpp" line="1053"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="948"/> + <location filename="../../interface.cpp" line="1054"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="949"/> + <location filename="../../interface.cpp" line="1055"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="951"/> + <location filename="../../interface.cpp" line="1057"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1134"/> - <location filename="../../interface.cpp" line="1146"/> - <location filename="../../interface.cpp" line="1158"/> + <location filename="../../interface.cpp" line="1244"/> + <location filename="../../interface.cpp" line="1256"/> + <location filename="../../interface.cpp" line="1268"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1233"/> - <location filename="../../interface.cpp" line="1237"/> - <location filename="../../interface.cpp" line="1239"/> + <location filename="../../interface.cpp" line="1343"/> + <location filename="../../interface.cpp" line="1347"/> + <location filename="../../interface.cpp" line="1349"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -61,24 +67,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="223"/> + <location filename="../../ThemesFactory.cpp" line="224"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="224"/> + <location filename="../../ThemesFactory.cpp" line="225"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="225"/> + <location filename="../../ThemesFactory.cpp" line="226"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="421"/> - <location filename="../../ThemesFactory.cpp" line="436"/> - <location filename="../../ThemesFactory.cpp" line="451"/> + <location filename="../../ThemesFactory.cpp" line="422"/> + <location filename="../../ThemesFactory.cpp" line="437"/> + <location filename="../../ThemesFactory.cpp" line="452"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/Themes/Oxygen/Languages/ru/translation.ts b/plugins/Themes/Oxygen/Languages/ru/translation.ts index 9ffa0a1..ac18a39 100644 --- a/plugins/Themes/Oxygen/Languages/ru/translation.ts +++ b/plugins/Themes/Oxygen/Languages/ru/translation.ts @@ -4,56 +4,62 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="240"/> + <location filename="../../interface.cpp" line="298"/> + <location filename="../../interface.cpp" line="309"/> + <source>%1 is deprecated, Use %2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../interface.cpp" line="311"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="310"/> + <location filename="../../interface.cpp" line="396"/> <source>File %1/%2, size: %3/%4</source> <translation>Файл %1/%2, размер: %3/%4</translation> </message> <message> - <location filename="../../interface.cpp" line="524"/> + <location filename="../../interface.cpp" line="630"/> <source>Copy list</source> <translation type="unfinished">Копировать список</translation> </message> <message> - <location filename="../../interface.cpp" line="526"/> + <location filename="../../interface.cpp" line="632"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="947"/> + <location filename="../../interface.cpp" line="1053"/> <source>Don't close if errors are found</source> <translation type="unfinished">Не закрывать, если найдены ошибки</translation> </message> <message> - <location filename="../../interface.cpp" line="948"/> + <location filename="../../interface.cpp" line="1054"/> <source>Never close</source> <translation type="unfinished">Никогда не закрывать</translation> </message> <message> - <location filename="../../interface.cpp" line="949"/> + <location filename="../../interface.cpp" line="1055"/> <source>Always close</source> <translation type="unfinished">Всегда закрывайте</translation> </message> <message> - <location filename="../../interface.cpp" line="951"/> + <location filename="../../interface.cpp" line="1057"/> <source>File Name, 0KB</source> <translation>Имя файла, 0KB</translation> </message> <message> - <location filename="../../interface.cpp" line="1134"/> - <location filename="../../interface.cpp" line="1146"/> - <location filename="../../interface.cpp" line="1158"/> + <location filename="../../interface.cpp" line="1244"/> + <location filename="../../interface.cpp" line="1256"/> + <location filename="../../interface.cpp" line="1268"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1233"/> - <location filename="../../interface.cpp" line="1237"/> - <location filename="../../interface.cpp" line="1239"/> + <location filename="../../interface.cpp" line="1343"/> + <location filename="../../interface.cpp" line="1347"/> + <location filename="../../interface.cpp" line="1349"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -61,24 +67,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="223"/> + <location filename="../../ThemesFactory.cpp" line="224"/> <source>Don't close if errors are found</source> <translation type="unfinished">Не закрывать, если найдены ошибки</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="224"/> + <location filename="../../ThemesFactory.cpp" line="225"/> <source>Never close</source> <translation type="unfinished">Никогда не закрывать</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="225"/> + <location filename="../../ThemesFactory.cpp" line="226"/> <source>Always close</source> <translation type="unfinished">Всегда закрывайте</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="421"/> - <location filename="../../ThemesFactory.cpp" line="436"/> - <location filename="../../ThemesFactory.cpp" line="451"/> + <location filename="../../ThemesFactory.cpp" line="422"/> + <location filename="../../ThemesFactory.cpp" line="437"/> + <location filename="../../ThemesFactory.cpp" line="452"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -116,10 +122,6 @@ <translation>отменить</translation> </message> <message> - <source>Limit copy speed at:</source> - <translation type="obsolete">Предельная скорость копирования по адресу:</translation> - </message> - <message> <location filename="../../interface.ui" line="118"/> <source>Close on transfer completion</source> <translation type="unfinished"></translation> @@ -295,14 +297,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>At the end of the copy: </source> - <translation type="obsolete">В конце копии: </translation> - </message> - <message> - <source>Limit copy speed at:</source> - <translation type="obsolete">Предельная скорость копирования по адресу:</translation> - </message> - <message> <location filename="../../themesOptions.ui" line="147"/> <source> KB/s</source> <translation type="unfinished"> Кб/с</translation> diff --git a/plugins/Themes/Oxygen/Languages/th/translation.ts b/plugins/Themes/Oxygen/Languages/th/translation.ts index ae86b54..483e140 100644 --- a/plugins/Themes/Oxygen/Languages/th/translation.ts +++ b/plugins/Themes/Oxygen/Languages/th/translation.ts @@ -4,56 +4,62 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="240"/> + <location filename="../../interface.cpp" line="298"/> + <location filename="../../interface.cpp" line="309"/> + <source>%1 is deprecated, Use %2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../interface.cpp" line="311"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="310"/> + <location filename="../../interface.cpp" line="396"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="524"/> + <location filename="../../interface.cpp" line="630"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="526"/> + <location filename="../../interface.cpp" line="632"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="947"/> + <location filename="../../interface.cpp" line="1053"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="948"/> + <location filename="../../interface.cpp" line="1054"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="949"/> + <location filename="../../interface.cpp" line="1055"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="951"/> + <location filename="../../interface.cpp" line="1057"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1134"/> - <location filename="../../interface.cpp" line="1146"/> - <location filename="../../interface.cpp" line="1158"/> + <location filename="../../interface.cpp" line="1244"/> + <location filename="../../interface.cpp" line="1256"/> + <location filename="../../interface.cpp" line="1268"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1233"/> - <location filename="../../interface.cpp" line="1237"/> - <location filename="../../interface.cpp" line="1239"/> + <location filename="../../interface.cpp" line="1343"/> + <location filename="../../interface.cpp" line="1347"/> + <location filename="../../interface.cpp" line="1349"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -61,24 +67,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="223"/> + <location filename="../../ThemesFactory.cpp" line="224"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="224"/> + <location filename="../../ThemesFactory.cpp" line="225"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="225"/> + <location filename="../../ThemesFactory.cpp" line="226"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="421"/> - <location filename="../../ThemesFactory.cpp" line="436"/> - <location filename="../../ThemesFactory.cpp" line="451"/> + <location filename="../../ThemesFactory.cpp" line="422"/> + <location filename="../../ThemesFactory.cpp" line="437"/> + <location filename="../../ThemesFactory.cpp" line="452"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/Themes/Oxygen/Languages/tr/translation.ts b/plugins/Themes/Oxygen/Languages/tr/translation.ts index ae86b54..483e140 100644 --- a/plugins/Themes/Oxygen/Languages/tr/translation.ts +++ b/plugins/Themes/Oxygen/Languages/tr/translation.ts @@ -4,56 +4,62 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="240"/> + <location filename="../../interface.cpp" line="298"/> + <location filename="../../interface.cpp" line="309"/> + <source>%1 is deprecated, Use %2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../interface.cpp" line="311"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="310"/> + <location filename="../../interface.cpp" line="396"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="524"/> + <location filename="../../interface.cpp" line="630"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="526"/> + <location filename="../../interface.cpp" line="632"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="947"/> + <location filename="../../interface.cpp" line="1053"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="948"/> + <location filename="../../interface.cpp" line="1054"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="949"/> + <location filename="../../interface.cpp" line="1055"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="951"/> + <location filename="../../interface.cpp" line="1057"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1134"/> - <location filename="../../interface.cpp" line="1146"/> - <location filename="../../interface.cpp" line="1158"/> + <location filename="../../interface.cpp" line="1244"/> + <location filename="../../interface.cpp" line="1256"/> + <location filename="../../interface.cpp" line="1268"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1233"/> - <location filename="../../interface.cpp" line="1237"/> - <location filename="../../interface.cpp" line="1239"/> + <location filename="../../interface.cpp" line="1343"/> + <location filename="../../interface.cpp" line="1347"/> + <location filename="../../interface.cpp" line="1349"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -61,24 +67,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="223"/> + <location filename="../../ThemesFactory.cpp" line="224"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="224"/> + <location filename="../../ThemesFactory.cpp" line="225"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="225"/> + <location filename="../../ThemesFactory.cpp" line="226"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="421"/> - <location filename="../../ThemesFactory.cpp" line="436"/> - <location filename="../../ThemesFactory.cpp" line="451"/> + <location filename="../../ThemesFactory.cpp" line="422"/> + <location filename="../../ThemesFactory.cpp" line="437"/> + <location filename="../../ThemesFactory.cpp" line="452"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/Themes/Oxygen/Languages/zh/translation.ts b/plugins/Themes/Oxygen/Languages/zh/translation.ts index 1ee75a9..facdce1 100644 --- a/plugins/Themes/Oxygen/Languages/zh/translation.ts +++ b/plugins/Themes/Oxygen/Languages/zh/translation.ts @@ -4,56 +4,62 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="240"/> + <location filename="../../interface.cpp" line="298"/> + <location filename="../../interface.cpp" line="309"/> + <source>%1 is deprecated, Use %2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../interface.cpp" line="311"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="310"/> + <location filename="../../interface.cpp" line="396"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="524"/> + <location filename="../../interface.cpp" line="630"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="526"/> + <location filename="../../interface.cpp" line="632"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="947"/> + <location filename="../../interface.cpp" line="1053"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="948"/> + <location filename="../../interface.cpp" line="1054"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="949"/> + <location filename="../../interface.cpp" line="1055"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="951"/> + <location filename="../../interface.cpp" line="1057"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1134"/> - <location filename="../../interface.cpp" line="1146"/> - <location filename="../../interface.cpp" line="1158"/> + <location filename="../../interface.cpp" line="1244"/> + <location filename="../../interface.cpp" line="1256"/> + <location filename="../../interface.cpp" line="1268"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1233"/> - <location filename="../../interface.cpp" line="1237"/> - <location filename="../../interface.cpp" line="1239"/> + <location filename="../../interface.cpp" line="1343"/> + <location filename="../../interface.cpp" line="1347"/> + <location filename="../../interface.cpp" line="1349"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -61,24 +67,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="223"/> + <location filename="../../ThemesFactory.cpp" line="224"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="224"/> + <location filename="../../ThemesFactory.cpp" line="225"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="225"/> + <location filename="../../ThemesFactory.cpp" line="226"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="421"/> - <location filename="../../ThemesFactory.cpp" line="436"/> - <location filename="../../ThemesFactory.cpp" line="451"/> + <location filename="../../ThemesFactory.cpp" line="422"/> + <location filename="../../ThemesFactory.cpp" line="437"/> + <location filename="../../ThemesFactory.cpp" line="452"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/Themes/Oxygen/ThemesFactory.cpp b/plugins/Themes/Oxygen/ThemesFactory.cpp index 595ed71..28961f0 100644 --- a/plugins/Themes/Oxygen/ThemesFactory.cpp +++ b/plugins/Themes/Oxygen/ThemesFactory.cpp @@ -5,6 +5,7 @@ #include <QColorDialog> #include "ThemesFactory.h" +#include "../../../cpp11addition.h" ThemesFactory::ThemesFactory() { @@ -25,7 +26,7 @@ ThemesFactory::~ThemesFactory() PluginInterface_Themes * ThemesFactory::getInstance() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start, currentSpeed: %1").arg(currentSpeed)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start, currentSpeed: "+std::to_string(currentSpeed)); Themes * newInterface=new Themes( ui->alwaysOnTop->isChecked(), @@ -48,11 +49,11 @@ PluginInterface_Themes * ThemesFactory::getInstance() return newInterface; } -void ThemesFactory::setResources(OptionInterface * optionsEngine,const QString & +void ThemesFactory::setResources(OptionInterface * optionsEngine,const std::string & #ifdef ULTRACOPIER_PLUGIN_DEBUG writePath #endif - ,const QString & + ,const std::string & #ifdef ULTRACOPIER_PLUGIN_DEBUG pluginPath #endif @@ -65,20 +66,20 @@ void ThemesFactory::setResources(OptionInterface * optionsEngine,const QString & { this->optionsEngine=optionsEngine; //load the options - QList<QPair<QString, QVariant> > KeysList; - KeysList.append(qMakePair(QStringLiteral("checkBoxShowSpeed"),QVariant(false))); - KeysList.append(qMakePair(QStringLiteral("moreButtonPushed"),QVariant(false))); - KeysList.append(qMakePair(QStringLiteral("speedWithProgressBar"),QVariant(true))); - KeysList.append(qMakePair(QStringLiteral("currentSpeed"),QVariant(0))); - KeysList.append(qMakePair(QStringLiteral("comboBox_copyEnd"),QVariant(0))); - KeysList.append(qMakePair(QStringLiteral("showDualProgression"),QVariant(false))); - KeysList.append(qMakePair(QStringLiteral("showProgressionInTheTitle"),QVariant(true))); - KeysList.append(qMakePair(QStringLiteral("progressColorWrite"),QVariant(QApplication::palette().color(QPalette::Highlight)))); - KeysList.append(qMakePair(QStringLiteral("progressColorRead"),QVariant(QApplication::palette().color(QPalette::AlternateBase)))); - KeysList.append(qMakePair(QStringLiteral("progressColorRemaining"),QVariant(QApplication::palette().color(QPalette::Base)))); - KeysList.append(qMakePair(QStringLiteral("alwaysOnTop"),QVariant(false))); - KeysList.append(qMakePair(QStringLiteral("minimizeToSystray"),QVariant(false))); - KeysList.append(qMakePair(QStringLiteral("startMinimized"),QVariant(false))); + std::vector<std::pair<std::string, std::string> > KeysList; + KeysList.push_back(std::pair<std::string, std::string>("checkBoxShowSpeed","false")); + KeysList.push_back(std::pair<std::string, std::string>("moreButtonPushed","false")); + KeysList.push_back(std::pair<std::string, std::string>("speedWithProgressBar","true")); + KeysList.push_back(std::pair<std::string, std::string>("currentSpeed","0")); + KeysList.push_back(std::pair<std::string, std::string>("comboBox_copyEnd","0")); + KeysList.push_back(std::pair<std::string, std::string>("showDualProgression","false")); + KeysList.push_back(std::pair<std::string, std::string>("showProgressionInTheTitle","true")); + KeysList.push_back(std::pair<std::string, std::string>("progressColorWrite",QApplication::palette().color(QPalette::Highlight).name().toStdString())); + KeysList.push_back(std::pair<std::string, std::string>("progressColorRead",QApplication::palette().color(QPalette::AlternateBase).name().toStdString())); + KeysList.push_back(std::pair<std::string, std::string>("progressColorRemaining",QApplication::palette().color(QPalette::Base).name().toStdString())); + KeysList.push_back(std::pair<std::string, std::string>("alwaysOnTop","false")); + KeysList.push_back(std::pair<std::string, std::string>("minimizeToSystray","false")); + KeysList.push_back(std::pair<std::string, std::string>("startMinimized","false")); optionsEngine->addOptionGroup(KeysList); connect(optionsEngine,&OptionInterface::resetOptions,this,&ThemesFactory::resetOptions); updateSpeed(); @@ -95,22 +96,22 @@ QWidget * ThemesFactory::options() if(optionsEngine!=NULL) { bool ok; - currentSpeed=optionsEngine->getOptionValue(QStringLiteral("currentSpeed")).toUInt(&ok); + currentSpeed=stringtouint32(optionsEngine->getOptionValue("currentSpeed"),&ok); if(!ok) currentSpeed=0; - ui->comboBox_copyEnd->setCurrentIndex(optionsEngine->getOptionValue(QStringLiteral("comboBox_copyEnd")).toUInt()); - ui->speedWithProgressBar->setChecked(optionsEngine->getOptionValue(QStringLiteral("speedWithProgressBar")).toBool()); - ui->checkBoxShowSpeed->setChecked(optionsEngine->getOptionValue(QStringLiteral("checkBoxShowSpeed")).toBool()); - ui->checkBoxStartWithMoreButtonPushed->setChecked(optionsEngine->getOptionValue(QStringLiteral("moreButtonPushed")).toBool()); - ui->showDualProgression->setChecked(optionsEngine->getOptionValue(QStringLiteral("showDualProgression")).toBool()); - ui->showProgressionInTheTitle->setChecked(optionsEngine->getOptionValue(QStringLiteral("showProgressionInTheTitle")).toBool()); - ui->alwaysOnTop->setChecked(optionsEngine->getOptionValue(QStringLiteral("alwaysOnTop")).toBool()); - ui->minimizeToSystray->setChecked(optionsEngine->getOptionValue(QStringLiteral("minimizeToSystray")).toBool()); - ui->startMinimized->setChecked(optionsEngine->getOptionValue(QStringLiteral("startMinimized")).toBool()); - - progressColorWrite=optionsEngine->getOptionValue(QStringLiteral("progressColorWrite")).value<QColor>(); - progressColorRead=optionsEngine->getOptionValue(QStringLiteral("progressColorRead")).value<QColor>(); - progressColorRemaining=optionsEngine->getOptionValue(QStringLiteral("progressColorRemaining")).value<QColor>(); + ui->comboBox_copyEnd->setCurrentIndex(stringtouint32(optionsEngine->getOptionValue("comboBox_copyEnd"))); + ui->speedWithProgressBar->setChecked(stringtobool(optionsEngine->getOptionValue("speedWithProgressBar"))); + ui->checkBoxShowSpeed->setChecked(stringtobool(optionsEngine->getOptionValue("checkBoxShowSpeed"))); + ui->checkBoxStartWithMoreButtonPushed->setChecked(stringtobool(optionsEngine->getOptionValue("moreButtonPushed"))); + ui->showDualProgression->setChecked(stringtobool(optionsEngine->getOptionValue("showDualProgression"))); + ui->showProgressionInTheTitle->setChecked(stringtobool(optionsEngine->getOptionValue("showProgressionInTheTitle"))); + ui->alwaysOnTop->setChecked(stringtobool(optionsEngine->getOptionValue("alwaysOnTop"))); + ui->minimizeToSystray->setChecked(stringtobool(optionsEngine->getOptionValue("minimizeToSystray"))); + ui->startMinimized->setChecked(stringtobool(optionsEngine->getOptionValue("startMinimized"))); + + progressColorWrite=QVariant(QString::fromStdString(optionsEngine->getOptionValue("progressColorWrite"))).value<QColor>(); + progressColorRead=QVariant(QString::fromStdString(optionsEngine->getOptionValue("progressColorRead"))).value<QColor>(); + progressColorRemaining=QVariant(QString::fromStdString(optionsEngine->getOptionValue("progressColorRemaining"))).value<QColor>(); QPixmap pixmap(75,20); pixmap.fill(progressColorWrite); @@ -146,33 +147,37 @@ QWidget * ThemesFactory::options() return tempWidget; } -QIcon ThemesFactory::getIcon(const QString &fileName) const +QIcon ThemesFactory::getIcon(const std::string &fileName) const { - if(fileName==QStringLiteral("SystemTrayIcon/exit.png")) + if(fileName=="SystemTrayIcon/exit.png") { - QIcon tempIcon=QIcon::fromTheme(QStringLiteral("application-exit")); + QIcon tempIcon=QIcon::fromTheme("application-exit"); if(!tempIcon.isNull()) return tempIcon; } - else if(fileName==QStringLiteral("SystemTrayIcon/add.png")) + else if(fileName=="SystemTrayIcon/add.png") { - QIcon tempIcon=QIcon::fromTheme(QStringLiteral("list-add")); + QIcon tempIcon=QIcon::fromTheme("list-add"); if(!tempIcon.isNull()) return tempIcon; } - else if(fileName==QStringLiteral("SystemTrayIcon/informations.png")) + else if(fileName=="SystemTrayIcon/informations.png") { - QIcon tempIcon=QIcon::fromTheme(QStringLiteral("help-about")); + QIcon tempIcon=QIcon::fromTheme("help-about"); if(!tempIcon.isNull()) return tempIcon; } - else if(fileName==QStringLiteral("SystemTrayIcon/options.png")) + else if(fileName=="SystemTrayIcon/options.png") { - QIcon tempIcon=QIcon::fromTheme(QStringLiteral("applications-system")); + QIcon tempIcon=QIcon::fromTheme("applications-system"); if(!tempIcon.isNull()) return tempIcon; } - return QIcon(QStringLiteral(":/Themes/Oxygen/resources/")+fileName); + #ifdef SUPERCOPIER + return QIcon(":/Themes/Supercopier/resources/"+QString::fromStdString(fileName)); + #else + return QIcon(":/Themes/Oxygen/resources/"+QString::fromStdString(fileName)); + #endif } void ThemesFactory::resetOptions() @@ -185,7 +190,7 @@ void ThemesFactory::checkBoxShowSpeedHaveChanged(bool toggled) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"the checkbox have changed"); if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("checkBoxShowSpeed"),toggled); + optionsEngine->setOptionValue("checkBoxShowSpeed",std::to_string(toggled)); else ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented"); } @@ -194,7 +199,7 @@ void ThemesFactory::checkBoxStartWithMoreButtonPushedHaveChanged(bool toggled) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"the checkbox have changed"); if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("moreButtonPushed"),toggled); + optionsEngine->setOptionValue("moreButtonPushed",std::to_string(toggled)); else ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented"); } @@ -203,7 +208,7 @@ void ThemesFactory::comboBox_copyEnd(int value) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"the checkbox have changed"); if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("comboBox_copyEnd"),value); + optionsEngine->setOptionValue("comboBox_copyEnd",std::to_string(value)); else ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented"); } @@ -212,7 +217,7 @@ void ThemesFactory::speedWithProgressBar(bool toggled) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"the checkbox have changed"); if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("speedWithProgressBar"),toggled); + optionsEngine->setOptionValue("speedWithProgressBar",std::to_string(toggled)); else ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented"); } @@ -237,7 +242,7 @@ void ThemesFactory::minimizeToSystray(bool checked) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"the checkbox have changed"); if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("minimizeToSystray"),checked); + optionsEngine->setOptionValue("minimizeToSystray",std::to_string(checked)); else ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented"); } @@ -246,7 +251,7 @@ void ThemesFactory::alwaysOnTop(bool checked) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"the checkbox have changed"); if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("alwaysOnTop"),checked); + optionsEngine->setOptionValue("alwaysOnTop",std::to_string(checked)); else ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented"); } @@ -255,7 +260,7 @@ void ThemesFactory::showDualProgression(bool checked) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"the checkbox have changed"); if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("showDualProgression"),checked); + optionsEngine->setOptionValue("showDualProgression",std::to_string(checked)); else ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented"); } @@ -264,7 +269,7 @@ void ThemesFactory::startMinimized(bool checked) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"the checkbox have changed"); if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("startMinimized"),checked); + optionsEngine->setOptionValue("startMinimized",std::to_string(checked)); else ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented"); } @@ -275,7 +280,7 @@ void ThemesFactory::on_SliderSpeed_valueChanged(int value) return; if(!ui->checkBoxShowSpeed->isChecked()) return; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("value: %1").arg(value)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"value: "+std::to_string(value)); switch(value) { case 0: @@ -298,7 +303,7 @@ void ThemesFactory::on_SliderSpeed_valueChanged(int value) break; } if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("currentSpeed"),currentSpeed); + optionsEngine->setOptionValue("currentSpeed",std::to_string(currentSpeed)); else ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented"); updateSpeed(); @@ -314,9 +319,9 @@ void ThemesFactory::uiUpdateSpeed() currentSpeed=0; else currentSpeed=ui->limitSpeed->value(); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("emit newSpeedLimitation(%1)").arg(currentSpeed)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"emit newSpeedLimitation: "+std::to_string(currentSpeed)); if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("currentSpeed"),currentSpeed); + optionsEngine->setOptionValue("currentSpeed",std::to_string(currentSpeed)); else ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented"); } @@ -333,12 +338,12 @@ void ThemesFactory::updateSpeed() if(ui->checkBoxShowSpeed->isChecked()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("checked, currentSpeed: %1").arg(currentSpeed)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"checked, currentSpeed: "+std::to_string(currentSpeed)); ui->limitSpeed->setEnabled(false); if(currentSpeed==0) { ui->SliderSpeed->setValue(0); - ui->label_SpeedMaxValue->setText(facilityEngine->translateText("Unlimited")); + ui->label_SpeedMaxValue->setText(QString::fromStdString(facilityEngine->translateText("Unlimited"))); } else if(currentSpeed<=1024) { @@ -346,12 +351,12 @@ void ThemesFactory::updateSpeed() { currentSpeed=1024; if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("currentSpeed"),currentSpeed); + optionsEngine->setOptionValue("currentSpeed",std::to_string(currentSpeed)); else ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented"); } ui->SliderSpeed->setValue(1); - ui->label_SpeedMaxValue->setText(facilityEngine->speedToString((double)(1024*1024)*1)); + ui->label_SpeedMaxValue->setText(QString::fromStdString(facilityEngine->speedToString((double)(1024*1024)*1))); } else if(currentSpeed<=1024*4) { @@ -359,12 +364,12 @@ void ThemesFactory::updateSpeed() { currentSpeed=1024*4; if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("currentSpeed"),currentSpeed); + optionsEngine->setOptionValue("currentSpeed",std::to_string(currentSpeed)); else ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented"); } ui->SliderSpeed->setValue(2); - ui->label_SpeedMaxValue->setText(facilityEngine->speedToString((double)(1024*1024)*4)); + ui->label_SpeedMaxValue->setText(QString::fromStdString(facilityEngine->speedToString((double)(1024*1024)*4))); } else if(currentSpeed<=1024*16) { @@ -372,12 +377,12 @@ void ThemesFactory::updateSpeed() { currentSpeed=1024*16; if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("currentSpeed"),currentSpeed); + optionsEngine->setOptionValue("currentSpeed",std::to_string(currentSpeed)); else ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented"); } ui->SliderSpeed->setValue(3); - ui->label_SpeedMaxValue->setText(facilityEngine->speedToString((double)(1024*1024)*16)); + ui->label_SpeedMaxValue->setText(QString::fromStdString(facilityEngine->speedToString((double)(1024*1024)*16))); } else if(currentSpeed<=1024*64) { @@ -385,12 +390,12 @@ void ThemesFactory::updateSpeed() { currentSpeed=1024*64; if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("currentSpeed"),currentSpeed); + optionsEngine->setOptionValue("currentSpeed",std::to_string(currentSpeed)); else ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented"); } ui->SliderSpeed->setValue(4); - ui->label_SpeedMaxValue->setText(facilityEngine->speedToString((double)(1024*1024)*64)); + ui->label_SpeedMaxValue->setText(QString::fromStdString(facilityEngine->speedToString((double)(1024*1024)*64))); } else { @@ -398,12 +403,12 @@ void ThemesFactory::updateSpeed() { currentSpeed=1024*128; if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("currentSpeed"),currentSpeed); + optionsEngine->setOptionValue("currentSpeed",std::to_string(currentSpeed)); else ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented"); } ui->SliderSpeed->setValue(5); - ui->label_SpeedMaxValue->setText(facilityEngine->speedToString((double)(1024*1024)*128)); + ui->label_SpeedMaxValue->setText(QString::fromStdString(facilityEngine->speedToString((double)(1024*1024)*128))); } } else @@ -426,7 +431,7 @@ void ThemesFactory::progressColorWrite_clicked() pixmap.fill(progressColorWrite); ui->progressColorWrite->setIcon(pixmap); if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("progressColorWrite"),progressColorWrite); + optionsEngine->setOptionValue("progressColorWrite",progressColorWrite.name().toStdString()); else ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented"); } @@ -441,7 +446,7 @@ void ThemesFactory::progressColorRead_clicked() pixmap.fill(progressColorRead); ui->progressColorRead->setIcon(pixmap); if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("progressColorRead"),progressColorRead); + optionsEngine->setOptionValue("progressColorRead",progressColorRead.name().toStdString()); else ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented"); } @@ -456,7 +461,7 @@ void ThemesFactory::progressColorRemaining_clicked() pixmap.fill(progressColorRemaining); ui->progressColorRemaining->setIcon(pixmap); if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("progressColorRemaining"),progressColorRemaining); + optionsEngine->setOptionValue("progressColorRemaining",progressColorRemaining.name().toStdString()); else ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented"); } @@ -470,7 +475,7 @@ void ThemesFactory::updateProgressionColorBar() void ThemesFactory::setShowProgressionInTheTitle() { if(optionsEngine!=NULL) - optionsEngine->setOptionValue(QStringLiteral("showProgressionInTheTitle"),ui->showProgressionInTheTitle->isChecked()); + optionsEngine->setOptionValue("showProgressionInTheTitle",std::to_string(ui->showProgressionInTheTitle->isChecked())); else ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented"); } diff --git a/plugins/Themes/Oxygen/ThemesFactory.h b/plugins/Themes/Oxygen/ThemesFactory.h index 895e32d..f5e304f 100644 --- a/plugins/Themes/Oxygen/ThemesFactory.h +++ b/plugins/Themes/Oxygen/ThemesFactory.h @@ -38,11 +38,11 @@ public: /// \brief to return the instance of the copy engine PluginInterface_Themes * getInstance(); /// \brief set the resources, to store options, to have facilityInterface - void setResources(OptionInterface * optionsEngine,const QString & + void setResources(OptionInterface * optionsEngine,const std::string & #ifdef ULTRACOPIER_PLUGIN_DEBUG writePath #endif - ,const QString & + ,const std::string & #ifdef ULTRACOPIER_PLUGIN_DEBUG pluginPath #endif @@ -50,7 +50,7 @@ public: /// \brief to get the default options widget QWidget * options(); /// \brief to get a resource icon - QIcon getIcon(const QString &fileName) const; + QIcon getIcon(const std::string &fileName) const; private slots: void checkBoxShowSpeedHaveChanged(bool toggled); void checkBoxStartWithMoreButtonPushedHaveChanged(bool toggled); @@ -77,7 +77,7 @@ private: Ui::themesOptions *ui; QWidget *tempWidget; FacilityInterface * facilityEngine; - qint32 currentSpeed;///< in KB/s, assume as 0KB/s as default like every where + int32_t currentSpeed;///< in KB/s, assume as 0KB/s as default like every where QColor progressColorWrite,progressColorRead,progressColorRemaining; signals: void reloadLanguage() const; diff --git a/plugins/Themes/Oxygen/TransferModel.cpp b/plugins/Themes/Oxygen/TransferModel.cpp index ff09d93..2959598 100644 --- a/plugins/Themes/Oxygen/TransferModel.cpp +++ b/plugins/Themes/Oxygen/TransferModel.cpp @@ -1,4 +1,5 @@ #include "TransferModel.h" +#include "../../../cpp11addition.h" #define COLUMN_COUNT 3 @@ -35,24 +36,24 @@ QVariant TransferModel::data( const QModelIndex& index, int role ) const int row,column; row=index.row(); column=index.column(); - if(index.parent()!=QModelIndex() || row < 0 || row >= transfertItemList.count() || column < 0 || column >= COLUMN_COUNT) + if(index.parent()!=QModelIndex() || row < 0 || (unsigned int)row >= transfertItemList.size() || column < 0 || column >= COLUMN_COUNT) return QVariant(); const TransfertItem& item = transfertItemList.at(row); if(role==Qt::UserRole) - return item.id; + return (quint64)item.id; else if(role==Qt::DisplayRole) { switch(column) { case 0: - return item.source; + return QString::fromStdString(item.source); break; case 1: - return item.size; + return QString::fromStdString(item.size); break; case 2: - return item.destination; + return QString::fromStdString(item.destination); break; default: return QVariant(); @@ -63,9 +64,9 @@ QVariant TransferModel::data( const QModelIndex& index, int role ) const switch(column) { case 0: - if(stopId.contains(item.id)) + if(stopId.find(item.id)!=stopId.cend()) return *stop; - else if(startId.contains(item.id)) + else if(startId.find(item.id)!=startId.cend()) return *start; else return QVariant(); @@ -76,7 +77,8 @@ QVariant TransferModel::data( const QModelIndex& index, int role ) const } else if(role==Qt::BackgroundRole) { - if(!search_text.isEmpty() && (item.source.indexOf(search_text,0,Qt::CaseInsensitive)!=-1 || item.destination.indexOf(search_text,0,Qt::CaseInsensitive)!=-1)) + if(!search_text.empty() && (item.source.find(search_text)!=std::string::npos || + item.destination.find(search_text)!=std::string::npos)) { if(haveSearchItem && searchId==item.id) return QColor(255,150,150,100); @@ -91,13 +93,13 @@ QVariant TransferModel::data( const QModelIndex& index, int role ) const int TransferModel::rowCount( const QModelIndex& parent ) const { - return parent == QModelIndex() ? transfertItemList.count() : 0; + return parent == QModelIndex() ? transfertItemList.size() : 0; } -quint64 TransferModel::firstId() const +uint64_t TransferModel::firstId() const { - if(transfertItemList.count()>0) - return transfertItemList.first().id; + if(transfertItemList.size()>0) + return transfertItemList.front().id; else return 0; } @@ -109,11 +111,11 @@ QVariant TransferModel::headerData( int section, Qt::Orientation orientation, in if ( role == Qt::DisplayRole && orientation == Qt::Horizontal && section >= 0 && section < COLUMN_COUNT ) { switch ( section ) { case 0: - return facilityEngine->translateText(QStringLiteral("Source")); + return QString::fromStdString(facilityEngine->translateText("Source")); case 1: - return facilityEngine->translateText(QStringLiteral("Size")); + return QString::fromStdString(facilityEngine->translateText("Size")); case 2: - return facilityEngine->translateText(QStringLiteral("Destination")); + return QString::fromStdString(facilityEngine->translateText("Destination")); } } @@ -124,7 +126,7 @@ bool TransferModel::setData( const QModelIndex& index, const QVariant& value, in { row=index.row(); column=index.column(); - if(index.parent()!=QModelIndex() || row < 0 || row >= transfertItemList.count() || column < 0 || column >= COLUMN_COUNT) + if(index.parent()!=QModelIndex() || row < 0 || (unsigned int)row >= transfertItemList.size() || column < 0 || column >= COLUMN_COUNT) return false; TransfertItem& item = transfertItemList[row]; @@ -138,17 +140,17 @@ bool TransferModel::setData( const QModelIndex& index, const QVariant& value, in switch(column) { case 0: - item.source=value.toString(); + item.source=value.toString().toStdString(); emit dataChanged(index,index); return true; break; case 1: - item.size=value.toString(); + item.size=value.toString().toStdString(); emit dataChanged(index,index); return true; break; case 2: - item.destination=value.toString(); + item.destination=value.toString().toStdString(); emit dataChanged(index,index); return true; break; @@ -164,7 +166,7 @@ bool TransferModel::setData( const QModelIndex& index, const QVariant& value, in Return[1]: totalSize Return[2]: currentFile */ -QList<quint64> TransferModel::synchronizeItems(const QList<Ultracopier::ReturnActionOnCopyList>& returnActions) +std::vector<uint64_t> TransferModel::synchronizeItems(const std::vector<Ultracopier::ReturnActionOnCopyList>& returnActions) { const QModelIndexList oldIndexes = persistentIndexList(); QModelIndexList newIndexes=oldIndexes; @@ -191,7 +193,7 @@ QList<quint64> TransferModel::synchronizeItems(const QList<Ultracopier::ReturnAc newItem.source=action.addAction.sourceFullPath; newItem.size=facilityEngine->sizeToString(action.addAction.size); newItem.destination=action.addAction.destinationFullPath; - transfertItemList<<newItem; + transfertItemList.push_back(newItem); totalFile++; totalSize+=action.addAction.size; } @@ -201,30 +203,32 @@ QList<quint64> TransferModel::synchronizeItems(const QList<Ultracopier::ReturnAc //bool current_entry= if(action.userAction.position<0) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("id: %1, position is wrong: %2").arg(action.addAction.id).arg(action.userAction.position)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("id: %1, position is wrong: %2").arg(action.addAction.id).arg(action.userAction.position).toStdString()); break; } - if(action.userAction.position>(transfertItemList.size()-1)) + if((unsigned int)action.userAction.position>(transfertItemList.size()-1)) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("id: %1, position is wrong: %2").arg(action.addAction.id).arg(action.userAction.position)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("id: %1, position is wrong: %2").arg(action.addAction.id).arg(action.userAction.position).toStdString()); break; } if(action.userAction.moveAt<0) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("id: %1, position is wrong: %2").arg(action.addAction.id).arg(action.userAction.position)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("id: %1, position is wrong: %2").arg(action.addAction.id).arg(action.userAction.position).toStdString()); break; } - if(action.userAction.moveAt>(transfertItemList.size()-1)) + if((unsigned int)action.userAction.moveAt>(transfertItemList.size()-1)) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("id: %1, position is wrong: %2").arg(action.addAction.id).arg(action.userAction.position)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("id: %1, position is wrong: %2").arg(action.addAction.id).arg(action.userAction.position).toStdString()); break; } if(action.userAction.position==action.userAction.moveAt) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("id: %1, move at same position: %2").arg(action.addAction.id).arg(action.userAction.position)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("id: %1, move at same position: %2").arg(action.addAction.id).arg(action.userAction.position).toStdString()); break; } - transfertItemList.move(action.userAction.position,action.userAction.moveAt); + const TransfertItem transfertItem=transfertItemList.at(action.userAction.position); + transfertItemList.erase(transfertItemList.cbegin()+action.userAction.position); + transfertItemList.insert(transfertItemList.cbegin()+action.userAction.moveAt,transfertItem); //newIndexes.move(action.userAction.position,action.userAction.moveAt); } break; @@ -234,19 +238,19 @@ QList<quint64> TransferModel::synchronizeItems(const QList<Ultracopier::ReturnAc currentIndexSearch--; if(action.userAction.position<0) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("id: %1, position is wrong: %3").arg(action.addAction.id).arg(action.userAction.position)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("id: %1, position is wrong: %3").arg(action.addAction.id).arg(action.userAction.position).toStdString()); break; } - if(action.userAction.position>(transfertItemList.size()-1)) + if((unsigned int)action.userAction.position>(transfertItemList.size()-1)) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("id: %1, position is wrong: %3").arg(action.addAction.id).arg(action.userAction.position)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("id: %1, position is wrong: %3").arg(action.addAction.id).arg(action.userAction.position).toStdString()); break; } - transfertItemList.removeAt(action.userAction.position); + transfertItemList.erase(transfertItemList.cbegin()+action.userAction.position); currentFile++; - startId.remove(action.addAction.id); - stopId.remove(action.addAction.id); - internalRunningOperation.remove(action.addAction.id); + startId.erase(action.addAction.id); + stopId.erase(action.addAction.id); + internalRunningOperation.erase(action.addAction.id); //newIndexes.remove(action.userAction.moveAt); } break; @@ -262,20 +266,20 @@ QList<quint64> TransferModel::synchronizeItems(const QList<Ultracopier::ReturnAc break; case Ultracopier::Transfer: { - if(!startId.contains(action.addAction.id)) - startId << action.addAction.id; - stopId.remove(action.addAction.id); - if(internalRunningOperation.contains(action.addAction.id)) + if(startId.find(action.addAction.id)==startId.cend()) + startId.insert(action.addAction.id); + stopId.erase(action.addAction.id); + if(internalRunningOperation.find(action.addAction.id)!=internalRunningOperation.cend()) internalRunningOperation[action.addAction.id].actionType=action.type; else - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("unable to found entry for file %1: actionType: Transfer").arg(action.addAction.id)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("unable to found entry for file %1: actionType: Transfer").arg(action.addAction.id).toStdString()); } break; case Ultracopier::PostOperation: { - if(!stopId.contains(action.addAction.id)) - stopId << action.addAction.id; - startId.remove(action.addAction.id); + if(stopId.find(action.addAction.id)==stopId.cend()) + stopId.insert(action.addAction.id); + startId.erase(action.addAction.id); } break; case Ultracopier::CustomOperation: @@ -284,18 +288,21 @@ QList<quint64> TransferModel::synchronizeItems(const QList<Ultracopier::ReturnAc //without progression if(custom_with_progression) { - if(startId.remove(action.addAction.id)) - if(!stopId.contains(action.addAction.id)) - stopId << action.addAction.id; + if(startId.find(action.addAction.id)!=startId.cend()) + { + startId.erase(action.addAction.id); + if(stopId.find(action.addAction.id)==stopId.cend()) + stopId.insert(action.addAction.id); + } } //with progression else { - stopId.remove(action.addAction.id); - if(!startId.contains(action.addAction.id)) - startId << action.addAction.id; + stopId.erase(action.addAction.id); + if(startId.find(action.addAction.id)==startId.cend()) + startId.insert(action.addAction.id); } - if(internalRunningOperation.contains(action.addAction.id)) + if(internalRunningOperation.find(action.addAction.id)!=internalRunningOperation.cend()) { ItemOfCopyListWithMoreInformations &item=internalRunningOperation[action.addAction.id]; item.actionType=action.type; @@ -316,7 +323,7 @@ QList<quint64> TransferModel::synchronizeItems(const QList<Ultracopier::ReturnAc { const QSet<quint64> ids = oldMapping.values().toSet(); - for ( int i = 0; i < transfertItemList.count(); i++ ) { + for ( unsigned int i = 0; i < transfertItemList.size(); i++ ) { const TransferModel::TransfertItem& item = transfertItemList.at(i); if ( ids.contains( item.id ) ) { @@ -333,7 +340,14 @@ QList<quint64> TransferModel::synchronizeItems(const QList<Ultracopier::ReturnAc changePersistentIndexList( oldIndexes, newIndexes ); emit layoutChanged(); - return QList<quint64>() << totalFile << totalSize << currentFile; + { + std::vector<uint64_t> newList; + newList.resize(3); + newList[0]=totalFile; + newList[1]=totalSize; + newList[2]=currentFile; + return newList; + } } void TransferModel::setFacilityEngine(FacilityInterface * facilityEngine) @@ -341,14 +355,14 @@ void TransferModel::setFacilityEngine(FacilityInterface * facilityEngine) this->facilityEngine=facilityEngine; } -int TransferModel::search(const QString &text,bool searchNext) +int TransferModel::search(const std::string &text, bool searchNext) { emit layoutAboutToBeChanged(); search_text=text; emit layoutChanged(); if(transfertItemList.size()==0) return -1; - if(text.isEmpty()) + if(text.empty()) return -1; if(searchNext) { @@ -360,7 +374,9 @@ int TransferModel::search(const QString &text,bool searchNext) loop_size=transfertItemList.size(); while(index_for_loop<loop_size) { - if(transfertItemList.at(currentIndexSearch).source.indexOf(search_text,0,Qt::CaseInsensitive)!=-1 || transfertItemList.at(currentIndexSearch).destination.indexOf(search_text,0,Qt::CaseInsensitive)!=-1) + const TransfertItem &transfertItem=transfertItemList.at(currentIndexSearch); + if(transfertItem.source.find(search_text)!=std::string::npos || + transfertItem.destination.find(search_text)!=std::string::npos) { haveSearchItem=true; searchId=transfertItemList.at(currentIndexSearch).id; @@ -375,14 +391,14 @@ int TransferModel::search(const QString &text,bool searchNext) return -1; } -int TransferModel::searchPrev(const QString &text) +int TransferModel::searchPrev(const std::string &text) { emit layoutAboutToBeChanged(); search_text=text; emit layoutChanged(); if(transfertItemList.size()==0) return -1; - if(text.isEmpty()) + if(text.empty()) return -1; if(currentIndexSearch==0) currentIndexSearch=loop_size-1; @@ -392,7 +408,9 @@ int TransferModel::searchPrev(const QString &text) loop_size=transfertItemList.size(); while(index_for_loop<loop_size) { - if(transfertItemList.at(currentIndexSearch).source.indexOf(search_text,0,Qt::CaseInsensitive)!=-1 || transfertItemList.at(currentIndexSearch).destination.indexOf(search_text,0,Qt::CaseInsensitive)!=-1) + const TransfertItem &transfertItem=transfertItemList.at(currentIndexSearch); + if(transfertItem.source.find(search_text)!=std::string::npos || + transfertItem.destination.find(search_text)!=std::string::npos) { haveSearchItem=true; searchId=transfertItemList.at(currentIndexSearch).id; @@ -408,19 +426,19 @@ int TransferModel::searchPrev(const QString &text) return -1; } -void TransferModel::setFileProgression(QList<Ultracopier::ProgressionItem> &progressionList) +void TransferModel::setFileProgression(std::vector<Ultracopier::ProgressionItem> &progressionList) { loop_size=progressionList.size(); index_for_loop=0; while(index_for_loop<loop_size) { - if(internalRunningOperation.contains(progressionList.at(index_for_loop).id)) + if(internalRunningOperation.find(progressionList.at(index_for_loop).id)!=internalRunningOperation.cend()) { internalRunningOperation[progressionList.at(index_for_loop).id].generalData.size=progressionList.at(index_for_loop).total; internalRunningOperation[progressionList.at(index_for_loop).id].currentReadProgression=progressionList.at(index_for_loop).currentRead; internalRunningOperation[progressionList.at(index_for_loop).id].currentWriteProgression=progressionList.at(index_for_loop).currentWrite; #ifdef ULTRACOPIER_PLUGIN_DEBUG - progressionList.removeAt(index_for_loop); + progressionList.erase(progressionList.cbegin()+index_for_loop); index_for_loop--; loop_size--; #endif @@ -429,7 +447,7 @@ void TransferModel::setFileProgression(QList<Ultracopier::ProgressionItem> &prog } #ifdef ULTRACOPIER_PLUGIN_DEBUG if(progressionList.size()>0) - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("progression remaning items")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"progression remaning items"); #endif } @@ -441,15 +459,15 @@ TransferModel::currentTransfertItem TransferModel::getCurrentTransfertItem() con returnItem.haveItem=startId.size()>0; if(returnItem.haveItem) { - if(!internalRunningOperation.contains(*startId.constBegin())) + if(internalRunningOperation.find(*startId.cbegin())==internalRunningOperation.cend()) { returnItem.haveItem=false; return returnItem; } - const ItemOfCopyListWithMoreInformations &itemTransfer=internalRunningOperation.value(*startId.constBegin()); + const ItemOfCopyListWithMoreInformations &itemTransfer=internalRunningOperation.at(*startId.cbegin()); returnItem.from=itemTransfer.generalData.sourceFullPath; returnItem.to=itemTransfer.generalData.destinationFullPath; - returnItem.current_file=itemTransfer.generalData.destinationFileName+QStringLiteral(", ")+facilityEngine->sizeToString(itemTransfer.generalData.size); + returnItem.current_file=itemTransfer.generalData.destinationFileName+", "+facilityEngine->sizeToString(itemTransfer.generalData.size); returnItem.id=itemTransfer.generalData.id; switch(itemTransfer.actionType) { @@ -481,20 +499,20 @@ TransferModel::currentTransfertItem TransferModel::getCurrentTransfertItem() con break; //should never pass here case Ultracopier::PostOperation: - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("wrong action type for file %1: actionType: %2").arg(itemTransfer.generalData.id).arg(itemTransfer.actionType)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("wrong action type for file %1: actionType: %2").arg(itemTransfer.generalData.id).arg(itemTransfer.actionType).toStdString()); returnItem.progressBar_read=65535; returnItem.progressBar_write=65535; break; //should never pass here case Ultracopier::PreOperation: - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("wrong action type for file %1: actionType: %2").arg(itemTransfer.generalData.id).arg(itemTransfer.actionType)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("wrong action type for file %1: actionType: %2").arg(itemTransfer.generalData.id).arg(itemTransfer.actionType).toStdString()); returnItem.progressBar_read=0; returnItem.progressBar_write=0; break; default: returnItem.progressBar_read=0; returnItem.progressBar_write=0; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("unknow action type for file %1: actionType: %2").arg(itemTransfer.generalData.id).arg(itemTransfer.actionType)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("unknow action type for file %1: actionType: %2").arg(itemTransfer.generalData.id).arg(itemTransfer.actionType).toStdString()); break; } } @@ -503,15 +521,15 @@ TransferModel::currentTransfertItem TransferModel::getCurrentTransfertItem() con returnItem.haveItem=stopId.size()>0; if(returnItem.haveItem) { - if(!internalRunningOperation.contains(*stopId.constBegin())) + if(internalRunningOperation.find(*stopId.cbegin())==internalRunningOperation.cend()) { returnItem.haveItem=false; return returnItem; } - const ItemOfCopyListWithMoreInformations &itemTransfer=internalRunningOperation.value(*stopId.constBegin()); + const ItemOfCopyListWithMoreInformations &itemTransfer=internalRunningOperation.at(*stopId.cbegin()); returnItem.from=itemTransfer.generalData.sourceFullPath; returnItem.to=itemTransfer.generalData.destinationFullPath; - returnItem.current_file=itemTransfer.generalData.destinationFileName+QStringLiteral(", ")+facilityEngine->sizeToString(itemTransfer.generalData.size); + returnItem.current_file=itemTransfer.generalData.destinationFileName+", "+facilityEngine->sizeToString(itemTransfer.generalData.size); returnItem.id=itemTransfer.generalData.id; switch(itemTransfer.actionType) { @@ -542,20 +560,20 @@ TransferModel::currentTransfertItem TransferModel::getCurrentTransfertItem() con } break; case Ultracopier::PostOperation: - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("wrong action type for file %1: actionType: %2").arg(itemTransfer.generalData.id).arg(itemTransfer.actionType)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("wrong action type for file %1: actionType: %2").arg(itemTransfer.generalData.id).arg(itemTransfer.actionType).toStdString()); returnItem.progressBar_read=65535; returnItem.progressBar_write=65535; break; //should never pass here case Ultracopier::PreOperation: - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("wrong action type for file %1: actionType: %2").arg(itemTransfer.generalData.id).arg(itemTransfer.actionType)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("wrong action type for file %1: actionType: %2").arg(itemTransfer.generalData.id).arg(itemTransfer.actionType).toStdString()); returnItem.progressBar_read=0; returnItem.progressBar_write=0; break; default: returnItem.progressBar_read=65535; returnItem.progressBar_write=65535; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("unknow action type for file %1: actionType: %2").arg(itemTransfer.generalData.id).arg(itemTransfer.actionType)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("unknow action type for file %1: actionType: %2").arg(itemTransfer.generalData.id).arg(itemTransfer.actionType).toStdString()); break; } } diff --git a/plugins/Themes/Oxygen/TransferModel.h b/plugins/Themes/Oxygen/TransferModel.h index d2a4a1c..e572f9e 100644 --- a/plugins/Themes/Oxygen/TransferModel.h +++ b/plugins/Themes/Oxygen/TransferModel.h @@ -9,6 +9,10 @@ #include <QSet> #include <QIcon> #include <QString> +#include <unordered_map> +#include <unordered_set> +#include <set> +#include <vector> #include "StructEnumDefinition.h" #include "Environment.h" @@ -23,15 +27,15 @@ public: /// \brief the transfer item displayed struct TransfertItem { - quint64 id; - QString source; - QString size; - QString destination; + uint64_t id; + std::string source; + std::string size; + std::string destination; }; /// \brief the transfer item with progression struct ItemOfCopyListWithMoreInformations { - quint64 currentReadProgression,currentWriteProgression; + uint64_t currentReadProgression,currentWriteProgression; Ultracopier::ItemOfCopyList generalData; Ultracopier::ActionTypeCopyList actionType; bool custom_with_progression; @@ -39,11 +43,11 @@ public: /// \brief returned first transfer item struct currentTransfertItem { - quint64 id; + uint64_t id; bool haveItem; - QString from; - QString to; - QString current_file; + std::string from; + std::string to; + std::string current_file; int progressBar_read,progressBar_write; }; @@ -55,37 +59,37 @@ public: virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; virtual bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole); - QList<quint64> synchronizeItems(const QList<Ultracopier::ReturnActionOnCopyList>& returnActions); + std::vector<uint64_t> synchronizeItems(const std::vector<Ultracopier::ReturnActionOnCopyList>& returnActions); void setFacilityEngine(FacilityInterface * facilityEngine); - int search(const QString &text,bool searchNext); - int searchPrev(const QString &text); + int search(const std::string &text,bool searchNext); + int searchPrev(const std::string &text); - void setFileProgression(QList<Ultracopier::ProgressionItem> &progressionList); + void setFileProgression(std::vector<Ultracopier::ProgressionItem> &progressionList); currentTransfertItem getCurrentTransfertItem() const; - quint64 firstId() const; + uint64_t firstId() const; protected: - QList<TransfertItem> transfertItemList;///< To have a transfer list for the user - QSet<quint64> startId,stopId;///< To show what is started, what is stopped - QHash<quint64,ItemOfCopyListWithMoreInformations> internalRunningOperation;///< to have progression and stat + std::vector<TransfertItem> transfertItemList;///< To have a transfer list for the user + std::set<uint64_t> startId,stopId;///< To show what is started, what is stopped + std::unordered_map<uint64_t,ItemOfCopyListWithMoreInformations> internalRunningOperation;///< to have progression and stat private: int loop_size,index_for_loop; int sub_loop_size,sub_index_for_loop; int row,column; FacilityInterface * facilityEngine; - QString search_text; + std::string search_text; /// \brief index from start the search, decresed by remove before it int currentIndexSearch; bool haveSearchItem; - quint64 searchId; + uint64_t searchId; static QIcon *start; static QIcon *stop; signals: #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 }; diff --git a/plugins/Themes/Oxygen/documentation.dox b/plugins/Themes/Oxygen/documentation.dox index 629330b..d94ce0b 100644 --- a/plugins/Themes/Oxygen/documentation.dox +++ b/plugins/Themes/Oxygen/documentation.dox @@ -10,7 +10,7 @@ \section mainpage_overview Overview - It's the default interface for Ultracopier. The first version, it's greatly inspirated by Supercopier. But have well evolued.\n + It's the default interface for Ultracopier.\n More informations on <a href="http://ultracopier-wiki.first-world.info/">the wiki of ultracopier</a>. \section mainpage_platforms Platforms @@ -20,7 +20,7 @@ \section mainpage_downloads Downloads - You can found link on <a href="http://ultracopier.first-world.info/">Ultracopier (Supercopier/Teracopy)</a> project page, via git, snapshot sources, ... + You can find the link on <a href="http://ultracopier.first-world.info/">Ultracopier</a> project page, via git, snapshot sources, ... \section license GPL Version 3 The code source is under GPL3. The image is extacted from Oxygen icon pack of KDE4.\n @@ -29,4 +29,3 @@ And 16x16/categories/applications-development.png -> SystemTrayIcon/options.png */ - diff --git a/plugins/Themes/Oxygen/informations.xml b/plugins/Themes/Oxygen/informations.xml index d81313d..6cfe489 100644 --- a/plugins/Themes/Oxygen/informations.xml +++ b/plugins/Themes/Oxygen/informations.xml @@ -17,7 +17,7 @@ <description xml:lang="en"><![CDATA[Oxygen style for Ultracopier]]></description> <description xml:lang="fr"><![CDATA[Style oxygen pour Ultracopier]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>1.2.3.6</version> + <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>Oxygen</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Themes/Oxygen/interface.cpp b/plugins/Themes/Oxygen/interface.cpp index 703f3b2..84b4dd6 100644 --- a/plugins/Themes/Oxygen/interface.cpp +++ b/plugins/Themes/Oxygen/interface.cpp @@ -8,7 +8,10 @@ #include <QColorDialog> #include <QRect> #include <QPainter> +#include <QDebug> #include <cmath> +#include <chrono> +#include <ctime> #ifdef Q_OS_WIN #ifndef NOMINMAX #define NOMINMAX @@ -158,6 +161,12 @@ Themes::Themes(const bool &alwaysOnTop, /// \note important for drag and drop, \see dropEvent() setAcceptDrops(true); + #ifdef SUPERCOPIER + const QString themePath=":/Themes/Supercopier/"; + #else + const QString themePath=":/Themes/Oxygen/"; + #endif + // try set the OS icon if(!iconLoaded) { @@ -166,10 +175,10 @@ Themes::Themes(const bool &alwaysOnTop, editDelete=QIcon::fromTheme(QStringLiteral("edit-delete")); player_pause=QIcon::fromTheme(QStringLiteral("media-playback-pause")); if(player_pause.isNull()) - player_pause=QIcon(QStringLiteral(":/Themes/Oxygen/resources/player_pause.png")); + player_pause=QIcon(themePath+QStringLiteral("resources/player_pause.png")); player_play=QIcon::fromTheme(QStringLiteral("media-playback-play")); if(player_play.isNull()) - player_play=QIcon(QStringLiteral(":/Themes/Oxygen/resources/player_play.png")); + player_play=QIcon(themePath+QStringLiteral("resources/player_play.png")); skinIcon=QIcon::fromTheme(QStringLiteral("media-skip-forward")); editFind=QIcon::fromTheme(QStringLiteral("edit-find")); documentOpen=QIcon::fromTheme(QStringLiteral("document-open")); @@ -208,14 +217,68 @@ Themes::Themes(const bool &alwaysOnTop, ui->actionAddFolderToMove->setIcon(listAdd); } #ifdef Q_OS_WIN32 - pixmapTop=QPixmap(QStringLiteral(":/Themes/Oxygen/resources/SystemTrayIcon/systray_Uncaught_Windows.png")); - pixmapBottom=QPixmap(QStringLiteral(":/Themes/Oxygen/resources/SystemTrayIcon/systray_Caught_Windows.png")); + pixmapTop=QPixmap(themePath+QStringLiteral("resources/SystemTrayIcon/systray_Uncaught_Windows.png")); + pixmapBottom=QPixmap(themePath+QStringLiteral("resources/SystemTrayIcon/systray_Caught_Windows.png")); #else - pixmapTop=QPixmap(QStringLiteral(":/Themes/Oxygen/resources/SystemTrayIcon/systray_Uncaught_Unix.png")); - pixmapBottom=QPixmap(QStringLiteral(":/Themes/Oxygen/resources/SystemTrayIcon/systray_Caught_Unix.png")); + pixmapTop=QPixmap(themePath+QStringLiteral("resources/SystemTrayIcon/systray_Uncaught_Unix.png")); + pixmapBottom=QPixmap(themePath+QStringLiteral("resources/SystemTrayIcon/systray_Caught_Unix.png")); #endif - shutdown=facilityEngine->haveFunctionality(QStringLiteral("shutdown")); + #ifdef SUPERCOPIER + /*QIcon icon; + icon.addFile(themePath+QStringLiteral("resources/main.png"), QSize(), QIcon::Normal, QIcon::Off); + ui->interfaceCopy->setWindowIcon(icon);*/ + QIcon icon1; + icon1.addFile(themePath+QStringLiteral("resources/add.png"), QSize(), QIcon::Normal, QIcon::Off); + ui->actionAddFile->setIcon(icon1); + QIcon icon2; + icon2.addFile(themePath+QStringLiteral("resources/SystemTrayIcon/exit.png"), QSize(), QIcon::Normal, QIcon::Off); + ui->shutdown->setIcon(icon2); + QIcon icon3; + icon3.addFile(themePath+QStringLiteral("resources/moveDown.png"), QSize(), QIcon::Normal, QIcon::Off); + ui->moreButton->setIcon(icon3); + ui->pushDown->setIcon(icon3); + if(!QFile::exists(themePath+QStringLiteral("resources/moveDown.png"))) + { + qDebug() << "File not found, can't continue: " << themePath+QStringLiteral("resources/moveDown.png"); + abort(); + } + QIcon icon4; + icon4.addFile(themePath+QStringLiteral("resources/player_pause.png"), QSize(), QIcon::Normal, QIcon::Off); + ui->pauseButton->setIcon(icon4); + QIcon icon5; + icon5.addFile(themePath+QStringLiteral("resources/player_end.png"), QSize(), QIcon::Normal, QIcon::Off); + ui->skipButton->setIcon(icon5); + QIcon icon6; + icon6.addFile(themePath+QStringLiteral("resources/cancel.png"), QSize(), QIcon::Normal, QIcon::Off); + ui->cancelButton->setIcon(icon6); + QIcon icon7; + icon7.addFile(themePath+QStringLiteral("resources/putOnTop.png"), QSize(), QIcon::Normal, QIcon::Off); + ui->putOnTop->setIcon(icon7); + QIcon icon8; + icon8.addFile(themePath+QStringLiteral("resources/moveUp.png"), QSize(), QIcon::Normal, QIcon::Off); + ui->pushUp->setIcon(icon8); + QIcon icon9; + icon9.addFile(themePath+QStringLiteral("resources/putOnBottom.png"), QSize(), QIcon::Normal, QIcon::Off); + ui->putOnBottom->setIcon(icon9); + QIcon icon10; + icon10.addFile(themePath+QStringLiteral("resources/remove.png"), QSize(), QIcon::Normal, QIcon::Off); + ui->del->setIcon(icon10); + QIcon icon11; + icon11.addFile(themePath+QStringLiteral("resources/search.png"), QSize(), QIcon::Normal, QIcon::Off); + ui->searchButton->setIcon(icon11); + QIcon icon12; + icon12.addFile(themePath+QStringLiteral("resources/export-transfer-list.png"), QSize(), QIcon::Normal, QIcon::Off); + ui->exportTransferList->setIcon(icon12); + QIcon icon13; + icon13.addFile(themePath+QStringLiteral("resources/import-transfer-list.png"), QSize(), QIcon::Normal, QIcon::Off); + ui->importTransferList->setIcon(icon13); + QIcon icon14; + icon14.addFile(themePath+QStringLiteral("resources/main.png"), QSize(), QIcon::Normal, QIcon::Off); + this->setWindowIcon(icon14); + #endif + + shutdown=facilityEngine->haveFunctionality("shutdown"); ui->shutdown->setVisible(shutdown); selectionModel=ui->TransferList->selectionModel(); @@ -231,13 +294,43 @@ Themes::Themes(const bool &alwaysOnTop, uiOptions->alwaysOnTop->hide(); #endif*/ #ifdef ULTRACOPIER_VERSION_ULTIMATE - ui->ad_ultimate->hide(); + #ifdef SUPERCOPIER + ui->ad_ultimate->setText(tr("%1 is deprecated, Use %2").arg("<span style=\"color:#ee0000\">Super</span><span style=\"color:#0000cc\">Copier</span>").arg("<a href=\"http://ultracopier.first-world.info/\">Ultracopier</a>")); + #else + #ifdef Q_OS_MACOS + ui->ad_ultimate->setText(tr("This will be the last version for Mac, but you can compile from source")); + #else + ui->ad_ultimate->hide(); + #endif + #endif #else - QString ultimateUrl=facilityEngine->ultimateUrl(); + QString ultimateUrl=QString::fromStdString(facilityEngine->ultimateUrl()); if(ultimateUrl.isEmpty()) ui->ad_ultimate->hide(); else - ui->ad_ultimate->setText(QStringLiteral("<a href=\"%1\">%2</a>").arg(ultimateUrl).arg(tr("Buy the Ultimate version to fund development"))); + ui->ad_ultimate->setText( + #ifdef SUPERCOPIER + tr("%1 is deprecated, Use %2").arg("<span style=\"color:#ee0000\">Super</span><span style=\"color:#0000cc\">copier</span>").arg("<a href=\"http://ultracopier.first-world.info/\">Ultracopier</a><br />")+ + #endif + #ifdef Q_OS_MACOS + tr("This will be the last version for Mac, but you can compile from source")+ + #endif + QStringLiteral("<a href=\"%1\">%2</a>").arg(ultimateUrl).arg(tr("Buy the Ultimate version to fund development"))); + #endif + + #ifdef SUPERCOPIER + uiOptions->labelDualProgression->hide(); + uiOptions->showDualProgression->hide(); + ui->progressBar_all->setMaximumHeight(17); + ui->progressBar_file->setMaximumHeight(17); + ui->progressBarCurrentSpeed->setMaximumHeight(17); + ui->progressBar_all->setMinimumHeight(17); + ui->progressBar_file->setMinimumHeight(17); + ui->progressBarCurrentSpeed->setMinimumHeight(17); + ui->progressBar_all->setStyleSheet(QStringLiteral("QProgressBar{color:#fff;font-weight:bold;border:1px solid black;text-align:center;background-image:url(:/Themes/Supercopier/resources/progressbarright.png);}QProgressBar::chunk{background-image: url(:/Themes/Supercopier/resources/progressbarleft.png);}")); + ui->progressBar_file->setStyleSheet(QStringLiteral("QProgressBar{color:#fff;font-weight:bold;border:1px solid black;text-align:center;background-image:url(:/Themes/Supercopier/resources/progressbarright.png);}QProgressBar::chunk{background-image: url(:/Themes/Supercopier/resources/progressbarleft.png);}")); + ui->progressBarCurrentSpeed->setStyleSheet(QStringLiteral("QProgressBar{color:#fff;font-weight:bold;border:1px solid black;text-align:center;background-image:url(:/Themes/Supercopier/resources/progressbarright.png);}QProgressBar::chunk{background-image: url(:/Themes/Supercopier/resources/progressbarleft.png);}")); + this->setWindowTitle("Supercopier"); #endif show(); @@ -248,7 +341,7 @@ Themes::Themes(const bool &alwaysOnTop, Themes::~Themes() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); //disconnect(ui->actionAddFile); //disconnect(ui->actionAddFolder); delete selectionModel; @@ -268,14 +361,14 @@ void Themes::getOptionsEngineEnabled(const bool &isEnabled) QScrollArea *scrollArea=new QScrollArea(ui->tabWidget); scrollArea->setWidgetResizable(true); scrollArea->setWidget(&optionEngineWidget); - ui->tabWidget->addTab(scrollArea,facilityEngine->translateText(QStringLiteral("Copy engine"))); + ui->tabWidget->addTab(scrollArea,QString::fromStdString(facilityEngine->translateText("Copy engine"))); } } void Themes::closeEvent(QCloseEvent *event) { event->ignore(); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); this->hide(); if(uiOptions->minimizeToSystray->isChecked()) { @@ -290,7 +383,7 @@ void Themes::updateSysTrayIcon() { if(totalSize==0) { - sysTrayIcon->setIcon(dynaIcon(0,QStringLiteral("-"))); + sysTrayIcon->setIcon(dynaIcon(0,"-")); return; } quint64 currentNew=currentSize*100; @@ -307,12 +400,17 @@ void Themes::updateOverallInformation() { if(uiOptions->showProgressionInTheTitle->isChecked()) updateTitle(); - ui->overall->setText(tr("File %1/%2, size: %3/%4").arg(currentFile).arg(totalFile).arg(facilityEngine->sizeToString(currentSize)).arg(facilityEngine->sizeToString(totalSize))); + ui->overall->setText(tr("File %1/%2, size: %3/%4") + .arg(currentFile) + .arg(totalFile) + .arg(QString::fromStdString(facilityEngine->sizeToString(currentSize))) + .arg(QString::fromStdString(facilityEngine->sizeToString(totalSize))) + ); } void Themes::actionInProgess(const Ultracopier::EngineActionInProgress &action) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,QStringLiteral("start: ")+QString::number(action)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"start: "+std::to_string(action)); this->action=action; switch(action) { @@ -332,7 +430,7 @@ void Themes::actionInProgess(const Ultracopier::EngineActionInProgress &action) { if(shutdown && ui->shutdown->isChecked()) { - facilityEngine->callFunctionality(QStringLiteral("shutdown")); + facilityEngine->callFunctionality("shutdown"); return; } switch(uiOptions->comboBox_copyEnd->currentIndex()) @@ -352,9 +450,16 @@ void Themes::actionInProgess(const Ultracopier::EngineActionInProgress &action) stat = status_stopped; if(durationStarted) { - Ultracopier::TimeDecomposition time=facilityEngine->secondsToTimeDecomposition(duration.elapsed()/1000); - ui->labelTimeRemaining->setText(QStringLiteral("<html><body style=\"white-space:nowrap;\">")+facilityEngine->translateText(QStringLiteral("Completed in %1")).arg( - QString::number(time.hour)+QStringLiteral(":")+QString::number(time.minute).rightJustified(2,'0')+QStringLiteral(":")+QString::number(time.second).rightJustified(2,'0') + Ultracopier::TimeDecomposition time=facilityEngine->secondsToTimeDecomposition( + (std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count()- + duration) + /1000); + ui->labelTimeRemaining->setText(QStringLiteral("<html><body style=\"white-space:nowrap;\">")+ + QString::fromStdString(facilityEngine->translateText("Completed in %1")).arg( + QString::number(time.hour)+QStringLiteral(":")+ + QString::number(time.minute).rightJustified(2,'0')+ + QStringLiteral(":")+ + QString::number(time.second).rightJustified(2,'0') )+QStringLiteral("</body></html>")); } } @@ -370,11 +475,11 @@ void Themes::actionInProgess(const Ultracopier::EngineActionInProgress &action) ui->pauseButton->setEnabled(true); if(!durationStarted) { - duration.start(); + duration=std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count(); durationStarted=true; } haveStarted=true; - ui->cancelButton->setText(facilityEngine->translateText(QStringLiteral("Quit"))); + ui->cancelButton->setText(QString::fromStdString(facilityEngine->translateText("Quit"))); updatePause(); break; case Ultracopier::Listing: @@ -389,17 +494,17 @@ void Themes::actionInProgess(const Ultracopier::EngineActionInProgress &action) } } -void Themes::newFolderListing(const QString &path) +void Themes::newFolderListing(const std::string &path) { - QString newPath=path; + QString newPath=QString::fromStdString(path); if(newPath.size()>(64+3)) newPath=newPath.mid(0,32)+QStringLiteral("...")+newPath.mid(newPath.size()-32,32); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); if(action==Ultracopier::Listing) ui->from->setText(newPath); } -void Themes::detectedSpeed(const quint64 &speed)//in byte per seconds +void Themes::detectedSpeed(const uint64_t &speed)//in byte per seconds { if(uiOptions->speedWithProgressBar->isChecked()) { @@ -408,19 +513,23 @@ void Themes::detectedSpeed(const quint64 &speed)//in byte per seconds tempSpeed=999999999; if(tempSpeed>(quint64)ui->progressBarCurrentSpeed->maximum()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("set max speed to: %1").arg(tempSpeed)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"set max speed to: "+std::to_string(tempSpeed)); ui->progressBarCurrentSpeed->setMaximum(tempSpeed); } ui->progressBarCurrentSpeed->setValue(tempSpeed); - ui->progressBarCurrentSpeed->setFormat(facilityEngine->speedToString(speed)); + ui->progressBarCurrentSpeed->setFormat(QString::fromStdString(facilityEngine->speedToString(speed))); } else - ui->currentSpeed->setText(facilityEngine->speedToString(speed)); + ui->currentSpeed->setText(QString::fromStdString(facilityEngine->speedToString(speed))); } void Themes::remainingTime(const int &remainingSeconds) { - QString labelTimeRemaining(QStringLiteral("<html><body style=\"white-space:nowrap;\">")+facilityEngine->translateText(QStringLiteral("Time remaining:"))+QStringLiteral(" ")); + QString labelTimeRemaining(QStringLiteral( + "<html><body style=\"white-space:nowrap;\">")+ + QString::fromStdString(facilityEngine->translateText("Time remaining:"))+ + QStringLiteral(" ") + ); if(remainingSeconds==-1) labelTimeRemaining+=QStringLiteral("∞"); else @@ -438,9 +547,13 @@ void Themes::errorDetected() } /// \brief new error -void Themes::errorToRetry(const QString &source,const QString &destination,const QString &error) +void Themes::errorToRetry(const std::string &source,const std::string &destination,const std::string &error) { - ui->errorList->addTopLevelItem(new QTreeWidgetItem(QStringList() << source << destination << error)); + ui->errorList->addTopLevelItem(new QTreeWidgetItem(QStringList() + << QString::fromStdString(source) + << QString::fromStdString(destination) + << QString::fromStdString(error) + )); } /** \brief support speed limitation */ @@ -459,7 +572,7 @@ void Themes::setSupportSpeedLimitation(const bool &supportSpeedLimitationBool) } //get information about the copy -void Themes::setGeneralProgression(const quint64 ¤t,const quint64 &total) +void Themes::setGeneralProgression(const uint64_t ¤t,const uint64_t &total) { currentSize=current; totalSize=total; @@ -477,22 +590,22 @@ void Themes::setGeneralProgression(const quint64 ¤t,const quint64 &total) updateSysTrayIcon(); } -void Themes::setFileProgression(const QList<Ultracopier::ProgressionItem> &progressionList) +void Themes::setFileProgression(const std::vector<Ultracopier::ProgressionItem> &progressionList) { - QList<Ultracopier::ProgressionItem> progressionListBis=progressionList; + std::vector<Ultracopier::ProgressionItem> progressionListBis=progressionList; transferModel.setFileProgression(progressionListBis); updateCurrentFileInformation(); } //edit the transfer list /// \todo check and re-enable to selection -void Themes::getActionOnList(const QList<Ultracopier::ReturnActionOnCopyList> &returnActions) +void Themes::getActionOnList(const std::vector<Ultracopier::ReturnActionOnCopyList> &returnActions) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start, returnActions.size(): ")+QString::number(returnActions.size())); - QList<quint64> returnValue=transferModel.synchronizeItems(returnActions); - totalFile+=returnValue.first(); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start, returnActions.size(): "+std::to_string(returnActions.size())); + std::vector<uint64_t> returnValue=transferModel.synchronizeItems(returnActions); + totalFile+=returnValue.front(); totalSize+=returnValue.at(1); - currentFile+=returnValue.last(); + currentFile+=returnValue.back(); if(transferModel.rowCount()==0) { ui->skipButton->setEnabled(false); @@ -505,19 +618,19 @@ void Themes::getActionOnList(const QList<Ultracopier::ReturnActionOnCopyList> &r else ui->skipButton->setEnabled(true); updateOverallInformation(); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("transferModel.rowCount(): ")+QString::number(transferModel.rowCount())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"transferModel.rowCount(): "+std::to_string(transferModel.rowCount())); } void Themes::setCopyType(const Ultracopier::CopyType &type) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); this->type=type; updateModeAndType(); } void Themes::forceCopyMode(const Ultracopier::CopyMode &mode) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); modeIsForced=true; this->mode=mode; if(mode==Ultracopier::Copy) @@ -536,13 +649,13 @@ void Themes::setTransferListOperation(const Ultracopier::TransferListOperation & void Themes::haveExternalOrder() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); // ui->moreButton->toggle(); } void Themes::isInPause(const bool &isInPause) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("isInPause: ")+QString::number(isInPause)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"isInPause: "+std::to_string(isInPause)); //resume in auto the pause storeIsInPause=isInPause; updatePause(); @@ -554,14 +667,14 @@ void Themes::updatePause() { ui->pauseButton->setIcon(player_play); if(stat == status_started) - ui->pauseButton->setText(facilityEngine->translateText(QStringLiteral("Resume"))); + ui->pauseButton->setText(QString::fromStdString(facilityEngine->translateText("Resume"))); else - ui->pauseButton->setText(facilityEngine->translateText(QStringLiteral("Start"))); + ui->pauseButton->setText(QString::fromStdString(facilityEngine->translateText("Start"))); } else { ui->pauseButton->setIcon(player_pause); - ui->pauseButton->setText(facilityEngine->translateText(QStringLiteral("Pause"))); + ui->pauseButton->setText(QString::fromStdString(facilityEngine->translateText("Pause"))); } } @@ -570,15 +683,15 @@ void Themes::updateCurrentFileInformation() TransferModel::currentTransfertItem transfertItem=transferModel.getCurrentTransfertItem(); if(transfertItem.haveItem) { - QString newPath=transfertItem.from; + QString newPath=QString::fromStdString(transfertItem.from); if(newPath.size()>(64+3)) newPath=newPath.mid(0,32)+QStringLiteral("...")+newPath.mid(newPath.size()-32,32); ui->from->setText(newPath); - newPath=transfertItem.to; + newPath=QString::fromStdString(transfertItem.to); if(newPath.size()>(64+3)) newPath=newPath.mid(0,32)+QStringLiteral("...")+newPath.mid(newPath.size()-32,32); ui->to->setText(newPath); - ui->current_file->setText(transfertItem.current_file); + ui->current_file->setText(QString::fromStdString(transfertItem.current_file)); if(transfertItem.progressBar_read!=-1) { ui->progressBar_file->setRange(0,65535); @@ -624,14 +737,14 @@ void Themes::updateCurrentFileInformation() void Themes::on_putOnTop_clicked() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); selectedItems=selectionModel->selectedRows(); - QList<int> ids; + std::vector<uint64_t> ids; int index=0; const int &loop_size=selectedItems.size(); while(index<loop_size) { - ids << transferModel.data(selectedItems.at(index),Qt::UserRole).toULongLong(); + ids.push_back(transferModel.data(selectedItems.at(index),Qt::UserRole).toULongLong()); index++; } if(ids.size()>0) @@ -640,14 +753,14 @@ void Themes::on_putOnTop_clicked() void Themes::on_pushUp_clicked() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); selectedItems=selectionModel->selectedRows(); - QList<int> ids; + std::vector<uint64_t> ids; int index=0; const int &loop_size=selectedItems.size(); while(index<loop_size) { - ids << transferModel.data(selectedItems.at(index),Qt::UserRole).toULongLong(); + ids.push_back(transferModel.data(selectedItems.at(index),Qt::UserRole).toULongLong()); index++; } if(ids.size()>0) @@ -656,14 +769,14 @@ void Themes::on_pushUp_clicked() void Themes::on_pushDown_clicked() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); selectedItems=selectionModel->selectedRows(); - QList<int> ids; + std::vector<uint64_t> ids; int index=0; const int &loop_size=selectedItems.size(); while(index<loop_size) { - ids << transferModel.data(selectedItems.at(index),Qt::UserRole).toULongLong(); + ids.push_back(transferModel.data(selectedItems.at(index),Qt::UserRole).toULongLong()); index++; } if(ids.size()>0) @@ -672,14 +785,14 @@ void Themes::on_pushDown_clicked() void Themes::on_putOnBottom_clicked() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); selectedItems=selectionModel->selectedRows(); - QList<int> ids; + std::vector<uint64_t> ids; int index=0; const int &loop_size=selectedItems.size(); while(index<loop_size) { - ids << transferModel.data(selectedItems.at(index),Qt::UserRole).toULongLong(); + ids.push_back(transferModel.data(selectedItems.at(index),Qt::UserRole).toULongLong()); index++; } if(ids.size()>0) @@ -688,14 +801,14 @@ void Themes::on_putOnBottom_clicked() void Themes::on_del_clicked() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); selectedItems=selectionModel->selectedRows(); - QList<int> ids; + std::vector<uint64_t> ids; int index=0; const int &loop_size=selectedItems.size(); while(index<loop_size) { - ids << transferModel.data(selectedItems.at(index),Qt::UserRole).toULongLong(); + ids.push_back(transferModel.data(selectedItems.at(index),Qt::UserRole).toULongLong()); index++; } if(ids.size()>0) @@ -704,7 +817,7 @@ void Themes::on_del_clicked() void Themes::on_cancelButton_clicked() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); this->hide(); emit cancel(); } @@ -712,7 +825,7 @@ void Themes::on_cancelButton_clicked() void Themes::speedWithProgressBar_toggled(bool checked) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); ui->progressBarCurrentSpeed->setVisible(checked); ui->currentSpeed->setVisible(!checked); } @@ -720,13 +833,13 @@ void Themes::speedWithProgressBar_toggled(bool checked) void Themes::showDualProgression_toggled(bool checked) { Q_UNUSED(checked); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); updateProgressionColorBar(); } void Themes::checkBoxShowSpeed_toggled(bool checked) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); Q_UNUSED(checked); updateSpeed(); } @@ -756,7 +869,7 @@ void Themes::on_SliderSpeed_valueChanged(int value) currentSpeed=1024*128; break; } - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("value: %1").arg(value)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"value: "+std::to_string(value)); emit newSpeedLimitation(currentSpeed); updateSpeed(); } @@ -769,7 +882,7 @@ void Themes::uiUpdateSpeed() currentSpeed=0; else currentSpeed=uiOptions->limitSpeed->value(); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("emit newSpeedLimitation(%1)").arg(currentSpeed)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"emit newSpeedLimitation"+std::to_string(currentSpeed)); emit newSpeedLimitation(currentSpeed); } @@ -783,12 +896,12 @@ void Themes::updateSpeed() if(uiOptions->checkBoxShowSpeed->isChecked()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("checked, currentSpeed: %1").arg(currentSpeed)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"checked, currentSpeed: "+std::to_string(currentSpeed)); uiOptions->limitSpeed->setEnabled(false); if(currentSpeed==0) { ui->SliderSpeed->setValue(0); - ui->label_SpeedMaxValue->setText(facilityEngine->translateText(QStringLiteral("Unlimited"))); + ui->label_SpeedMaxValue->setText(QString::fromStdString(facilityEngine->translateText("Unlimited"))); } else if(currentSpeed<=1024) { @@ -798,7 +911,7 @@ void Themes::updateSpeed() emit newSpeedLimitation(currentSpeed); } ui->SliderSpeed->setValue(1); - ui->label_SpeedMaxValue->setText(facilityEngine->speedToString((double)(1024*1024)*1)); + ui->label_SpeedMaxValue->setText(QString::fromStdString(facilityEngine->speedToString((double)(1024*1024)*1))); } else if(currentSpeed<=1024*4) { @@ -808,7 +921,7 @@ void Themes::updateSpeed() emit newSpeedLimitation(currentSpeed); } ui->SliderSpeed->setValue(2); - ui->label_SpeedMaxValue->setText(facilityEngine->speedToString((double)(1024*1024)*4)); + ui->label_SpeedMaxValue->setText(QString::fromStdString(facilityEngine->speedToString((double)(1024*1024)*4))); } else if(currentSpeed<=1024*16) { @@ -818,7 +931,7 @@ void Themes::updateSpeed() emit newSpeedLimitation(currentSpeed); } ui->SliderSpeed->setValue(3); - ui->label_SpeedMaxValue->setText(facilityEngine->speedToString((double)(1024*1024)*16)); + ui->label_SpeedMaxValue->setText(QString::fromStdString(facilityEngine->speedToString((double)(1024*1024)*16))); } else if(currentSpeed<=1024*64) { @@ -828,7 +941,7 @@ void Themes::updateSpeed() emit newSpeedLimitation(currentSpeed); } ui->SliderSpeed->setValue(4); - ui->label_SpeedMaxValue->setText(facilityEngine->speedToString((double)(1024*1024)*64)); + ui->label_SpeedMaxValue->setText(QString::fromStdString(facilityEngine->speedToString((double)(1024*1024)*64))); } else { @@ -838,7 +951,7 @@ void Themes::updateSpeed() emit newSpeedLimitation(currentSpeed); } ui->SliderSpeed->setValue(5); - ui->label_SpeedMaxValue->setText(facilityEngine->speedToString((double)(1024*1024)*128)); + ui->label_SpeedMaxValue->setText(QString::fromStdString(facilityEngine->speedToString((double)(1024*1024)*128))); } } else @@ -853,7 +966,7 @@ void Themes::updateSpeed() void Themes::on_pauseButton_clicked() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); if(storeIsInPause) emit resume(); else @@ -865,14 +978,14 @@ void Themes::on_skipButton_clicked() TransferModel::currentTransfertItem transfertItem=transferModel.getCurrentTransfertItem(); if(transfertItem.haveItem) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("skip at running: %1").arg(transfertItem.id)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"skip at running: "+std::to_string(transfertItem.id)); emit skip(transfertItem.id); } else { if(transferModel.rowCount()>1) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("skip at idle: %1").arg(transferModel.firstId())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"skip at idle: "+std::to_string(transferModel.firstId())); emit skip(transferModel.firstId()); } else @@ -903,43 +1016,43 @@ void Themes::updateModeAndType() void Themes::forcedModeAddFile() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); emit userAddFile(mode); } void Themes::forcedModeAddFolder() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); emit userAddFolder(mode); } void Themes::forcedModeAddFileToCopy() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); emit userAddFile(Ultracopier::Copy); } void Themes::forcedModeAddFolderToCopy() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); emit userAddFolder(Ultracopier::Copy); } void Themes::forcedModeAddFileToMove() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); emit userAddFile(Ultracopier::Move); } void Themes::forcedModeAddFolderToMove() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); emit userAddFolder(Ultracopier::Move); } void Themes::newLanguageLoaded() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); if(modeIsForced) forceCopyMode(mode); ui->retranslateUi(this); @@ -954,7 +1067,8 @@ void Themes::newLanguageLoaded() updateOverallInformation(); updateSpeed(); if(ui->tabWidget->count()>=4) - ui->tabWidget->setTabText(ui->tabWidget->count()-1,facilityEngine->translateText(QStringLiteral("Copy engine"))); + ui->tabWidget->setTabText(ui->tabWidget->count()-1, + QString::fromStdString(facilityEngine->translateText("Copy engine"))); on_moreButton_toggled(ui->moreButton->isChecked()); } @@ -995,7 +1109,7 @@ void Themes::searchBoxShortcut() //hilight the search void Themes::hilightTheSearch(bool searchNext) { - int result=transferModel.search(ui->lineEditSearch->text(),searchNext); + int result=transferModel.search(ui->lineEditSearch->text().toStdString(),searchNext); if(ui->lineEditSearch->text().isEmpty()) ui->lineEditSearch->setStyleSheet(""); else @@ -1017,7 +1131,7 @@ void Themes::hilightTheSearchSlot() void Themes::on_pushButtonSearchPrev_clicked() { - int result=transferModel.searchPrev(ui->lineEditSearch->text()); + int result=transferModel.searchPrev(ui->lineEditSearch->text().toStdString()); if(ui->lineEditSearch->text().isEmpty()) ui->lineEditSearch->setStyleSheet(""); else @@ -1075,24 +1189,27 @@ void dragLeaveEvent(QDragLeaveEvent* event); */ void Themes::dropEvent(QDropEvent *event) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); const QMimeData* mimeData = event->mimeData(); if(mimeData->hasUrls()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("hasUrls")); - emit urlDropped(mimeData->urls()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"hasUrls"); + std::vector<std::string> urls; + foreach (QUrl url, mimeData->urls()) + urls.push_back(url.toString().toStdString()); + emit urlDropped(urls); event->acceptProposedAction(); } } void Themes::dragEnterEvent(QDragEnterEvent* event) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); // if some actions should not be usable, like move, this code must be adopted const QMimeData* mimeData = event->mimeData(); if(mimeData->hasUrls()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("hasUrls")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"hasUrls"); event->acceptProposedAction(); } } @@ -1107,7 +1224,7 @@ void Themes::dragMoveEvent(QDragMoveEvent* event) void Themes::dragLeaveEvent(QDragLeaveEvent* event) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); event->accept(); } @@ -1184,7 +1301,7 @@ void Themes::alwaysOnTop_clicked(bool reshow) flags=flags | Qt::WindowStaysOnTopHint; else flags=flags & ~Qt::WindowStaysOnTopHint; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"uiOptions->alwaysOnTop->isChecked(): "+QString::number(uiOptions->alwaysOnTop->isChecked())+", flags: "+QString::number(flags)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"uiOptions->alwaysOnTop->isChecked(): "+std::to_string(uiOptions->alwaysOnTop->isChecked())+", flags: "+std::to_string(flags)); setWindowFlags(flags); if(reshow) show(); @@ -1197,7 +1314,7 @@ void Themes::alwaysOnTop_clickedSlot() void Themes::updateProgressionColorBar() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); uiOptions->labelProgressionColor->setVisible(uiOptions->showDualProgression->isChecked()); uiOptions->frameProgressionColor->setVisible(uiOptions->showDualProgression->isChecked()); if(!uiOptions->showDualProgression->isChecked()) @@ -1230,25 +1347,25 @@ void Themes::updateTitle() if(uiOptions->showProgressionInTheTitle->isChecked() && totalSize>0) { if(!modeIsForced) - this->setWindowTitle(tr("%1 %2% of %3").arg(facilityEngine->translateText(QStringLiteral("Transfer"))).arg((currentSize*100)/totalSize).arg(facilityEngine->sizeToString(totalSize))+QStringLiteral(" - ")+facilityEngine->softwareName()); + this->setWindowTitle(tr("%1 %2% of %3").arg(QString::fromStdString(facilityEngine->translateText("Transfer"))).arg((currentSize*100)/totalSize).arg(QString::fromStdString(facilityEngine->sizeToString(totalSize)))+QStringLiteral(" - ")+QString::fromStdString(facilityEngine->softwareName())); else { if(mode==Ultracopier::Copy) - this->setWindowTitle(tr("%1 %2% of %3").arg(facilityEngine->translateText(QStringLiteral("Copy"))).arg((currentSize*100)/totalSize).arg(facilityEngine->sizeToString(totalSize))+QStringLiteral(" - ")+facilityEngine->softwareName()); + this->setWindowTitle(tr("%1 %2% of %3").arg(QString::fromStdString(facilityEngine->translateText("Copy"))).arg((currentSize*100)/totalSize).arg(QString::fromStdString(facilityEngine->sizeToString(totalSize)))+QStringLiteral(" - ")+QString::fromStdString(facilityEngine->softwareName())); else - this->setWindowTitle(tr("%1 %2% of %3").arg(facilityEngine->translateText(QStringLiteral("Move"))).arg((currentSize*100)/totalSize).arg(facilityEngine->sizeToString(totalSize))+QStringLiteral(" - ")+facilityEngine->softwareName()); + this->setWindowTitle(tr("%1 %2% of %3").arg(QString::fromStdString(facilityEngine->translateText("Move"))).arg((currentSize*100)/totalSize).arg(QString::fromStdString(facilityEngine->sizeToString(totalSize)))+QStringLiteral(" - ")+QString::fromStdString(facilityEngine->softwareName())); } } else { if(!modeIsForced) - this->setWindowTitle(QStringLiteral("%1").arg(facilityEngine->translateText(QStringLiteral("Transfer")))+QStringLiteral(" - ")+facilityEngine->softwareName()); + this->setWindowTitle(QStringLiteral("%1").arg(QString::fromStdString(facilityEngine->translateText("Transfer")))+QStringLiteral(" - ")+QString::fromStdString(facilityEngine->softwareName())); else { if(mode==Ultracopier::Copy) - this->setWindowTitle(QStringLiteral("%1").arg(facilityEngine->translateText(QStringLiteral("Copy")))+QStringLiteral(" - ")+facilityEngine->softwareName()); + this->setWindowTitle(QStringLiteral("%1").arg(QString::fromStdString(facilityEngine->translateText("Copy")))+QStringLiteral(" - ")+QString::fromStdString(facilityEngine->softwareName())); else - this->setWindowTitle(QStringLiteral("%1").arg(facilityEngine->translateText(QStringLiteral("Move")))+QStringLiteral(" - ")+facilityEngine->softwareName()); + this->setWindowTitle(QStringLiteral("%1").arg(QString::fromStdString(facilityEngine->translateText("Move")))+QStringLiteral(" - ")+QString::fromStdString(facilityEngine->softwareName())); } } } @@ -1263,7 +1380,7 @@ Do by mongaulois, remake by alpha_one_x86. \return QIcon of the final image \note Can be used as it: dynaIcon(75,"...") */ -QIcon Themes::dynaIcon(int percent,QString text) const +QIcon Themes::dynaIcon(int percent,std::string text) const { #ifdef ULTRACOPIER_PLUGIN_DEBUG if(pixmapTop.isNull() || pixmapBottom.isNull()) @@ -1320,13 +1437,13 @@ QIcon Themes::dynaIcon(int percent,QString text) const qint8 textxOffset=0; qint8 textyOffset=0; - if(text.isEmpty()) + if(text.empty()) { if(percent!=100) - text=QString::number(percent); + text=std::to_string(percent); else { - text=QStringLiteral(":)"); + text=":)"; #ifdef Q_OS_WIN32 textyOffset-=2; #else @@ -1352,9 +1469,9 @@ QIcon Themes::dynaIcon(int percent,QString text) const textyOffset+=3; #endif painter.setPen(QPen(Qt::black)); - painter.drawText(3+textxOffset,13+textyOffset,text); + painter.drawText(3+textxOffset,13+textyOffset,QString::fromStdString(text)); painter.setPen(QPen(Qt::white)); - painter.drawText(2+textxOffset,12+textyOffset,text); + painter.drawText(2+textxOffset,12+textyOffset,QString::fromStdString(text)); } return QIcon(resultImage); } @@ -1371,7 +1488,7 @@ void Themes::catchAction(QSystemTrayIcon::ActivationReason reason) ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"Double Click detected"); } else - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,QStringLiteral("reason: %1").arg(reason)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"reason: "+std::to_string(reason)); } void Themes::on_exportErrorToTransferList_clicked() diff --git a/plugins/Themes/Oxygen/interface.h b/plugins/Themes/Oxygen/interface.h index ee3cadd..acca141 100644 --- a/plugins/Themes/Oxygen/interface.h +++ b/plugins/Themes/Oxygen/interface.h @@ -58,28 +58,28 @@ public: /// \brief to set the action in progress void actionInProgess(const Ultracopier::EngineActionInProgress &); /// \brief the new folder is listing - void newFolderListing(const QString &path); + void newFolderListing(const std::string &path); /** \brief show the detected speed * in byte per seconds */ - void detectedSpeed(const quint64 &speed); + void detectedSpeed(const uint64_t &speed); /** \brief show the remaining time * time in seconds */ void remainingTime(const int &remainingSeconds); /// \brief set the current collision action - void newCollisionAction(const QString &action); + void newCollisionAction(const std::string &action); /// \brief set the current error action - void newErrorAction(const QString &action); + void newErrorAction(const std::string &action); /// \brief set one error is detected void errorDetected(); /// \brief new error - void errorToRetry(const QString &source,const QString &destination,const QString &error); + void errorToRetry(const std::string &source,const std::string &destination,const std::string &error); /** \brief support speed limitation */ void setSupportSpeedLimitation(const bool &supportSpeedLimitationBool); //get information about the copy /// \brief show the general progression - void setGeneralProgression(const quint64 ¤t,const quint64 &total); + void setGeneralProgression(const uint64_t ¤t,const uint64_t &total); /// \brief show the file progression - void setFileProgression(const QList<Ultracopier::ProgressionItem> &progressionList); + void setFileProgression(const std::vector<Ultracopier::ProgressionItem> &progressionList); /// \brief set the copyType -> file or folder void setCopyType(const Ultracopier::CopyType &); /// \brief set the copyMove -> copy or move, to force in copy or move, else support both @@ -88,7 +88,7 @@ public: void setTransferListOperation(const Ultracopier::TransferListOperation &transferListOperation); //edit the transfer list /// \brief get action on the transfer list (add/move/remove) - void getActionOnList(const QList<Ultracopier::ReturnActionOnCopyList> &returnActions); + void getActionOnList(const std::vector<Ultracopier::ReturnActionOnCopyList> &returnActions); /** \brief set if the order is external (like file manager copy) * to notify the interface, which can hide add folder/filer button */ void haveExternalOrder(); @@ -150,24 +150,24 @@ private slots: void catchAction(QSystemTrayIcon::ActivationReason reason); void on_exportErrorToTransferList_clicked(); private: - QTime duration; + uint64_t duration; bool durationStarted; QPixmap pixmapTop,pixmapBottom; QColor progressColorWrite,progressColorRead,progressColorRemaining; Ui::interfaceCopy *ui; Ui::themesOptions *uiOptions; - quint64 currentFile; - quint64 totalFile; - quint64 currentSize; - quint64 totalSize; - quint8 getOldProgression; + uint64_t currentFile; + uint64_t totalFile; + uint64_t currentSize; + uint64_t totalSize; + uint8_t getOldProgression; QSystemTrayIcon *sysTrayIcon; void updateOverallInformation(); void updateCurrentFileInformation(); QMenu *menu; Ultracopier::EngineActionInProgress action; void closeEvent(QCloseEvent *event); - qint32 currentSpeed;///< in KB/s, assume as 0KB/s as default like every where + int32_t currentSpeed;///< in KB/s, assume as 0KB/s as default like every where void updateSpeed(); bool storeIsInPause; bool modeIsForced; @@ -212,11 +212,11 @@ private: //have functionality bool shutdown; void updatePause(); - QIcon dynaIcon(int percent,QString text="") const; + QIcon dynaIcon(int percent,std::string text="") const; void updateSysTrayIcon(); 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 // INTERFACE_H diff --git a/plugins/Themes/Oxygen/interface.pro b/plugins/Themes/Oxygen/interface.pro index 8ddf147..9b4923d 100644 --- a/plugins/Themes/Oxygen/interface.pro +++ b/plugins/Themes/Oxygen/interface.pro @@ -1,59 +1,8 @@ -CONFIG += c++11 -QMAKE_CXXFLAGS+="-std=c++0x -Wall -Wextra" -mac:QMAKE_CXXFLAGS+="-stdlib=libc++" - -QT += widgets -TEMPLATE = lib -CONFIG += plugin -HEADERS = ThemesFactory.h \ - StructEnumDefinition.h \ - DebugEngineMacro.h \ - Environment.h \ - Variable.h \ - ../../../interface/PluginInterface_Themes.h \ - ../../../interface/FacilityInterface.h \ - ../../../interface/OptionInterface.h \ - TransferModel.h \ - interface.h -SOURCES = ThemesFactory.cpp \ - TransferModel.cpp \ - interface.cpp -TARGET = $$qtLibraryTarget(interface) -TRANSLATIONS += Languages/ar/translation.ts \ - Languages/de/translation.ts \ - Languages/el/translation.ts \ - Languages/en/translation.ts \ - Languages/es/translation.ts \ - Languages/fr/translation.ts \ - Languages/hi/translation.ts \ - Languages/hu/translation.ts \ - Languages/id/translation.ts \ - Languages/it/translation.ts \ - Languages/ja/translation.ts \ - Languages/ko/translation.ts \ - Languages/nl/translation.ts \ - Languages/no/translation.ts \ - Languages/pl/translation.ts \ - Languages/pt/translation.ts \ - Languages/ru/translation.ts \ - Languages/th/translation.ts \ - Languages/tr/translation.ts \ - Languages/zh/translation.ts - -win32 { - RESOURCES += -} -!win32 { - RESOURCES += -} +include($$PWD/../Oxygen/interfaceInclude.pri) !CONFIG(static) { RESOURCES += \ - interfaceResources.qrc \ - interfaceResources_unix.qrc \ - interfaceResources_windows.qrc + $$PWD/../Oxygen/interfaceResources.qrc \ + $$PWD/../Oxygen/interfaceResources_unix.qrc \ + $$PWD/../Oxygen/interfaceResources_windows.qrc } - -FORMS += \ - interface.ui \ - themesOptions.ui diff --git a/plugins/Themes/Oxygen/interfaceInclude.pri b/plugins/Themes/Oxygen/interfaceInclude.pri new file mode 100644 index 0000000..5f7317b --- /dev/null +++ b/plugins/Themes/Oxygen/interfaceInclude.pri @@ -0,0 +1,51 @@ +CONFIG += c++11 +QMAKE_CXXFLAGS+="-std=c++0x -Wall -Wextra" +mac:QMAKE_CXXFLAGS+="-stdlib=libc++" + +QT += widgets +TEMPLATE = lib +CONFIG += plugin +HEADERS = \ + $$PWD/ThemesFactory.h \ + $$PWD/StructEnumDefinition.h \ + $$PWD/DebugEngineMacro.h \ + $$PWD/Environment.h \ + $$PWD/Variable.h \ + $$PWD/../../../interface/PluginInterface_Themes.h \ + $$PWD/../../../interface/FacilityInterface.h \ + $$PWD/../../../interface/OptionInterface.h \ + $$PWD/../../../cpp11addition.h \ + $$PWD/TransferModel.h \ + $$PWD/interface.h +SOURCES = \ + $$PWD/ThemesFactory.cpp \ + $$PWD/TransferModel.cpp \ + $$PWD/interface.cpp \ + $$PWD/../../../cpp11addition.cpp \ + $$PWD/../../../cpp11additionstringtointcpp.cpp +TARGET = $$qtLibraryTarget(interface) +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 += \ + $$PWD/interface.ui \ + $$PWD/themesOptions.ui diff --git a/plugins/SessionLoader/KDE4/informations.xml b/plugins/Themes/Supercopier/informations.xml index 2178b0e..476e5f5 100644 --- a/plugins/SessionLoader/KDE4/informations.xml +++ b/plugins/Themes/Supercopier/informations.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <package> - <title xml:lang="en"><![CDATA[Session loader for test]]></title><!-- english is required --> - <title xml:lang="fr"><![CDATA[Chargeur de session pour des testes]]></title> + <title xml:lang="en"><![CDATA[Supercopier style for Ultracopier]]></title><!-- english is required --> + <title xml:lang="fr"><![CDATA[Style supercopier pour Ultracopier]]></title> <!-- What kind of plugin this is --> - <category>SessionLoader</category> + <category>Themes</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). --> @@ -14,13 +14,13 @@ <!-- the architecture code of this plugin, found PlatformMacro.h into ultracopier source --> <architecture>windows-x86</architecture> <!-- Detailed description --> - <description xml:lang="en"><![CDATA[Test plugin to show how create SessionLoader plugin]]></description> - <description xml:lang="fr"><![CDATA[Plugin de test pour monter comment créer un plugin SessionLoader]]></description> + <description xml:lang="en"><![CDATA[Supercopier style for Ultracopier]]></description> + <description xml:lang="fr"><![CDATA[Style supercopier pour Ultracopier]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>1.2.3.6</version> + <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>KDE4</name> + <name>Supercopier</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>
\ No newline at end of file +</package> diff --git a/plugins/Themes/Supercopier/interface.pro b/plugins/Themes/Supercopier/interface.pro new file mode 100644 index 0000000..1b0ef2e --- /dev/null +++ b/plugins/Themes/Supercopier/interface.pro @@ -0,0 +1,10 @@ +DEFINES+=SUPERCOPIER + +include($$PWD/../Oxygen/interfaceInclude.pri) + +!CONFIG(static) { +RESOURCES += \ + $$PWD/../Supercopier/interfaceResources.qrc \ + $$PWD/../Supercopier/interfaceResources_unix.qrc \ + $$PWD/../Supercopier/interfaceResources_windows.qrc +} diff --git a/plugins/Themes/Supercopier/interfaceResources.qrc b/plugins/Themes/Supercopier/interfaceResources.qrc new file mode 100644 index 0000000..d8990aa --- /dev/null +++ b/plugins/Themes/Supercopier/interfaceResources.qrc @@ -0,0 +1,24 @@ +<RCC> + <qresource prefix="/Themes/Supercopier"> + <file>resources/add.png</file> + <file>resources/cancel.png</file> + <file>resources/main.png</file> + <file>resources/moveDown.png</file> + <file>resources/moveUp.png</file> + <file>resources/player_end.png</file> + <file>resources/player_pause.png</file> + <file>resources/player_play.png</file> + <file>resources/putOnBottom.png</file> + <file>resources/putOnTop.png</file> + <file>resources/remove.png</file> + <file>resources/search.png</file> + <file>resources/export-transfer-list.png</file> + <file>resources/import-transfer-list.png</file> + <file>resources/SystemTrayIcon/add.png</file> + <file>resources/SystemTrayIcon/exit.png</file> + <file>resources/SystemTrayIcon/informations.png</file> + <file>resources/SystemTrayIcon/options.png</file> + <file>resources/progressbarleft.png</file> + <file>resources/progressbarright.png</file> + </qresource> +</RCC> diff --git a/plugins/Themes/Supercopier/interfaceResources_unix.qrc b/plugins/Themes/Supercopier/interfaceResources_unix.qrc new file mode 100644 index 0000000..2cf979f --- /dev/null +++ b/plugins/Themes/Supercopier/interfaceResources_unix.qrc @@ -0,0 +1,7 @@ +<RCC> + <qresource prefix="/Themes/Supercopier"> + <file>resources/SystemTrayIcon/systray_Caught_Unix.png</file> + <file>resources/SystemTrayIcon/systray_Semiuncaught_Unix.png</file> + <file>resources/SystemTrayIcon/systray_Uncaught_Unix.png</file> + </qresource> +</RCC> diff --git a/plugins/Themes/Supercopier/interfaceResources_windows.qrc b/plugins/Themes/Supercopier/interfaceResources_windows.qrc new file mode 100644 index 0000000..abbedba --- /dev/null +++ b/plugins/Themes/Supercopier/interfaceResources_windows.qrc @@ -0,0 +1,7 @@ +<RCC> + <qresource prefix="/Themes/Supercopier"> + <file>resources/SystemTrayIcon/systray_Caught_Windows.png</file> + <file>resources/SystemTrayIcon/systray_Semiuncaught_Windows.png</file> + <file>resources/SystemTrayIcon/systray_Uncaught_Windows.png</file> + </qresource> +</RCC> diff --git a/plugins/Themes/Supercopier/resources/SystemTrayIcon/add.png b/plugins/Themes/Supercopier/resources/SystemTrayIcon/add.png Binary files differnew file mode 100644 index 0000000..d41fce6 --- /dev/null +++ b/plugins/Themes/Supercopier/resources/SystemTrayIcon/add.png diff --git a/plugins/Themes/Supercopier/resources/SystemTrayIcon/exit.png b/plugins/Themes/Supercopier/resources/SystemTrayIcon/exit.png Binary files differnew file mode 100644 index 0000000..9599bba --- /dev/null +++ b/plugins/Themes/Supercopier/resources/SystemTrayIcon/exit.png diff --git a/plugins/Themes/Supercopier/resources/SystemTrayIcon/informations.png b/plugins/Themes/Supercopier/resources/SystemTrayIcon/informations.png Binary files differnew file mode 100644 index 0000000..86c9ba6 --- /dev/null +++ b/plugins/Themes/Supercopier/resources/SystemTrayIcon/informations.png diff --git a/plugins/Themes/Supercopier/resources/SystemTrayIcon/options.png b/plugins/Themes/Supercopier/resources/SystemTrayIcon/options.png Binary files differnew file mode 100644 index 0000000..cf699d5 --- /dev/null +++ b/plugins/Themes/Supercopier/resources/SystemTrayIcon/options.png diff --git a/plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Caught_Unix.png b/plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Caught_Unix.png Binary files differnew file mode 100644 index 0000000..be2ba20 --- /dev/null +++ b/plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Caught_Unix.png diff --git a/plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Caught_Windows.png b/plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Caught_Windows.png Binary files differnew file mode 100644 index 0000000..9c597af --- /dev/null +++ b/plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Caught_Windows.png diff --git a/plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Semiuncaught_Unix.png b/plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Semiuncaught_Unix.png Binary files differnew file mode 100644 index 0000000..be2ba20 --- /dev/null +++ b/plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Semiuncaught_Unix.png diff --git a/plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Semiuncaught_Windows.png b/plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Semiuncaught_Windows.png Binary files differnew file mode 100644 index 0000000..9c597af --- /dev/null +++ b/plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Semiuncaught_Windows.png diff --git a/plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Uncaught_Unix.png b/plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Uncaught_Unix.png Binary files differnew file mode 100644 index 0000000..4da8cc0 --- /dev/null +++ b/plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Uncaught_Unix.png diff --git a/plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Uncaught_Windows.png b/plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Uncaught_Windows.png Binary files differnew file mode 100644 index 0000000..8bfbcf9 --- /dev/null +++ b/plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Uncaught_Windows.png diff --git a/plugins/Themes/Supercopier/resources/add.png b/plugins/Themes/Supercopier/resources/add.png Binary files differnew file mode 100644 index 0000000..af8a401 --- /dev/null +++ b/plugins/Themes/Supercopier/resources/add.png diff --git a/plugins/Themes/Supercopier/resources/cancel.png b/plugins/Themes/Supercopier/resources/cancel.png Binary files differnew file mode 100644 index 0000000..1e7579c --- /dev/null +++ b/plugins/Themes/Supercopier/resources/cancel.png diff --git a/plugins/Themes/Supercopier/resources/export-transfer-list.png b/plugins/Themes/Supercopier/resources/export-transfer-list.png Binary files differnew file mode 100644 index 0000000..2bcc455 --- /dev/null +++ b/plugins/Themes/Supercopier/resources/export-transfer-list.png diff --git a/plugins/Themes/Supercopier/resources/import-transfer-list.png b/plugins/Themes/Supercopier/resources/import-transfer-list.png Binary files differnew file mode 100644 index 0000000..d208342 --- /dev/null +++ b/plugins/Themes/Supercopier/resources/import-transfer-list.png diff --git a/plugins/Themes/Supercopier/resources/main.png b/plugins/Themes/Supercopier/resources/main.png Binary files differnew file mode 100644 index 0000000..9bec399 --- /dev/null +++ b/plugins/Themes/Supercopier/resources/main.png diff --git a/plugins/Themes/Supercopier/resources/moveDown.png b/plugins/Themes/Supercopier/resources/moveDown.png Binary files differnew file mode 100644 index 0000000..7f4ff27 --- /dev/null +++ b/plugins/Themes/Supercopier/resources/moveDown.png diff --git a/plugins/Themes/Supercopier/resources/moveUp.png b/plugins/Themes/Supercopier/resources/moveUp.png Binary files differnew file mode 100644 index 0000000..9397b76 --- /dev/null +++ b/plugins/Themes/Supercopier/resources/moveUp.png diff --git a/plugins/Themes/Supercopier/resources/player_end.png b/plugins/Themes/Supercopier/resources/player_end.png Binary files differnew file mode 100644 index 0000000..9730302 --- /dev/null +++ b/plugins/Themes/Supercopier/resources/player_end.png diff --git a/plugins/Themes/Supercopier/resources/player_pause.png b/plugins/Themes/Supercopier/resources/player_pause.png Binary files differnew file mode 100644 index 0000000..429ae43 --- /dev/null +++ b/plugins/Themes/Supercopier/resources/player_pause.png diff --git a/plugins/Themes/Supercopier/resources/player_play.png b/plugins/Themes/Supercopier/resources/player_play.png Binary files differnew file mode 100644 index 0000000..a28ac73 --- /dev/null +++ b/plugins/Themes/Supercopier/resources/player_play.png diff --git a/plugins/Themes/Supercopier/resources/progressbarleft.png b/plugins/Themes/Supercopier/resources/progressbarleft.png Binary files differnew file mode 100644 index 0000000..bbee9c8 --- /dev/null +++ b/plugins/Themes/Supercopier/resources/progressbarleft.png diff --git a/plugins/Themes/Supercopier/resources/progressbarright.png b/plugins/Themes/Supercopier/resources/progressbarright.png Binary files differnew file mode 100644 index 0000000..93e5781 --- /dev/null +++ b/plugins/Themes/Supercopier/resources/progressbarright.png diff --git a/plugins/Themes/Supercopier/resources/putOnBottom.png b/plugins/Themes/Supercopier/resources/putOnBottom.png Binary files differnew file mode 100644 index 0000000..9ac517c --- /dev/null +++ b/plugins/Themes/Supercopier/resources/putOnBottom.png diff --git a/plugins/Themes/Supercopier/resources/putOnTop.png b/plugins/Themes/Supercopier/resources/putOnTop.png Binary files differnew file mode 100644 index 0000000..5682829 --- /dev/null +++ b/plugins/Themes/Supercopier/resources/putOnTop.png diff --git a/plugins/Themes/Supercopier/resources/remove.png b/plugins/Themes/Supercopier/resources/remove.png Binary files differnew file mode 100644 index 0000000..3a2a9f1 --- /dev/null +++ b/plugins/Themes/Supercopier/resources/remove.png diff --git a/plugins/Themes/Supercopier/resources/search.png b/plugins/Themes/Supercopier/resources/search.png Binary files differnew file mode 100644 index 0000000..567f498 --- /dev/null +++ b/plugins/Themes/Supercopier/resources/search.png |
