diff options
Diffstat (limited to 'plugins')
210 files changed, 10982 insertions, 6589 deletions
diff --git a/plugins/CopyEngine/Random/informations.xml b/plugins/CopyEngine/Random/informations.xml index 88f79bd..3145f44 100755 --- a/plugins/CopyEngine/Random/informations.xml +++ b/plugins/CopyEngine/Random/informations.xml @@ -15,7 +15,7 @@ <!-- Detailed description --> <description xml:lang="en"><![CDATA[TODO]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>2.2.4.7</version> + <version>2.2.6.0</version> <!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. --> <name>Random</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/CopyEngine/Rsync/informations.xml b/plugins/CopyEngine/Rsync/informations.xml index 92f21c7..d2f698f 100755 --- a/plugins/CopyEngine/Rsync/informations.xml +++ b/plugins/CopyEngine/Rsync/informations.xml @@ -17,7 +17,7 @@ <description xml:lang="en"><![CDATA[Rsync copy engine, variant of the official copy engine to provide simple way to do backups]]></description> <description xml:lang="fr"><![CDATA[Moteur de copie rsync, variante du moteur de copie officiel pour fournir une maniére simple de faire des backups]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>2.2.4.7</version> + <version>2.2.6.0</version> <!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. --> <name>Rsync</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/CopyEngine/Ultracopier-Spec/CopyEngine-collision-and-error.cpp b/plugins/CopyEngine/Ultracopier-Spec/CopyEngine-collision-and-error.cpp index fcf43ff..2262b95 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/CopyEngine-collision-and-error.cpp +++ b/plugins/CopyEngine/Ultracopier-Spec/CopyEngine-collision-and-error.cpp @@ -38,7 +38,7 @@ void CopyEngine::mkPathErrorOnFolderSlot(INTERNALTYPEPATH folder,std::string err } /// \note Can be call without queue because all call will be serialized -void CopyEngine::fileAlreadyExists(INTERNALTYPEPATH source,INTERNALTYPEPATH destination,bool isSame,TransferThreadAsync * thread,bool isCalledByShowOneNewDialog) +void CopyEngine::fileAlreadyExists(INTERNALTYPEPATH source,INTERNALTYPEPATH destination,bool isSame,TransferThreadAsync * thread) { if(stopIt) return; @@ -106,13 +106,9 @@ void CopyEngine::fileAlreadyExists(INTERNALTYPEPATH source,INTERNALTYPEPATH dest else thread->setFileRename(dialog.getNewName()); dialogIsOpen=false; - if(!isCalledByShowOneNewDialog) - { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"emit queryOneNewDialog()"); - emit queryOneNewDialog(); - } - else - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"NOT emit queryOneNewDialog(), !isCalledByShowOneNewDialog"); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"emit queryOneNewDialog()"); + //always call to check if pending dialog + emit queryOneNewDialog(); return; break; } @@ -161,11 +157,14 @@ void CopyEngine::fileAlreadyExists(INTERNALTYPEPATH source,INTERNALTYPEPATH dest ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"close dialog: "+std::to_string(newAction)); if(newAction==FileExists_Cancel) { + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"cancel"); emit cancelAll(); return; } + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"close dialog: newAction!=FileExists_Cancel"); if(dialog.getAlways() && newAction!=alwaysDoThisActionForFileExists) { + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"close dialog: always"); alwaysDoThisActionForFileExists=newAction; listThread->setAlwaysFileExistsAction(alwaysDoThisActionForFileExists); if(uiIsInstalled) @@ -198,18 +197,16 @@ void CopyEngine::fileAlreadyExists(INTERNALTYPEPATH source,INTERNALTYPEPATH dest break; } } + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"close dialog: post always"); if(dialog.getAlways() || newAction!=FileExists_Rename) thread->setFileExistsAction(newAction); else thread->setFileRename(dialog.getNewName()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"close dialog: post set thread"); dialogIsOpen=false; - if(!isCalledByShowOneNewDialog) - { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"emit queryOneNewDialog()"); - emit queryOneNewDialog(); - } - else - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"NOT emit queryOneNewDialog(), !isCalledByShowOneNewDialog"); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"emit queryOneNewDialog()"); + //always call to check if pending dialog + emit queryOneNewDialog(); return; break; } @@ -254,7 +251,7 @@ void CopyEngine::missingDiskSpace(std::vector<Diskspace> list) } /// \note Can be call without queue because all call will be serialized -void CopyEngine::errorOnFile(INTERNALTYPEPATH fileInfo,std::string errorString,TransferThreadAsync * thread,const ErrorType &errorType,bool isCalledByShowOneNewDialog) +void CopyEngine::errorOnFile(INTERNALTYPEPATH fileInfo, std::string errorString, TransferThreadAsync * thread, const ErrorType &errorType) { if(stopIt) return; @@ -309,9 +306,13 @@ void CopyEngine::errorOnFile(INTERNALTYPEPATH fileInfo,std::string errorString,T WIN32_FILE_ATTRIBUTE_DATA sourceW; if(GetFileAttributesExW(fileInfo.c_str(),GetFileExInfoStandard,&sourceW)) { - mdate=sourceW.ftLastWriteTime.dwHighDateTime; + LARGE_INTEGER li; + li.LowPart = sourceW.ftLastWriteTime.dwLowDateTime; + li.HighPart = sourceW.ftLastWriteTime.dwHighDateTime; + mdate=(li.QuadPart - 0x019DB1DED53E8000) / 10000000; + /*mdate=sourceW.ftLastWriteTime.dwHighDateTime; mdate<<=32; - mdate|=sourceW.ftLastWriteTime.dwLowDateTime; + mdate|=sourceW.ftLastWriteTime.dwLowDateTime;*/ size=sourceW.nFileSizeHigh; size<<=32; size|=sourceW.nFileSizeLow; @@ -381,13 +382,9 @@ void CopyEngine::errorOnFile(INTERNALTYPEPATH fileInfo,std::string errorString,T break; } dialogIsOpen=false; - if(!isCalledByShowOneNewDialog) - { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"emit queryOneNewDialog()"); - emit queryOneNewDialog(); - } - else - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"isCalledByShowOneNewDialog==true then not show other dial"); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"emit queryOneNewDialog()"); + //always call to check if pending dialog + emit queryOneNewDialog(); return; break; } @@ -395,7 +392,7 @@ void CopyEngine::errorOnFile(INTERNALTYPEPATH fileInfo,std::string errorString,T } /// \note Can be call without queue because all call will be serialized -void CopyEngine::folderAlreadyExists(INTERNALTYPEPATH source,INTERNALTYPEPATH destination,bool isSame,ScanFileOrFolder * thread,bool isCalledByShowOneNewDialog) +void CopyEngine::folderAlreadyExists(INTERNALTYPEPATH source, INTERNALTYPEPATH destination, bool isSame, ScanFileOrFolder * thread) { if(stopIt) return; @@ -445,13 +442,9 @@ void CopyEngine::folderAlreadyExists(INTERNALTYPEPATH source,INTERNALTYPEPATH de else thread->setFolderExistsAction(newAction); dialogIsOpen=false; - if(!isCalledByShowOneNewDialog) - { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"emit queryOneNewDialog()"); - emit queryOneNewDialog(); - } - else - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"NOT emit queryOneNewDialog(), !isCalledByShowOneNewDialog"); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"emit queryOneNewDialog()"); + //always call to check if pending dialog + emit queryOneNewDialog(); return; break; } @@ -459,7 +452,7 @@ void CopyEngine::folderAlreadyExists(INTERNALTYPEPATH source,INTERNALTYPEPATH de /// \note Can be call without queue because all call will be serialized /// \todo all this part -void CopyEngine::errorOnFolder(INTERNALTYPEPATH fileInfo, std::string errorString, ScanFileOrFolder * thread, ErrorType errorType, bool isCalledByShowOneNewDialog) +void CopyEngine::errorOnFolder(INTERNALTYPEPATH fileInfo, std::string errorString, ScanFileOrFolder * thread, ErrorType errorType) { if(stopIt) return; @@ -500,9 +493,13 @@ void CopyEngine::errorOnFolder(INTERNALTYPEPATH fileInfo, std::string errorStrin WIN32_FILE_ATTRIBUTE_DATA sourceW; if(GetFileAttributesExW(fileInfo.c_str(),GetFileExInfoStandard,&sourceW)) { - mdate=sourceW.ftLastWriteTime.dwHighDateTime; + LARGE_INTEGER li; + li.LowPart = sourceW.ftLastWriteTime.dwLowDateTime; + li.HighPart = sourceW.ftLastWriteTime.dwHighDateTime; + mdate=(li.QuadPart - 0x019DB1DED53E8000) / 10000000; + /*mdate=sourceW.ftLastWriteTime.dwHighDateTime; mdate<<=32; - mdate|=sourceW.ftLastWriteTime.dwLowDateTime; + mdate|=sourceW.ftLastWriteTime.dwLowDateTime;*/ size=sourceW.nFileSizeHigh; size<<=32; size|=sourceW.nFileSizeLow; @@ -546,13 +543,9 @@ void CopyEngine::errorOnFolder(INTERNALTYPEPATH fileInfo, std::string errorStrin } dialogIsOpen=false; thread->setFolderErrorAction(newAction); - if(!isCalledByShowOneNewDialog) - { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"emit queryOneNewDialog()"); - emit queryOneNewDialog(); - } - else - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"NOT emit queryOneNewDialog(), !isCalledByShowOneNewDialog"); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"emit queryOneNewDialog()"); + //always call to check if pending dialog + emit queryOneNewDialog(); return; break; } @@ -562,7 +555,7 @@ void CopyEngine::errorOnFolder(INTERNALTYPEPATH fileInfo, std::string errorStrin // ----------------------------------------------------- //mkpath event -void CopyEngine::mkPathErrorOnFolder(INTERNALTYPEPATH folder, std::string errorString, const ErrorType &errorType, bool isCalledByShowOneNewDialog) +void CopyEngine::mkPathErrorOnFolder(INTERNALTYPEPATH folder, std::string errorString, const ErrorType &errorType) { if(stopIt) return; @@ -600,9 +593,13 @@ void CopyEngine::mkPathErrorOnFolder(INTERNALTYPEPATH folder, std::string errorS WIN32_FILE_ATTRIBUTE_DATA sourceW; if(GetFileAttributesExW(folder.c_str(),GetFileExInfoStandard,&sourceW)) { - mdate=sourceW.ftLastWriteTime.dwHighDateTime; + LARGE_INTEGER li; + li.LowPart = sourceW.ftLastWriteTime.dwLowDateTime; + li.HighPart = sourceW.ftLastWriteTime.dwHighDateTime; + mdate=(li.QuadPart - 0x019DB1DED53E8000) / 10000000; + /*mdate=sourceW.ftLastWriteTime.dwHighDateTime; mdate<<=32; - mdate|=sourceW.ftLastWriteTime.dwLowDateTime; + mdate|=sourceW.ftLastWriteTime.dwLowDateTime;*/ size=sourceW.nFileSizeHigh; size<<=32; size|=sourceW.nFileSizeLow; @@ -656,13 +653,9 @@ void CopyEngine::mkPathErrorOnFolder(INTERNALTYPEPATH folder, std::string errorS ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unknow switch case: "+std::to_string(newAction)); break; } - if(!isCalledByShowOneNewDialog) - { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"emit queryOneNewDialog()"); - emit queryOneNewDialog(); - } - else - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"NOT emit queryOneNewDialog(), !isCalledByShowOneNewDialog"); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"emit queryOneNewDialog()"); + //always call to check if pending dialog + emit queryOneNewDialog(); return; break; } @@ -676,44 +669,42 @@ void CopyEngine::showOneNewDialog() return; ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"alreadyExistsQueue.size(): "+std::to_string(alreadyExistsQueue.size())); ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"errorQueue.size(): "+std::to_string(errorQueue.size())); - //reset to always show the dialog - dialogIsOpen=false; - int loop_size=alreadyExistsQueue.size(); - while(loop_size>0) + if(dialogIsOpen) + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"dialogIsOpen should false here"); { - if(alreadyExistsQueue.front().transfer!=NULL) + const std::vector<alreadyExistsQueueItem> alreadyExistsQueue=this->alreadyExistsQueue; + this->alreadyExistsQueue.clear(); + for(const alreadyExistsQueueItem &u : alreadyExistsQueue) { - fileAlreadyExists(alreadyExistsQueue.front().source, - alreadyExistsQueue.front().destination, - alreadyExistsQueue.front().isSame, - alreadyExistsQueue.front().transfer, - true); + if(u.transfer!=NULL) + { + fileAlreadyExists(u.source, + u.destination, + u.isSame, + u.transfer); + } + else if(u.scan!=NULL) + folderAlreadyExists(u.source, + u.destination, + u.isSame, + u.scan); + else + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"bug, no thread actived"); } - 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.erase(alreadyExistsQueue.cbegin()); - loop_size--; } - loop_size=errorQueue.size(); - while(errorQueue.size()>0 && loop_size>0) { - 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.erase(errorQueue.cbegin()); - loop_size--; + const std::vector<errorQueueItem> errorQueue=this->errorQueue; + this->errorQueue.clear(); + for(const errorQueueItem &u : errorQueue) + { + if(u.transfer!=NULL) + errorOnFile(u.inode,u.errorString,u.transfer,u.errorType); + else if(u.scan!=NULL) + errorOnFolder(u.inode,u.errorString,u.scan,u.errorType); + else if(u.mkPath) + mkPathErrorOnFolder(u.inode,u.errorString,u.errorType); + else + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"bug, no thread actived"); + } } - //no more to show then reset - dialogIsOpen=false; } diff --git a/plugins/CopyEngine/Ultracopier-Spec/CopyEngine.cpp b/plugins/CopyEngine/Ultracopier-Spec/CopyEngine.cpp index 8ec21e1..0061f0a 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/CopyEngine.cpp +++ b/plugins/CopyEngine/Ultracopier-Spec/CopyEngine.cpp @@ -5,6 +5,10 @@ #include <QFileDialog> #include <QMessageBox> #include <cmath> +#ifdef ULTRACOPIER_PLUGIN_DEBUG +#include <sys/stat.h> +#include <regex> +#endif #include "CopyEngine.h" #include "FolderExistsDialog.h" @@ -464,8 +468,50 @@ bool CopyEngine::newCopy(const std::vector<std::string> &sources,const std::stri return listThread->newCopy(sources,destination); } +#ifdef ULTRACOPIER_PLUGIN_DEBUG +bool stringStartWithC(std::string const &fullString, std::string const &starting) +{ + if (fullString.length() >= starting.length()) { + return (fullString.substr(0,starting.length())==starting); + } else { + return false; + } +} +#endif + bool CopyEngine::newMove(const std::vector<std::string> &sources) { + #ifdef ULTRACOPIER_PLUGIN_DEBUG + { + std::regex base_regex("^[a-z][a-z][a-z]*:/.*"); + std::smatch base_match; + + unsigned int index=0; + while(index<sources.size()) + { + std::string source=sources.at(index); + //can be: file://192.168.0.99/share/file.txt + //can be: file:///C:/file.txt + //can be: file:///home/user/fileatrootunderunix + #ifndef Q_OS_WIN + if(stringStartWithC(source,"file:///")) + source.replace(0,7,""); + #else + if(stringStartWithC(source,"file:///")) + source.replace(0,8,""); + else if(stringStartWithC(source,"file://")) + source.replace(0,5,""); + else if(stringStartWithC(source,"file:/")) + source.replace(0,6,""); + #endif + if(index<99) + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,sources.at(index)+" -> "+source); + index++; + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"source is_file: "+std::to_string(TransferThread::is_file(TransferThread::stringToInternalString(source)))+" is_dir: "+std::to_string(TransferThread::is_dir(TransferThread::stringToInternalString(source)))); + } + } + #endif + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,stringimplode(sources,", ")); if(forcedMode && mode!=Ultracopier::Move) { @@ -764,8 +810,14 @@ void CopyEngine::setFileCollision(int index) case 6: alwaysDoThisActionForFileExists=FileExists_Rename; break; + case 7: + alwaysDoThisActionForFileExists=FileExists_OverwriteIfNotSameSize; + break; + case 8: + alwaysDoThisActionForFileExists=FileExists_OverwriteIfNotSameSizeAndDate; + break; default: - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Error, unknow index, ignored"); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Error, unknow index, ignored: "+std::to_string(index)); alwaysDoThisActionForFileExists=FileExists_NotSet; break; } @@ -790,7 +842,7 @@ void CopyEngine::setFileError(int index) alwaysDoThisActionForFileError=FileError_PutToEndOfTheList; break; default: - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Error, unknow index, ignored"); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Error, unknow index, ignored: "+std::to_string(index)); alwaysDoThisActionForFileError=FileError_NotSet; break; } @@ -826,7 +878,14 @@ void CopyEngine::setNativeCopy(const bool native_copy) { this->native_copy=native_copy; if(uiIsInstalled) + { ui->native_copy->setChecked(native_copy); + #ifndef Q_OS_WIN32 + ui->native_copy->setEnabled(false); + ui->label_native_copy->setEnabled(false); + ui->native_copy->setToolTip(tr("Supported only on Windows")); + #endif + } listThread->setNativeCopy(native_copy); } diff --git a/plugins/CopyEngine/Ultracopier-Spec/CopyEngine.h b/plugins/CopyEngine/Ultracopier-Spec/CopyEngine.h index caba5b5..2a43986 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/CopyEngine.h +++ b/plugins/CopyEngine/Ultracopier-Spec/CopyEngine.h @@ -75,7 +75,7 @@ private: FileErrorAction alwaysDoThisActionForFileError; FileErrorAction alwaysDoThisActionForFolderError; FolderExistsAction alwaysDoThisActionForFolderExists; - bool dialogIsOpen; + volatile bool dialogIsOpen; volatile bool stopIt; std::string defaultDestinationFolder; /// \brief error queue @@ -140,15 +140,15 @@ private slots: //dialog message /// \note Can be call without queue because all call will be serialized - void fileAlreadyExists(INTERNALTYPEPATH source, INTERNALTYPEPATH destination, bool isSame, TransferThreadAsync * thread, bool isCalledByShowOneNewDialog=false); + void fileAlreadyExists(INTERNALTYPEPATH source, INTERNALTYPEPATH destination, bool isSame, TransferThreadAsync * thread); /// \note Can be call without queue because all call will be serialized - void errorOnFile(INTERNALTYPEPATH fileInfo, std::string errorString, TransferThreadAsync * thread, const ErrorType &errorType, bool isCalledByShowOneNewDialog=false); + void errorOnFile(INTERNALTYPEPATH fileInfo, std::string errorString, TransferThreadAsync * thread, const ErrorType &errorType); /// \note Can be call without queue because all call will be serialized - void folderAlreadyExists(INTERNALTYPEPATH source,INTERNALTYPEPATH destination,bool isSame,ScanFileOrFolder * thread,bool isCalledByShowOneNewDialog=false); + void folderAlreadyExists(INTERNALTYPEPATH source,INTERNALTYPEPATH destination,bool isSame,ScanFileOrFolder * thread); /// \note Can be call without queue because all call will be serialized - void errorOnFolder(INTERNALTYPEPATH fileInfo, std::string errorString, ScanFileOrFolder * thread, ErrorType errorType, bool isCalledByShowOneNewDialog=false); + void errorOnFolder(INTERNALTYPEPATH fileInfo, std::string errorString, ScanFileOrFolder * thread, ErrorType errorType); //mkpath event - void mkPathErrorOnFolder(INTERNALTYPEPATH, std::string, const ErrorType &errorType, bool isCalledByShowOneNewDialog=false); + void mkPathErrorOnFolder(INTERNALTYPEPATH, std::string, const ErrorType &errorType); //show one new dialog if needed void showOneNewDialog(); diff --git a/plugins/CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp b/plugins/CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp index 9dc9bc2..d437ff5 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp +++ b/plugins/CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp @@ -54,6 +54,11 @@ CopyEngineFactory::CopyEngineFactory() : connect(ui->doRightTransfer, &QCheckBox::toggled, this,&CopyEngineFactory::setDoRightTransfer); connect(ui->keepDate, &QCheckBox::toggled, this,&CopyEngineFactory::setKeepDate); connect(ui->native_copy, &QCheckBox::toggled, this,&CopyEngineFactory::setNativeCopy); + #ifndef Q_OS_WIN32 + ui->native_copy->setEnabled(false); + ui->label_native_copy->setEnabled(false); + ui->native_copy->setToolTip(tr("Supported only on Windows")); + #endif connect(ui->os_spec_flags, &QCheckBox::toggled, this,&CopyEngineFactory::setOsSpecFlags); connect(ui->inodeThreads, static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged), this,&CopyEngineFactory::on_inodeThreads_editingFinished); connect(ui->autoStart, &QCheckBox::toggled, this,&CopyEngineFactory::setAutoStart); @@ -298,8 +303,9 @@ void CopyEngineFactory::resetOptions() ui->keepDate->setChecked(stringtobool(options->getOptionValue("keepDate"))); ui->os_spec_flags->setChecked(stringtobool(options->getOptionValue("os_spec_flags"))); ui->native_copy->setChecked(stringtobool(options->getOptionValue("native_copy"))); - #ifdef Q_OS_WIN32 + #ifndef Q_OS_WIN32 ui->native_copy->setEnabled(false); + ui->label_native_copy->setEnabled(false); ui->native_copy->setToolTip(tr("Supported only on Windows")); #endif ui->autoStart->setChecked(stringtobool(options->getOptionValue("autoStart"))); diff --git a/plugins/CopyEngine/Ultracopier-Spec/DebugDialog.cpp b/plugins/CopyEngine/Ultracopier-Spec/DebugDialog.cpp index 79e1088..8f04867 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/DebugDialog.cpp +++ b/plugins/CopyEngine/Ultracopier-Spec/DebugDialog.cpp @@ -58,6 +58,7 @@ void DebugDialog::updateOnTimer() { ui->alreadyExistsQueue->setValue(copyEngine->alreadyExistsQueue.size()); ui->errorQueue->setValue(copyEngine->errorQueue.size()); + ui->realByteTransfered->setValue(copyEngine->realByteTransfered()/1024); } #endif diff --git a/plugins/CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp b/plugins/CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp index 587a889..d5f23c8 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp +++ b/plugins/CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp @@ -25,14 +25,19 @@ FileErrorDialog::FileErrorDialog(QWidget *parent, INTERNALTYPEPATH fileInfo, std WIN32_FILE_ATTRIBUTE_DATA fileInfoW; if(GetFileAttributesExW(fileInfo.c_str(),GetFileExInfoStandard,&fileInfoW)) { - uint64_t mdate=fileInfoW.ftLastWriteTime.dwHighDateTime; - mdate<<=32; - mdate|=fileInfoW.ftLastWriteTime.dwLowDateTime; + LARGE_INTEGER li; + li.LowPart = fileInfoW.ftLastWriteTime.dwLowDateTime; + li.HighPart = fileInfoW.ftLastWriteTime.dwHighDateTime; + const uint64_t mdate=(li.QuadPart - 0x019DB1DED53E8000) / 10000000; + //uint64_t mdate=fileInfoW.ftLastWriteTime.dwHighDateTime; + /*mdate<<=32; + mdate|=fileInfoW.ftLastWriteTime.dwLowDateTime;*/ uint64_t size=fileInfoW.nFileSizeHigh; size<<=32; size|=fileInfoW.nFileSizeLow; #else struct stat p_statbuf; + memset(&p_statbuf,0,sizeof(p_statbuf)); if(stat(TransferThread::internalStringTostring(fileInfo).c_str(), &p_statbuf)==0) { #ifdef Q_OS_UNIX diff --git a/plugins/CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp b/plugins/CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp index e0d841e..e6b554d 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp +++ b/plugins/CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp @@ -52,14 +52,19 @@ FileExistsDialog::FileExistsDialog(QWidget *parent, INTERNALTYPEPATH source, WIN32_FILE_ATTRIBUTE_DATA sourceW; if(GetFileAttributesExW(source.c_str(),GetFileExInfoStandard,&sourceW)) { - uint64_t mdate=sourceW.ftLastWriteTime.dwHighDateTime; + LARGE_INTEGER li; + li.LowPart = sourceW.ftLastWriteTime.dwLowDateTime; + li.HighPart = sourceW.ftLastWriteTime.dwHighDateTime; + const uint64_t mdate=(li.QuadPart - 0x019DB1DED53E8000) / 10000000; + /*uint64_t mdate=sourceW.ftLastWriteTime.dwHighDateTime; mdate<<=32; - mdate|=sourceW.ftLastWriteTime.dwLowDateTime; + mdate|=sourceW.ftLastWriteTime.dwLowDateTime;*/ uint64_t size=sourceW.nFileSizeHigh; size<<=32; size|=sourceW.nFileSizeLow; #else struct stat source_statbuf; + memset(&source_statbuf,0,sizeof(source_statbuf)); #ifdef Q_OS_UNIX if(lstat(TransferThread::internalStringTostring(source).c_str(), &source_statbuf)==0) #else @@ -96,14 +101,19 @@ FileExistsDialog::FileExistsDialog(QWidget *parent, INTERNALTYPEPATH source, WIN32_FILE_ATTRIBUTE_DATA destinationW; if(GetFileAttributesExW(destination.c_str(),GetFileExInfoStandard,&destinationW)) { - uint64_t mdate=destinationW.ftLastWriteTime.dwHighDateTime; + LARGE_INTEGER li; + li.LowPart = destinationW.ftLastWriteTime.dwLowDateTime; + li.HighPart = destinationW.ftLastWriteTime.dwHighDateTime; + const uint64_t mdate=(li.QuadPart - 0x019DB1DED53E8000) / 10000000; + /*uint64_t mdate=destinationW.ftLastWriteTime.dwHighDateTime; mdate<<=32; - mdate|=destinationW.ftLastWriteTime.dwLowDateTime; + mdate|=destinationW.ftLastWriteTime.dwLowDateTime;*/ uint64_t size=destinationW.nFileSizeHigh; size<<=32; size|=destinationW.nFileSizeLow; #else struct stat destination_statbuf; + memset(&destination_statbuf,0,sizeof(destination_statbuf)); #ifdef Q_OS_UNIX if(lstat(TransferThread::internalStringTostring(destination).c_str(), &destination_statbuf)==0) #else diff --git a/plugins/CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp b/plugins/CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp index 69d63d0..c99ad10 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp +++ b/plugins/CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp @@ -39,14 +39,19 @@ FileIsSameDialog::FileIsSameDialog(QWidget *parent, INTERNALTYPEPATH fileInfo, WIN32_FILE_ATTRIBUTE_DATA fileInfoW; if(GetFileAttributesExW(fileInfo.c_str(),GetFileExInfoStandard,&fileInfoW)) { - uint64_t mdate=fileInfoW.ftLastWriteTime.dwHighDateTime; + LARGE_INTEGER li; + li.LowPart = fileInfoW.ftLastWriteTime.dwLowDateTime; + li.HighPart = fileInfoW.ftLastWriteTime.dwHighDateTime; + const uint64_t mdate=(li.QuadPart - 0x019DB1DED53E8000) / 10000000; + /*uint64_t mdate=fileInfoW.ftLastWriteTime.dwHighDateTime; mdate<<=32; - mdate|=fileInfoW.ftLastWriteTime.dwLowDateTime; + mdate|=fileInfoW.ftLastWriteTime.dwLowDateTime;*/ uint64_t size=fileInfoW.nFileSizeHigh; size<<=32; size|=fileInfoW.nFileSizeLow; #else struct stat source_statbuf; + memset(&source_statbuf,0,sizeof(source_statbuf)); #ifdef Q_OS_UNIX if(lstat(TransferThread::internalStringTostring(fileInfo).c_str(), &source_statbuf)==0) #else diff --git a/plugins/CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp b/plugins/CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp index f37acd1..7ad06d9 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp +++ b/plugins/CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp @@ -2,6 +2,8 @@ #include "ui_folderExistsDialog.h" #include "TransferThread.h" #include "../../../cpp11addition.h" +#include <cstring> +#include <QDateTime> #ifdef Q_OS_WIN32 #define CURRENTSEPARATOR "\\" @@ -32,15 +34,20 @@ FolderExistsDialog::FolderExistsDialog(QWidget *parent, INTERNALTYPEPATH source, WIN32_FILE_ATTRIBUTE_DATA fileInfoW; if(GetFileAttributesExW(source.c_str(),GetFileExInfoStandard,&fileInfoW)) { - uint64_t mdate=fileInfoW.ftLastWriteTime.dwHighDateTime; + LARGE_INTEGER li; + li.LowPart = fileInfoW.ftLastWriteTime.dwLowDateTime; + li.HighPart = fileInfoW.ftLastWriteTime.dwHighDateTime; + const uint64_t mdate=(li.QuadPart - 0x019DB1DED53E8000) / 10000000; + /*uint64_t mdate=fileInfoW.ftLastWriteTime.dwHighDateTime; mdate<<=32; - mdate|=fileInfoW.ftLastWriteTime.dwLowDateTime; + mdate|=fileInfoW.ftLastWriteTime.dwLowDateTime;*/ uint64_t size=fileInfoW.nFileSizeHigh; size<<=32; size|=fileInfoW.nFileSizeLow; #else struct stat source_statbuf; - if(TransferThread::exists(source)) + memset(&source_statbuf,0,sizeof(source_statbuf)); + if (lstat(TransferThread::internalStringTostring(source).c_str(), &source_statbuf) < 0) { #ifdef Q_OS_UNIX #ifdef Q_OS_MAC @@ -83,6 +90,7 @@ FolderExistsDialog::FolderExistsDialog(QWidget *parent, INTERNALTYPEPATH source, this->destinationInfo=TransferThread::internalStringTostring(destination); this->setWindowTitle(tr("Folder already exists")); struct stat destination_statbuf; + memset(&destination_statbuf,0,sizeof(destination_statbuf)); if(TransferThread::exists(destination)) { #ifdef Q_OS_UNIX diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/ar/translation.qm b/plugins/CopyEngine/Ultracopier-Spec/Languages/ar/translation.qm Binary files differindex a48b608..cadeaf2 100644 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/ar/translation.qm +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/ar/translation.qm diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/ar/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/ar/translation.ts index d2b3fda..7ff11cf 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/ar/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/ar/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation>تم إجبار المحرك على الحركة ، لا يمكنك نسخه</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation>تم إجبار المحرك على النسخ ، لا يمكنك التحرك معه</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> <translation>الوجهه</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation>استخدام الوجهة الفعلية "%1" ؟</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation>تم فرض الوضع مسبقا. هذا خطا داخلي ، الرجاء الإبلاغ عنه</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation>اسال</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation>تخطي</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation>دمج</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation>اعاده تسميه</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation>وضع في نهاية</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation>الكتابة فوق</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation>الكتابة فوق إذا كان مختلفا</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation>الكتابة فوق إذا كان أحدث</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation>الكتابة فوق إذا كان أقدم</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation>خطا في الخيارات</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation>لم يتم تحميل محرك الخيارات. غير قادر علي الوصول إلى الفلاتر</translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation>اسال</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation>تخطي</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation>دمج</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation>اعاده تسميه</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation>وضع في نهاية</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation>الكتابة فوق</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation>الكتابة فوق إذا كان مختلفا</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation>الكتابة فوق إذا كان أحدث</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation>الكتابة فوق إذا كان أقدم</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation>خطا في الخيارات</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation>لم يتم تحميل محرك الخيارات. غير قادر علي الوصول إلى الفلاتر</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation>لم يتم تحميل محرك الخيارات. غير قادر علي الوصول إلى الفلاتر</translation> </message> @@ -200,12 +206,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation>خطأ في المجلد</translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation>اسم المجلد</translation> </message> @@ -213,22 +219,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation>% اسم%-نسخ% لاحقه%</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation>(% الاسم%-النسخ (% العدد%% اللاحق +ه%</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation>الخطا</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation>حاول أعاده تسميه باستخدام أحرف خاصه</translation> </message> @@ -236,22 +242,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation>% اسم%-نسخ% لاحقه%</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation>(% الاسم%-النسخ (% العدد%% اللاحق +ه%</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation>الخطا</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation>حاول أعاده تسميه باستخدام أحرف خاصه</translation> </message> @@ -398,27 +404,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation>المجلد موجود بالفعل</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation>% اسم%-نسخ% لاحقه%</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation>(% الاسم%-النسخ (% العدد%% اللاحق +ه%</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation>الخطا</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation>حاول أعاده التسميه باستخدام أحرف خاصه</translation> </message> @@ -478,6 +484,8 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation>غير قادر على إنشاء المجلد</translation> </message> @@ -487,28 +495,33 @@ <translation>مجلد المصدر غير موجود</translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation>غير قادر على أعاده تسميه المجلد المؤقت</translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation>غير قادر على القيام بالخطوة الحقيقية النهائية المجلد</translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation>غير قادر على نقل المجلد</translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation>errno: %1 :غير قادر على نقل المجلد</translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation>غير قادر على أزاله</translation> </message> @@ -521,12 +534,12 @@ <translation>خطا داخلي ، يرجى الإبلاغ عن ذلك!</translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation>غير قادر على قراءه الملف المصدر:</translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation>تم اقتطاع الملف اثناء القراءة ، وتغيير البيانات المحتملة</translation> </message> @@ -582,32 +595,38 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> - <translation>%1-نسخ</translation> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> + <source>%1 - copy</source> + <translation>%1-نسخ</translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> <source>%1 - copy (%2)</source> <translation>%1 - نسخ (%2)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> + <location filename="../../ScanFileOrFolder.cpp" line="587"/> + <location filename="../../ScanFileOrFolder.cpp" line="589"/> <source>%name% - copy</source> <translation>%اسم% - نسخ</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="587"/> - <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation>% الاسم%-النسخة (% العدد%)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation>مشكله في قراءه المجلد</translation> </message> @@ -615,29 +634,29 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation>% اسم%-نسخ% لاحقه%</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation>(% الاسم%-النسخ (% العدد%% اللاحق +ه%</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation>الملف غير موجود</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation>غير قادر على تغيير التاريخ</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation>حاول أعاده تسميه باستخدام أحرف خاصه</translation> </message> @@ -645,19 +664,19 @@ <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation>تاريخ تعديل خاطئ أو غير قادر علي الحصول عليه ، يمكنك تعطيل نقل الوقت للقيام بذلك</translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished">غير قادر على إنشاء مجلد الوجهة:</translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished">errno: %1 غير قادر علي إنشاء المجلد الوجهة</translation> </message> @@ -665,24 +684,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation>(خطأ في دقة المسار (مسار فارغ</translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation>غير قادر على إنشاء مجلد الوجهة:</translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation>errno: %1 غير قادر علي إنشاء المجلد الوجهة</translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation>خطا داخلي ، يرجى الإبلاغ عن ذلك!</translation> </message> @@ -976,12 +995,27 @@ <translation>& تنفيذ هذا الاجراء دوما</translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> <translation>الكتابة فوق إذا اختلف تاريخ التعديل</translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="357"/> + <source>Overwrite if destination older</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="362"/> <location filename="../../fileExistsDialog.ui" line="365"/> <source>Overwrite if not same size</source> @@ -1013,17 +1047,6 @@ <source>&Cancel</source> <translation>&الغاء الامر</translation> </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation>الكتابة فوق إذا كان أحدث</translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="354"/> - <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation>الكتابة فوق إذا كان أقدم</translation> - </message> </context> <context> <name>fileIsSameDialog</name> diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/de/translation.qm b/plugins/CopyEngine/Ultracopier-Spec/Languages/de/translation.qm Binary files differindex 10475cf..6a89849 100644 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/de/translation.qm +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/de/translation.qm diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/de/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/de/translation.ts index 0a32a65..30906dd 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/de/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/de/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation>Verschiebemodus - Sie können nicht kopieren</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation>Kopiermodus - Sie können nicht verschieben</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> <translation>Ziel</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation>Aktuelles Ziel: "%1" benutzen?</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation>Der Modus wurde vorher erzwungen. Interner Fehler - Bitte bei mir melden</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation>Fragen</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation>Überspringen</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation>Fusionieren</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation>Umbenennen</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation>Ans Ende verschieben</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation>Überschreiben</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation>Überschreiben, falls verschieden</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation>Überschreiben, falls neuer</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation>Überschreiben, falls älter</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation>Fehlerhafte Optionen</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation>Optionen nicht geladen - Kein Zugriff auf Filter</translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation>Fragen</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation>Überspringen</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation>Fusionieren</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation>Umbenennen</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation>Ans Ende verschieben</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation>Überschreiben</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation>Überschreiben, falls verschieden</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation>Überschreiben, falls neuer</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation>Überschreiben, falls älter</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation>Fehlerhafte Optionen</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation>Option nicht geladen - Kein Zugriff auf Filter</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation>Option nicht geladen - Kann nicht auf Filter zugreifen</translation> </message> @@ -200,12 +206,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation>Ordnerfehler</translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation>Ordnername</translation> </message> @@ -213,22 +219,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished">%name% - Kopie%suffix%</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished">%name% - Kopie% (%number%)%suffix%</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation>Versuche Umbenennung mit Sonderzeichen</translation> </message> @@ -236,22 +242,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished">%name% - Kopie%suffix%</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished">%name% - Kopie% (%number%)%suffix%</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation>Versuche Umbenennung mit Sonderzeichen</translation> </message> @@ -398,27 +404,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation>Ordner existiert bereits</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished">%name% - Kopie%suffix%</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished">%name% - Kopie% (%number%)%suffix%</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation>Versuche Umbenennung mit Sonderzeichen</translation> </message> @@ -478,6 +484,8 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation>Der Ordner kann nicht erstellt werden</translation> </message> @@ -487,28 +495,33 @@ <translation>Quell-Ordner existiert nicht</translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation>Kann den Ordner nicht temporär umbenennen</translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation>Kann den Ordner nicht endgültig verschieben</translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation>Kann den Ordner nicht verschieben</translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation>Kann Ordner nicht verschieben: Fehler Nummer: %1</translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation>Kann nicht löschen</translation> </message> @@ -521,12 +534,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -582,32 +595,38 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> - <translation>%1 - Kopie</translation> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> + <source>%1 - copy</source> + <translation>%1 - Kopie</translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> <source>%1 - copy (%2)</source> <translation>%1 - Kopie (%2)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> + <location filename="../../ScanFileOrFolder.cpp" line="587"/> + <location filename="../../ScanFileOrFolder.cpp" line="589"/> <source>%name% - copy</source> <translation>%name% - Kopie</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="587"/> - <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation>%name% - Kopie (%number%)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation>Problem beim Lesen des Ordners</translation> </message> @@ -615,29 +634,29 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished">%name% - Kopie%suffix%</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished">%name% - Kopie% (%number%)%suffix%</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation>Datei nicht gefunden</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation>Kann Datum nicht ändern</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation>Versuche Umbenennung mit Sonderzeichen</translation> </message> @@ -645,19 +664,19 @@ <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation>Falsches Änderungsdatum oder Fehler beim Auslesen, Sie können die Übertragung des Zeitstempels deaktivieren</translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished">Zielordner konnte nicht erstellt werden: </translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished">Zielordner konnte nicht erstellt werden, Fehler Nummer: %1</translation> </message> @@ -665,24 +684,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished">Zielordner konnte nicht erstellt werden: </translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished">Zielordner konnte nicht erstellt werden, Fehler Nummer: %1</translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -976,12 +995,27 @@ <translation>&Aktion immer ausführen</translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> <translation>Überschreiben, falls Änderungsdatum verschieden</translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="357"/> + <source>Overwrite if destination older</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="362"/> <location filename="../../fileExistsDialog.ui" line="365"/> <source>Overwrite if not same size</source> @@ -1013,17 +1047,6 @@ <source>&Cancel</source> <translation>Abbrechen (&C)</translation> </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation>Überschreiben, falls neuer</translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="354"/> - <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation>Überschreiben, falls älter</translation> - </message> </context> <context> <name>fileIsSameDialog</name> diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/el/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/el/translation.ts index f608b09..f043c14 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/el/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/el/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -200,12 +206,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -213,22 +219,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -236,22 +242,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -398,27 +404,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -478,6 +484,8 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -487,28 +495,33 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> @@ -521,12 +534,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -582,32 +595,38 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="587"/> <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -615,29 +634,29 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -645,19 +664,19 @@ <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -665,24 +684,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -976,12 +995,27 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="357"/> + <source>Overwrite if destination older</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="362"/> <location filename="../../fileExistsDialog.ui" line="365"/> <source>Overwrite if not same size</source> @@ -1013,17 +1047,6 @@ <source>&Cancel</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="354"/> - <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>fileIsSameDialog</name> diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/en/translation.qm b/plugins/CopyEngine/Ultracopier-Spec/Languages/en/translation.qm Binary files differindex d925dd6..922339a 100644 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/en/translation.qm +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/en/translation.qm diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/en/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/en/translation.ts index 7bb754e..9d266b0 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/en/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/en/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -200,12 +206,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -213,22 +219,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -236,22 +242,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -398,27 +404,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -478,6 +484,8 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -487,28 +495,33 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> @@ -521,12 +534,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -582,32 +595,38 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="587"/> <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -615,29 +634,29 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -645,19 +664,19 @@ <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -665,24 +684,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -976,12 +995,27 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="357"/> + <source>Overwrite if destination older</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="362"/> <location filename="../../fileExistsDialog.ui" line="365"/> <source>Overwrite if not same size</source> @@ -1013,17 +1047,6 @@ <source>&Cancel</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="354"/> - <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>fileIsSameDialog</name> diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/es/translation.qm b/plugins/CopyEngine/Ultracopier-Spec/Languages/es/translation.qm Binary files differindex feaf1fc..f4883db 100644 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/es/translation.qm +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/es/translation.qm diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/es/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/es/translation.ts index 3565910..41a5dbb 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/es/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/es/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation>El motor se ve obligado a moverse, no se puede copiar con ella</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation>El motor se ve obligado a copiar, no te puedes mover con él</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> <translation>Destino</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation>Utilice el destino "%1" actual?</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation>El modo se ha visto obligado previamente. Este es un error interno, por favor repórtelo</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation>Compatible solo con Windows</translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation>Pedir</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation>Omitir</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation>Unir</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation>Cambiar el nombre</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation>Ponga al final</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation>Sobrescribir</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation>Sobrescribir si es diferente</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation>Sobrescribir si nuevo</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation>Sobrescribir si es mayor</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation>error Opciones</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation>Opciones del motor no está cargado. No es posible acceder a los filtros</translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> - <translation type="unfinished"></translation> + <translation>Compatible solo con Windows</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation>Pedir</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation>Omitir</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation>Unir</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation>Cambiar el nombre</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation>Ponga al final</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation>Sobrescribir</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation>Sobrescribir si es diferente</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation>Sobrescribir si nuevo</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation>Sobrescribir si es mayor</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation>error Opciones</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation>Opciones del motor no está cargado. No es posible acceder a los filtros</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation>Opciones del motor no está cargado, no se puede acceder a los filtros</translation> </message> @@ -200,12 +206,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation>Error en la carpeta</translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation>Nombre de la carpeta</translation> </message> @@ -213,22 +219,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation>%name% - copia%suffix%</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation>%name% - copia (%number%)%suffix%</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation>Trate de cambiar el nombre con el uso de caracteres especiales</translation> </message> @@ -236,22 +242,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation>%name% - copia%suffix%</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation>%name% - copia (%number%)%suffix%</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation>Trate de cambiar el nombre con el uso de caracteres especiales</translation> </message> @@ -398,27 +404,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation>Carpeta ya existe</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation>%name% - copia%suffix%</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation>%name% - copia (%number%)%suffix%</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation>Trate de cambiar el nombre con el uso de caracteres especiales</translation> </message> @@ -478,6 +484,8 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation>No se puede crear la carpeta</translation> </message> @@ -487,28 +495,33 @@ <translation>La carpeta de origen no existe</translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation>No es posible cambiar el nombre de la carpeta temporal</translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation>No se puede revertir el cambio de nombre temporal para un movimiento real</translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation>No se puede hacer el movimiento final real de la carpeta</translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation>No se puede mover la carpeta</translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation>No se puede mover la carpeta: errno: %1</translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation>No se puede eliminar</translation> </message> @@ -521,12 +534,12 @@ <translation>¡Error interno, por favor repórtelo!</translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation>No se puede leer el archivo fuente: </translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation>Archivo truncado durante la lectura, posible cambio de datos</translation> </message> @@ -582,32 +595,38 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> - <translation>%1 - copia</translation> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> + <translation>Carpeta en la lista negra</translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> + <source>%1 - copy</source> + <translation>%1 - copia</translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> <source>%1 - copy (%2)</source> <translation>%1 - copia (%2)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> + <location filename="../../ScanFileOrFolder.cpp" line="587"/> + <location filename="../../ScanFileOrFolder.cpp" line="589"/> <source>%name% - copy</source> <translation>%name% - copia</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="587"/> - <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation>%name% - copia (%number%)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation>Problema con la carpeta leída</translation> </message> @@ -615,29 +634,29 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation>%name% - copia%suffix%</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation>%name% - copia (%number%)%suffix%</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation>Archivo no encontrado</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation>No se puede cambiar la fecha</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation>Trate de cambiar el nombre con el uso de caracteres especiales</translation> </message> @@ -645,19 +664,19 @@ <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation>Fecha de modificación incorrecta o incapaz de obtenerla, puede desactivar la transferencia de tiempo para hacerlo</translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation>No se puede crear la carpeta de destino: </translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation>No se puede crear la carpeta de destino, errno: %1</translation> </message> @@ -665,24 +684,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation>Error de resolución de ruta (ruta vacía)</translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation>No se puede crear la carpeta de destino: </translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation>No se puede crear la carpeta de destino, errno: %1</translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation>¡Error interno, por favor repórtelo!</translation> </message> @@ -793,7 +812,7 @@ <location filename="../../copyEngineOptions.ui" line="397"/> <location filename="../../copyEngineOptions.ui" line="413"/> <source>MB</source> - <translation type="unfinished"></translation> + <translation>MB</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="429"/> @@ -803,32 +822,32 @@ <message> <location filename="../../copyEngineOptions.ui" line="436"/> <source>OS Buffer</source> - <translation type="unfinished"></translation> + <translation>Búfer del SO</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="456"/> <source>Disable parallel transfer when are different devices</source> - <translation type="unfinished"></translation> + <translation>Deshabilitar la transferencia paralela cuando hay diferentes dispositivos</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="463"/> <source>Buffer for different device</source> - <translation type="unfinished"></translation> + <translation>Búfer para diferentes dispositivos</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="470"/> <source>OS FLags</source> - <translation type="unfinished"></translation> + <translation>Banderas de SO</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="477"/> <source>Buffer for same device</source> - <translation type="unfinished"></translation> + <translation>Búfer para el mismo dispositivo</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="484"/> <source>OS native copy (disable speed limitation)</source> - <translation type="unfinished"></translation> + <translation>Copia nativa del sistema operativo (deshabilitar la limitación de velocidad)</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="514"/> @@ -976,12 +995,27 @@ <translation>&Siempre realice esta acción</translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation>Sobrescribir si la fuente es más nueva que el destino</translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> <translation>Sobrescribir si la fecha de modificación difiere</translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation>Sobrescribir si la fuente es más antigua que el destino</translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="357"/> + <source>Overwrite if destination older</source> + <translation>Sobrescribir si el destino es más antiguo</translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="362"/> <location filename="../../fileExistsDialog.ui" line="365"/> <source>Overwrite if not same size</source> @@ -1013,17 +1047,6 @@ <source>&Cancel</source> <translation>Ca&ncelar</translation> </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation>Sobrescribir si nuevo</translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="354"/> - <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation>Sobrescribir si es mayor</translation> - </message> </context> <context> <name>fileIsSameDialog</name> diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/fr/translation.qm b/plugins/CopyEngine/Ultracopier-Spec/Languages/fr/translation.qm Binary files differindex c538b95..a40a9f1 100644 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/fr/translation.qm +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/fr/translation.qm diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/fr/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/fr/translation.ts index 19789ff..094e612 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/fr/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/fr/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation>Le moteur est forcé en déplacement, vous ne pouvez pas copier avec</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation>Le moteur est forcé en copie, vous ne pouvez pas déplacer avec</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> <translation>Destination</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation>Utiliser la destination actuelle "%1"?</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation>Le mode a été forcé. C'est une erreur interne, merci de la repporter</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation>Pris en charge uniquement sous Windows</translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation>Demander</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation>Passer</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation>Fusionner</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation>Renommer</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation>Mettre à la fin</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation>Écraser</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation>Écraser si différent</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation>Écraser si plus récent</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation>Écraser si plus vieux</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation>Erreur d'options</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation>Le moteur d'options n'est pas chargé. Impossible d'accédé aux filtres</translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> - <translation type="unfinished"></translation> + <translation>Pris en charge uniquement sous Windows</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation>Demander</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation>Passer</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation>Fusionner</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation>Renommer</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation>Mettre à la fin</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation>Écraser</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation>Écraser si différent</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation>Écraser si plus récent</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation>Écraser si plus vieux</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation>Erreur d'options</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation>Le moteur d'options n'est pas chargé. Impossible d'accédé aux filtres</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation>Moteur d'options non chargé, impossible d'accéder aux filtres</translation> </message> @@ -200,12 +206,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation>Erreur sur un dossier</translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation>Nom de répertoire</translation> </message> @@ -213,22 +219,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation>%name% - copie%suffix%</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation>%name% - copie (%number%)%suffix%</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation>Essaie de renommage avec caratéres interdits</translation> </message> @@ -236,22 +242,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation>%name% - copie%suffix%</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation>%name% - copie (%number%)%suffix%</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation>Essaie de renommage avec caratéres interdits</translation> </message> @@ -398,27 +404,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation>Dossier déjà existant</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation>%name% - copie%suffix%</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation>%name% - copie (%number%)%suffix%</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation>Essaie de renommage avec caratéres interdits</translation> </message> @@ -478,6 +484,8 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation>Impossible de créer le répertoire</translation> </message> @@ -487,28 +495,33 @@ <translation>Le dossier source n'éxiste pas</translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation>Impossible de renommer le dossier</translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation>Impossible d'inverser le renommage temporaire pour un déplacement réel</translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation>Impossible de faire le déplacement final du dossier</translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation>Impossible de déplacer le dossier</translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation>Impossible de déplacer le dossier: errno: %1</translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation>Impossible de supprimer</translation> </message> @@ -521,12 +534,12 @@ <translation>Erreur interne, veuillez la signaler!</translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation>Impossible de lire le fichier source: </translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation>Fichier tronqué lors de la lecture, modification possible des données</translation> </message> @@ -582,32 +595,38 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> - <translation>%1 - copie</translation> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> + <translation>Dossier sur liste noire</translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> + <source>%1 - copy</source> + <translation>%1 - copie</translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> <source>%1 - copy (%2)</source> <translation>%1 - copie (%2)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> + <location filename="../../ScanFileOrFolder.cpp" line="587"/> + <location filename="../../ScanFileOrFolder.cpp" line="589"/> <source>%name% - copy</source> <translation>%name% - copie</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="587"/> - <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation>%name% - copie (%number%)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation>Probléme avec la lecture du dossier</translation> </message> @@ -615,29 +634,29 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation>%name% - copie%suffix%</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation>%name% - copie (%number%)%suffix%</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation>Fichier non trouvé</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation>Essaie de renommage avec caratéres interdits</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation>Impossible de changer la date</translation> </message> @@ -645,19 +664,19 @@ <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation>Mauvaise date de modification ou impossible de l'avoir, vous pouvez désactiver le transfert de celui-ci</translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation>Impossible de créer le dossier de destination: </translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation>Impossible de créer le dossier de destination, errno: %1</translation> </message> @@ -665,24 +684,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation>Erreur de résolution de chemin (chemin vide)</translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation>Impossible de créer le dossier de destination: </translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation>Impossible de créer le dossier de destination, errno: %1</translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation>Erreur interne, veuillez la signaler!</translation> </message> @@ -793,7 +812,7 @@ <location filename="../../copyEngineOptions.ui" line="397"/> <location filename="../../copyEngineOptions.ui" line="413"/> <source>MB</source> - <translation type="unfinished"></translation> + <translation>Mo</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="429"/> @@ -803,32 +822,32 @@ <message> <location filename="../../copyEngineOptions.ui" line="436"/> <source>OS Buffer</source> - <translation type="unfinished"></translation> + <translation>Tampon du système d'exploitation</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="456"/> <source>Disable parallel transfer when are different devices</source> - <translation type="unfinished"></translation> + <translation>Désactiver le transfert parallèle lorsque différents appareils</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="463"/> <source>Buffer for different device</source> - <translation type="unfinished"></translation> + <translation>Tampon pour différents appareils</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="470"/> <source>OS FLags</source> - <translation type="unfinished"></translation> + <translation>Drapeaux du système d'exploitation</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="477"/> <source>Buffer for same device</source> - <translation type="unfinished"></translation> + <translation>Tampon pour le même appareil</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="484"/> <source>OS native copy (disable speed limitation)</source> - <translation type="unfinished"></translation> + <translation>Copie native du système d'exploitation (désactiver la limitation de vitesse)</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="514"/> @@ -976,12 +995,27 @@ <translation>&Toujours faire cette action</translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation>Écraser si la source est plus récente que la destination</translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> <translation>Écraser si les dates différes</translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation>Écraser si la source est antérieure à la destination</translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="357"/> + <source>Overwrite if destination older</source> + <translation>Écraser si destination plus ancienne</translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="362"/> <location filename="../../fileExistsDialog.ui" line="365"/> <source>Overwrite if not same size</source> @@ -1013,17 +1047,6 @@ <source>&Cancel</source> <translation>&Annuler</translation> </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation>Écraser si plus récent</translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="354"/> - <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation>Écraser si plus vieux</translation> - </message> </context> <context> <name>fileIsSameDialog</name> diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/hi/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/hi/translation.ts index f608b09..f043c14 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/hi/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/hi/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -200,12 +206,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -213,22 +219,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -236,22 +242,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -398,27 +404,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -478,6 +484,8 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -487,28 +495,33 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> @@ -521,12 +534,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -582,32 +595,38 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="587"/> <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -615,29 +634,29 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -645,19 +664,19 @@ <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -665,24 +684,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -976,12 +995,27 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="357"/> + <source>Overwrite if destination older</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="362"/> <location filename="../../fileExistsDialog.ui" line="365"/> <source>Overwrite if not same size</source> @@ -1013,17 +1047,6 @@ <source>&Cancel</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="354"/> - <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>fileIsSameDialog</name> diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/hu/translation.qm b/plugins/CopyEngine/Ultracopier-Spec/Languages/hu/translation.qm Binary files differindex 6b6a991..37f9dac 100644 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/hu/translation.qm +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/hu/translation.qm diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/hu/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/hu/translation.ts index 5df5fab..09d41cc 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/hu/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/hu/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation>A motort mozgatásra kényszerítik, nem másolhatsz vele</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation>A motort másolásra kényszerítik, nem mozgathatsz vele</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> <translation>Cél</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation>Használja a jelenlegi célt: "%1"?</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation>Ezt a módot már korábban kényszerítették. Belső hiba történt, kérlek jelentsd be</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation>Kérdezzen rá</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation>Kihagy</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation>Összeolvaszt</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation>Nevezze át</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation>Helyezze a végére</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation>Felülír</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation>Felülír, ha különbözik</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation>Felülír, ha újabb</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation>Felülír, ha régebbi</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation>Beállítási hiba</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation>A beállítási motor nincs betöltve. A szűrők elérése nem lehetséges</translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation>Kérdezzen rá</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation>Kihagy</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation>Összeolvaszt</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation>Nevezze át</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation>Helyezze a végére</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation>Felülír</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation>Felülír, ha különbözik</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation>Felülír, ha újabb</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation>Felülír, ha régebbi</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation>Beállítási hiba</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation>A beállítási motor nincs betöltve. A szűrők elérése nem lehetséges</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation>A beállítási motor nincs betöltve, a szűrők elérése nem lehetséges</translation> </message> @@ -200,12 +206,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation>Hiba a mappával</translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation>Mappa neve</translation> </message> @@ -213,22 +219,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation>Hiba</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation>Átnevezés speciális karakterek használatával</translation> </message> @@ -236,22 +242,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation>Hiba</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation>Átnevezés speciális karakterek használatával</translation> </message> @@ -398,27 +404,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation>Mappa már létezik</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation>Hiba</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation>Átnevezés speciális karakterek használatával</translation> </message> @@ -478,6 +484,8 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation>Mappa létrehozása nem lehetséges</translation> </message> @@ -487,28 +495,33 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation>Eltávolítás nem lehetséges</translation> </message> @@ -521,12 +534,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -582,32 +595,38 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> - <translation>%1 - másolás</translation> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> + <source>%1 - copy</source> + <translation>%1 - másolás</translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> <source>%1 - copy (%2)</source> <translation>%1 - másolás (%2)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> + <location filename="../../ScanFileOrFolder.cpp" line="587"/> + <location filename="../../ScanFileOrFolder.cpp" line="589"/> <source>%name% - copy</source> <translation type="unfinished">%name% - másolás</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="587"/> - <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished">%name% - másolás (%number%)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -615,29 +634,29 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation>Fájl nem található</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation>Átnevezés speciális karakterek használatával</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -645,19 +664,19 @@ <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -665,24 +684,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -976,6 +995,11 @@ <translation>&Mindig hajtsa végre ezt a műveletet</translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> @@ -983,9 +1007,13 @@ </message> <message> <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation>Felülír, ha régebbi</translation> + <source>Overwrite if destination older</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../../fileExistsDialog.ui" line="362"/> @@ -1019,11 +1047,6 @@ <source>&Cancel</source> <translation>&Mégse</translation> </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation>Felülír, ha újabb</translation> - </message> </context> <context> <name>fileIsSameDialog</name> diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/id/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/id/translation.ts index f608b09..f043c14 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/id/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/id/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -200,12 +206,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -213,22 +219,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -236,22 +242,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -398,27 +404,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -478,6 +484,8 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -487,28 +495,33 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> @@ -521,12 +534,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -582,32 +595,38 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="587"/> <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -615,29 +634,29 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -645,19 +664,19 @@ <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -665,24 +684,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -976,12 +995,27 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="357"/> + <source>Overwrite if destination older</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="362"/> <location filename="../../fileExistsDialog.ui" line="365"/> <source>Overwrite if not same size</source> @@ -1013,17 +1047,6 @@ <source>&Cancel</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="354"/> - <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>fileIsSameDialog</name> diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/it/translation.qm b/plugins/CopyEngine/Ultracopier-Spec/Languages/it/translation.qm Binary files differindex 5090866..d9be48c 100644 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/it/translation.qm +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/it/translation.qm diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/it/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/it/translation.ts index 89d53ff..ad2cf8f 100644 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/it/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/it/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> - <translation>Impossibile copiare, il motore di copia forzerà lo spostamento</translation> + <translation>Il motore è forzato a spostare, non potete copiare con esso</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> - <translation>Impossibile effettuare lo spostamento, il motore di copia forzerà la copia</translation> + <translation>Il motore è forzato a copiare, non potete spostare con esso</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> - <translation>Percorso di destinazione</translation> + <translation>Destinazione</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> - <translation>Usare l'attuale destinazione? "%1"</translation> + <translation>Usare l'attuale destinazione "%1"?</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> - <translation>La modalità è stata forzata precedentemente. Questo è un errore interno, si prega di riportatelo</translation> + <translation>La modalità è stata precedentemente forzata. Questo è un errore interno, si prega di riportatelo</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation>Supportato solo per Windows</translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation>Chiedi</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation>Salta</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation>Unisci</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation>Rinomina</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation>Metti in coda</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation>Sovrascrivi</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> - <translation>Sovrascrivi se differente</translation> + <translation>Sovrascrivi se diverso</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation>Sovrascrivi se più recente</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation>Sovrascrivi se meno recente</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> - <translation>Errore opzioni</translation> + <translation>Errore nelle opzioni</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation>Motore delle opzioni non caricato. Impossibile accedere ai filtri</translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> - <translation type="unfinished"></translation> + <translation>Supportato solo per Windows</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation>Chiedi</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation>Salta</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation>Unisci</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation>Rinomina</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation>Metti in coda</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation>Sovrascrivi</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> - <translation>Sovrascrivi se differente</translation> + <translation>Sovrascrivi se diverso</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation>Sovrascrivi se più recente</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation>Sovrascrivi se meno recente</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> - <translation>Errore opzioni</translation> + <translation>Errore nelle opzioni</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation>Motore delle opzioni non caricato. Impossibile accedere ai filtri</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation>Le opzioni del motore di copia non sono state caricate. Impossibile accedere ai filtri</translation> </message> @@ -179,7 +185,7 @@ <message> <location filename="../../DiskSpace.ui" line="24"/> <source>You need more space on this drive to finish this transfer</source> - <translation>Hai bisogno di più spazio su questo disco per finire il trasferimento</translation> + <translation>Necessario più spazio su questa unità per finire il trasferimento</translation> </message> <message> <location filename="../../DiskSpace.ui" line="49"/> @@ -194,18 +200,18 @@ <message> <location filename="../../DiskSpace.cpp" line="23"/> <source>Drives %1 have %2 available but need %3</source> - <translation>L'unità %1 ha %2 disponibili, ma necessita di %3</translation> + <translation>Unità %1 hanno %2 disponibili, ma necessitano di %3</translation> </message> </context> <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> - <translation>Errore con la cartella</translation> + <translation>Errore sulla cartella</translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation>Nome cartella</translation> </message> @@ -213,47 +219,47 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation>Copia di %name% %suffix%</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation>Copia di %name% (%number%) %suffix%</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation>Errore</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> - <translation>Tenta ridenominazione usando caratteri speciali</translation> + <translation>Tenta rinomina usando caratteri speciali</translation> </message> </context> <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation>Copia di %name% %suffix%</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation>Copia di %name% (%number%) %suffix%</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation>Errore</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> - <translation>Tenta ridenominazione usando caratteri speciali</translation> + <translation>Tenta rinomina usando caratteri speciali</translation> </message> </context> <context> @@ -271,22 +277,22 @@ <message> <location filename="../../FilterRules.ui" line="51"/> <source>Raw text</source> - <translation>Testo nudo</translation> + <translation>Testo grezzo</translation> </message> <message> <location filename="../../FilterRules.ui" line="56"/> <source>Simplified regex</source> - <translation>Espressione regolare semplificata</translation> + <translation>Regex semplificata</translation> </message> <message> <location filename="../../FilterRules.ui" line="61"/> <source>Perl's regex</source> - <translation>Espressione regolare in Perl</translation> + <translation>Regex in Perl</translation> </message> <message> <location filename="../../FilterRules.ui" line="69"/> <source>Apply on:</source> - <translation>Applicare a:</translation> + <translation>Applica per:</translation> </message> <message> <location filename="../../FilterRules.ui" line="77"/> @@ -311,17 +317,17 @@ <message> <location filename="../../FilterRules.ui" line="102"/> <source>Checking</source> - <translation>Verifica</translation> + <translation>Verifica in corso</translation> </message> <message> <location filename="../../FilterRules.ui" line="115"/> <source>Test string:</source> - <translation>Stringa di verifica:</translation> + <translation>Stringa di prova:</translation> </message> <message> <location filename="../../FilterRules.ui" line="17"/> <source>Filters dialog</source> - <translation>Finestra dialogo dei filtri</translation> + <translation>Finestra di dialogo filtri</translation> </message> <message> <location filename="../../FilterRules.ui" line="95"/> @@ -331,7 +337,7 @@ <message> <location filename="../../FilterRules.ui" line="108"/> <source>The regex is valid</source> - <translation>L'espressione regolare è valida</translation> + <translation>Regex valida</translation> </message> </context> <context> @@ -354,25 +360,25 @@ <message> <location filename="../../Filters.ui" line="132"/> <source>None = Include all</source> - <translation>Nessuno = Includi tutti</translation> + <translation>Nessuno = Includere tutti</translation> </message> <message> <location filename="../../Filters.cpp" line="94"/> <location filename="../../Filters.cpp" line="132"/> <source>Raw text</source> - <translation>Testo nudo</translation> + <translation>Testo grezzo</translation> </message> <message> <location filename="../../Filters.cpp" line="97"/> <location filename="../../Filters.cpp" line="135"/> <source>Simplified regex</source> - <translation>Espressione regolare semplificata</translation> + <translation>Regex semplificata</translation> </message> <message> <location filename="../../Filters.cpp" line="100"/> <location filename="../../Filters.cpp" line="138"/> <source>Perl's regex</source> - <translation>Espressione regolare in Perl</translation> + <translation>Regex in Perl</translation> </message> <message> <location filename="../../Filters.cpp" line="108"/> @@ -392,35 +398,35 @@ <location filename="../../Filters.cpp" line="217"/> <location filename="../../Filters.cpp" line="256"/> <source>Full match</source> - <translation>Corrispondenza completa</translation> + <translation>Corrispondenza intera</translation> </message> </context> <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> - <translation>Cartella già presente</translation> + <translation>Cartella già eistente</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation>Copia di %name% %suffix%</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation>Copia di %name% (%number%) %suffix%</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation>Errore</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> - <translation>Tenta ridenominazione usando caratteri speciali</translation> + <translation>Tenta rinomina usando caratteri speciali</translation> </message> </context> <context> @@ -435,12 +441,12 @@ <location filename="../../ListThreadListChange.cpp" line="249"/> <location filename="../../ListThreadListChange.cpp" line="420"/> <source>Unable to save the transfer list: %1</source> - <translation>Impossibile salvare la lista di trasferimento %1</translation> + <translation>Impossibile salvare lista di trasferimento %1</translation> </message> <message> <location filename="../../ListThreadListChange.cpp" line="270"/> <source>Problem reading file, or file-size is 0</source> - <translation>Problema durante la lettura del file o dimensione file nulla</translation> + <translation>Errore durante la lettura del file o dimensione file nulla</translation> </message> <message> <location filename="../../ListThreadListChange.cpp" line="277"/> @@ -450,17 +456,17 @@ <message> <location filename="../../ListThreadListChange.cpp" line="286"/> <source>The transfer list is in mixed mode, but this instance is not in this mode</source> - <translation>La lista di trasferimento è in modalità mista ma questa istanza non lo è</translation> + <translation>La lista di trasferimento è in modalità mista ma questa istanza no</translation> </message> <message> <location filename="../../ListThreadListChange.cpp" line="295"/> <source>The transfer list is in copy mode, but this instance is not in this mode</source> - <translation>La lista di trasferimento è in modalità copia ma questa istanza non lo è</translation> + <translation>La lista di trasferimento è in modalità copia ma questa istanza no</translation> </message> <message> <location filename="../../ListThreadListChange.cpp" line="301"/> <source>The transfer list is in move mode, but this instance is not in this mode</source> - <translation>La lista di trasferimento è in modalità spostamento ma questa istanza non lo è</translation> + <translation>La lista di trasferimento è in modalità spostamento ma questa istanza no</translation> </message> <message> <location filename="../../ListThreadListChange.cpp" line="365"/> @@ -478,39 +484,46 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation>Impossibile creare la cartella</translation> </message> <message> <location filename="../../MkPath.cpp" line="227"/> <source>The source folder don't exists</source> - <translation>La cartella di origine non esiste</translation> + <translation>La cartella d'origine non esiste</translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> - <translation>Impossibile ridenominare temporaneamente la cartella</translation> + <translation>Impossibile rinominare temporaneamente la cartella</translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation>Impossibile invertire rinomina temporanea dello spostamento reale</translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> - <translation>Impossibile fare il vero spostamento finale della cartella</translation> + <translation>Impossibile effettuare il reale spostamento finale della cartella</translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation>Impossibile spostare la cartella</translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation>Impossibile spostare la cartella: errore %1</translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> - <translation>Impossibile eliminare</translation> + <translation>Impossibile rimuovere</translation> </message> </context> <context> @@ -521,14 +534,14 @@ <translation>Errore interno, si prega di riportarlo!</translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation>Impossibile leggere file di origine: </translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> - <translation>File troncato durante la lettura. Possibile cambio dati</translation> + <translation>File troncato durante la lettura. Possibile modifica dati</translation> </message> </context> <context> @@ -536,7 +549,7 @@ <message> <location filename="../../RenamingRules.ui" line="35"/> <source>First renaming</source> - <translation>Prima ridenominazione</translation> + <translation>Prima rinomina</translation> </message> <message> <location filename="../../RenamingRules.ui" line="41"/> @@ -562,55 +575,61 @@ <message> <location filename="../../RenamingRules.ui" line="51"/> <source>Second renaming</source> - <translation>Seconda ridenominazione</translation> + <translation>Seconda rinomina</translation> </message> <message> <location filename="../../RenamingRules.ui" line="14"/> <source>Renaming rules</source> - <translation>Regole di ridenominazione</translation> + <translation>Regole di rinomina</translation> </message> <message> <location filename="../../RenamingRules.cpp" line="46"/> <location filename="../../RenamingRules.cpp" line="71"/> <source>%1 - copy%2</source> - <translation>Copia di %1 %2</translation> + <translation>%1 - copia%2</translation> </message> <message> <location filename="../../RenamingRules.cpp" line="50"/> <location filename="../../RenamingRules.cpp" line="84"/> <source>%1 - copy (%2)%3</source> - <translation>Copia di %1 (%2) %3</translation> + <translation>%1 - copia (%2)%3</translation> </message> </context> <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> - <translation>Copia di %1</translation> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> + <translation>Cartella in lista nera</translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> + <source>%1 - copy</source> + <translation>%1 - copia</translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> <source>%1 - copy (%2)</source> - <translation>Copia di %1 (%2)</translation> + <translation>%1 - copia (%2)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> + <location filename="../../ScanFileOrFolder.cpp" line="587"/> + <location filename="../../ScanFileOrFolder.cpp" line="589"/> <source>%name% - copy</source> <translation>Copia di %name%</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="587"/> - <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation>Copia di %name% (%number%)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation>Problema con la lettura della cartella</translation> </message> @@ -618,49 +637,49 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation>Copia di %name% %suffix%</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation>Copia di %name% (%number%) %suffix%</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation>File non trovato</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> - <translation>Tenta ridenominazione usando caratteri speciali</translation> + <translation>Tenta rinomina usando caratteri speciali</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> - <translation>Impossibile cambiare data</translation> + <translation>Impossibile cambiare la data</translation> </message> </context> <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> - <translation>Data di modifica sbagliata o impossibile ottenerla, potete disabilitare l'orario di trasferimento per procedere</translation> + <translation>Data di modifica sbagliata o impossibile da ottenere, si può disabilitare l'orario di trasferimento per procedere</translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> - <translation>Impossibile creare cartella di destinazione: </translation> + <translation>Impossibile creare cartella di destinazione:</translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation>Impossibile creare cartella di destinazione, error %1</translation> </message> @@ -668,24 +687,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> - <translation>Errore di risoluzione percorso (vuoto)</translation> + <translation>Errore nella risoluzione percorso (vuoto)</translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> - <translation>Impossibile creare cartella di destinazione: </translation> + <translation>Impossibile creare cartella di destinazione:</translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation>Impossibile creare cartella di destinazione, errore %1</translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation>Errore interno, si prega di riportarlo!</translation> </message> @@ -695,27 +714,27 @@ <message> <location filename="../../copyEngineOptions.ui" line="44"/> <source>Transfer</source> - <translation>Trasferimento</translation> + <translation>Trasferisci</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="63"/> <source>Move the whole folder</source> - <translation>Spostare intera cartella</translation> + <translation>Sposta l'intera cartella</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="97"/> <source>Transfer the file rights</source> - <translation>Trasferire autorizzazioni dei file</translation> + <translation>Trasferisci autorizzazioni file</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="76"/> <source>Keep the file date</source> - <translation>Mantenere date dei file</translation> + <translation>Mantieni data file</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="114"/> <source>Create full path if not exists</source> - <translation>Creare percorso completo se non esistente</translation> + <translation>Crea percorso completo se non esistente</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="138"/> @@ -730,57 +749,57 @@ <message> <location filename="../../copyEngineOptions.ui" line="154"/> <source>Error and collision</source> - <translation>Errori di coincidenze</translation> + <translation>Errore di collisione</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="160"/> <source>When folder error</source> - <translation>Quando si verifica errore nelle cartelle</translation> + <translation>Quando si verifica un errore nelle cartelle</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="170"/> <source>When file error</source> - <translation>Quando si verifica errore nei file</translation> + <translation>Quando si verifica un errore nei file</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="196"/> <source>When file collision</source> - <translation>Quando i file coincidono</translation> + <translation>Quando collidono i file</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="239"/> <source>Overwrite if not same size</source> - <translation>Sovrascrivere se dimensione differisce</translation> + <translation>Sovrascrivi se la dimensione differisce</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="244"/> <source>Overwrite if modification date differs</source> - <translation>Sovrascrivere se data di modifica differisce</translation> + <translation>Sovrascrivi se la data di modifica differisce</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="266"/> <source>When folder collision</source> - <translation>Quando le cartelle coincidono</translation> + <translation>Quando collidono le cartelle</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="297"/> <source>Check if destination folder exists</source> - <translation>Controllare esistenza cartella di destinazione</translation> + <translation>Controllare esistenza della cartella di destinazione</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="304"/> <source>Renaming rules</source> - <translation>Regole di ridenominazione</translation> + <translation>Regole di rinomina</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="324"/> <source>Delete partially transferred files</source> - <translation>Eliminare i file parzialmente trasferiti</translation> + <translation>Elimina file parzialmente trasferiti</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="337"/> <source>Rename the original destination</source> - <translation>Ridenominare destinazione all'origine</translation> + <translation>Rinomina destinazione originale</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="368"/> @@ -790,48 +809,48 @@ <message> <location filename="../../copyEngineOptions.ui" line="387"/> <source>Inode threads</source> - <translation>Numero thread inode</translation> + <translation>Numero thread i-node</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="397"/> <location filename="../../copyEngineOptions.ui" line="413"/> <source>MB</source> - <translation type="unfinished"></translation> + <translation>MB</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="429"/> <source>Uncheck this under Windows create problem</source> - <translation>Deselezionare ciò su Windows causa problemi</translation> + <translation>Deselezionare ciò in Windows crea problemi</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="436"/> <source>OS Buffer</source> - <translation type="unfinished"></translation> + <translation>Buffer SO</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="456"/> <source>Disable parallel transfer when are different devices</source> - <translation type="unfinished"></translation> + <translation>Disabilita trasferimenti paralleli quando i dispositivi sono diversi</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="463"/> <source>Buffer for different device</source> - <translation type="unfinished"></translation> + <translation>Buffer per diverso dispositivo</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="470"/> <source>OS FLags</source> - <translation type="unfinished"></translation> + <translation>Flags SO</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="477"/> <source>Buffer for same device</source> - <translation type="unfinished"></translation> + <translation>Buffer per stesso dispositivo</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="484"/> <source>OS native copy (disable speed limitation)</source> - <translation type="unfinished"></translation> + <translation>Copia nativa SO (disattiva limitazione di velocità)</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="514"/> @@ -841,7 +860,7 @@ <message> <location filename="../../copyEngineOptions.ui" line="520"/> <source>Check the disk space</source> - <translation>Controllare spazio su disco</translation> + <translation>Controlla spazio su disco</translation> </message> <message> <location filename="../../copyEngineOptions.ui" line="530"/> @@ -864,7 +883,7 @@ <message> <location filename="../../fileErrorDialog.ui" line="14"/> <source>Error with file</source> - <translation>Errore con file</translation> + <translation>Errore con il file</translation> </message> <message> <location filename="../../fileErrorDialog.ui" line="20"/> @@ -879,7 +898,7 @@ <message> <location filename="../../fileErrorDialog.ui" line="76"/> <source>Modified</source> - <translation>Modificato</translation> + <translation>Modificata/o</translation> </message> <message> <location filename="../../fileErrorDialog.ui" line="93"/> @@ -894,22 +913,22 @@ <message> <location filename="../../fileErrorDialog.ui" line="127"/> <source>Folder</source> - <translation>Cartelle</translation> + <translation>Cartella</translation> </message> <message> <location filename="../../fileErrorDialog.ui" line="173"/> <source>&Always perform this action</source> - <translation>Esegui sempre questa azione</translation> + <translation>&Esegui sempre questa azione</translation> </message> <message> <location filename="../../fileErrorDialog.ui" line="193"/> <source>Try in with elevated privileges</source> - <translation>Tenta con privilegi superiori</translation> + <translation>Prova con privilegi superiori</translation> </message> <message> <location filename="../../fileErrorDialog.ui" line="200"/> <source>Put to bottom</source> - <translation>Metti in coda</translation> + <translation>Metti in fondo</translation> </message> <message> <location filename="../../fileErrorDialog.ui" line="207"/> @@ -919,12 +938,12 @@ <message> <location filename="../../fileErrorDialog.ui" line="214"/> <source>&Skip</source> - <translation>Salta</translation> + <translation>&Salta</translation> </message> <message> <location filename="../../fileErrorDialog.ui" line="221"/> <source>&Cancel</source> - <translation>Annulla</translation> + <translation>&Annulla</translation> </message> </context> <context> @@ -932,7 +951,7 @@ <message> <location filename="../../fileExistsDialog.ui" line="14"/> <source>The file exists</source> - <translation>File è già presente</translation> + <translation>File già eistente</translation> </message> <message> <location filename="../../fileExistsDialog.ui" line="34"/> @@ -966,66 +985,70 @@ <location filename="../../fileExistsDialog.ui" line="133"/> <location filename="../../fileExistsDialog.ui" line="221"/> <source>Folder</source> - <translation>Cartelle</translation> + <translation>Cartella</translation> </message> <message> <location filename="../../fileExistsDialog.ui" line="277"/> <source>Suggest new &name</source> - <translation>Suggerisci nuovo nome</translation> + <translation>Suggerisci nuovo &nome</translation> </message> <message> <location filename="../../fileExistsDialog.ui" line="288"/> <source>&Always perform this action</source> - <translation>Esegui sempre questa azione</translation> + <translation>&Esegui sempre questa azione</translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation>Sovrascrivi se l'origine è più recente della destinazione</translation> </message> <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> - <translation>Sovrascrivere se data di modifica differisce</translation> + <translation>Sovrascrivi se la data di modifica differisce</translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation>Sovrascrivi se l'origine è meno recente della destinazione</translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="357"/> + <source>Overwrite if destination older</source> + <translation>Sovrasccrivi se la destinazione è meno recente</translation> </message> <message> <location filename="../../fileExistsDialog.ui" line="362"/> <location filename="../../fileExistsDialog.ui" line="365"/> <source>Overwrite if not same size</source> - <translation>Sovrascrivere se dimensione differisce</translation> + <translation>Sovrascrivi se la dimensione differisce</translation> </message> <message> <location filename="../../fileExistsDialog.ui" line="370"/> <location filename="../../fileExistsDialog.ui" line="373"/> <source>Overwrite if not same size and date</source> - <translation>Sovrascrivere se dimensione e data differiscono</translation> + <translation>Sovrascrivi se dimensione e data differiscono</translation> </message> <message> <location filename="../../fileExistsDialog.ui" line="308"/> <source>&Rename</source> - <translation>Rinomina</translation> + <translation>&Rinomina</translation> </message> <message> <location filename="../../fileExistsDialog.ui" line="315"/> <source>&Overwrite</source> - <translation>Sovrascrivi</translation> + <translation>&Sovrascrivi</translation> </message> <message> <location filename="../../fileExistsDialog.ui" line="325"/> <source>&Skip</source> - <translation>Salta</translation> + <translation>&Salta</translation> </message> <message> <location filename="../../fileExistsDialog.ui" line="332"/> <source>&Cancel</source> - <translation>Annulla</translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation>Sovrascrivi se più recente</translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="354"/> - <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation>Sovrascrivi se meno recente</translation> + <translation>&Annulla</translation> </message> </context> <context> @@ -1038,7 +1061,7 @@ <message> <location filename="../../fileIsSameDialog.ui" line="110"/> <source>Modified</source> - <translation>Modificato</translation> + <translation>Modificata/o</translation> </message> <message> <location filename="../../fileIsSameDialog.ui" line="70"/> @@ -1048,37 +1071,37 @@ <message> <location filename="../../fileIsSameDialog.ui" line="14"/> <source>The source and destination are same</source> - <translation>Origine e destinazioni sono identiche</translation> + <translation>Origine e destinazione sono identiche</translation> </message> <message> <location filename="../../fileIsSameDialog.ui" line="90"/> <source>Folder</source> - <translation>Cartelle</translation> + <translation>Cartella</translation> </message> <message> <location filename="../../fileIsSameDialog.ui" line="159"/> <source>Suggest new &name</source> - <translation>Suggerisci nuovo nome</translation> + <translation>Suggerisci nuovo &nome</translation> </message> <message> <location filename="../../fileIsSameDialog.ui" line="170"/> <source>&Always perform this action</source> - <translation>Esegui sempre questa azione</translation> + <translation>&Esegui sempre questa azione</translation> </message> <message> <location filename="../../fileIsSameDialog.ui" line="190"/> <source>&Rename</source> - <translation>Rinomina</translation> + <translation>&Rinomina</translation> </message> <message> <location filename="../../fileIsSameDialog.ui" line="197"/> <source>&Skip</source> - <translation>Salta</translation> + <translation>&Salta</translation> </message> <message> <location filename="../../fileIsSameDialog.ui" line="204"/> <source>&Cancel</source> - <translation>Annulla</translation> + <translation>&Annulla</translation> </message> </context> <context> @@ -1096,13 +1119,13 @@ <message> <location filename="../../folderExistsDialog.ui" line="14"/> <source>The source and destination is identical</source> - <translation>Origine e destinazioni sono identiche</translation> + <translation>Origine e destinazione sono identiche</translation> </message> <message> <location filename="../../folderExistsDialog.ui" line="82"/> <location filename="../../folderExistsDialog.ui" line="150"/> <source>Modified</source> - <translation>Modificato</translation> + <translation>Modificata/o</translation> </message> <message> <location filename="../../folderExistsDialog.ui" line="99"/> @@ -1114,22 +1137,22 @@ <location filename="../../folderExistsDialog.ui" line="116"/> <location filename="../../folderExistsDialog.ui" line="184"/> <source>Folder</source> - <translation>Cartelle</translation> + <translation>Cartella</translation> </message> <message> <location filename="../../folderExistsDialog.ui" line="227"/> <source>Suggest new &name</source> - <translation>Suggerisci nuovo nome</translation> + <translation>Suggerisci nuovo &nome</translation> </message> <message> <location filename="../../folderExistsDialog.ui" line="238"/> <source>&Always perform this action</source> - <translation>Esegui sempre questa azione</translation> + <translation>&Esegui sempre questa azione</translation> </message> <message> <location filename="../../folderExistsDialog.ui" line="245"/> <source>&Rename</source> - <translation>Rinomina</translation> + <translation>&Rinomina</translation> </message> <message> <location filename="../../folderExistsDialog.ui" line="252"/> @@ -1144,7 +1167,7 @@ <message> <location filename="../../folderExistsDialog.ui" line="266"/> <source>&Cancel</source> - <translation>Annulla</translation> + <translation>&Annulla</translation> </message> </context> </TS> diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/ja/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/ja/translation.ts index ebb1c5a..5d3d997 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/ja/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/ja/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -200,12 +206,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -213,22 +219,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -236,22 +242,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -398,27 +404,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -478,6 +484,8 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -487,28 +495,33 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> @@ -521,12 +534,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -582,32 +595,38 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="587"/> <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -615,29 +634,29 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -645,19 +664,19 @@ <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -665,24 +684,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -976,12 +995,27 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="357"/> + <source>Overwrite if destination older</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="362"/> <location filename="../../fileExistsDialog.ui" line="365"/> <source>Overwrite if not same size</source> @@ -1013,17 +1047,6 @@ <source>&Cancel</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="354"/> - <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>fileIsSameDialog</name> diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/ko/translation.qm b/plugins/CopyEngine/Ultracopier-Spec/Languages/ko/translation.qm Binary files differindex 04477d6..1ffa2aa 100644 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/ko/translation.qm +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/ko/translation.qm diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/ko/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/ko/translation.ts index 74fbf13..0c57b9c 100644 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/ko/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/ko/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation>엔진이 강제로 이동합니다. 사용자가 복사할 수 없습니다.</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation>엔진이 강제로 복사합니다. 사용자가 이동할 수 없습니다.</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished">대상</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished">실제 대상 "%1"를(을) 사용하시겠습니까?</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation>모드가 이전에 강제되었습니다. 내부 오류입니다. 문제를 보고해 주세요.</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished">Windows에서만 지원</translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished">확인</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished">건너뛰기</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished">합치기</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished">이름 바꾸기</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished">끝에 놓기</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished">덮어쓰기</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished">다르면 덮어쓰기</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished">더 최신이면 덮어쓰기</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished">더 이전이면 덮어쓰기</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished">옵션 오류</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation>옵션 엔진이 호출되지 않았습니다. 필터에 액세스할 수 없습니다. </translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished">Windows에서만 지원</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished">확인</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished">건너뛰기</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished">합치기</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished">이름 바꾸기</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished">끝에 놓기</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished">덮어쓰기</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished">다르면 덮어쓰기</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished">더 최신이면 덮어씌우기</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished">더 이전이면 덮어쓰기</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished">옵션 오류</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation>옵션 엔진이 호출되지 않았습니다. 필터에 액세스할 수 없습니다.</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation>옵션 엔진이 호출되지 않았습니다. 필터에 액세스할 수 없습니다.</translation> </message> @@ -200,12 +206,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished">폴더 오류</translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished">폴더 이름</translation> </message> @@ -213,22 +219,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished">%name% - 복사%suffix%</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished">%name% - 복사 (%number%)%suffix%</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished">오류</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation>특수 문자를 사용하여 이름을 바꾸세요.</translation> </message> @@ -236,22 +242,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished">%name% - 복사%suffix%</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished">%name% - 복사 (%number%)%suffix%</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished">오류</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation>특수 문자를 사용하여 이름을 바꾸세요.</translation> </message> @@ -398,27 +404,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation>폴더가 이미 존재합니다.</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished">%name% - 복사%suffix%</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished">%name% - 복사 (%number%)%suffix%</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation>오류</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation>특수 문자를 사용하여 이름을 바꾸세요.</translation> </message> @@ -478,6 +484,8 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished">폴더를 만들 수 없습니다</translation> </message> @@ -487,28 +495,33 @@ <translation>원본 폴더가 존재하지 않습니다.</translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation>폴더 이름을 임시로 바꿀 수 없습니다.</translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation>폴더를 이동할 수 없습니다.</translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation>폴더를 이동할 수 없습니다.</translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished">폴더를 이동할 수 없습니다. Errno: %1 </translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation>제거할 수 없습니다.</translation> </message> @@ -521,12 +534,12 @@ <translation type="unfinished">내부 오류. 이 문제를 보고해 주세요!</translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished">원본 파일을 읽을 수 없습니다: </translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation>읽기 중 파일이 잘림. 데이터가 변경되었을 수 있습니다. </translation> </message> @@ -582,32 +595,38 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> - <translation type="unfinished">%1 - 복사</translation> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> + <source>%1 - copy</source> + <translation type="unfinished">%1 - 복사</translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> <source>%1 - copy (%2)</source> <translation type="unfinished">%1 - 복사 (%2)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> + <location filename="../../ScanFileOrFolder.cpp" line="587"/> + <location filename="../../ScanFileOrFolder.cpp" line="589"/> <source>%name% - copy</source> <translation type="unfinished">%name% - 복사</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="587"/> - <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished">%name% - 복사 (%number%)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished">폴더 읽기 문제</translation> </message> @@ -615,29 +634,29 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished">%name% - 복사%suffix%</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished">%name% - 복사 (%number%)%suffix%</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation>파일을 찾을 수 없습니다.</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation>날짜를 변경할 수 없습니다.</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation>특수 문자를 사용하여 이름을 바꾸세요.</translation> </message> @@ -645,19 +664,19 @@ <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation>수정 날짜가 잘못되었거나 가져올 수 없습니다. 시간 보내기를 비활성화할 수 있습니다.</translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished">대상 폴더를 만들 수 없음:</translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished">대상 폴더를 만들 수 없음. Errno: %1</translation> </message> @@ -665,24 +684,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished">경로 확인 오류 (빈 경로)</translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished">대상 폴더를 만들 수 없음:</translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished">대상 폴더를 만들 수 없음. Errno: %1</translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished">내부 오류. 문제를 보고해 주세요!</translation> </message> @@ -976,12 +995,27 @@ <translation type="unfinished">&항상 이 동작 수행</translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> <translation type="unfinished">수정한 날짜가 다르면 덮어쓰기</translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="357"/> + <source>Overwrite if destination older</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="362"/> <location filename="../../fileExistsDialog.ui" line="365"/> <source>Overwrite if not same size</source> @@ -1013,17 +1047,6 @@ <source>&Cancel</source> <translation>&취소</translation> </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation type="unfinished">더 최신이면 덮어쓰기</translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="354"/> - <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation type="unfinished">더 이전이면 덮어쓰기</translation> - </message> </context> <context> <name>fileIsSameDialog</name> diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/nl/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/nl/translation.ts index f608b09..f043c14 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/nl/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/nl/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -200,12 +206,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -213,22 +219,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -236,22 +242,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -398,27 +404,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -478,6 +484,8 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -487,28 +495,33 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> @@ -521,12 +534,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -582,32 +595,38 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="587"/> <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -615,29 +634,29 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -645,19 +664,19 @@ <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -665,24 +684,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -976,12 +995,27 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="357"/> + <source>Overwrite if destination older</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="362"/> <location filename="../../fileExistsDialog.ui" line="365"/> <source>Overwrite if not same size</source> @@ -1013,17 +1047,6 @@ <source>&Cancel</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="354"/> - <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>fileIsSameDialog</name> diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/no/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/no/translation.ts index f608b09..f043c14 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/no/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/no/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -200,12 +206,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -213,22 +219,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -236,22 +242,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -398,27 +404,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -478,6 +484,8 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -487,28 +495,33 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> @@ -521,12 +534,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -582,32 +595,38 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="587"/> <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -615,29 +634,29 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -645,19 +664,19 @@ <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -665,24 +684,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -976,12 +995,27 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="357"/> + <source>Overwrite if destination older</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="362"/> <location filename="../../fileExistsDialog.ui" line="365"/> <source>Overwrite if not same size</source> @@ -1013,17 +1047,6 @@ <source>&Cancel</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="354"/> - <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>fileIsSameDialog</name> diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/pl/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/pl/translation.ts index f608b09..f043c14 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/pl/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/pl/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -200,12 +206,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -213,22 +219,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -236,22 +242,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -398,27 +404,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -478,6 +484,8 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -487,28 +495,33 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> @@ -521,12 +534,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -582,32 +595,38 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="587"/> <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -615,29 +634,29 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -645,19 +664,19 @@ <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -665,24 +684,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -976,12 +995,27 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="357"/> + <source>Overwrite if destination older</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="362"/> <location filename="../../fileExistsDialog.ui" line="365"/> <source>Overwrite if not same size</source> @@ -1013,17 +1047,6 @@ <source>&Cancel</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="354"/> - <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>fileIsSameDialog</name> diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/pt/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/pt/translation.ts index f608b09..f043c14 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/pt/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/pt/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -200,12 +206,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -213,22 +219,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -236,22 +242,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -398,27 +404,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -478,6 +484,8 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -487,28 +495,33 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> @@ -521,12 +534,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -582,32 +595,38 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="587"/> <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -615,29 +634,29 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -645,19 +664,19 @@ <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -665,24 +684,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -976,12 +995,27 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="357"/> + <source>Overwrite if destination older</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="362"/> <location filename="../../fileExistsDialog.ui" line="365"/> <source>Overwrite if not same size</source> @@ -1013,17 +1047,6 @@ <source>&Cancel</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="354"/> - <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>fileIsSameDialog</name> diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/ru/translation.qm b/plugins/CopyEngine/Ultracopier-Spec/Languages/ru/translation.qm Binary files differindex a1f6180..427ee00 100644 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/ru/translation.qm +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/ru/translation.qm diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/ru/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/ru/translation.ts index 5ca2037..e507d1e 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/ru/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/ru/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished">Двигатель вынуждены покинуть свои дома, вы не можете скопировать с ним</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished">Двигатель вынужден копии, вы не можете двигаться вместе с ним</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished">назначение</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished">просить</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished">пропускать</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished">слияние</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished">переименовать</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished">Заменить, если новее</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished">Опции ошибке</translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished">просить</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished">пропускать</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished">слияние</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished">переименовать</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished">Заменить, если новее</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished">Опции ошибке</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished">Параметры двигателя не загружается, не может получить доступ к фильтрам</translation> </message> @@ -200,12 +206,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished">Ошибка в папку</translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished">имя папки</translation> </message> @@ -213,22 +219,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished">ошибка</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -236,22 +242,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished">ошибка</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -398,27 +404,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished">Папка уже существует</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished">ошибка</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -478,6 +484,8 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation>Невозможно создать папку</translation> </message> @@ -487,28 +495,33 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> @@ -521,12 +534,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -582,32 +595,38 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> - <translation type="unfinished">%1 - копия</translation> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> + <source>%1 - copy</source> + <translation type="unfinished">%1 - копия</translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> <source>%1 - copy (%2)</source> <translation type="unfinished">%1 - копия (%2)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> + <location filename="../../ScanFileOrFolder.cpp" line="587"/> + <location filename="../../ScanFileOrFolder.cpp" line="589"/> <source>%name% - copy</source> <translation type="unfinished">%name% - копия</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="587"/> - <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished">%name% - копия (%number%)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -615,29 +634,29 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -645,19 +664,19 @@ <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -665,24 +684,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -976,12 +995,27 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="357"/> + <source>Overwrite if destination older</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="362"/> <location filename="../../fileExistsDialog.ui" line="365"/> <source>Overwrite if not same size</source> @@ -1013,17 +1047,6 @@ <source>&Cancel</source> <translation>отменить</translation> </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation>Заменить, если новее</translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="354"/> - <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>fileIsSameDialog</name> diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/th/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/th/translation.ts index f608b09..f043c14 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/th/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/th/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -200,12 +206,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -213,22 +219,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -236,22 +242,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -398,27 +404,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -478,6 +484,8 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -487,28 +495,33 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> @@ -521,12 +534,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -582,32 +595,38 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="587"/> <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -615,29 +634,29 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -645,19 +664,19 @@ <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -665,24 +684,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -976,12 +995,27 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="357"/> + <source>Overwrite if destination older</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="362"/> <location filename="../../fileExistsDialog.ui" line="365"/> <source>Overwrite if not same size</source> @@ -1013,17 +1047,6 @@ <source>&Cancel</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="354"/> - <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>fileIsSameDialog</name> diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/tr/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/tr/translation.ts index f608b09..f043c14 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/tr/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/tr/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -200,12 +206,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -213,22 +219,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -236,22 +242,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -398,27 +404,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -478,6 +484,8 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -487,28 +495,33 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> @@ -521,12 +534,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -582,32 +595,38 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="587"/> <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -615,29 +634,29 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -645,19 +664,19 @@ <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -665,24 +684,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -976,12 +995,27 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="357"/> + <source>Overwrite if destination older</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="362"/> <location filename="../../fileExistsDialog.ui" line="365"/> <source>Overwrite if not same size</source> @@ -1013,17 +1047,6 @@ <source>&Cancel</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="354"/> - <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>fileIsSameDialog</name> diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/zh/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/zh/translation.ts index ebb1c5a..5d3d997 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/zh/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/zh/translation.ts @@ -4,91 +4,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -96,75 +101,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -200,12 +206,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../FileErrorDialog.cpp" line="87"/> + <location filename="../../FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileErrorDialog.cpp" line="90"/> + <location filename="../../FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -213,22 +219,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../FileExistsDialog.cpp" line="191"/> + <location filename="../../FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="198"/> + <location filename="../../FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="289"/> + <location filename="../../FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -236,22 +242,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../FileIsSameDialog.cpp" line="140"/> + <location filename="../../FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="147"/> + <location filename="../../FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="220"/> + <location filename="../../FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -398,27 +404,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../FolderExistsDialog.cpp" line="84"/> + <location filename="../../FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="164"/> + <location filename="../../FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="173"/> + <location filename="../../FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="240"/> + <location filename="../../FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -478,6 +484,8 @@ <message> <location filename="../../MkPath.cpp" line="187"/> <location filename="../../MkPath.cpp" line="210"/> + <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -487,28 +495,33 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="255"/> + <location filename="../../MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="278"/> + <location filename="../../MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="309"/> + <location filename="../../MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../MkPath.cpp" line="315"/> + <location filename="../../MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../MkPath.cpp" line="124"/> - <location filename="../../MkPath.cpp" line="394"/> + <location filename="../../MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> @@ -521,12 +534,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="541"/> + <location filename="../../async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/ReadThread.cpp" line="595"/> + <location filename="../../async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -582,32 +595,38 @@ <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="331"/> + <location filename="../../ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="463"/> <location filename="../../ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="576"/> - <location filename="../../ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../ScanFileOrFolder.cpp" line="474"/> + <location filename="../../ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="587"/> <location filename="../../ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="598"/> + <location filename="../../ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="673"/> - <location filename="../../ScanFileOrFolder.cpp" line="677"/> + <location filename="../../ScanFileOrFolder.cpp" line="691"/> + <location filename="../../ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -615,29 +634,29 @@ <context> <name>TransferThread</name> <message> - <location filename="../../TransferThread.cpp" line="613"/> + <location filename="../../TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="620"/> + <location filename="../../TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="648"/> - <location filename="../../TransferThread.cpp" line="889"/> + <location filename="../../TransferThread.cpp" line="663"/> + <location filename="../../TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="889"/> - <location filename="../../TransferThread.cpp" line="925"/> + <location filename="../../TransferThread.cpp" line="904"/> + <location filename="../../TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="179"/> + <location filename="../../TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -645,19 +664,19 @@ <context> <name>TransferThreadAsync</name> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -665,24 +684,24 @@ <context> <name>WriteThread</name> <message> - <location filename="../../async/WriteThread.cpp" line="135"/> + <location filename="../../async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="164"/> - <location filename="../../async/WriteThread.cpp" line="197"/> + <location filename="../../async/WriteThread.cpp" line="167"/> + <location filename="../../async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="175"/> - <location filename="../../async/WriteThread.cpp" line="199"/> + <location filename="../../async/WriteThread.cpp" line="178"/> + <location filename="../../async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../async/WriteThread.cpp" line="456"/> + <location filename="../../async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -976,12 +995,27 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="341"/> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="346"/> <location filename="../../fileExistsDialog.ui" line="349"/> <source>Overwrite if modification date differs</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../../fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../fileExistsDialog.ui" line="357"/> + <source>Overwrite if destination older</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../fileExistsDialog.ui" line="362"/> <location filename="../../fileExistsDialog.ui" line="365"/> <source>Overwrite if not same size</source> @@ -1013,17 +1047,6 @@ <source>&Cancel</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../../fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../fileExistsDialog.ui" line="354"/> - <location filename="../../fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>fileIsSameDialog</name> diff --git a/plugins/CopyEngine/Ultracopier-Spec/ListThread.cpp b/plugins/CopyEngine/Ultracopier-Spec/ListThread.cpp index 9c5e8f8..b7a7a69 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/ListThread.cpp +++ b/plugins/CopyEngine/Ultracopier-Spec/ListThread.cpp @@ -166,7 +166,23 @@ 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).toStdString()); + #ifdef ULTRACOPIER_PLUGIN_DEBUG + std::string threadidstring="?"; + { + size_t index=0; + while(index<transferThreadList.size()) + { + if(transferThreadList.at(index)==temp_transfer_thread) + { + threadidstring=std::to_string(index); + break; + } + index++; + } + } + #endif + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("[%1] have finish, put at idle; for id: %2").arg(QString::fromStdString(threadidstring)) + .arg(temp_transfer_thread->transferId).toStdString()+" "+TransferThread::internalStringTostring(temp_transfer_thread->getDestinationPath())); Ultracopier::ReturnActionOnCopyList newAction; newAction.type=Ultracopier::RemoveItem; newAction.userAction.moveAt=0; @@ -196,6 +212,8 @@ void ListThread::transferInodeIsClosed() } bytesTransfered+=temp_transfer_thread->transferSize; + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+threadidstring+"] transferId=0 currentTransferThread->transferId: "+ + std::to_string(temp_transfer_thread->transferId)+" on thread "+std::to_string((quint64)QThread::currentThread())); temp_transfer_thread->transferId=0; temp_transfer_thread->transferSize=0; #ifdef ULTRACOPIER_PLUGIN_DEBUG @@ -215,7 +233,9 @@ void ListThread::transferInodeIsClosed() int_for_internal_loop++; } if(isFound) - deleteTransferThread(); + { + //deleteTransferThread();//why? generate use after free! + } 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).toStdString()); @@ -271,6 +291,24 @@ void ListThread::transferPutAtBottom() //move at the end actionToDoListTransfer.push_back(actionToDoListTransfer.at(indexAction)); actionToDoListTransfer.erase(actionToDoListTransfer.cbegin()+indexAction); + #ifdef ULTRACOPIER_PLUGIN_DEBUG + { + size_t index=0; + while(index<transferThreadList.size()) + { + if(transferThreadList.at(index)==transfer) + { + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(index)+"] currentTransferThread->transferId: "+ + std::to_string(transfer->transferId)+" on thread "+std::to_string((quint64)QThread::currentThread())); + break; + } + index++; + } + if(index>=transferThreadList.size()) + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"[?] currentTransferThread->transferId: "+ + std::to_string(transfer->transferId)+" on thread "+std::to_string((quint64)QThread::currentThread())); + } + #endif transfer->transferId=0; transfer->transferSize=0; #ifdef ULTRACOPIER_PLUGIN_DEBUG @@ -301,6 +339,13 @@ void ListThread::fileTransfer(const INTERNALTYPEPATH &sourceFileInfo,const INTER { if(stopIt) return; + #ifdef Q_OS_WIN32 + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"source: "+TransferThread::internalStringTostring(sourceFileInfo)+ + ", destination: "+TransferThread::internalStringTostring(destinationFileInfo)+" windows"); + #else + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"source: "+TransferThread::internalStringTostring(sourceFileInfo)+ + ", destination: "+TransferThread::internalStringTostring(destinationFileInfo)+" unix"); + #endif addToTransfer(sourceFileInfo,destinationFileInfo,mode); } @@ -310,9 +355,13 @@ void ListThread::fileTransferWithInode(const INTERNALTYPEPATH &sourceFileInfo,co if(stopIt) return; #ifdef Q_OS_WIN32 + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"source: "+TransferThread::internalStringTostring(sourceFileInfo)+ + ", destination: "+TransferThread::internalStringTostring(destinationFileInfo)+" windows "+std::to_string(inode.isFolder)); addToTransfer(sourceFileInfo,destinationFileInfo,mode,inode.size); #else (void)inode; + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"source: "+TransferThread::internalStringTostring(sourceFileInfo)+ + ", destination: "+TransferThread::internalStringTostring(destinationFileInfo)+" unix"); addToTransfer(sourceFileInfo,destinationFileInfo,mode); #endif } @@ -642,6 +691,13 @@ uint64_t ListThread::addToTransfer(const INTERNALTYPEPATH &source, const INTERNA const int64_t tempSize=TransferThread::file_stat_size(source); if(tempSize>=0) size=tempSize; + else + { + if(TransferThread::is_file(source)) + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to detect size on "+TransferThread::internalStringTostring(source)); + else + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"File not existing during listing "+TransferThread::internalStringTostring(source)); + } } const std::string &drive=driveManagement.getDrive(TransferThread::internalStringTostring(destination)); if(!drive.empty())//can be a network drive @@ -850,6 +906,24 @@ void ListThread::doNewActions_inode_manipulation() if(currentTransferThread->getStat()==TransferStat_Idle && currentTransferThread->transferId==0 && overCheckUsedThread.find(currentTransferThread)==overCheckUsedThread.cend()) // /!\ important! { + #ifdef ULTRACOPIER_PLUGIN_DEBUG + { + size_t index=0; + while(index<transferThreadList.size()) + { + if(transferThreadList.at(index)==currentTransferThread) + { + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(index)+"] currentTransferThread->transferId: "+ + std::to_string(currentTransferThread->transferId)+" on thread "+std::to_string((quint64)QThread::currentThread())); + break; + } + index++; + } + if(index>=transferThreadList.size()) + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"[?] currentTransferThread->transferId: "+ + std::to_string(currentTransferThread->transferId)+" on thread "+std::to_string((quint64)QThread::currentThread())); + } + #endif overCheckUsedThread.insert(currentTransferThread); std::string drive=driveManagement.getDrive(TransferThread::internalStringTostring(currentActionToDoTransfer.destination)); @@ -871,12 +945,19 @@ void ListThread::doNewActions_inode_manipulation() currentActionToDoTransfer.mode )) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(int_for_loop)+"] id: "+ + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(int_for_loop)+"] id: "+ std::to_string(currentTransferThread->transferId)+ " is idle, but seam busy at set name: "+TransferThread::internalStringTostring(currentActionToDoTransfer.destination) ); break; } + else + { + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(int_for_loop)+"] id: "+ + std::to_string(currentTransferThread->transferId)+ + " is idle, but seam busy at set name: "+TransferThread::internalStringTostring(currentActionToDoTransfer.destination) + ); + } currentActionToDoTransfer.isRunning=true; ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(int_for_loop)+"] id: "+ @@ -1063,12 +1144,14 @@ void ListThread::mkPathFirstFolderFinish() /// \note Can be call without queue because all call will be serialized void ListThread::fileAlreadyExists(const INTERNALTYPEPATH &source,const INTERNALTYPEPATH &destination,const bool &isSame) { + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,TransferThread::internalStringTostring(source)+" to "+TransferThread::internalStringTostring(destination)); emit send_fileAlreadyExists(source,destination,isSame,qobject_cast<TransferThreadAsync *>(sender())); } /// \note Can be call without queue because all call will be serialized void ListThread::errorOnFile(const INTERNALTYPEPATH &fileInfo, const std::string &errorString, const ErrorType &errorType) { + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,TransferThread::internalStringTostring(fileInfo)+" error: "+errorString); TransferThreadAsync * transferThread=qobject_cast<TransferThreadAsync *>(sender()); if(transferThread==NULL) { @@ -1090,6 +1173,7 @@ void ListThread::errorOnFile(const INTERNALTYPEPATH &fileInfo, const std::string /// \note Can be call without queue because all call will be serialized void ListThread::folderAlreadyExists(const INTERNALTYPEPATH &source,const INTERNALTYPEPATH &destination,const bool &isSame) { + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,TransferThread::internalStringTostring(source)+" to "+TransferThread::internalStringTostring(destination)); emit send_folderAlreadyExists(source,destination,isSame,qobject_cast<ScanFileOrFolder *>(sender())); } @@ -1097,6 +1181,7 @@ void ListThread::folderAlreadyExists(const INTERNALTYPEPATH &source,const INTERN /// \todo all this part void ListThread::errorOnFolder(const INTERNALTYPEPATH &fileInfo,const std::string &errorString,const ErrorType &errorType) { + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,TransferThread::internalStringTostring(fileInfo)+" error: "+errorString); emit send_errorOnFolder(fileInfo,errorString,qobject_cast<ScanFileOrFolder *>(sender()),errorType); } @@ -1121,6 +1206,7 @@ void ListThread::getNeedPutAtBottom(const INTERNALTYPEPATH &fileInfo, const std: /// \to create transfer thread void ListThread::createTransferThread() { + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); if(stopIt) return; if(transferThreadList.size()>=(unsigned int)inodeThreads) @@ -1206,6 +1292,7 @@ void ListThread::deleteTransferThread() int index=0; while(index<loop_size && loop_size>inodeThreads) { + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"delete thread ["+std::to_string(index)+"]"); if(transferThreadList.at(index)->getStat()==TransferStat_Idle && transferThreadList.at(index)->transferId==0) { transferThreadList.at(index)->stop(); diff --git a/plugins/CopyEngine/Ultracopier-Spec/ListThreadNew.cpp b/plugins/CopyEngine/Ultracopier-Spec/ListThreadNew.cpp index f4a1857..43b7a03 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/ListThreadNew.cpp +++ b/plugins/CopyEngine/Ultracopier-Spec/ListThreadNew.cpp @@ -8,7 +8,7 @@ // -> add thread safe, by Qt::BlockingQueuedConnection bool ListThread::newCopy(const std::vector<std::string> &sources,const std::string &destination) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start: "+stringimplode(sources,";")+", destination: "+destination); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"sources: "+stringimplode(sources,";")+", destination: "+destination); ScanFileOrFolder * scanFileOrFolderThread=newScanThread(Ultracopier::Copy); if(scanFileOrFolderThread==NULL) { @@ -60,6 +60,35 @@ bool ListThread::newCopy(const std::vector<std::string> &sources,const std::stri bool ListThread::newMove(const std::vector<std::string> &sources,const std::string &destination) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); + + #ifdef ULTRACOPIER_PLUGIN_DEBUG + { + unsigned int index=0; + while(index<sources.size()) + { + std::string source=sources.at(index); + //can be: file://192.168.0.99/share/file.txt + //can be: file:///C:/file.txt + //can be: file:///home/user/fileatrootunderunix + #ifndef Q_OS_WIN + if(stringStartWith(source,"file:///")) + source.replace(0,7,""); + #else + if(stringStartWith(source,"file:///")) + source.replace(0,8,""); + else if(stringStartWith(source,"file://")) + source.replace(0,5,""); + else if(stringStartWith(source,"file:/")) + source.replace(0,6,""); + #endif + if(index<99) + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,sources.at(index)+" -> "+source); + index++; + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"source is_file: "+std::to_string(TransferThread::is_file(TransferThread::stringToInternalString(source)))+" is_dir: "+std::to_string(TransferThread::is_dir(TransferThread::stringToInternalString(source)))); + } + } + #endif + ScanFileOrFolder * scanFileOrFolderThread = newScanThread(Ultracopier::Move); if(scanFileOrFolderThread==NULL) { @@ -92,6 +121,7 @@ bool ListThread::newMove(const std::vector<std::string> &sources,const std::stri if(index<99) ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,sources.at(index)+" -> "+source); index++; + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"source is_file: "+std::to_string(TransferThread::is_file(TransferThread::stringToInternalString(source)))+" is_dir: "+std::to_string(TransferThread::is_dir(TransferThread::stringToInternalString(source)))); sourcesClean.push_back(TransferThread::stringToInternalString(source)); } ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"destination: "+destination); diff --git a/plugins/CopyEngine/Ultracopier-Spec/MkPath.cpp b/plugins/CopyEngine/Ultracopier-Spec/MkPath.cpp index 3d6729c..d6aa0f9 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/MkPath.cpp +++ b/plugins/CopyEngine/Ultracopier-Spec/MkPath.cpp @@ -238,63 +238,133 @@ void MkPath::internalDoThisPath() } if(stringStartWith(item.destination,(item.source+text_slash))) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"move into it self: "+TransferThread::internalStringTostring(item.destination)); + INTERNALTYPEPATH source=item.source; + INTERNALTYPEPATH destination=item.destination; + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"move into it self: "+TransferThread::internalStringTostring(destination)); int random=rand(); - INTERNALTYPEPATH tempFolder=FSabsolutePath(item.source)+text_slash+TransferThread::stringToInternalString(std::to_string(random)); + INTERNALTYPEPATH tempFolder=FSabsolutePath(source)+text_slash+TransferThread::stringToInternalString(std::to_string(random)); + #ifdef _WIN32 + #ifdef WIDESTRING + stringreplaceAll(tempFolder,L"\\",L"/"); + #else + stringreplaceAll(tempFolder,"\\","/"); + #endif + #endif + #ifdef WIDESTRING + stringreplaceAll(tempFolder,L"//",L"/"); + #else + stringreplaceAll(tempFolder,"//","/"); + #endif while(TransferThread::is_dir(tempFolder)) { random=rand(); - tempFolder=FSabsolutePath(item.source)+text_slash+TransferThread::stringToInternalString(std::to_string(random)); + tempFolder=FSabsolutePath(source)+text_slash+TransferThread::stringToInternalString(std::to_string(random)); + #ifdef _WIN32 + #ifdef WIDESTRING + stringreplaceAll(tempFolder,L"\\",L"/"); + #else + stringreplaceAll(tempFolder,"\\","/"); + #endif + #endif + #ifdef WIDESTRING + stringreplaceAll(tempFolder,L"//",L"/"); + #else + stringreplaceAll(tempFolder,"//","/"); + #endif } - if(!TransferThread::rename(item.source,tempFolder)) + #ifdef _WIN32 + stringreplaceAll(tempFolder,L"/",L"\\"); + #endif + + #ifdef _WIN32 + #ifdef WIDESTRING + stringreplaceAll(tempFolder,L"\\",L"/"); + #else + stringreplaceAll(tempFolder,"\\","/"); + #endif + #endif + #ifdef WIDESTRING + stringreplaceAll(tempFolder,L"//",L"/"); + #else + stringreplaceAll(tempFolder,"//","/"); + #endif + #ifdef _WIN32 + #ifdef WIDESTRING + stringreplaceAll(tempFolder,L"/",L"\\"); + #else + stringreplaceAll(tempFolder,"/","\\"); + #endif + #endif + if(!TransferThread::rename(source,tempFolder)) { if(stopIt) return; waitAction=true; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to temporary rename the folder: "+TransferThread::internalStringTostring(item.destination)); - emit errorOnFolder(item.destination,tr("Unable to temporary rename the folder").toStdString()); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to temporary rename the folder: from "+TransferThread::internalStringTostring(source)+" to "+TransferThread::internalStringTostring(tempFolder)); + emit errorOnFolder(destination,tr("Unable to temporary rename the folder").toStdString()); return; } - /* http://doc.qt.io/qt-5/qdir.html#rename - * On most file systems, rename() fails only if oldName does not exist, or if a file with the new name already exists. - if(!dir.mkpath(FSabsolutePath(item.destination))) + if(!TransferThread::mkpath(FSabsolutePath(destination))) { - if(!dir.exists(FSabsolutePath(item.destination))) + if(!TransferThread::is_dir(FSabsolutePath(destination))) { if(stopIt) return; waitAction=true; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to make the folder: "+item.destination.absoluteFilePath()); - emit errorOnFolder(item.destination,tr("Unable to create the folder")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to make the folder: "+TransferThread::internalStringTostring(destination)); + emit errorOnFolder(destination,tr("Unable to create the folder").toStdString()); return; } - }*/ - if(!TransferThread::rename(tempFolder,item.destination)) + } + #ifdef _WIN32 + #ifdef WIDESTRING + stringreplaceAll(tempFolder,L"\\",L"/"); + #else + stringreplaceAll(tempFolder,"\\","/"); + #endif + #endif + #ifdef WIDESTRING + stringreplaceAll(tempFolder,L"//",L"/"); + #else + stringreplaceAll(tempFolder,"//","/"); + #endif + if(!TransferThread::rename(tempFolder,destination)) { - if(stopIt) + if(!TransferThread::rename(tempFolder,source)) + { + if(stopIt) + return; + waitAction=true; + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to reverse temporary rename the folder: from "+TransferThread::internalStringTostring(tempFolder)+" to "+TransferThread::internalStringTostring(destination)); + emit errorOnFolder(destination,tr("Unable to reverse temporary rename for real move").toStdString()); return; - waitAction=true; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to do the final real move the folder: "+TransferThread::internalStringTostring(item.destination)); - emit errorOnFolder(item.destination,tr("Unable to do the final real move the folder").toStdString()); - return; + } + else + { + if(stopIt) + return; + waitAction=true; + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to temporary rename the folder: from "+TransferThread::internalStringTostring(tempFolder)+" to "+TransferThread::internalStringTostring(destination)); + emit errorOnFolder(destination,tr("Unable to do the final real move the folder").toStdString()); + return; + } } } else { - /* http://doc.qt.io/qt-5/qdir.html#rename - * On most file systems, rename() fails only if oldName does not exist, or if a file with the new name already exists. - if(!dir.mkpath(FSabsolutePath(item.destination))) + if(!TransferThread::mkpath(FSabsolutePath(item.destination))) { - if(!dir.exists(FSabsolutePath(item.destination))) + if(!TransferThread::is_dir(FSabsolutePath(item.destination))) { if(stopIt) return; waitAction=true; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to make the folder: "+item.destination.absoluteFilePath()); - emit errorOnFolder(item.destination,tr("Unable to create the folder")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to make the folder: "+TransferThread::internalStringTostring(item.destination)); + emit errorOnFolder(item.destination,tr("Unable to create the folder").toStdString()); return; } - }*/ + } + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"move/rename: "+TransferThread::internalStringTostring(item.source)+" to "+TransferThread::internalStringTostring(item.destination)); if(!TransferThread::rename(item.source,item.destination)!=0) { if(stopIt) @@ -318,22 +388,6 @@ void MkPath::internalDoThisPath() } } } - if(doTheDateTransfer) - if(!writeFileDateTime(item.destination)) - { - if(!TransferThread::exists(item.destination)) - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to set destination folder time (not exists): "+TransferThread::internalStringTostring(item.destination)); - else if(!TransferThread::is_dir(item.destination)) - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to set destination folder time (not a dir): "+TransferThread::internalStringTostring(item.destination)); - else - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to set destination folder time: "+TransferThread::internalStringTostring(item.destination)); - /*if(stopIt) - return; - waitAction=true; - - emit errorOnFolder(item.source,tr("Unable to set time")); - return;*/ - } if(doRightTransfer && item.actionType!=ActionType_RealMove) { #ifdef Q_OS_UNIX @@ -383,6 +437,22 @@ void MkPath::internalDoThisPath() } #endif } + if(doTheDateTransfer) + if(!writeFileDateTime(item.destination)) + { + if(!TransferThread::exists(item.destination)) + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to set destination folder time (not exists): "+TransferThread::internalStringTostring(item.destination)); + else if(!TransferThread::is_dir(item.destination)) + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to set destination folder time (not a dir): "+TransferThread::internalStringTostring(item.destination)); + else + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to set destination folder time: "+TransferThread::internalStringTostring(item.destination)); + /*if(stopIt) + return; + waitAction=true; + + emit errorOnFolder(item.source,tr("Unable to set time")); + return;*/ + } if(item.actionType==ActionType_MovePath) { if(!rmpath(item.source)) diff --git a/plugins/CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp b/plugins/CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp index b1d8ed2..035ed09 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp +++ b/plugins/CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp @@ -45,17 +45,22 @@ ScanFileOrFolder::ScanFileOrFolder(const Ultracopier::CopyMode &mode) : this->mode = mode; folder_isolation = std::regex("^(.*/)?([^/]+)/$"); setObjectName(QStringLiteral("ScanFileOrFolder")); - /*#ifdef Q_OS_WIN32 + #ifdef Q_OS_WIN32 QString userName; DWORD size=255; WCHAR * userNameW=new WCHAR[size]; if(GetUserNameW(userNameW,&size)) { - userName=QString::fromWCharArray(userNameW,size-1); - blackList.push_back(QFileInfo(QStringLiteral("C:/Users/%1/AppData/Roaming/").arg(userName))); + #ifdef WIDESTRING + blackList.push_back(INTERNALTYPEPATH(L"C:/Users/")+userNameW+L"/AppData/Roaming/"); + blackList.push_back(INTERNALTYPEPATH(L"C:\\Users\\")+userNameW+L"\\AppData\\Roaming\\"); + #else + blackList.push_back(INTERNALTYPEPATH("C:/Users/")+userNameW+"/AppData/Roaming/"); + blackList.push_back(INTERNALTYPEPATH("C:\\Users\\")+userNameW+"\\AppData\\Roaming\\"); + #endif } delete userNameW; - #endif*/ + #endif } ScanFileOrFolder::~ScanFileOrFolder() @@ -302,8 +307,8 @@ void ScanFileOrFolder::run() } else { - //ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"tempString: "+tempString+" normal listing, blacklist size: "+std::to_string(blackList.size())); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"tempString: "+TransferThread::internalStringTostring(tempString)+" normal listing"); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"tempString: "+TransferThread::internalStringTostring(tempString)+" normal listing, blacklist size: "+std::to_string(blackList.size())); + //ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"tempString: "+TransferThread::internalStringTostring(tempString)+" normal listing"); if(stringEndsWith(source,'/')) source.erase(source.end()-1); if(stringEndsWith(tempString,'/')) @@ -313,11 +318,23 @@ void ScanFileOrFolder::run() } else { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"source: "+TransferThread::internalStringTostring(source)+" is file or symblink"); - if(stringEndsWith(destination,'/') || stringEndsWith(destination,'\\')) - emit fileTransfer(source,destination+TransferThread::resolvedName(source),mode); - else - emit fileTransfer(source,destination+text_slash+TransferThread::resolvedName(source),mode); + INTERNALTYPEPATH destinationFinish=destination; + if(stringEndsWith(destinationFinish,'/') || stringEndsWith(destinationFinish,'\\')) + destinationFinish.pop_back(); + destinationFinish+=text_slash; + do + { + fileErrorAction=FileError_NotSet; + if(isBlackListed(destination)) + { + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"isBlackListed: "+TransferThread::internalStringTostring(destination)); + emit errorOnFolder(destination,tr("Blacklisted folder").toStdString(),ErrorType_Folder); + waitOneAction.acquire(); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,std::string("actionNum: ")+std::to_string((int)fileErrorAction)); + } + } while(fileErrorAction==FileError_Retry); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"source: "+TransferThread::internalStringTostring(source)+" is file or symblink, is_file: "+std::to_string(TransferThread::is_file(source))); + emit fileTransfer(source,destinationFinish+TransferThread::resolvedName(source),mode); } sourceIndex++; } @@ -362,38 +379,32 @@ INTERNALTYPEPATH ScanFileOrFolder::resolvDestination(const INTERNALTYPEPATH &des buf.resize(nbytes); } return temp; - /*do - { - fileErrorAction=FileError_NotSet; - if(isBlackListed(destination)) - { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"isBlackListed: "+destination); - emit errorOnFolder(destination,tr("Blacklisted folder").toStdString(),ErrorType_Folder); - waitOneAction.acquire(); - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"actionNum: "+std::to_string(fileErrorAction)); - } - } while(fileErrorAction==FileError_Retry || fileErrorAction==FileError_PutToEndOfTheList); - return newDestination;*/ } #endif -/*bool ScanFileOrFolder::isBlackListed(const QFileInfo &destination) +bool ScanFileOrFolder::isBlackListed(const INTERNALTYPEPATH &path) { int index=0; int size=blackList.size(); + INTERNALTYPEPATH path2=path; while(index<size) { - if(stringStartWith(destination,blackList.at(index))) + #ifdef WIDESTRING + stringreplaceAll(path2,L"\\",L"/"); + #else + stringreplaceAll(path2,"\\","/"); + #endif + if(stringStartWith(path2,blackList.at(index))) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,destination+" start with: "+blackList.at(index)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,TransferThread::internalStringTostring(path)+" start with: "+TransferThread::internalStringTostring(blackList.at(index))); return true; } else - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,destination+" not start with: "+blackList.at(index)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,TransferThread::internalStringTostring(path)+" not start with: "+TransferThread::internalStringTostring(blackList.at(index))); index++; } return false; -}*/ +} void ScanFileOrFolder::listFolder(INTERNALTYPEPATH source,INTERNALTYPEPATH destination) { @@ -664,7 +675,14 @@ void ScanFileOrFolder::listFolder(INTERNALTYPEPATH source,INTERNALTYPEPATH desti do { fileErrorAction=FileError_NotSet; - if(!TransferThread::entryInfoList(source,entryList)) + if(isBlackListed(destination)) + { + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"isBlackListed: "+TransferThread::internalStringTostring(destination)); + emit errorOnFolder(destination,tr("Blacklisted folder").toStdString(),ErrorType_Folder); + waitOneAction.acquire(); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,std::string("actionNum: ")+std::to_string((int)fileErrorAction)); + } + else if(!TransferThread::entryInfoList(source,entryList)) { #ifdef Q_OS_UNIX int saveerrno=errno; diff --git a/plugins/CopyEngine/Ultracopier-Spec/ScanFileOrFolder.h b/plugins/CopyEngine/Ultracopier-Spec/ScanFileOrFolder.h index f74d355..bb6b5bd 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/ScanFileOrFolder.h +++ b/plugins/CopyEngine/Ultracopier-Spec/ScanFileOrFolder.h @@ -79,6 +79,8 @@ private: std::vector<INTERNALTYPEPATH> sources; INTERNALTYPEPATH destination; volatile bool stopIt; + std::vector<INTERNALTYPEPATH> blackList; + bool isBlackListed(const INTERNALTYPEPATH &path); void listFolder(INTERNALTYPEPATH source, INTERNALTYPEPATH destination); #ifdef Q_OS_UNIX INTERNALTYPEPATH resolvDestination(const INTERNALTYPEPATH &destination); diff --git a/plugins/CopyEngine/Ultracopier-Spec/StructEnumDefinition_CopyEngine.h b/plugins/CopyEngine/Ultracopier-Spec/StructEnumDefinition_CopyEngine.h index 5898e5a..66163a4 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/StructEnumDefinition_CopyEngine.h +++ b/plugins/CopyEngine/Ultracopier-Spec/StructEnumDefinition_CopyEngine.h @@ -42,7 +42,8 @@ enum TransferStat TransferStat_WaitForTheTransfer=2, TransferStat_Transfer=3, TransferStat_PostTransfer=5, - TransferStat_PostOperation=6 + TransferStat_PostOperation=6, + TransferStat_Checksum=7 }; /// \brief Define overwrite mode diff --git a/plugins/CopyEngine/Ultracopier-Spec/TransferThread.cpp b/plugins/CopyEngine/Ultracopier-Spec/TransferThread.cpp index d986b49..0a56bd3 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/TransferThread.cpp +++ b/plugins/CopyEngine/Ultracopier-Spec/TransferThread.cpp @@ -93,6 +93,10 @@ void TransferThread::run() if(!connect(&driveManagement,&DriveManagement::debugInformation,this, &TransferThread::debugInformation, Qt::QueuedConnection)) abort(); #endif + if(!connect(this,&TransferThread::setFileRenameSend,this, &TransferThread::setFileRenameInternal, Qt::QueuedConnection)) + abort(); + if(!connect(this,&TransferThread::setAlwaysFileExistsActionSend,this, &TransferThread::setAlwaysFileExistsActionInternal, Qt::QueuedConnection)) + abort(); } TransferStat TransferThread::getStat() const @@ -167,6 +171,11 @@ bool TransferThread::setFiles(const INTERNALTYPEPATH& source, const int64_t &siz void TransferThread::setFileRename(const std::string &nameForRename) { + emit setFileRenameSend(nameForRename); +} + +void TransferThread::setFileRenameInternal(const std::string &nameForRename) +{ if(transfer_stat!=TransferStat_PreOperation) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"["+std::to_string(id)+("] already used, source: ")+ @@ -257,6 +266,11 @@ bool TransferThread::rename(const INTERNALTYPEPATH &source, const INTERNALTYPEPA void TransferThread::setAlwaysFileExistsAction(const FileExistsAction &action) { + emit setAlwaysFileExistsActionSend(action); +} + +void TransferThread::setAlwaysFileExistsActionInternal(const FileExistsAction &action) +{ //ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+QStringLiteral("] action to do always: ")+QString::number(action))); alwaysDoFileExistsAction=action; } @@ -297,6 +311,7 @@ bool TransferThread::isSame() } if(checkAlwaysRename()) return false; + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,internalStringTostring(source)+" to "+internalStringTostring(destination)); emit fileAlreadyExists(source,destination,true); return true; } @@ -771,7 +786,7 @@ bool TransferThread::mkpath(const INTERNALTYPEPATH &path) return false; #endif - pathCedit.resize(lastpos); + pathCedit.resize(lastpos); previouspos=lastpos; errno=0; @@ -981,12 +996,13 @@ int64_t TransferThread::readFileMDateTime(const INTERNALTYPEPATH &source) return -1; } CloseHandle(hFileSouce); - const int64_t UNIX_TIME_START = 0x019DB1DED53E8000; //January 1, 1970 (start of Unix epoch) in "ticks" - const int64_t TICKS_PER_SECOND = 10000000; //a tick is 100ns + //const int64_t UNIX_TIME_START = 0x019DB1DED53E8000; //January 1, 1970 (start of Unix epoch) in "ticks" + //const int64_t TICKS_PER_SECOND = 10000000; //a tick is 100ns LARGE_INTEGER li; li.LowPart = ftWrite.dwLowDateTime; li.HighPart = ftWrite.dwHighDateTime; - return (li.QuadPart - UNIX_TIME_START) / TICKS_PER_SECOND; + //return (li.QuadPart - UNIX_TIME_START) / TICKS_PER_SECOND; + return (li.QuadPart - 0x019DB1DED53E8000) / 10000000; #else return -1; #endif @@ -1044,7 +1060,10 @@ bool TransferThread::readSourceFileDateTime(const INTERNALTYPEPATH &source) this->ftAccess=ftAccess; this->ftWrite=ftWrite; CloseHandle(hFileSouce); - const uint64_t modtime=(uint64_t)ftWrite.dwLowDateTime + ((uint64_t)2^32 * (uint64_t)ftWrite.dwHighDateTime); + LARGE_INTEGER li; + li.LowPart = ftWrite.dwLowDateTime; + li.HighPart = ftWrite.dwHighDateTime; + const uint64_t modtime=(li.QuadPart - 0x019DB1DED53E8000) / 10000000; if(modtime<ULTRACOPIER_PLUGIN_MINIMALYEAR_TIMESTAMPS) { //ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] the sources is older to copy the time: "+source+": "+source.lastModified().toString().toStdString()); @@ -1250,7 +1269,8 @@ bool TransferThread::is_file(const char * const filename) #ifdef Q_OS_WIN32 DWORD dwAttrib = GetFileAttributesA(TransferThread::toFinalPath(filename).c_str()); return (dwAttrib != INVALID_FILE_ATTRIBUTES && - (dwAttrib & FILE_ATTRIBUTE_DIRECTORY)); + (dwAttrib & FILE_ATTRIBUTE_NORMAL || dwAttrib & FILE_ATTRIBUTE_ARCHIVE) + ); #else struct stat p_statbuf; if (lstat(filename, &p_statbuf) < 0) diff --git a/plugins/CopyEngine/Ultracopier-Spec/TransferThread.h b/plugins/CopyEngine/Ultracopier-Spec/TransferThread.h index 42db854..cb0ab5b 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/TransferThread.h +++ b/plugins/CopyEngine/Ultracopier-Spec/TransferThread.h @@ -4,7 +4,7 @@ \licence GPL3, see the file COPYING */ #include <QObject> -#include <QTime> +#include <QElapsedTimer> #include <QThread> #include <regex> @@ -169,6 +169,9 @@ signals: void tryPutAtBottom() const; /// \brief update the transfer stat void pushStat(const TransferStat &stat,const uint64_t &pos) const; + + void setFileRenameSend(const std::string &nameForRename); + void setAlwaysFileExistsActionSend(const FileExistsAction &action); public slots: /// \brief to set files to transfer virtual bool setFiles(const INTERNALTYPEPATH& source,const int64_t &size,const INTERNALTYPEPATH& destination,const Ultracopier::CopyMode &mode); @@ -195,6 +198,8 @@ public slots: void setRenameTheOriginalDestination(const bool &renameTheOriginalDestination); void set_updateMount(); protected: + void setFileRenameInternal(const std::string &nameForRename); + void setAlwaysFileExistsActionInternal(const FileExistsAction &action); enum MoveReturn { MoveReturn_skip=0, @@ -220,8 +225,8 @@ protected: INTERNALTYPEPATH source; INTERNALTYPEPATH destination; int64_t size; - FileExistsAction fileExistsAction; - FileExistsAction alwaysDoFileExistsAction; + volatile FileExistsAction fileExistsAction; + volatile FileExistsAction alwaysDoFileExistsAction; bool needSkip,needRemove; int id; bool deletePartiallyTransferredFiles; @@ -258,7 +263,7 @@ protected: //different post-operation bool doFilePostOperation(); protected: - QTime startTransferTime; + QElapsedTimer startTransferTime; bool haveTransferTime; }; diff --git a/plugins/CopyEngine/Ultracopier-Spec/async/ReadThread.cpp b/plugins/CopyEngine/Ultracopier-Spec/async/ReadThread.cpp index d83e8ff..c2389b4 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/async/ReadThread.cpp +++ b/plugins/CopyEngine/Ultracopier-Spec/async/ReadThread.cpp @@ -59,8 +59,8 @@ void ReadThread::run() { if(!connect(this,&ReadThread::internalStartOpen, this,&ReadThread::internalOpenSlot, Qt::QueuedConnection)) abort(); - if(!connect(this,&ReadThread::internalStartReopen, this,&ReadThread::internalReopen, Qt::QueuedConnection)) - abort(); + /*if(!connect(this,&ReadThread::internalStartReopen, this,&ReadThread::internalReopen, Qt::QueuedConnection)) + abort();*/ if(!connect(this,&ReadThread::internalStartRead, this,&ReadThread::internalRead, Qt::QueuedConnection)) abort(); if(!connect(this,&ReadThread::internalStartClose, this,&ReadThread::internalCloseSlot, Qt::QueuedConnection)) @@ -510,6 +510,8 @@ void ReadThread::internalRead() ); isInReadLoop=false; emit error(); + /// in version 2, full close and retry from open(), see comment into TransferThreadAsync::retryAfterError() + internalClose(); return; } #ifdef Q_OS_WIN32 @@ -546,6 +548,8 @@ void ReadThread::internalRead() #endif isInReadLoop=false; emit error(); + /// in version 2, full close and retry from open(), see comment into TransferThreadAsync::retryAfterError() + internalClose(); return; } if(sizeReaden>0) @@ -597,6 +601,8 @@ void ReadThread::internalRead() "Source truncated during the read"); isInReadLoop=false; emit error(); + /// in version 2, full close and retry from open(), see comment into TransferThreadAsync::retryAfterError() + internalClose(); return; } isInReadLoop=false; @@ -742,8 +748,7 @@ int64_t ReadThread::getLastGoodPosition() const return lastGoodPosition; } -//reopen after an error -void ReadThread::reopen() +/*void ReadThread::reopen() { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start"); if(isInReadLoop) @@ -753,9 +758,10 @@ void ReadThread::reopen() } stopIt=true; emit internalStartReopen(); -} +}*/ -bool ReadThread::internalReopen() +/// disabled into version 2, see comment into TransferThreadAsync::retryAfterError() +/* bool ReadThread::internalReopen() { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start"); stopIt=false; @@ -826,7 +832,7 @@ bool ReadThread::internalReopen() return false; } return false; -} +}*/ //set the write thread void ReadThread::setWriteThread(WriteThread * writeThread) diff --git a/plugins/CopyEngine/Ultracopier-Spec/async/ReadThread.h b/plugins/CopyEngine/Ultracopier-Spec/async/ReadThread.h index 4de0129..de0fc9b 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/async/ReadThread.h +++ b/plugins/CopyEngine/Ultracopier-Spec/async/ReadThread.h @@ -61,8 +61,8 @@ public: #endif /// \brief set block size in KB mostly for speed bool setBlockSize(const int blockSize); - /// \brief reopen after an error - void reopen(); + + void reopen();//-> not valid in version 2, beacause it restart from open in case of error /// \brief set the write thread void setWriteThread(WriteThread * writeThread); #ifdef ULTRACOPIER_PLUGIN_DEBUG @@ -108,7 +108,7 @@ signals: void resumeAfterErrorByRestartAtTheLastPosition() const; // internal signals void internalStartOpen() const; - void internalStartReopen() const; + //void internalStartReopen() const;-> not valid in version 2, beacause it restart from open in case of error void internalStartRead() const; void internalStartClose() const; /// \brief To debug source @@ -153,7 +153,7 @@ private: private slots: bool internalOpen(bool resetLastGoodPosition=true); bool internalOpenSlot(); - bool internalReopen(); + //bool internalReopen(); void internalRead(); void internalClose(bool callByTheDestructor=false); void internalCloseSlot(); diff --git a/plugins/CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp b/plugins/CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp index e52bc7f..22a690a 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp +++ b/plugins/CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp @@ -112,15 +112,9 @@ TransferThreadAsync::TransferThreadAsync() : if(!connect(&writeThread,&WriteThread::opened, this, &TransferThreadAsync::write_opened, Qt::QueuedConnection)) abort(); - //error management -/* if(!connect(&readThread,&ReadThread::isSeekToZeroAndWait, this, &TransferThreadAsync::readThreadIsSeekToZeroAndWait, Qt::QueuedConnection)) - abort(); - if(!connect(&readThread,&ReadThread::resumeAfterErrorByRestartAtTheLastPosition,this, &TransferThreadAsync::readThreadResumeAfterError, Qt::QueuedConnection)) - abort(); + //error management, just try restart from 0 if(!connect(&readThread,&ReadThread::resumeAfterErrorByRestartAll,&writeThread, &WriteThread::flushAndSeekToZero, Qt::QueuedConnection)) abort(); - if(!connect(&writeThread,&WriteThread::flushedAndSeekedToZero, this, &TransferThread::readThreadResumeAfterError, Qt::QueuedConnection)) - abort();*/ #ifdef ULTRACOPIER_PLUGIN_DEBUG if(!connect(&readThread,&ReadThread::debugInformation, this, &TransferThreadAsync::debugInformation, Qt::QueuedConnection)) @@ -130,6 +124,8 @@ TransferThreadAsync::TransferThreadAsync() : if(!connect(&driveManagement,&DriveManagement::debugInformation,this, &TransferThreadAsync::debugInformation, Qt::QueuedConnection)) abort(); #endif + if(!connect(this,&TransferThreadAsync::setFileExistsActionSend,this, &TransferThreadAsync::setFileExistsActionInternal, Qt::QueuedConnection)) + abort(); ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start: "+std::to_string((int64_t)QThread::currentThreadId())); start(); @@ -177,7 +173,7 @@ void TransferThreadAsync::run() void TransferThreadAsync::startTheTransfer() { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+("] start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+("] start")+", transfert id: "+std::to_string(transferId)); if(transferId==0) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"["+std::to_string(id)+("] can't start transfert if transferId==0")); @@ -194,7 +190,7 @@ void TransferThreadAsync::internalStartTheTransfer() if(QThread::currentThread()!=this) abort(); #endif - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+("] start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+("] start")+", transfert id: "+std::to_string(transferId)+" readError: "+std::to_string(writeError)+" writeError: "+std::to_string(writeError)+" canStartTransfer: "+std::to_string(canStartTransfer)); if(transfer_stat==TransferStat_Idle) { if(mode!=Ultracopier::Move) @@ -204,25 +200,25 @@ void TransferThreadAsync::internalStartTheTransfer() } return; } - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+("] start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+("] start")+", transfert id: "+std::to_string(transferId)); if(transfer_stat==TransferStat_PostOperation) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"["+std::to_string(id)+("] can't start transfert at PostOperation")); return; } - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+("] start")); - if(transfer_stat==TransferStat_Transfer) + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+("] start")+", transfert id: "+std::to_string(transferId)); + if(transfer_stat==TransferStat_Transfer && !readError && !writeError) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"["+std::to_string(id)+("] can't start transfert at Transfer")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"["+std::to_string(id)+("] can't start transfert at Transfer due to transfer_stat==TransferStat_Transfer (double start?)")); return; } - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+("] start")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+("] start")+", transfert id: "+std::to_string(transferId)); if(canStartTransfer) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+("] canStartTransfer is already set to true")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+("] canStartTransfer is already set to true")+", transfert id: "+std::to_string(transferId)+", transfer_stat: "+std::to_string((int)transfer_stat)); // call for second time, first time was not ready, if blocked in preop why? //ifCanStartTransfer(); - return; + //return;-> try call again, protected by if(transfer_stat!=TransferStat_WaitForTheTransfer /*wait preoperation*/ || !canStartTransfer/*wait start call*/) into ifCanStartTransfer() } ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+("] check how start the transfer")); canStartTransfer=true; @@ -298,6 +294,11 @@ void TransferThreadAsync::preOperation() TransferThread::internalStringTostring(source)+" than "+TransferThread::internalStringTostring(destination)); return; } + + //this case is used only on retry after error + readThread.stop(); + writeThread.stop(); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] after is same"); /*Why this code? if(readError) @@ -308,7 +309,7 @@ void TransferThreadAsync::preOperation() ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] before destination exists"); if(destinationExists()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] destination exists: "+TransferThread::internalStringTostring(destination)); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] destination exists: "+TransferThread::internalStringTostring(destination)+", alwaysDoFileExistsAction: "+std::to_string((int)alwaysDoFileExistsAction)); return; } ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] after destination exists"); @@ -337,6 +338,7 @@ void TransferThreadAsync::preOperation() ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] unable to read the source time: "+TransferThread::internalStringTostring(source)); if(keepDate) { + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"!doTheDateTransfer && keepDate"); emit errorOnFile(source,tr("Wrong modification date or unable to get it, you can disable time transfer to do it").toStdString()); return; } @@ -392,6 +394,12 @@ void TransferThreadAsync::setProgression(const uint64_t &pos, const uint64_t &si emit readStopped(); transferProgression=pos; } + else + { + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"["+std::to_string(id)+ + "] transfer_stat:"+std::to_string(transfer_stat)+ + ", canStartTransfer: "+std::to_string(canStartTransfer)+", transfert id: "+std::to_string(transferId)); + } } #endif @@ -409,7 +417,7 @@ void TransferThreadAsync::ifCanStartTransfer() { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"["+std::to_string(id)+ "] transfer_stat:"+std::to_string(transfer_stat)+ - ", canStartTransfer: "+std::to_string(canStartTransfer)); + ", canStartTransfer: "+std::to_string(canStartTransfer)+", transfert id: "+std::to_string(transferId)); //preOperationStopped();//tiger to seam maybe is can be started, maybe this generate a bug return; } @@ -475,8 +483,9 @@ void TransferThreadAsync::ifCanStartTransfer() writeError=false; if(realMove) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start real move"); - successFull=TransferThread::rename(source,destination); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start real move, source "+TransferThread::internalStringTostring(source)+" exists: "+std::to_string(TransferThread::exists(source))); + if(TransferThread::exists(source)) + successFull=TransferThread::rename(source,destination); #ifdef Q_OS_UNIX if(!successFull && errno==18) { @@ -667,6 +676,7 @@ void TransferThreadAsync::ifCanStartTransfer() #ifdef Q_OS_WIN32 if(native_copy) { + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,internalStringTostring(source)+" to "+internalStringTostring(destination)+": native_copy enabled"); successFull=CopyFileExW(TransferThread::toFinalPath(source).c_str(),TransferThread::toFinalPath(destination).c_str(), (LPPROGRESS_ROUTINE)progressRoutine,this,&stopItWin,COPY_FILE_ALLOW_DECRYPTED_DESTINATION | 0x00000800);//0x00000800 is COPY_FILE_COPY_SYMLINK if(successFull==FALSE) @@ -717,12 +727,19 @@ void TransferThreadAsync::ifCanStartTransfer() #ifdef Q_OS_WIN32 readError=true; writeError=true; + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"!successFull"); emit errorOnFile(destination,strError); #else if(readError) + { + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"!successFull on read"); emit errorOnFile(source,strError); + } else + { + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"!successFull on write"); emit errorOnFile(destination,strError); + } #endif return; } @@ -746,22 +763,29 @@ void TransferThreadAsync::checkIfAllIsClosedAndDoOperations() } if(!source.empty() && needRemove && (stopIt || needSkip)) if(is_file(source) && source!=destination) + { + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"remove because: is_file(source): "+std::to_string(is_file(source))+", source: "+TransferThread::internalStringTostring(source)); unlink(destination); + } transfer_stat=TransferStat_Idle; transferSize=readThread.getLastGoodPosition(); if(mode==Ultracopier::Move && !realMove) + { + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] remove mode==Ultracopier::Move && !realMove: "+ + TransferThread::internalStringTostring(source)); if(exists(destination)) if(!unlink(source)) ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] move and unable to remove: "+ - TransferThread::internalStringTostring(source)+ + TransferThread::internalStringTostring(source)+std::string(" ")+ #ifdef Q_OS_WIN32 GetLastErrorStdStr() #else strerror(errno) #endif ); + } transfer_stat=TransferStat_PostTransfer; emit pushStat(transfer_stat,transferId); transfer_stat=TransferStat_PostOperation; @@ -808,52 +832,6 @@ void TransferThreadAsync::stop() writeThread.stop(); } -//retry after error -void TransferThreadAsync::retryAfterError() -{ - /// \warning skip the resetExtraVariable(); to be more exact and resolv some bug - if(transfer_stat==TransferStat_Idle) - { - if(transferId==0) - { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"["+std::to_string(id)+ - ("] seam have bug, source: ")+TransferThread::internalStringTostring(source)+", destination: "+TransferThread::internalStringTostring(destination)); - return; - } - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+ - "] restart all, source: "+TransferThread::internalStringTostring(source)+", destination: "+TransferThread::internalStringTostring(destination)); - readError=false; - //writeError=false; - emit internalStartPreOperation(); - return; - } - //opening error - if(transfer_stat==TransferStat_PreOperation) - { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+ - "] is not idle, source: "+TransferThread::internalStringTostring(source)+", destination: "+TransferThread::internalStringTostring(destination)+ - ", stat: "+std::to_string(transfer_stat)); - readError=false; - //writeError=false; - emit internalStartPreOperation(); - //tryOpen();-> recheck all, because can be an error into isSame(), rename(), ... - return; - } - //data streaming error - if(transfer_stat!=TransferStat_PostOperation && transfer_stat!=TransferStat_Transfer && transfer_stat!=TransferStat_PostTransfer) - { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"["+std::to_string(id)+("] is not in right stat, source: ")+ - TransferThread::internalStringTostring(source)+", destination: "+TransferThread::internalStringTostring(destination)+", stat: "+std::to_string(transfer_stat)); - return; - } - if(transfer_stat==TransferStat_PostOperation) - { - emit internalStartPostOperation(); - return; - } - emit internalTryStartTheTransfer(); -} - //skip the copy void TransferThreadAsync::skip() { @@ -979,9 +957,22 @@ int64_t TransferThreadAsync::copiedSize() switch(static_cast<TransferStat>(transfer_stat)) { case TransferStat_Transfer: + if(transferProgression>0)//then native copy started, read/write thread not used + return transferProgression; + else + return (readThread.getLastGoodPosition()+writeThread.getLastGoodPosition())/2; + break; case TransferStat_PostOperation: + if(transferProgression>0)//then native copy started, read/write thread not used + return transferSize; + else + return (readThread.getLastGoodPosition()+writeThread.getLastGoodPosition())/2; + break; case TransferStat_PostTransfer: - return (readThread.getLastGoodPosition()+writeThread.getLastGoodPosition())/2; + if(transferProgression>0)//then native copy started, read/write thread not used + return transferProgression; + else + return (readThread.getLastGoodPosition()+writeThread.getLastGoodPosition())/2; default: return 0; } @@ -1066,14 +1057,17 @@ char TransferThreadAsync::writingLetter() const //not copied size, ... uint64_t TransferThreadAsync::realByteTransfered() const { - const uint64_t &l=readThread.getLastGoodPosition(); switch(static_cast<TransferStat>(transfer_stat)) { case TransferStat_Transfer: + if(transferProgression>0)//then native copy started, read/write thread not used + return transferProgression; + else + return readThread.getLastGoodPosition(); case TransferStat_PostTransfer: - return l; + return readThread.getLastGoodPosition(); case TransferStat_PostOperation: - return l; + return readThread.getLastGoodPosition(); default: return 0; } @@ -1086,8 +1080,16 @@ std::pair<uint64_t, uint64_t> TransferThreadAsync::progression() const switch(static_cast<TransferStat>(transfer_stat)) { case TransferStat_Transfer: - returnVar.first=readThread.getLastGoodPosition(); - returnVar.second=writeThread.getLastGoodPosition(); + if(transferProgression>0)//then native copy started, read/write thread not used + { + returnVar.first=transferProgression; + returnVar.second=transferProgression; + } + else + { + returnVar.first=readThread.getLastGoodPosition(); + returnVar.second=writeThread.getLastGoodPosition(); + } /*if(returnVar.first<returnVar.second) ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+QStringLiteral("] read is smaller than write"));*/ break; @@ -1110,6 +1112,11 @@ std::pair<uint64_t, uint64_t> TransferThreadAsync::progression() const void TransferThreadAsync::setFileExistsAction(const FileExistsAction &action) { + emit setFileExistsActionSend(action); +} + +void TransferThreadAsync::setFileExistsActionInternal(const FileExistsAction &action) +{ if(transfer_stat!=TransferStat_PreOperation) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"["+std::to_string(id)+("] already used, source: ")+ @@ -1249,7 +1256,12 @@ void TransferThreadAsync::read_error() readError = true; //writeIsReadyVariable = false;//wrong because write can be ready here if(!writeError)//already display error for the write + { + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"read error && !writeError"); emit errorOnFile(source,readThread.errorString()); + } + else + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"read error && writeError"); } void TransferThreadAsync::read_readIsStopped() @@ -1447,3 +1459,70 @@ void TransferThreadAsync::setNativeCopy(bool native_copy) { this->native_copy=native_copy; } + +////////////////////////////////////////////////////////////////// +/////////////////////// Error management ///////////////////////// +////////////////////////////////////////////////////////////////// + +void TransferThreadAsync::retryAfterError() +{ + /// \warning skip the resetExtraVariable(); to be more exact and resolv some bug + if(transfer_stat==TransferStat_Idle) + { + if(transferId==0) + { + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"["+std::to_string(id)+ + ("] seam have bug, source: ")+TransferThread::internalStringTostring(source)+", destination: "+TransferThread::internalStringTostring(destination)); + return; + } + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+ + "] restart all, source: "+TransferThread::internalStringTostring(source)+", destination: "+TransferThread::internalStringTostring(destination)); + readError=false; + //writeError=false; + emit internalStartPreOperation(); + return; + } + //opening error + if(transfer_stat==TransferStat_PreOperation) + { + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+ + "] is not idle, source: "+TransferThread::internalStringTostring(source)+", destination: "+TransferThread::internalStringTostring(destination)+ + ", stat: "+std::to_string(transfer_stat)); + readError=false; + writeError=false;//why was commented? + emit internalStartPreOperation(); + //tryOpen();-> recheck all, because can be an error into isSame(), rename(), ... + return; + } + //data streaming error + if(transfer_stat!=TransferStat_PostOperation && transfer_stat!=TransferStat_Transfer && transfer_stat!=TransferStat_PostTransfer) + { + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"["+std::to_string(id)+("] is not in right stat, source: ")+ + TransferThread::internalStringTostring(source)+", destination: "+TransferThread::internalStringTostring(destination)+", stat: "+std::to_string(transfer_stat)); + return; + } + if(transfer_stat==TransferStat_PostOperation) + { + emit internalStartPostOperation(); + return; + } + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+ + "] retryAfterError, source: "+TransferThread::internalStringTostring(source)+", destination: "+TransferThread::internalStringTostring(destination)); + + /*try restart from 0 + * This is simplest way + * Simple mean less bug + * Allow restart with native copy + * More data check + * Yes it's less efficient, on failed on source, if after close/reopen the size is same, can be resumed where it stop + * */ + //emit internalTryStartTheTransfer(); -> wrong in version 2 + resetExtraVariable(); + /*included into resetExtraVariable() + writeIsOpenVariable=false; + readError=false; + writeError=false;*/ + transfer_stat=TransferStat_PreOperation; + writeThread.flushBuffer(); + emit internalStartPreOperation(); +} diff --git a/plugins/CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.h b/plugins/CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.h index 83ddb91..404735a 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.h +++ b/plugins/CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.h @@ -112,6 +112,8 @@ signals: void openRead(const INTERNALTYPEPATH &file, const Ultracopier::CopyMode &mode); //async due to tread conflict on to, if(to>=0) {do something, abort() -> on abort to =-1} void openWrite(const INTERNALTYPEPATH &file,const uint64_t &startSize); + + void setFileExistsActionSend(const FileExistsAction &action); public slots: /// \brief to start the transfer of data void startTheTransfer(); @@ -119,8 +121,6 @@ public slots: void stop(); /// \brief skip the copy void skip(); - /// \brief retry after error - void retryAfterError(); /// \brief return info about the copied size int64_t copiedSize(); /// \brief put the current file at bottom @@ -132,7 +132,12 @@ public slots: #ifdef Q_OS_WIN32 void setProgression(const uint64_t &pos,const uint64_t &size); #endif + + //eror management + /// \brief retry after error + void retryAfterError(); private: + void setFileExistsActionInternal(const FileExistsAction &action); //ready = open + ready to operation (no error to resolv) bool transferIsReadyVariable; uint64_t transferProgression; diff --git a/plugins/CopyEngine/Ultracopier-Spec/async/WriteThread.cpp b/plugins/CopyEngine/Ultracopier-Spec/async/WriteThread.cpp index 2d6748e..154eed2 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/async/WriteThread.cpp +++ b/plugins/CopyEngine/Ultracopier-Spec/async/WriteThread.cpp @@ -63,8 +63,9 @@ void WriteThread::run() { if(!connect(this,&WriteThread::internalStartOpen, this,&WriteThread::internalOpen, Qt::QueuedConnection)) abort(); - if(!connect(this,&WriteThread::internalStartReopen, this,&WriteThread::internalReopen, Qt::QueuedConnection)) - abort(); + /// in version 2, full close and retry from open(), see comment into TransferThreadAsync::retryAfterError() + /*if(!connect(this,&WriteThread::internalStartReopen, this,&WriteThread::internalReopen, Qt::QueuedConnection)) + abort();*/ if(!connect(this,&WriteThread::internalStartWrite, this,&WriteThread::internalWrite, Qt::QueuedConnection)) abort(); if(!connect(this,&WriteThread::internalStartClose, this,&WriteThread::internalCloseSlot, Qt::QueuedConnection)) @@ -73,6 +74,8 @@ void WriteThread::run() abort(); if(!connect(this,&WriteThread::internalStartFlushAndSeekToZero, this,&WriteThread::internalFlushAndSeekToZero, Qt::QueuedConnection)) abort(); + if(!connect(this,&WriteThread::openWriteSend, this,&WriteThread::openWriteInternal, Qt::QueuedConnection)) + abort(); exec(); } @@ -450,6 +453,11 @@ bool WriteThread::internalOpen() void WriteThread::openWrite(const INTERNALTYPEPATH &file, const uint64_t &startSize) { + emit openWriteInternal(file,startSize); +} + +void WriteThread::openWriteInternal(const INTERNALTYPEPATH &file, const uint64_t &startSize) +{ if(!isRunning()) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] the thread not running to open destination: "+TransferThread::internalStringTostring(file)+", numberOfBlock: "+std::to_string(numberOfBlock)); @@ -799,7 +807,8 @@ void WriteThread::internalClose(bool emitSignal) isOpen.release(); } -void WriteThread::internalReopen() +/// in version 2, full close and retry from open(), see comment into TransferThreadAsync::retryAfterError() +/*void WriteThread::internalReopen() { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start"); INTERNALTYPEPATH tempFile=file; @@ -810,15 +819,16 @@ void WriteThread::internalReopen() file=tempFile; if(internalOpen()) emit reopened(); -} +}*/ -void WriteThread::reopen() +/// in version 2, full close and retry from open(), see comment into TransferThreadAsync::retryAfterError() +/*void WriteThread::reopen() { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] start"); stopIt=true; endDetected=false; emit internalStartReopen(); -} +}*/ #ifdef ULTRACOPIER_PLUGIN_DEBUG //to set the id @@ -1126,14 +1136,26 @@ void WriteThread::internalWrite() #endif stopIt=true; emit error(); + /// in version 2, full close and retry from open(), see comment into TransferThreadAsync::retryAfterError() + internalClose(false); + flushBuffer(); return; } if(bytesWriten!=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(); + #ifdef Q_OS_WIN32 + std::string eStr=TransferThread::GetLastErrorStdStr(); + #else + int t=errno; + std::string eStr=strerror(t); + #endif + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] "+QStringLiteral("Error in writing, bytesWriten: %1, blockArray.size(): %2").arg(bytesWriten).arg(blockArray.size).toStdString()+", "+eStr); + errorString_internal=QStringLiteral("Error in writing, bytesWriten: %1, blockArray.size(): %2").arg(bytesWriten).arg(blockArray.size).toStdString()+", "+eStr; stopIt=true; emit error(); + /// in version 2, full close and retry from open(), see comment into TransferThreadAsync::retryAfterError() + internalClose(false); + flushBuffer(); return; } lastGoodPosition+=bytesWriten; diff --git a/plugins/CopyEngine/Ultracopier-Spec/async/WriteThread.h b/plugins/CopyEngine/Ultracopier-Spec/async/WriteThread.h index 5e0b265..6c587a0 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/async/WriteThread.h +++ b/plugins/CopyEngine/Ultracopier-Spec/async/WriteThread.h @@ -101,7 +101,7 @@ public slots: /// \brief set the end is detected void endIsDetected(); /// \brief reopen the file - void reopen(); + //void reopen(); /// \brief flush and seek to zero void flushAndSeekToZero(); void setDeletePartiallyTransferredFiles(const bool &deletePartiallyTransferredFiles); @@ -119,11 +119,12 @@ signals: void closed() const; //internal signals void internalStartOpen() const; - void internalStartReopen() const; + //void internalStartReopen() const; void internalStartWrite() const; void internalStartClose() const; void internalStartEndOfFile() const; void internalStartFlushAndSeekToZero() const; + void openWriteSend(const INTERNALTYPEPATH &file,const uint64_t &startSize); /// \brief To debug source void debugInformation(const Ultracopier::DebugLevel &level,const std::string &fonction,const std::string &text,const std::string &file,const int &ligne) const; private: @@ -173,9 +174,10 @@ private slots: void internalWrite(); void internalCloseSlot(); void internalClose(bool emitSignal=true); - void internalReopen(); + //void internalReopen(); void internalEndOfFile(); void internalFlushAndSeekToZero(); + void openWriteInternal(const INTERNALTYPEPATH &file,const uint64_t &startSize); }; #endif // WRITETHREAD_H diff --git a/plugins/CopyEngine/Ultracopier-Spec/copyEngineOptions.ui b/plugins/CopyEngine/Ultracopier-Spec/copyEngineOptions.ui index e646a2d..a399c70 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/copyEngineOptions.ui +++ b/plugins/CopyEngine/Ultracopier-Spec/copyEngineOptions.ui @@ -479,7 +479,7 @@ </widget> </item> <item row="6" column="0"> - <widget class="QLabel" name="label_16"> + <widget class="QLabel" name="label_native_copy"> <property name="text"> <string>OS native copy (disable speed limitation)</string> </property> diff --git a/plugins/CopyEngine/Ultracopier-Spec/debugDialog.ui b/plugins/CopyEngine/Ultracopier-Spec/debugDialog.ui index 5803f99..53f49b9 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/debugDialog.ui +++ b/plugins/CopyEngine/Ultracopier-Spec/debugDialog.ui @@ -56,16 +56,6 @@ <string notr="true">Variables</string> </property> <layout class="QGridLayout" name="gridLayout_2"> - <item row="0" column="0"> - <widget class="QLabel" name="label"> - <property name="text"> - <string notr="true">Active transfer:</string> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="QSpinBox" name="alreadyExistsQueue"/> - </item> <item row="1" column="1"> <widget class="QSpinBox" name="spinBoxNumberOfInode"> <property name="readOnly"> @@ -76,6 +66,20 @@ </property> </widget> </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string notr="true">alreadyExistsQueueItem:</string> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string notr="true">Active transfer:</string> + </property> + </widget> + </item> <item row="0" column="1"> <widget class="QSpinBox" name="spinBoxActiveTransfer"> <property name="readOnly"> @@ -96,12 +100,8 @@ <item row="3" column="1"> <widget class="QSpinBox" name="errorQueue"/> </item> - <item row="2" column="0"> - <widget class="QLabel" name="label_3"> - <property name="text"> - <string notr="true">alreadyExistsQueueItem:</string> - </property> - </widget> + <item row="2" column="1"> + <widget class="QSpinBox" name="alreadyExistsQueue"/> </item> <item row="3" column="0"> <widget class="QLabel" name="label_4"> @@ -110,6 +110,20 @@ </property> </widget> </item> + <item row="4" column="0"> + <widget class="QLabel" name="label_5"> + <property name="text"> + <string notr="true">realByteTransfered:</string> + </property> + </widget> + </item> + <item row="4" column="1"> + <widget class="QSpinBox" name="realByteTransfered"> + <property name="maximum"> + <number>999999999</number> + </property> + </widget> + </item> </layout> </widget> </item> diff --git a/plugins/CopyEngine/Ultracopier-Spec/fileExistsDialog.ui b/plugins/CopyEngine/Ultracopier-Spec/fileExistsDialog.ui index 2ca480b..0455387 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/fileExistsDialog.ui +++ b/plugins/CopyEngine/Ultracopier-Spec/fileExistsDialog.ui @@ -6,7 +6,7 @@ <rect> <x>0</x> <y>0</y> - <width>615</width> + <width>620</width> <height>222</height> </rect> </property> @@ -338,7 +338,7 @@ </layout> <action name="actionOverwrite_if_newer"> <property name="text"> - <string>Overwrite if newer</string> + <string>Overwrite if source newer than destination</string> </property> </action> <action name="actionOverwrite_if_not_same_modification_date"> @@ -351,10 +351,10 @@ </action> <action name="actionOverwrite_if_older"> <property name="text"> - <string>Overwrite if older</string> + <string>Overwrite if source older than destination</string> </property> <property name="toolTip"> - <string>Overwrite if older</string> + <string>Overwrite if destination older</string> </property> </action> <action name="actionOverwrite_if_not_same_size"> diff --git a/plugins/CopyEngine/Ultracopier-Spec/informations.xml b/plugins/CopyEngine/Ultracopier-Spec/informations.xml index d906bfb..15e003e 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/informations.xml +++ b/plugins/CopyEngine/Ultracopier-Spec/informations.xml @@ -17,7 +17,7 @@ <description xml:lang="en"><![CDATA[Copy engine of Ultracopier, OS Specific, Posix for Unix, Win32API for windows]]></description> <description xml:lang="fr"><![CDATA[Moteur de copie d'ultracopier, spécifique à l'OS, Posix pour Unix, Win32API pour 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>2.2.4.7</version> + <version>2.2.6.0</version> <!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. --> <name>Ultracopier Spec</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 275ae58..f35b778 100644 --- a/plugins/Languages/ar/informations.xml +++ b/plugins/Languages/ar/informations.xml @@ -12,7 +12,7 @@ <!-- Detailed description --> <description xml:lang="en"><![CDATA[Translation of Ultracopier to arabic. For more details see the web site.]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>2.2.4.7</version> + <version>2.2.6.0</version> <!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. --> <name>ar</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/ar/translation.qm b/plugins/Languages/ar/translation.qm Binary files differindex 988a96e..b7c25e2 100755 --- a/plugins/Languages/ar/translation.qm +++ b/plugins/Languages/ar/translation.qm diff --git a/plugins/Languages/ar/translation.ts b/plugins/Languages/ar/translation.ts index 301d0c2..10d5562 100644 --- a/plugins/Languages/ar/translation.ts +++ b/plugins/Languages/ar/translation.ts @@ -93,91 +93,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished">الوجهه</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished">اسال</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished">تخطي</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished">اعاده تسميه</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished">الكتابة فوق</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished">الكتابة فوق إذا كان أحدث</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -185,75 +190,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished">اسال</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished">تخطي</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished">اعاده تسميه</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished">الكتابة فوق</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished">الكتابة فوق إذا كان أحدث</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -670,12 +676,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="87"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="90"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -683,22 +689,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="191"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="198"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished">الخطا</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -706,22 +712,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="140"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="147"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished">الخطا</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -868,27 +874,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="84"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="164"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="173"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished">الخطا</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -1096,13 +1102,15 @@ This version is compiled as version: %1.</source> <name>MkPath</name> <message> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="124"/> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="394"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="187"/> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="210"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -1112,22 +1120,27 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="255"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="278"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="309"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> @@ -1206,7 +1219,7 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="75"/> <location filename="../../../OptionDialog.ui" line="366"/> - <location filename="../../../OptionDialog.cpp" line="290"/> + <location filename="../../../OptionDialog.cpp" line="297"/> <source>Copy engine</source> <translation>محرك النسخ</translation> </message> @@ -1255,21 +1268,21 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="80"/> <location filename="../../../OptionDialog.ui" line="379"/> - <location filename="../../../OptionDialog.cpp" line="291"/> + <location filename="../../../OptionDialog.cpp" line="298"/> <source>Listener</source> <translation>مستمع</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="85"/> <location filename="../../../OptionDialog.ui" line="384"/> - <location filename="../../../OptionDialog.cpp" line="292"/> + <location filename="../../../OptionDialog.cpp" line="299"/> <source>Plugin loader</source> <translation>محمل المساعد</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="93"/> <location filename="../../../OptionDialog.ui" line="389"/> - <location filename="../../../OptionDialog.cpp" line="293"/> + <location filename="../../../OptionDialog.cpp" line="300"/> <source>Session loader</source> <translation>محمل الجلسة</translation> </message> @@ -1415,78 +1428,78 @@ This version is compiled as version: %1.</source> <translation>الكتابة مباشرة إلى الملف عند تلقي إدخال جديد (يمكن أن تنتج 50٪ من فقدان الأداء)</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="197"/> - <location filename="../../../OptionDialog.cpp" line="211"/> + <location filename="../../../OptionDialog.cpp" line="204"/> + <location filename="../../../OptionDialog.cpp" line="218"/> <source>Load</source> <translation>حمل</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="197"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load the theme?</source> <translation>تحميل الموضوع؟</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="211"/> + <location filename="../../../OptionDialog.cpp" line="218"/> <source>Load the language?</source> <translation>تحميل اللغة؟</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="298"/> + <location filename="../../../OptionDialog.cpp" line="305"/> <source>Do nothing</source> <translation>لا تفعل شيئا</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="299"/> + <location filename="../../../OptionDialog.cpp" line="306"/> <source>Ask source as folder</source> <translation>اسأل المصدر كمجلد</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="300"/> + <location filename="../../../OptionDialog.cpp" line="307"/> <source>Ask sources as files</source> <translation>اسأل المصادر كملفات</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="301"/> + <location filename="../../../OptionDialog.cpp" line="308"/> <source>Never</source> <translation>أبدا</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="302"/> + <location filename="../../../OptionDialog.cpp" line="309"/> <source>When source is same</source> <translatorcomment>عندما يكون المصدر هو نفسه</translatorcomment> <translation>عندما يكون المصدر هو نفسه</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="303"/> + <location filename="../../../OptionDialog.cpp" line="310"/> <source>When destination is same</source> <translatorcomment>عندما الوجهة هي نفسها</translatorcomment> <translation>عندما تكون الوجهة نفسها</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="304"/> + <location filename="../../../OptionDialog.cpp" line="311"/> <source>When source and destination are same</source> <translatorcomment>عندما المصدر والوجهة هي نفسها</translatorcomment> <translation>عندما تكون المصدر والوجهة هي نفسها</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="305"/> + <location filename="../../../OptionDialog.cpp" line="312"/> <source>When source or destination are same</source> <translation>عندما المصدر أو الوجهة هي نفسها</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="306"/> + <location filename="../../../OptionDialog.cpp" line="313"/> <source>Always</source> <translation>دائما</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="320"/> - <location filename="../../../OptionDialog.cpp" line="321"/> - <location filename="../../../OptionDialog.cpp" line="322"/> + <location filename="../../../OptionDialog.cpp" line="327"/> + <location filename="../../../OptionDialog.cpp" line="328"/> + <location filename="../../../OptionDialog.cpp" line="329"/> <source>The variables are %1</source> <translation>%1 المتغيرات هي</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="962"/> + <location filename="../../../OptionDialog.cpp" line="969"/> <source>Save logs as: </source> <translation>حفظ السجلات باسم:</translation> </message> @@ -1779,12 +1792,12 @@ Error:%2</source> <translation>مفتاح المنتج</translation> </message> <message> - <location filename="../../../ProductKey.cpp" line="56"/> + <location filename="../../../ProductKey.cpp" line="60"/> <source>Error</source> <translation>الخطا</translation> </message> <message> - <location filename="../../../ProductKey.cpp" line="56"/> + <location filename="../../../ProductKey.cpp" line="60"/> <source>Your product key was rejected.<br />If you buy key, unmark check your spam and unmark the mail as spam<br />If you have not buy your key, go to <a href="https://shop.first-world.info/">https://shop.first-world.info/</a></source> <translation><a href="https://shop.first-world.info/">https://shop.first-world.info/</a>إذا لم تشتري مفتاحك ، انتقل إلى <br />إذا قمت بشراء المفتاح ، قم بإلغاء تحديد بريدك المزعج وإلغاء وضع علامة للبريد على انه غير مرغوب <br />تم رفض مفتاح منتجك</translation> </message> @@ -1842,12 +1855,12 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="541"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="595"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -1903,32 +1916,38 @@ Error:%2</source> <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="452"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="331"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="463"/> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="576"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="474"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="587"/> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="598"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="673"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="677"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="691"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -2039,61 +2058,61 @@ Error:%2</source> <context> <name>Themes</name> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="328"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="328"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="427"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="661"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="663"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1091"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1092"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1093"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1095"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1289"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1301"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1313"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1395"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1407"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1388"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1392"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1394"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1494"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1498"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -2101,24 +2120,24 @@ Error:%2</source> <context> <name>ThemesFactory</name> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="284"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="285"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="286"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="482"/> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="497"/> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="512"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="510"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="525"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -2126,29 +2145,29 @@ Error:%2</source> <context> <name>TransferThread</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="179"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="613"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="620"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="648"/> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="663"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="925"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -2156,19 +2175,19 @@ Error:%2</source> <context> <name>TransferThreadAsync</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -2176,24 +2195,24 @@ Error:%2</source> <context> <name>WriteThread</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="135"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="164"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="197"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="167"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="175"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="199"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="178"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="456"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -2508,8 +2527,8 @@ Error:%2</source> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation type="unfinished">الكتابة فوق إذا كان أحدث</translation> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="346"/> @@ -2519,8 +2538,12 @@ Error:%2</source> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> + <source>Overwrite if destination older</source> <translation type="unfinished"></translation> </message> <message> @@ -2908,8 +2931,8 @@ Error:%2</source> </message> <message> <location filename="../../Themes/Oxygen/themesOptions.ui" line="213"/> - <source>Informations</source> - <translation type="unfinished"></translation> + <source>Information</source> + <translation type="unfinished">المعلومات</translation> </message> <message> <location filename="../../Themes/Oxygen/themesOptions.ui" line="219"/> @@ -2922,28 +2945,38 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="257"/> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="269"/> + <source>Click to edit the color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="267"/> - <source>Show dual progression</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="378"/> + <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="277"/> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="287"/> - <source>Progression color</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="395"/> + <source>General margin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="306"/> - <source>Click to edit the color</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="402"/> + <source>Show dual progression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="425"/> + <source>General spacing</source> <translation type="unfinished"></translation> </message> </context> diff --git a/plugins/Languages/de/informations.xml b/plugins/Languages/de/informations.xml index 86964a5..f50f225 100644 --- a/plugins/Languages/de/informations.xml +++ b/plugins/Languages/de/informations.xml @@ -12,7 +12,7 @@ <!-- Detailed description --> <description xml:lang="en"><![CDATA[Translation of Ultracopier to german. For more details see the web site.]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>2.2.4.7</version> + <version>2.2.6.0</version> <!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. --> <name>de</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/de/translation.qm b/plugins/Languages/de/translation.qm Binary files differindex 9cc5174..143550a 100755 --- a/plugins/Languages/de/translation.qm +++ b/plugins/Languages/de/translation.qm diff --git a/plugins/Languages/de/translation.ts b/plugins/Languages/de/translation.ts index 96f6145..12db0eb 100644 --- a/plugins/Languages/de/translation.ts +++ b/plugins/Languages/de/translation.ts @@ -94,91 +94,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished">Ziel</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished">Fragen</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished">Überspringen</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished">Umbenennen</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished">Überschreiben</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished">Überschreiben, falls neuer</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -186,75 +191,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished">Fragen</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished">Überspringen</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished">Umbenennen</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished">Überschreiben</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished">Überschreiben, falls neuer</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -684,12 +690,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="87"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="90"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -697,22 +703,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="191"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="198"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished">Fehler</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -720,22 +726,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="140"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="147"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished">Fehler</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -882,27 +888,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="84"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="164"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="173"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished">Fehler</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -1112,13 +1118,15 @@ Diese Version wurde kompiliert als Version: %1.</translation> <name>MkPath</name> <message> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="124"/> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="394"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="187"/> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="210"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -1128,22 +1136,27 @@ Diese Version wurde kompiliert als Version: %1.</translation> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="255"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="278"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="309"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> @@ -1222,7 +1235,7 @@ Diese Version wurde kompiliert als Version: %1.</translation> <message> <location filename="../../../OptionDialog.ui" line="75"/> <location filename="../../../OptionDialog.ui" line="366"/> - <location filename="../../../OptionDialog.cpp" line="290"/> + <location filename="../../../OptionDialog.cpp" line="297"/> <source>Copy engine</source> <translation>Kopier-Engine</translation> </message> @@ -1270,21 +1283,21 @@ Diese Version wurde kompiliert als Version: %1.</translation> <message> <location filename="../../../OptionDialog.ui" line="80"/> <location filename="../../../OptionDialog.ui" line="379"/> - <location filename="../../../OptionDialog.cpp" line="291"/> + <location filename="../../../OptionDialog.cpp" line="298"/> <source>Listener</source> <translation>Listener</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="85"/> <location filename="../../../OptionDialog.ui" line="384"/> - <location filename="../../../OptionDialog.cpp" line="292"/> + <location filename="../../../OptionDialog.cpp" line="299"/> <source>Plugin loader</source> <translation>Plugin loader</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="93"/> <location filename="../../../OptionDialog.ui" line="389"/> - <location filename="../../../OptionDialog.cpp" line="293"/> + <location filename="../../../OptionDialog.cpp" line="300"/> <source>Session loader</source> <translation>Session loader</translation> </message> @@ -1416,75 +1429,75 @@ Diese Version wurde kompiliert als Version: %1.</translation> <translation>Schreibe direkt in die Datei, wenn ein neuer Eintrag erreicht wird (50% Leistungsverlust möglich)</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="197"/> - <location filename="../../../OptionDialog.cpp" line="211"/> + <location filename="../../../OptionDialog.cpp" line="204"/> + <location filename="../../../OptionDialog.cpp" line="218"/> <source>Load</source> <translation>Laden</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="197"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load the theme?</source> <translation>Dieses Theme laden?</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="211"/> + <location filename="../../../OptionDialog.cpp" line="218"/> <source>Load the language?</source> <translation>Diese Sprache laden?</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="298"/> + <location filename="../../../OptionDialog.cpp" line="305"/> <source>Do nothing</source> <translation>Nichts unternehmen</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="299"/> + <location filename="../../../OptionDialog.cpp" line="306"/> <source>Ask source as folder</source> <translation>Nach Quell-Ordner fragen</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="300"/> + <location filename="../../../OptionDialog.cpp" line="307"/> <source>Ask sources as files</source> <translation>Nach Quell-Datei fragen</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="301"/> + <location filename="../../../OptionDialog.cpp" line="308"/> <source>Never</source> <translation>Nie</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="302"/> + <location filename="../../../OptionDialog.cpp" line="309"/> <source>When source is same</source> <translation>Falls Quelle gleich ist</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="303"/> + <location filename="../../../OptionDialog.cpp" line="310"/> <source>When destination is same</source> <translation>Falls Ziel gleich ist</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="304"/> + <location filename="../../../OptionDialog.cpp" line="311"/> <source>When source and destination are same</source> <translation>Falls Quelle und Ziel gleich sind</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="305"/> + <location filename="../../../OptionDialog.cpp" line="312"/> <source>When source or destination are same</source> <translation>Falls Quelle oder Ziel gleich sind</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="306"/> + <location filename="../../../OptionDialog.cpp" line="313"/> <source>Always</source> <translation>Immer</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="320"/> - <location filename="../../../OptionDialog.cpp" line="321"/> - <location filename="../../../OptionDialog.cpp" line="322"/> + <location filename="../../../OptionDialog.cpp" line="327"/> + <location filename="../../../OptionDialog.cpp" line="328"/> + <location filename="../../../OptionDialog.cpp" line="329"/> <source>The variables are %1</source> <translation>Die Variablen sind %1</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="962"/> + <location filename="../../../OptionDialog.cpp" line="969"/> <source>Save logs as: </source> <translation>Protokolle speichern als: </translation> </message> @@ -1791,12 +1804,12 @@ Error:%2</source> <translation>Produktschlüssel</translation> </message> <message> - <location filename="../../../ProductKey.cpp" line="56"/> + <location filename="../../../ProductKey.cpp" line="60"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../../../ProductKey.cpp" line="56"/> + <location filename="../../../ProductKey.cpp" line="60"/> <source>Your product key was rejected.<br />If you buy key, unmark check your spam and unmark the mail as spam<br />If you have not buy your key, go to <a href="https://shop.first-world.info/">https://shop.first-world.info/</a></source> <translation>Ihr Produktschlüssel wurde verweigert. <br /> Wenn Sie einen Schlüssel gekauft haben, überprüfen Sie auch Ihren Spam-Ordner. <br />Wenn Sie noch keinen Schlüssel erworben haben gehen Sie bitte auf <a href="https://shop.first-world.info/">https://shop.first-world.info/</a></translation> </message> @@ -1854,12 +1867,12 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="541"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="595"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -1915,32 +1928,38 @@ Error:%2</source> <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="452"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="331"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="463"/> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="576"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="474"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="587"/> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="598"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="673"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="677"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="691"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -2051,61 +2070,61 @@ Error:%2</source> <context> <name>Themes</name> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="328"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="328"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="427"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="661"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="663"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1091"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1092"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1093"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1095"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1289"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1301"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1313"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1395"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1407"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1388"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1392"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1394"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1494"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1498"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -2113,24 +2132,24 @@ Error:%2</source> <context> <name>ThemesFactory</name> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="284"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="285"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="286"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="482"/> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="497"/> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="512"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="510"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="525"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -2138,29 +2157,29 @@ Error:%2</source> <context> <name>TransferThread</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="179"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="613"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="620"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="648"/> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="663"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="925"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -2168,19 +2187,19 @@ Error:%2</source> <context> <name>TransferThreadAsync</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -2188,24 +2207,24 @@ Error:%2</source> <context> <name>WriteThread</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="135"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="164"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="197"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="167"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="175"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="199"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="178"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="456"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -2520,8 +2539,8 @@ Error:%2</source> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation type="unfinished">Überschreiben, falls neuer</translation> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="346"/> @@ -2531,8 +2550,12 @@ Error:%2</source> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> + <source>Overwrite if destination older</source> <translation type="unfinished"></translation> </message> <message> @@ -2920,7 +2943,7 @@ Error:%2</source> </message> <message> <location filename="../../Themes/Oxygen/themesOptions.ui" line="213"/> - <source>Informations</source> + <source>Information</source> <translation type="unfinished"></translation> </message> <message> @@ -2934,28 +2957,38 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="257"/> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="269"/> + <source>Click to edit the color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="267"/> - <source>Show dual progression</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="378"/> + <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="277"/> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="287"/> - <source>Progression color</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="395"/> + <source>General margin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="306"/> - <source>Click to edit the color</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="402"/> + <source>Show dual progression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="425"/> + <source>General spacing</source> <translation type="unfinished"></translation> </message> </context> diff --git a/plugins/Languages/el/informations.xml b/plugins/Languages/el/informations.xml index 860e9a0..faf1b79 100755 --- a/plugins/Languages/el/informations.xml +++ b/plugins/Languages/el/informations.xml @@ -12,7 +12,7 @@ <!-- Detailed description --> <description xml:lang="en"><![CDATA[Translation of Ultracopier to greek. For more details see the web site.]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>2.2.4.7</version> + <version>2.2.6.0</version> <!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. --> <name>el</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/el/translation.ts b/plugins/Languages/el/translation.ts index 2066182..b1cbcc0 100755 --- a/plugins/Languages/el/translation.ts +++ b/plugins/Languages/el/translation.ts @@ -93,91 +93,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -185,75 +190,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -670,12 +676,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="87"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="90"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -683,22 +689,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="191"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="198"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -706,22 +712,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="140"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="147"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -868,27 +874,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="84"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="164"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="173"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -1096,13 +1102,15 @@ This version is compiled as version: %1.</source> <name>MkPath</name> <message> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="124"/> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="394"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="187"/> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="210"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -1112,22 +1120,27 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="255"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="278"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="309"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> @@ -1206,7 +1219,7 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="75"/> <location filename="../../../OptionDialog.ui" line="366"/> - <location filename="../../../OptionDialog.cpp" line="290"/> + <location filename="../../../OptionDialog.cpp" line="297"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> @@ -1254,21 +1267,21 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="80"/> <location filename="../../../OptionDialog.ui" line="379"/> - <location filename="../../../OptionDialog.cpp" line="291"/> + <location filename="../../../OptionDialog.cpp" line="298"/> <source>Listener</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="85"/> <location filename="../../../OptionDialog.ui" line="384"/> - <location filename="../../../OptionDialog.cpp" line="292"/> + <location filename="../../../OptionDialog.cpp" line="299"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="93"/> <location filename="../../../OptionDialog.ui" line="389"/> - <location filename="../../../OptionDialog.cpp" line="293"/> + <location filename="../../../OptionDialog.cpp" line="300"/> <source>Session loader</source> <translation type="unfinished"></translation> </message> @@ -1410,75 +1423,75 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="197"/> - <location filename="../../../OptionDialog.cpp" line="211"/> + <location filename="../../../OptionDialog.cpp" line="204"/> + <location filename="../../../OptionDialog.cpp" line="218"/> <source>Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="197"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load the theme?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="211"/> + <location filename="../../../OptionDialog.cpp" line="218"/> <source>Load the language?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="298"/> + <location filename="../../../OptionDialog.cpp" line="305"/> <source>Do nothing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="299"/> + <location filename="../../../OptionDialog.cpp" line="306"/> <source>Ask source as folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="300"/> + <location filename="../../../OptionDialog.cpp" line="307"/> <source>Ask sources as files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="301"/> + <location filename="../../../OptionDialog.cpp" line="308"/> <source>Never</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="302"/> + <location filename="../../../OptionDialog.cpp" line="309"/> <source>When source is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="303"/> + <location filename="../../../OptionDialog.cpp" line="310"/> <source>When destination is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="304"/> + <location filename="../../../OptionDialog.cpp" line="311"/> <source>When source and destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="305"/> + <location filename="../../../OptionDialog.cpp" line="312"/> <source>When source or destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="306"/> + <location filename="../../../OptionDialog.cpp" line="313"/> <source>Always</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="320"/> - <location filename="../../../OptionDialog.cpp" line="321"/> - <location filename="../../../OptionDialog.cpp" line="322"/> + <location filename="../../../OptionDialog.cpp" line="327"/> + <location filename="../../../OptionDialog.cpp" line="328"/> + <location filename="../../../OptionDialog.cpp" line="329"/> <source>The variables are %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="962"/> + <location filename="../../../OptionDialog.cpp" line="969"/> <source>Save logs as: </source> <translation type="unfinished"></translation> </message> @@ -1771,12 +1784,12 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../ProductKey.cpp" line="56"/> + <location filename="../../../ProductKey.cpp" line="60"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../ProductKey.cpp" line="56"/> + <location filename="../../../ProductKey.cpp" line="60"/> <source>Your product key was rejected.<br />If you buy key, unmark check your spam and unmark the mail as spam<br />If you have not buy your key, go to <a href="https://shop.first-world.info/">https://shop.first-world.info/</a></source> <translation type="unfinished"></translation> </message> @@ -1834,12 +1847,12 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="541"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="595"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -1895,32 +1908,38 @@ Error:%2</source> <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="452"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="331"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="463"/> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="576"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="474"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="587"/> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="598"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="673"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="677"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="691"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -2031,61 +2050,61 @@ Error:%2</source> <context> <name>Themes</name> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="328"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="328"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="427"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="661"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="663"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1091"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1092"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1093"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1095"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1289"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1301"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1313"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1395"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1407"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1388"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1392"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1394"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1494"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1498"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -2093,24 +2112,24 @@ Error:%2</source> <context> <name>ThemesFactory</name> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="284"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="285"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="286"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="482"/> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="497"/> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="512"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="510"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="525"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -2118,29 +2137,29 @@ Error:%2</source> <context> <name>TransferThread</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="179"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="613"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="620"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="648"/> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="663"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="925"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -2148,19 +2167,19 @@ Error:%2</source> <context> <name>TransferThreadAsync</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -2168,24 +2187,24 @@ Error:%2</source> <context> <name>WriteThread</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="135"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="164"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="197"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="167"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="175"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="199"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="178"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="456"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -2500,7 +2519,7 @@ Error:%2</source> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> + <source>Overwrite if source newer than destination</source> <translation type="unfinished"></translation> </message> <message> @@ -2511,8 +2530,12 @@ Error:%2</source> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> + <source>Overwrite if destination older</source> <translation type="unfinished"></translation> </message> <message> @@ -2900,7 +2923,7 @@ Error:%2</source> </message> <message> <location filename="../../Themes/Oxygen/themesOptions.ui" line="213"/> - <source>Informations</source> + <source>Information</source> <translation type="unfinished"></translation> </message> <message> @@ -2914,28 +2937,38 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="257"/> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="269"/> + <source>Click to edit the color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="267"/> - <source>Show dual progression</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="378"/> + <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="277"/> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="287"/> - <source>Progression color</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="395"/> + <source>General margin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="306"/> - <source>Click to edit the color</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="402"/> + <source>Show dual progression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="425"/> + <source>General spacing</source> <translation type="unfinished"></translation> </message> </context> diff --git a/plugins/Languages/es/informations.xml b/plugins/Languages/es/informations.xml index 9a11458..5c9a0c5 100755 --- a/plugins/Languages/es/informations.xml +++ b/plugins/Languages/es/informations.xml @@ -12,7 +12,7 @@ <!-- Detailed description --> <description xml:lang="en"><![CDATA[Translation of Ultracopier to spanish. For more details see the web site.]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>2.2.4.7</version> + <version>2.2.6.0</version> <!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. --> <name>es</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/es/translation.qm b/plugins/Languages/es/translation.qm Binary files differindex ef1c26c..38c59cb 100755 --- a/plugins/Languages/es/translation.qm +++ b/plugins/Languages/es/translation.qm diff --git a/plugins/Languages/es/translation.ts b/plugins/Languages/es/translation.ts index c93f06c..5627778 100755 --- a/plugins/Languages/es/translation.ts +++ b/plugins/Languages/es/translation.ts @@ -93,91 +93,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished">Destino</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished">Pedir</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished">Salto</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished">Cambiar el nombre</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished">Sobrescribir</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished">Sobrescribir si nuevo</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -185,75 +190,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished">Pedir</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished">Salto</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished">Cambiar el nombre</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished">Sobrescribir</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished">Sobrescribir si nuevo</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -672,12 +678,12 @@ Este motor de copia no soporta mover</translation> <context> <name>FileErrorDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="87"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="90"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -685,22 +691,22 @@ Este motor de copia no soporta mover</translation> <context> <name>FileExistsDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="191"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="198"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished">Error</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -708,22 +714,22 @@ Este motor de copia no soporta mover</translation> <context> <name>FileIsSameDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="140"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="147"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished">Error</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -870,27 +876,27 @@ Este motor de copia no soporta mover</translation> <context> <name>FolderExistsDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="84"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="164"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="173"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished">Error</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -1099,13 +1105,15 @@ Esta versión está compilada en versión:%1.</translation> <name>MkPath</name> <message> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="124"/> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="394"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="187"/> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="210"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -1115,22 +1123,27 @@ Esta versión está compilada en versión:%1.</translation> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="255"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="278"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="309"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> @@ -1209,7 +1222,7 @@ Esta versión está compilada en versión:%1.</translation> <message> <location filename="../../../OptionDialog.ui" line="75"/> <location filename="../../../OptionDialog.ui" line="366"/> - <location filename="../../../OptionDialog.cpp" line="290"/> + <location filename="../../../OptionDialog.cpp" line="297"/> <source>Copy engine</source> <translation>Motor de copia</translation> </message> @@ -1257,21 +1270,21 @@ Esta versión está compilada en versión:%1.</translation> <message> <location filename="../../../OptionDialog.ui" line="80"/> <location filename="../../../OptionDialog.ui" line="379"/> - <location filename="../../../OptionDialog.cpp" line="291"/> + <location filename="../../../OptionDialog.cpp" line="298"/> <source>Listener</source> <translation>Oyente</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="85"/> <location filename="../../../OptionDialog.ui" line="384"/> - <location filename="../../../OptionDialog.cpp" line="292"/> + <location filename="../../../OptionDialog.cpp" line="299"/> <source>Plugin loader</source> <translation>Plugin cargador</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="93"/> <location filename="../../../OptionDialog.ui" line="389"/> - <location filename="../../../OptionDialog.cpp" line="293"/> + <location filename="../../../OptionDialog.cpp" line="300"/> <source>Session loader</source> <translation>Sesión cargador</translation> </message> @@ -1423,75 +1436,75 @@ Esta versión está compilada en versión:%1.</translation> <translation>Escriba directamente el archivo cuando se recibe una nueva entrada (se puede producir un 50% de pérdida de rendimiento)</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="197"/> - <location filename="../../../OptionDialog.cpp" line="211"/> + <location filename="../../../OptionDialog.cpp" line="204"/> + <location filename="../../../OptionDialog.cpp" line="218"/> <source>Load</source> <translation>Cargar</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="197"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load the theme?</source> <translation>Cargue el tema?</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="211"/> + <location filename="../../../OptionDialog.cpp" line="218"/> <source>Load the language?</source> <translation>Cargue el idioma?</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="298"/> + <location filename="../../../OptionDialog.cpp" line="305"/> <source>Do nothing</source> <translation>No hacer nada</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="299"/> + <location filename="../../../OptionDialog.cpp" line="306"/> <source>Ask source as folder</source> <translation>Pregunte a la fuente que la carpeta</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="300"/> + <location filename="../../../OptionDialog.cpp" line="307"/> <source>Ask sources as files</source> <translation>Pregunte a las fuentes como archivos</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="301"/> + <location filename="../../../OptionDialog.cpp" line="308"/> <source>Never</source> <translation>Nunca</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="302"/> + <location filename="../../../OptionDialog.cpp" line="309"/> <source>When source is same</source> <translation>Cuando la fuente es la misma</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="303"/> + <location filename="../../../OptionDialog.cpp" line="310"/> <source>When destination is same</source> <translation>Cuando destino es el mismo</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="304"/> + <location filename="../../../OptionDialog.cpp" line="311"/> <source>When source and destination are same</source> <translation>Cuando la fuente y el destino son los mismos</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="305"/> + <location filename="../../../OptionDialog.cpp" line="312"/> <source>When source or destination are same</source> <translation>Cuando la fuente o el destino son los mismos</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="306"/> + <location filename="../../../OptionDialog.cpp" line="313"/> <source>Always</source> <translation>Siempre</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="320"/> - <location filename="../../../OptionDialog.cpp" line="321"/> - <location filename="../../../OptionDialog.cpp" line="322"/> + <location filename="../../../OptionDialog.cpp" line="327"/> + <location filename="../../../OptionDialog.cpp" line="328"/> + <location filename="../../../OptionDialog.cpp" line="329"/> <source>The variables are %1</source> <translation>Las variables son %1</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="962"/> + <location filename="../../../OptionDialog.cpp" line="969"/> <source>Save logs as: </source> <translation>Guardar registros como: </translation> </message> @@ -1779,12 +1792,12 @@ Error:%2</translation> <translation>Clave de producto</translation> </message> <message> - <location filename="../../../ProductKey.cpp" line="56"/> + <location filename="../../../ProductKey.cpp" line="60"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../../../ProductKey.cpp" line="56"/> + <location filename="../../../ProductKey.cpp" line="60"/> <source>Your product key was rejected.<br />If you buy key, unmark check your spam and unmark the mail as spam<br />If you have not buy your key, go to <a href="https://shop.first-world.info/">https://shop.first-world.info/</a></source> <translation>Su clave de producto fue rechazada. <br /> Si compra la clave, desmarque, verifique su correo no deseado y desmarque el correo como spam <br /> Si no ha comprado su clave, vaya a <a href="https://shop.first-world.info/">https://shop.first-world.info/</a></translation> </message> @@ -1842,12 +1855,12 @@ Error:%2</translation> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="541"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="595"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -1903,32 +1916,38 @@ Error:%2</translation> <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="452"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="331"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="463"/> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="576"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="474"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="587"/> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="598"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="673"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="677"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="691"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -2039,61 +2058,61 @@ Error:%2</translation> <context> <name>Themes</name> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="328"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="328"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="427"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="661"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="663"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1091"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1092"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1093"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1095"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1289"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1301"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1313"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1395"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1407"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1388"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1392"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1394"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1494"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1498"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -2101,24 +2120,24 @@ Error:%2</translation> <context> <name>ThemesFactory</name> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="284"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="285"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="286"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="482"/> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="497"/> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="512"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="510"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="525"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -2126,29 +2145,29 @@ Error:%2</translation> <context> <name>TransferThread</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="179"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="613"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="620"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="648"/> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="663"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="925"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -2156,19 +2175,19 @@ Error:%2</translation> <context> <name>TransferThreadAsync</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -2176,24 +2195,24 @@ Error:%2</translation> <context> <name>WriteThread</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="135"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="164"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="197"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="167"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="175"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="199"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="178"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="456"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -2508,8 +2527,8 @@ Error:%2</translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation type="unfinished">Sobrescribir si nuevo</translation> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="346"/> @@ -2519,8 +2538,12 @@ Error:%2</translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> + <source>Overwrite if destination older</source> <translation type="unfinished"></translation> </message> <message> @@ -2908,8 +2931,8 @@ Error:%2</translation> </message> <message> <location filename="../../Themes/Oxygen/themesOptions.ui" line="213"/> - <source>Informations</source> - <translation type="unfinished"></translation> + <source>Information</source> + <translation type="unfinished">Información</translation> </message> <message> <location filename="../../Themes/Oxygen/themesOptions.ui" line="219"/> @@ -2922,28 +2945,38 @@ Error:%2</translation> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="257"/> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="269"/> + <source>Click to edit the color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="267"/> - <source>Show dual progression</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="378"/> + <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="277"/> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="287"/> - <source>Progression color</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="395"/> + <source>General margin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="306"/> - <source>Click to edit the color</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="402"/> + <source>Show dual progression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="425"/> + <source>General spacing</source> <translation type="unfinished"></translation> </message> </context> diff --git a/plugins/Languages/fr/informations.xml b/plugins/Languages/fr/informations.xml index 4b614d0..e994c3c 100755 --- a/plugins/Languages/fr/informations.xml +++ b/plugins/Languages/fr/informations.xml @@ -15,7 +15,7 @@ <description xml:lang="en"><![CDATA[Translation of Ultracopier to French. For more details see the web site.]]></description> <description xml:lang="fr"><![CDATA[Traduction d'ultracopier en Français. Pour plus de détails regardez le site web]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>2.2.4.7</version> + <version>2.2.6.0</version> <!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. --> <name>fr</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/fr/translation.qm b/plugins/Languages/fr/translation.qm Binary files differindex 7ca3f05..64c79a2 100755 --- a/plugins/Languages/fr/translation.qm +++ b/plugins/Languages/fr/translation.qm diff --git a/plugins/Languages/fr/translation.ts b/plugins/Languages/fr/translation.ts index 3d2ed5c..e1a3a87 100755 --- a/plugins/Languages/fr/translation.ts +++ b/plugins/Languages/fr/translation.ts @@ -93,91 +93,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished">Destination</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished">Demander</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished">Passer</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished">Renommer</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished">Écraser</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished">Écraser si plus récent</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -185,75 +190,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished">Demander</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished">Passer</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished">Renommer</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished">Écraser</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished">Écraser si plus récent</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -673,12 +679,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="87"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="90"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -686,22 +692,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="191"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="198"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished">Erreur</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -709,22 +715,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="140"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="147"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished">Erreur</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -871,27 +877,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="84"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="164"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="173"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished">Erreur</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -1100,13 +1106,15 @@ Cette version est compilée comme version : %1.</translation> <name>MkPath</name> <message> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="124"/> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="394"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="187"/> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="210"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -1116,22 +1124,27 @@ Cette version est compilée comme version : %1.</translation> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="255"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="278"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="309"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> @@ -1210,7 +1223,7 @@ Cette version est compilée comme version : %1.</translation> <message> <location filename="../../../OptionDialog.ui" line="75"/> <location filename="../../../OptionDialog.ui" line="366"/> - <location filename="../../../OptionDialog.cpp" line="290"/> + <location filename="../../../OptionDialog.cpp" line="297"/> <source>Copy engine</source> <translation>Moteurs de copie</translation> </message> @@ -1258,21 +1271,21 @@ Cette version est compilée comme version : %1.</translation> <message> <location filename="../../../OptionDialog.ui" line="80"/> <location filename="../../../OptionDialog.ui" line="379"/> - <location filename="../../../OptionDialog.cpp" line="291"/> + <location filename="../../../OptionDialog.cpp" line="298"/> <source>Listener</source> <translation>Écouteur</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="85"/> <location filename="../../../OptionDialog.ui" line="384"/> - <location filename="../../../OptionDialog.cpp" line="292"/> + <location filename="../../../OptionDialog.cpp" line="299"/> <source>Plugin loader</source> <translation>Chargeur de plugin</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="93"/> <location filename="../../../OptionDialog.ui" line="389"/> - <location filename="../../../OptionDialog.cpp" line="293"/> + <location filename="../../../OptionDialog.cpp" line="300"/> <source>Session loader</source> <translation>Chargeur de session</translation> </message> @@ -1424,75 +1437,75 @@ Cette version est compilée comme version : %1.</translation> <translation>Écrire directement le fichier quand il reçoit une nouvelle entrée (peut entrainer 50% de perte de performances)</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="197"/> - <location filename="../../../OptionDialog.cpp" line="211"/> + <location filename="../../../OptionDialog.cpp" line="204"/> + <location filename="../../../OptionDialog.cpp" line="218"/> <source>Load</source> <translation>Charger</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="197"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load the theme?</source> <translation>Charger le thème?</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="211"/> + <location filename="../../../OptionDialog.cpp" line="218"/> <source>Load the language?</source> <translation>Charger la langue?</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="298"/> + <location filename="../../../OptionDialog.cpp" line="305"/> <source>Do nothing</source> <translation>Ne rien faire</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="299"/> + <location filename="../../../OptionDialog.cpp" line="306"/> <source>Ask source as folder</source> <translation>Demander la source comme un dossier</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="300"/> + <location filename="../../../OptionDialog.cpp" line="307"/> <source>Ask sources as files</source> <translation>Demander la sources comme des fichiers</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="301"/> + <location filename="../../../OptionDialog.cpp" line="308"/> <source>Never</source> <translation>Jamais</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="302"/> + <location filename="../../../OptionDialog.cpp" line="309"/> <source>When source is same</source> <translation>Quand la source est la même</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="303"/> + <location filename="../../../OptionDialog.cpp" line="310"/> <source>When destination is same</source> <translation>Quand la destination est la même</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="304"/> + <location filename="../../../OptionDialog.cpp" line="311"/> <source>When source and destination are same</source> <translation>Quand la destination et la source sont les mêmes</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="305"/> + <location filename="../../../OptionDialog.cpp" line="312"/> <source>When source or destination are same</source> <translation>Quand la destination ou la source sont les mêmes</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="306"/> + <location filename="../../../OptionDialog.cpp" line="313"/> <source>Always</source> <translation>Toujours</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="320"/> - <location filename="../../../OptionDialog.cpp" line="321"/> - <location filename="../../../OptionDialog.cpp" line="322"/> + <location filename="../../../OptionDialog.cpp" line="327"/> + <location filename="../../../OptionDialog.cpp" line="328"/> + <location filename="../../../OptionDialog.cpp" line="329"/> <source>The variables are %1</source> <translation>Les variables sont %1</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="962"/> + <location filename="../../../OptionDialog.cpp" line="969"/> <source>Save logs as: </source> <translation>Sauvegarder les logs sous: </translation> </message> @@ -1781,12 +1794,12 @@ Erreur:%2</translation> <translation>Clef de produit</translation> </message> <message> - <location filename="../../../ProductKey.cpp" line="56"/> + <location filename="../../../ProductKey.cpp" line="60"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location filename="../../../ProductKey.cpp" line="56"/> + <location filename="../../../ProductKey.cpp" line="60"/> <source>Your product key was rejected.<br />If you buy key, unmark check your spam and unmark the mail as spam<br />If you have not buy your key, go to <a href="https://shop.first-world.info/">https://shop.first-world.info/</a></source> <translation>Votre clé de produit a été rejetée. <br />Si vous achetez une clé, décochez cette case et décochez le courrier en tant que spam <br />Si vous n’avez pas acheté votre clé, accédez à <a href="https: // shop. first-world.info/">https://shop.first-world.info/</a></translation> </message> @@ -1844,12 +1857,12 @@ Erreur:%2</translation> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="541"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="595"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -1905,32 +1918,38 @@ Erreur:%2</translation> <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="452"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="331"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="463"/> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="576"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="474"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="587"/> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="598"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="673"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="677"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="691"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -2041,61 +2060,61 @@ Erreur:%2</translation> <context> <name>Themes</name> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="328"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="328"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="427"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="661"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="663"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1091"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1092"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1093"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1095"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1289"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1301"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1313"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1395"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1407"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1388"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1392"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1394"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1494"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1498"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -2103,24 +2122,24 @@ Erreur:%2</translation> <context> <name>ThemesFactory</name> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="284"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="285"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="286"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="482"/> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="497"/> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="512"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="510"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="525"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -2128,29 +2147,29 @@ Erreur:%2</translation> <context> <name>TransferThread</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="179"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="613"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="620"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="648"/> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="663"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="925"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -2158,19 +2177,19 @@ Erreur:%2</translation> <context> <name>TransferThreadAsync</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -2178,24 +2197,24 @@ Erreur:%2</translation> <context> <name>WriteThread</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="135"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="164"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="197"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="167"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="175"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="199"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="178"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="456"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -2510,8 +2529,8 @@ Erreur:%2</translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation type="unfinished">Écraser si plus récent</translation> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="346"/> @@ -2521,8 +2540,12 @@ Erreur:%2</translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> + <source>Overwrite if destination older</source> <translation type="unfinished"></translation> </message> <message> @@ -2910,8 +2933,8 @@ Erreur:%2</translation> </message> <message> <location filename="../../Themes/Oxygen/themesOptions.ui" line="213"/> - <source>Informations</source> - <translation type="unfinished"></translation> + <source>Information</source> + <translation type="unfinished">Informations</translation> </message> <message> <location filename="../../Themes/Oxygen/themesOptions.ui" line="219"/> @@ -2924,28 +2947,38 @@ Erreur:%2</translation> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="257"/> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="269"/> + <source>Click to edit the color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="267"/> - <source>Show dual progression</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="378"/> + <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="277"/> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="287"/> - <source>Progression color</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="395"/> + <source>General margin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="306"/> - <source>Click to edit the color</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="402"/> + <source>Show dual progression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="425"/> + <source>General spacing</source> <translation type="unfinished"></translation> </message> </context> diff --git a/plugins/Languages/hi/informations.xml b/plugins/Languages/hi/informations.xml index 14fcf4b..42bee05 100755 --- a/plugins/Languages/hi/informations.xml +++ b/plugins/Languages/hi/informations.xml @@ -12,7 +12,7 @@ <!-- Detailed description --> <description xml:lang="en"><![CDATA[Translation of Ultracopier to hindi. For more details see the web site.]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>2.2.4.7</version> + <version>2.2.6.0</version> <!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. --> <name>hi</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/hi/translation.qm b/plugins/Languages/hi/translation.qm Binary files differindex d925dd6..0e38009 100755 --- a/plugins/Languages/hi/translation.qm +++ b/plugins/Languages/hi/translation.qm diff --git a/plugins/Languages/hi/translation.ts b/plugins/Languages/hi/translation.ts index 7c569a5..8618aed 100755 --- a/plugins/Languages/hi/translation.ts +++ b/plugins/Languages/hi/translation.ts @@ -93,91 +93,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -185,75 +190,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -670,12 +676,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="87"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="90"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -683,22 +689,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="191"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="198"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -706,22 +712,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="140"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="147"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -868,27 +874,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="84"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="164"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="173"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -1096,13 +1102,15 @@ This version is compiled as version: %1.</source> <name>MkPath</name> <message> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="124"/> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="394"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="187"/> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="210"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -1112,22 +1120,27 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="255"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="278"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="309"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> @@ -1206,7 +1219,7 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="75"/> <location filename="../../../OptionDialog.ui" line="366"/> - <location filename="../../../OptionDialog.cpp" line="290"/> + <location filename="../../../OptionDialog.cpp" line="297"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> @@ -1254,21 +1267,21 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="80"/> <location filename="../../../OptionDialog.ui" line="379"/> - <location filename="../../../OptionDialog.cpp" line="291"/> + <location filename="../../../OptionDialog.cpp" line="298"/> <source>Listener</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="85"/> <location filename="../../../OptionDialog.ui" line="384"/> - <location filename="../../../OptionDialog.cpp" line="292"/> + <location filename="../../../OptionDialog.cpp" line="299"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="93"/> <location filename="../../../OptionDialog.ui" line="389"/> - <location filename="../../../OptionDialog.cpp" line="293"/> + <location filename="../../../OptionDialog.cpp" line="300"/> <source>Session loader</source> <translation type="unfinished"></translation> </message> @@ -1410,75 +1423,75 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="197"/> - <location filename="../../../OptionDialog.cpp" line="211"/> + <location filename="../../../OptionDialog.cpp" line="204"/> + <location filename="../../../OptionDialog.cpp" line="218"/> <source>Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="197"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load the theme?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="211"/> + <location filename="../../../OptionDialog.cpp" line="218"/> <source>Load the language?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="298"/> + <location filename="../../../OptionDialog.cpp" line="305"/> <source>Do nothing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="299"/> + <location filename="../../../OptionDialog.cpp" line="306"/> <source>Ask source as folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="300"/> + <location filename="../../../OptionDialog.cpp" line="307"/> <source>Ask sources as files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="301"/> + <location filename="../../../OptionDialog.cpp" line="308"/> <source>Never</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="302"/> + <location filename="../../../OptionDialog.cpp" line="309"/> <source>When source is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="303"/> + <location filename="../../../OptionDialog.cpp" line="310"/> <source>When destination is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="304"/> + <location filename="../../../OptionDialog.cpp" line="311"/> <source>When source and destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="305"/> + <location filename="../../../OptionDialog.cpp" line="312"/> <source>When source or destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="306"/> + <location filename="../../../OptionDialog.cpp" line="313"/> <source>Always</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="320"/> - <location filename="../../../OptionDialog.cpp" line="321"/> - <location filename="../../../OptionDialog.cpp" line="322"/> + <location filename="../../../OptionDialog.cpp" line="327"/> + <location filename="../../../OptionDialog.cpp" line="328"/> + <location filename="../../../OptionDialog.cpp" line="329"/> <source>The variables are %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="962"/> + <location filename="../../../OptionDialog.cpp" line="969"/> <source>Save logs as: </source> <translation type="unfinished"></translation> </message> @@ -1771,12 +1784,12 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../ProductKey.cpp" line="56"/> + <location filename="../../../ProductKey.cpp" line="60"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../ProductKey.cpp" line="56"/> + <location filename="../../../ProductKey.cpp" line="60"/> <source>Your product key was rejected.<br />If you buy key, unmark check your spam and unmark the mail as spam<br />If you have not buy your key, go to <a href="https://shop.first-world.info/">https://shop.first-world.info/</a></source> <translation type="unfinished"></translation> </message> @@ -1834,12 +1847,12 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="541"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="595"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -1895,32 +1908,38 @@ Error:%2</source> <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="452"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="331"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="463"/> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="576"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="474"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="587"/> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="598"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="673"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="677"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="691"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -2031,61 +2050,61 @@ Error:%2</source> <context> <name>Themes</name> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="328"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="328"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="427"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="661"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="663"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1091"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1092"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1093"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1095"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1289"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1301"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1313"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1395"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1407"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1388"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1392"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1394"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1494"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1498"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -2093,24 +2112,24 @@ Error:%2</source> <context> <name>ThemesFactory</name> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="284"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="285"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="286"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="482"/> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="497"/> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="512"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="510"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="525"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -2118,29 +2137,29 @@ Error:%2</source> <context> <name>TransferThread</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="179"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="613"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="620"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="648"/> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="663"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="925"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -2148,19 +2167,19 @@ Error:%2</source> <context> <name>TransferThreadAsync</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -2168,24 +2187,24 @@ Error:%2</source> <context> <name>WriteThread</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="135"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="164"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="197"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="167"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="175"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="199"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="178"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="456"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -2500,7 +2519,7 @@ Error:%2</source> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> + <source>Overwrite if source newer than destination</source> <translation type="unfinished"></translation> </message> <message> @@ -2511,8 +2530,12 @@ Error:%2</source> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> + <source>Overwrite if destination older</source> <translation type="unfinished"></translation> </message> <message> @@ -2900,7 +2923,7 @@ Error:%2</source> </message> <message> <location filename="../../Themes/Oxygen/themesOptions.ui" line="213"/> - <source>Informations</source> + <source>Information</source> <translation type="unfinished"></translation> </message> <message> @@ -2914,28 +2937,38 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="257"/> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="269"/> + <source>Click to edit the color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="267"/> - <source>Show dual progression</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="378"/> + <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="277"/> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="287"/> - <source>Progression color</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="395"/> + <source>General margin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="306"/> - <source>Click to edit the color</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="402"/> + <source>Show dual progression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="425"/> + <source>General spacing</source> <translation type="unfinished"></translation> </message> </context> diff --git a/plugins/Languages/hu/informations.xml b/plugins/Languages/hu/informations.xml index f6f0383..dbd1247 100755 --- a/plugins/Languages/hu/informations.xml +++ b/plugins/Languages/hu/informations.xml @@ -12,7 +12,7 @@ <!-- Detailed description --> <description xml:lang="en"><![CDATA[Hungarian translation of Ultracopier]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>2.2.4.7</version> + <version>2.2.6.0</version> <!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. --> <name>hu</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/hu/translation.qm b/plugins/Languages/hu/translation.qm Binary files differindex fd1e794..fd2c66b 100755 --- a/plugins/Languages/hu/translation.qm +++ b/plugins/Languages/hu/translation.qm diff --git a/plugins/Languages/hu/translation.ts b/plugins/Languages/hu/translation.ts index 721f3fa..9333fe5 100755 --- a/plugins/Languages/hu/translation.ts +++ b/plugins/Languages/hu/translation.ts @@ -93,91 +93,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished">Cél</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished">Rákérdez</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished">Kihagyás</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished">Átnevezés</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished">Felülírás</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished">Felülírás, ha újabb</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -185,75 +190,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished">Rákérdez</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished">Kihagyás</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished">Átnevezés</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished">Felülírás</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished">Felülírás, ha újabb</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -671,12 +677,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="87"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="90"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -684,22 +690,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="191"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="198"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished">Hiba</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -707,22 +713,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="140"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="147"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished">Hiba</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -869,27 +875,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="84"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="164"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="173"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished">Hiba</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -1098,13 +1104,15 @@ Ez a verzió a következő verzióként került lefordításra: %1.</translation <name>MkPath</name> <message> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="124"/> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="394"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="187"/> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="210"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -1114,22 +1122,27 @@ Ez a verzió a következő verzióként került lefordításra: %1.</translation <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="255"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="278"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="309"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> @@ -1208,28 +1221,28 @@ Ez a verzió a következő verzióként került lefordításra: %1.</translation <message> <location filename="../../../OptionDialog.ui" line="75"/> <location filename="../../../OptionDialog.ui" line="366"/> - <location filename="../../../OptionDialog.cpp" line="290"/> + <location filename="../../../OptionDialog.cpp" line="297"/> <source>Copy engine</source> <translation>Másoló motor</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="80"/> <location filename="../../../OptionDialog.ui" line="379"/> - <location filename="../../../OptionDialog.cpp" line="291"/> + <location filename="../../../OptionDialog.cpp" line="298"/> <source>Listener</source> <translation>Figyelő</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="85"/> <location filename="../../../OptionDialog.ui" line="384"/> - <location filename="../../../OptionDialog.cpp" line="292"/> + <location filename="../../../OptionDialog.cpp" line="299"/> <source>Plugin loader</source> <translation>Beépüő betöltő</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="93"/> <location filename="../../../OptionDialog.ui" line="389"/> - <location filename="../../../OptionDialog.cpp" line="293"/> + <location filename="../../../OptionDialog.cpp" line="300"/> <source>Session loader</source> <translation>Folyamat betöltő</translation> </message> @@ -1433,75 +1446,75 @@ Ez a verzió a következő verzióként került lefordításra: %1.</translation <translation>A változók: %path%, %operation%</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="197"/> - <location filename="../../../OptionDialog.cpp" line="211"/> + <location filename="../../../OptionDialog.cpp" line="204"/> + <location filename="../../../OptionDialog.cpp" line="218"/> <source>Load</source> <translation>Betöltés</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="197"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load the theme?</source> <translation>Téma betöltése?</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="211"/> + <location filename="../../../OptionDialog.cpp" line="218"/> <source>Load the language?</source> <translation>Nyelv betöltése?</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="298"/> + <location filename="../../../OptionDialog.cpp" line="305"/> <source>Do nothing</source> <translation>Ne tegyen semmit</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="299"/> + <location filename="../../../OptionDialog.cpp" line="306"/> <source>Ask source as folder</source> <translation>Rákérdezés a forrás mint mappa</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="300"/> + <location filename="../../../OptionDialog.cpp" line="307"/> <source>Ask sources as files</source> <translation>Rákérdezés a forrásokra mint fájlok</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="301"/> + <location filename="../../../OptionDialog.cpp" line="308"/> <source>Never</source> <translation>Soha</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="302"/> + <location filename="../../../OptionDialog.cpp" line="309"/> <source>When source is same</source> <translation>Amikor a forrás ugyanaz</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="303"/> + <location filename="../../../OptionDialog.cpp" line="310"/> <source>When destination is same</source> <translation>Amikor a cél ugyanaz</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="304"/> + <location filename="../../../OptionDialog.cpp" line="311"/> <source>When source and destination are same</source> <translation>Amikor a forrás és a cél ugyanaz</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="305"/> + <location filename="../../../OptionDialog.cpp" line="312"/> <source>When source or destination are same</source> <translation>Amikor a forrás vagy cél ugyanaz</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="306"/> + <location filename="../../../OptionDialog.cpp" line="313"/> <source>Always</source> <translation>Mindig</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="320"/> - <location filename="../../../OptionDialog.cpp" line="321"/> - <location filename="../../../OptionDialog.cpp" line="322"/> + <location filename="../../../OptionDialog.cpp" line="327"/> + <location filename="../../../OptionDialog.cpp" line="328"/> + <location filename="../../../OptionDialog.cpp" line="329"/> <source>The variables are %1</source> <translation>A változók: %1</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="962"/> + <location filename="../../../OptionDialog.cpp" line="969"/> <source>Save logs as: </source> <translation>Napló mentése mint:</translation> </message> @@ -1775,12 +1788,12 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../ProductKey.cpp" line="56"/> + <location filename="../../../ProductKey.cpp" line="60"/> <source>Error</source> <translation type="unfinished">Hiba</translation> </message> <message> - <location filename="../../../ProductKey.cpp" line="56"/> + <location filename="../../../ProductKey.cpp" line="60"/> <source>Your product key was rejected.<br />If you buy key, unmark check your spam and unmark the mail as spam<br />If you have not buy your key, go to <a href="https://shop.first-world.info/">https://shop.first-world.info/</a></source> <translation type="unfinished"></translation> </message> @@ -1838,12 +1851,12 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="541"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="595"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -1899,32 +1912,38 @@ Error:%2</source> <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="452"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="331"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="463"/> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="576"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="474"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="587"/> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="598"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="673"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="677"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="691"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -2035,61 +2054,61 @@ Error:%2</source> <context> <name>Themes</name> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="328"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="328"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="427"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="661"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="663"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1091"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1092"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1093"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1095"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1289"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1301"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1313"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1395"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1407"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1388"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1392"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1394"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1494"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1498"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -2097,24 +2116,24 @@ Error:%2</source> <context> <name>ThemesFactory</name> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="284"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="285"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="286"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="482"/> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="497"/> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="512"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="510"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="525"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -2122,29 +2141,29 @@ Error:%2</source> <context> <name>TransferThread</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="179"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="613"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="620"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="648"/> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="663"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="925"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -2152,19 +2171,19 @@ Error:%2</source> <context> <name>TransferThreadAsync</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -2172,24 +2191,24 @@ Error:%2</source> <context> <name>WriteThread</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="135"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="164"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="197"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="167"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="175"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="199"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="178"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="456"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -2504,8 +2523,8 @@ Error:%2</source> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation type="unfinished">Felülírás, ha újabb</translation> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="346"/> @@ -2515,8 +2534,12 @@ Error:%2</source> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> + <source>Overwrite if destination older</source> <translation type="unfinished"></translation> </message> <message> @@ -2904,8 +2927,8 @@ Error:%2</source> </message> <message> <location filename="../../Themes/Oxygen/themesOptions.ui" line="213"/> - <source>Informations</source> - <translation type="unfinished"></translation> + <source>Information</source> + <translation type="unfinished">Információ</translation> </message> <message> <location filename="../../Themes/Oxygen/themesOptions.ui" line="219"/> @@ -2918,28 +2941,38 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="257"/> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="269"/> + <source>Click to edit the color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="267"/> - <source>Show dual progression</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="378"/> + <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="277"/> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="287"/> - <source>Progression color</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="395"/> + <source>General margin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="306"/> - <source>Click to edit the color</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="402"/> + <source>Show dual progression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="425"/> + <source>General spacing</source> <translation type="unfinished"></translation> </message> </context> diff --git a/plugins/Languages/id/informations.xml b/plugins/Languages/id/informations.xml index f6a4d71..2ec69da 100755 --- a/plugins/Languages/id/informations.xml +++ b/plugins/Languages/id/informations.xml @@ -12,7 +12,7 @@ <!-- Detailed description --> <description xml:lang="en"><![CDATA[Translation of Ultracopier to indonesian. For more details see the web site.]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>2.2.4.7</version> + <version>2.2.6.0</version> <!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. --> <name>id</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/id/translation.ts b/plugins/Languages/id/translation.ts index 2066182..b1cbcc0 100755 --- a/plugins/Languages/id/translation.ts +++ b/plugins/Languages/id/translation.ts @@ -93,91 +93,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -185,75 +190,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -670,12 +676,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="87"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="90"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -683,22 +689,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="191"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="198"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -706,22 +712,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="140"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="147"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -868,27 +874,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="84"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="164"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="173"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -1096,13 +1102,15 @@ This version is compiled as version: %1.</source> <name>MkPath</name> <message> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="124"/> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="394"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="187"/> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="210"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -1112,22 +1120,27 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="255"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="278"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="309"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> @@ -1206,7 +1219,7 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="75"/> <location filename="../../../OptionDialog.ui" line="366"/> - <location filename="../../../OptionDialog.cpp" line="290"/> + <location filename="../../../OptionDialog.cpp" line="297"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> @@ -1254,21 +1267,21 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="80"/> <location filename="../../../OptionDialog.ui" line="379"/> - <location filename="../../../OptionDialog.cpp" line="291"/> + <location filename="../../../OptionDialog.cpp" line="298"/> <source>Listener</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="85"/> <location filename="../../../OptionDialog.ui" line="384"/> - <location filename="../../../OptionDialog.cpp" line="292"/> + <location filename="../../../OptionDialog.cpp" line="299"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="93"/> <location filename="../../../OptionDialog.ui" line="389"/> - <location filename="../../../OptionDialog.cpp" line="293"/> + <location filename="../../../OptionDialog.cpp" line="300"/> <source>Session loader</source> <translation type="unfinished"></translation> </message> @@ -1410,75 +1423,75 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="197"/> - <location filename="../../../OptionDialog.cpp" line="211"/> + <location filename="../../../OptionDialog.cpp" line="204"/> + <location filename="../../../OptionDialog.cpp" line="218"/> <source>Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="197"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load the theme?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="211"/> + <location filename="../../../OptionDialog.cpp" line="218"/> <source>Load the language?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="298"/> + <location filename="../../../OptionDialog.cpp" line="305"/> <source>Do nothing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="299"/> + <location filename="../../../OptionDialog.cpp" line="306"/> <source>Ask source as folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="300"/> + <location filename="../../../OptionDialog.cpp" line="307"/> <source>Ask sources as files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="301"/> + <location filename="../../../OptionDialog.cpp" line="308"/> <source>Never</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="302"/> + <location filename="../../../OptionDialog.cpp" line="309"/> <source>When source is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="303"/> + <location filename="../../../OptionDialog.cpp" line="310"/> <source>When destination is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="304"/> + <location filename="../../../OptionDialog.cpp" line="311"/> <source>When source and destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="305"/> + <location filename="../../../OptionDialog.cpp" line="312"/> <source>When source or destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="306"/> + <location filename="../../../OptionDialog.cpp" line="313"/> <source>Always</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="320"/> - <location filename="../../../OptionDialog.cpp" line="321"/> - <location filename="../../../OptionDialog.cpp" line="322"/> + <location filename="../../../OptionDialog.cpp" line="327"/> + <location filename="../../../OptionDialog.cpp" line="328"/> + <location filename="../../../OptionDialog.cpp" line="329"/> <source>The variables are %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="962"/> + <location filename="../../../OptionDialog.cpp" line="969"/> <source>Save logs as: </source> <translation type="unfinished"></translation> </message> @@ -1771,12 +1784,12 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../ProductKey.cpp" line="56"/> + <location filename="../../../ProductKey.cpp" line="60"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../ProductKey.cpp" line="56"/> + <location filename="../../../ProductKey.cpp" line="60"/> <source>Your product key was rejected.<br />If you buy key, unmark check your spam and unmark the mail as spam<br />If you have not buy your key, go to <a href="https://shop.first-world.info/">https://shop.first-world.info/</a></source> <translation type="unfinished"></translation> </message> @@ -1834,12 +1847,12 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="541"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="595"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -1895,32 +1908,38 @@ Error:%2</source> <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="452"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="331"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="463"/> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="576"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="474"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="587"/> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="598"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="673"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="677"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="691"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -2031,61 +2050,61 @@ Error:%2</source> <context> <name>Themes</name> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="328"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="328"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="427"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="661"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="663"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1091"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1092"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1093"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1095"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1289"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1301"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1313"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1395"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1407"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1388"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1392"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1394"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1494"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1498"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -2093,24 +2112,24 @@ Error:%2</source> <context> <name>ThemesFactory</name> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="284"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="285"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="286"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="482"/> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="497"/> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="512"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="510"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="525"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -2118,29 +2137,29 @@ Error:%2</source> <context> <name>TransferThread</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="179"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="613"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="620"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="648"/> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="663"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="925"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -2148,19 +2167,19 @@ Error:%2</source> <context> <name>TransferThreadAsync</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -2168,24 +2187,24 @@ Error:%2</source> <context> <name>WriteThread</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="135"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="164"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="197"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="167"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="175"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="199"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="178"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="456"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -2500,7 +2519,7 @@ Error:%2</source> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> + <source>Overwrite if source newer than destination</source> <translation type="unfinished"></translation> </message> <message> @@ -2511,8 +2530,12 @@ Error:%2</source> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> + <source>Overwrite if destination older</source> <translation type="unfinished"></translation> </message> <message> @@ -2900,7 +2923,7 @@ Error:%2</source> </message> <message> <location filename="../../Themes/Oxygen/themesOptions.ui" line="213"/> - <source>Informations</source> + <source>Information</source> <translation type="unfinished"></translation> </message> <message> @@ -2914,28 +2937,38 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="257"/> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="269"/> + <source>Click to edit the color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="267"/> - <source>Show dual progression</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="378"/> + <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="277"/> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="287"/> - <source>Progression color</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="395"/> + <source>General margin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="306"/> - <source>Click to edit the color</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="402"/> + <source>Show dual progression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="425"/> + <source>General spacing</source> <translation type="unfinished"></translation> </message> </context> diff --git a/plugins/Languages/it/informations.xml b/plugins/Languages/it/informations.xml index e3efa99..4c40170 100644 --- a/plugins/Languages/it/informations.xml +++ b/plugins/Languages/it/informations.xml @@ -12,7 +12,7 @@ <!-- Detailed description --> <description xml:lang="en"><![CDATA[Translation of Ultracopier to italian. For more details see the web site.]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>2.2.4.7</version> + <version>2.2.6.0</version> <!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. --> <name>it</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/it/translation.qm b/plugins/Languages/it/translation.qm Binary files differindex 6b2c9cb..5efb69a 100755 --- a/plugins/Languages/it/translation.qm +++ b/plugins/Languages/it/translation.qm diff --git a/plugins/Languages/it/translation.ts b/plugins/Languages/it/translation.ts index db61cd0..2eb27ce 100644 --- a/plugins/Languages/it/translation.ts +++ b/plugins/Languages/it/translation.ts @@ -15,7 +15,7 @@ <message> <location filename="../../../CliParser.cpp" line="86"/> <source>Problem reading file, or file size is 0</source> - <translation>Problema durante la lettura del file o dimensione file nulla</translation> + <translation>Errore durante la lettura del file o dimensione file nulla</translation> </message> <message> <location filename="../../../CliParser.cpp" line="174"/> @@ -27,19 +27,19 @@ <location filename="../../../CliParser.cpp" line="176"/> <location filename="../../../CliParser.cpp" line="187"/> <source>To display the options</source> - <translation>Mostrare le opzioni</translation> + <translation>Visualizzare opzioni</translation> </message> <message> <location filename="../../../CliParser.cpp" line="179"/> <location filename="../../../CliParser.cpp" line="190"/> <source>To copy sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> - <translation>Copiare file di origine nella destinazione separati da uno spazio. Se la destinazione è "?" Ultracopier chiederà all'utente</translation> + <translation>Copiare file di origine nella destinazione separato/i da uno spazio. Se la destinazione è "?" Ultracopier chiederà all'utente</translation> </message> <message> <location filename="../../../CliParser.cpp" line="180"/> <location filename="../../../CliParser.cpp" line="191"/> <source>To move sources to destination, separated by space. If destination is "?", ultracopier will ask the user</source> - <translation>Spostare file di origine nella destinazione separati da uno spazio. Se la destinazione è "?" Ultracopier chiederà all'utente</translation> + <translation>Spostare file di origine nella destinazione separato/i da uno spazio. Se la destinazione è "?" Ultracopier chiederà all'utente</translation> </message> <message> <location filename="../../../CliParser.cpp" line="184"/> @@ -49,17 +49,17 @@ <message> <location filename="../../../CliParser.cpp" line="99"/> <source>This file is not supported transfer list</source> - <translation>Questo file non è supportato dalla lista trasferimenti</translation> + <translation>Questo file non è supportato dalla lista di trasferimento</translation> </message> <message> <location filename="../../../CliParser.cpp" line="32"/> <source>Ultracopier is already running, right click on its system tray icon (near the clock) to use it or just copy and paste</source> - <translation>Ultracopier è già avviato, click destro su icona nell'area di notifica per usarlo oppure copia e incolla semplicemente</translation> + <translation>Ultracopier è già avviato, cliccare col destro sull'icona nell'area di notifica per utilizzarlo, oppure copiare e incollare semplicemente</translation> </message> <message> <location filename="../../../CliParser.cpp" line="34"/> <source>Ultracopier is already running, view all notification area icons (near the clock), right click on its system tray icon to use it or just copy and paste</source> - <translation>Ultracopier è già avviato, controlla tra le icone nell'area di notifica. Click destro sull'icona della barra applicazioni di sistema per usarlo oppure copia e incolla semplicemente</translation> + <translation>Ultracopier è già avviato, controlla tra le icone nell'area di notifica. Cliccare col destro sull'icona nell'area di notifica per utilizzarlo, oppure copiare e incollare semplicemente</translation> </message> <message> <location filename="../../../CliParser.cpp" line="109"/> @@ -70,7 +70,7 @@ <location filename="../../../CliParser.cpp" line="175"/> <location filename="../../../CliParser.cpp" line="186"/> <source>To display this help</source> - <translation>Mostrare questa guida</translation> + <translation>Visualizzare questa guida</translation> </message> <message> <location filename="../../../CliParser.cpp" line="177"/> @@ -93,91 +93,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished">Destinazione</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished">Chiedi</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished">Salta</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished">Rinomina</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished">Sovrascrivi</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> - <translation type="unfinished">Sovrascrivere se più recente</translation> + <translation type="unfinished">Sovrascrivi se più recente</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -185,75 +190,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished">Chiedi</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished">Salta</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished">Rinomina</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished">Sovrascrivi</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> - <translation type="unfinished">Sovrascrivere se più recente</translation> + <translation type="unfinished">Sovrascrivi se più recente</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -338,12 +344,12 @@ <message> <location filename="../../../Core.cpp" line="104"/> <source>Group window</source> - <translation>Raggruppare finestre</translation> + <translation>Raggruppa finestre</translation> </message> <message> <location filename="../../../Core.cpp" line="104"/> <source>Do you want group the transfer with another actual running transfer?</source> - <translation>Vuoi raggruppare il trasferimento con un altro attualmente avviato?</translation> + <translation>Si vuole raggruppare il trasferimento con un altro attualmente avviato?</translation> </message> <message> <location filename="../../../Core.cpp" line="127"/> @@ -358,7 +364,7 @@ <message> <location filename="../../../Core.cpp" line="1200"/> <source>Do you want to copy? If no, it will be moved.</source> - <translation>Vuoi copiare? Altrimenti verrà spostato</translation> + <translation>Si vuole procedere alla copia? Altrimenti verrà spostato.</translation> </message> <message> <location filename="../../../Core.cpp" line="275"/> @@ -422,7 +428,7 @@ <location filename="../../../FacilityEngine.cpp" line="65"/> <source>Move</source> <extracomment>a move</extracomment> - <translation>Sposta</translation> + <translation>Spostamento</translation> </message> <message> <location filename="../../../FacilityEngine.cpp" line="67"/> @@ -524,12 +530,12 @@ <location filename="../../../FacilityEngine.cpp" line="63"/> <source>Transfer</source> <extracomment>a transfer</extracomment> - <translation>Trasferisci</translation> + <translation>Trasferimento</translation> </message> <message> <location filename="../../../FacilityEngine.cpp" line="66"/> <source>Start</source> - <translation>Avvia</translation> + <translation>Avvio</translation> </message> <message> <location filename="../../../FacilityEngine.cpp" line="71"/> @@ -560,22 +566,22 @@ <location filename="../../../FacilityEngine.cpp" line="76"/> <location filename="../../../FacilityEngine.cpp" line="80"/> <source>Time remaining:</source> - <translation>Tempo residuo:</translation> + <translation>Tempo rimanente:</translation> </message> <message> <location filename="../../../FacilityEngine.cpp" line="77"/> <source>Listing</source> - <translation>Elencando</translation> + <translation>Elenco in corso</translation> </message> <message> <location filename="../../../FacilityEngine.cpp" line="78"/> <source>Copying</source> - <translation>Copia</translation> + <translation>Copia in corso</translation> </message> <message> <location filename="../../../FacilityEngine.cpp" line="79"/> <source>Listing and copying</source> - <translation>Elencando e copiando</translation> + <translation>Elenco e copia in corso</translation> </message> <message> <location filename="../../../FacilityEngine.cpp" line="81"/> @@ -595,12 +601,12 @@ <message> <location filename="../../../FacilityEngine.cpp" line="86"/> <source>Overwrite if newer</source> - <translation>Sovrascrivere se più recente</translation> + <translation>Sovrascrivi se più recente</translation> </message> <message> <location filename="../../../FacilityEngine.cpp" line="87"/> <source>Overwrite if the last modification dates are different</source> - <translation>Sovrascrivere se le date di ultima modifica sono differenti</translation> + <translation>Sovrascrivi se le ultime date di modifica differiscono</translation> </message> <message> <location filename="../../../FacilityEngine.cpp" line="88"/> @@ -620,12 +626,12 @@ <message> <location filename="../../../FacilityEngine.cpp" line="90"/> <source>Select source directory</source> - <translation>Selezionare cartella di origine</translation> + <translation>Seleziona directory di origine</translation> </message> <message> <location filename="../../../FacilityEngine.cpp" line="91"/> <source>Select destination directory</source> - <translation>Selezionare cartella di destinazione</translation> + <translation>Seleziona directory di destinazione</translation> </message> <message> <location filename="../../../FacilityEngine.cpp" line="92"/> @@ -645,12 +651,12 @@ <message> <location filename="../../../FacilityEngine.cpp" line="95"/> <source>Save transfer list</source> - <translation>Salvare lista di trasferimento</translation> + <translation>Salva lista di trasferimento</translation> </message> <message> <location filename="../../../FacilityEngine.cpp" line="96"/> <source>Open transfer list</source> - <translation>Aprire lista di trasferimento</translation> + <translation>Apri lista di trasferimento</translation> </message> <message> <location filename="../../../FacilityEngine.cpp" line="97"/> @@ -665,18 +671,18 @@ <message> <location filename="../../../FacilityEngine.cpp" line="99"/> <source>Not supported on this platform</source> - <translation>Non supportato su questa piattaforma</translation> + <translation>Non supportato per questa piattaforma</translation> </message> </context> <context> <name>FileErrorDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="87"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="90"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -684,22 +690,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="191"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="198"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished">Errore</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -707,22 +713,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="140"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="147"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished">Errore</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -869,27 +875,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="84"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="164"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="173"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished">Errore</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -899,7 +905,7 @@ <message> <location filename="../../../HelpDialog.cpp" line="36"/> <source>About Ultracopier</source> - <translation>Informazioni su Ultracopier</translation> + <translation>Riguardo a Ultrpier</translation> </message> <message> <location filename="../../../HelpDialog.ui" line="67"/> @@ -907,8 +913,8 @@ This version is compiled as version: %1.</source> <extracomment>%1 will be replaced by a variable content (normal, debug, ...)</extracomment> <translatorcomment>%1 sarà rimpiazzato da un contenuto variabile (normale, debug, ...)</translatorcomment> - <translation>Utility avanzata sotto licenza GPL3 per la copia dei file basata su Qt. -Compilata come versione: %1.</translation> + <translation>Utility avanzata per la copia dei file basata su Qt sotto licenza GPL3. +Versione compilata come: %1.</translation> </message> <message> <location filename="../../../HelpDialog.ui" line="85"/> @@ -925,12 +931,12 @@ Compilata come versione: %1.</translation> <message> <location filename="../../../HelpDialog.ui" line="131"/> <source>About Qt</source> - <translation>Informazioni su Qt</translation> + <translation>Riguardo a Qt</translation> </message> <message> <location filename="../../../HelpDialog.ui" line="154"/> <source>Check update</source> - <translation>Controllare aggiornamenti</translation> + <translation>Controlla aggiornamenti</translation> </message> <message> <location filename="../../../HelpDialog.ui" line="161"/> @@ -1003,7 +1009,7 @@ Compilata come versione: %1.</translation> <source><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> <translatorcomment>%1 sarà rimpiazzato dal sito in lingua corrispondente</translatorcomment> - <translation><html><head/><body><p>Per ulteriori informazioni consultare il sito <a href="%1"><span style=" text-decoration: underline; color:#0057ae;">%1</span></a></p></body></html></translation> + <translation><html><head/><body><p>Per ulteriori informazioni consultare il sito web <a href="%1"><span style=" text-decoration: underline; color:#0057ae;">%1</span></a></p></body></html></translation> </message> </context> <context> @@ -1074,7 +1080,7 @@ Compilata come versione: %1.</translation> <message> <location filename="../../../LocalListener.cpp" line="168"/> <source>Timeout while recomposing data from connected clients</source> - <translation>Tempo scaduto durante la ricomposizione dei dati dai client collegati</translation> + <translation>Timeout durante la ricomposizione dei dati dai client collegati</translation> </message> </context> <context> @@ -1089,26 +1095,28 @@ Compilata come versione: %1.</translation> <message> <location filename="../../../LogThread.cpp" line="107"/> <source>Log file already open, error: %1</source> - <translation>File log già aperto, errore %1</translation> + <translation>File di registro già aperto, errore %1</translation> </message> <message> <location filename="../../../LogThread.cpp" line="116"/> <location filename="../../../LogThread.cpp" line="126"/> <source>Unable to open the log file, error: %1</source> - <translation>Impossibile aprire il file di log, errore %1</translation> + <translation>Impossibile aprire file di registro, errore %1</translation> </message> </context> <context> <name>MkPath</name> <message> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="124"/> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="394"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="187"/> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="210"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -1118,22 +1126,27 @@ Compilata come versione: %1.</translation> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="255"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="278"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="309"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> @@ -1148,12 +1161,12 @@ Compilata come versione: %1.</translation> <message> <location filename="../../../OSSpecific.ui" line="119"/> <source>Classic</source> - <translation>Classic</translation> + <translation>Classica</translation> </message> <message> <location filename="../../../OSSpecific.ui" line="124"/> <source>Modern</source> - <translation>Modern</translation> + <translation>Moderna</translation> </message> <message> <location filename="../../../OSSpecific.ui" line="177"/> @@ -1168,27 +1181,27 @@ Compilata come versione: %1.</translation> <message> <location filename="../../../OSSpecific.cpp" line="29"/> <source>The replacement of default copy/move system is not supported by the file manager (Dolphin, Nautilus, ...).<br />Ask the developer of your file manager to support it.<br />You need do the copy/move manually.</source> - <translation>Il rimpiazzo del sistema di copia e spostamento predefinito non è supportato dal file manager (Dolphin, Nautilus, ...)<br />Chiedere allo sviluppatore del vostro file manager di supportarlo.<br />Dovete copiare/spostare manualmente.</translation> + <translation>Il rimpiazzo del sistema di copia e spostamento predefinito non è supportato dal gestore file (Dolphin, Nautilus, ...)<br />Chiedere allo sviluppatore dello stesso di supportarlo.<br />Dovete copiare/spostare manualmente.</translation> </message> <message> <location filename="../../../OSSpecific.cpp" line="31"/> <source>Reboot the system if previously had similar software installed (like Teracopy, Supercopier or an earlier version of Ultracopier).</source> - <translation>Riavviare il sistema, se in precedenza avevate installato un software simile a questo (Teracopy, Supercopier o una versione precedente di Ultracopier)</translation> + <translation>Riavviare il sistema, se in precedenza avevate installato un software simile a questo (Teracopy, Supercopier o una versione precedente di Ultracopier, ecc.).</translation> </message> <message> <location filename="../../../OSSpecific.cpp" line="33"/> <source>The replacement of default copy/move system is not supported and blocked by finder of Mac OS X.<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>Il rimpiazzo del sistema di copia e spostamento predefinito non è supportato, quindi viene bloccato dal finder di Mac OS X.<br />Chiedere supporto allo sviluppatore.<br />Sarà possibile copiare/spostare manualmente cliccando col tasto destro del mouse sull'icona della barra applicazioni di sistema</translation> + <translation>Il rimpiazzo del sistema di copia e spostamento predefinito non è supportato, quindi viene bloccato dal finder di Mac OS X.<br />Chiedere supporto allo sviluppatore.<br />Sarà possibile copiare/spostare manualmente cliccando col tasto destro del mouse sull'icona della barra applicazioni di sistema.</translation> </message> <message> <location filename="../../../OSSpecific.cpp" line="35"/> <source>The replacement of default copy/move system should be not supported by the file manager.<br />Ask to the developer to support it.<br />You need do the copy/move manually.</source> - <translation>Il rimpiazzo del sistema di copia e spostamento predefinito potrebbe non essere supportato dal file manager.<br />Chiedere supporto allo sviluppatore.<br />Necessario usare copia/spostamento manuale</translation> + <translation>Il rimpiazzo del sistema di copia e spostamento predefinito potrebbe non essere supportato dal gestore file.<br />Chiedere supporto allo sviluppatore.<br />Necessario usare copia/spostamento manuale.</translation> </message> <message> <location filename="../../../OSSpecific.cpp" line="38"/> <source>Consider Supercopier as deprecated, prefer Ultracopier</source> - <translation>Considerate Supercopier deprecato, favorite Ultracopier</translation> + <translation>Considerate Supercopier deprecato, preferite Ultracopier</translation> </message> </context> <context> @@ -1207,12 +1220,12 @@ Compilata come versione: %1.</translation> <message> <location filename="../../../OptionDialog.ui" line="70"/> <source>Plugins</source> - <translation>Plug-in</translation> + <translation>Plug-ins</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="75"/> <location filename="../../../OptionDialog.ui" line="366"/> - <location filename="../../../OptionDialog.cpp" line="290"/> + <location filename="../../../OptionDialog.cpp" line="297"/> <source>Copy engine</source> <translation>Motore di copia</translation> </message> @@ -1225,12 +1238,12 @@ Compilata come versione: %1.</translation> <message> <location filename="../../../OptionDialog.ui" line="106"/> <source>Log</source> - <translation>Log</translation> + <translation>Registro</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="251"/> <source>Check for updates</source> - <translation>Controlla aggiornamenti automaticamente</translation> + <translation>Controlla aggiornamenti</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="289"/> @@ -1255,58 +1268,58 @@ Compilata come versione: %1.</translation> <message> <location filename="../../../OptionDialog.ui" line="80"/> <location filename="../../../OptionDialog.ui" line="379"/> - <location filename="../../../OptionDialog.cpp" line="291"/> + <location filename="../../../OptionDialog.cpp" line="298"/> <source>Listener</source> <translation>Rilevatore</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="85"/> <location filename="../../../OptionDialog.ui" line="384"/> - <location filename="../../../OptionDialog.cpp" line="292"/> + <location filename="../../../OptionDialog.cpp" line="299"/> <source>Plugin loader</source> - <translation>Caricatore dei plug-in</translation> + <translation>Caricatore di plug-ins</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="93"/> <location filename="../../../OptionDialog.ui" line="389"/> - <location filename="../../../OptionDialog.cpp" line="293"/> + <location filename="../../../OptionDialog.cpp" line="300"/> <source>Session loader</source> - <translation>Caricatore di sessione</translation> + <translation>Caricatore di sessioni</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="126"/> <source>Force the language</source> - <translation>Forzare lingua</translation> + <translation>Forza lingua</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="136"/> <source>Replace the default copy and move system</source> - <translation>Rimpiazzare sistema di copia e spostamento predefinito</translation> + <translation>Rimpiazza il sistema di copia e spostamento predefinito</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="150"/> <source>Load at the session loading</source> - <translation>Caricare il programma all'avvio di sistema</translation> + <translation>Carica al caricamento della sessione</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="164"/> <source>When manual open</source> - <translation>Con avvio manuale</translation> + <translation>Quando l'avvio è manuale</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="190"/> <source>Group the windows when</source> - <translation>Raggruppare finestre quando</translation> + <translation>Raggruppa finestre quando</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="231"/> <source>Confirm to group the windows</source> - <translation>Conferma raggruppamento finestre</translation> + <translation>Conferma per raggruppare le finestre</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="241"/> <source>Display the OS warning</source> - <translation>Mostrare avviso del Sistema Operativo</translation> + <translation>Visualizza avviso del Sistema Operativo</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="261"/> @@ -1326,7 +1339,7 @@ Compilata come versione: %1.</translation> <message> <location filename="../../../OptionDialog.ui" line="304"/> <source>default: finish.opus</source> - <translation>Predefinito: finish.opus</translation> + <translation>predefinito: finish.opus</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="311"/> @@ -1341,7 +1354,7 @@ Compilata come versione: %1.</translation> <message> <location filename="../../../OptionDialog.ui" line="402"/> <source>Plugin</source> - <translation>Plug-in</translation> + <translation>Plug-ins</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="421"/> @@ -1351,7 +1364,7 @@ Compilata come versione: %1.</translation> <message> <location filename="../../../OptionDialog.ui" line="434"/> <source>Remove</source> - <translation>Elimina</translation> + <translation>Rimuovi</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="444"/> @@ -1361,12 +1374,12 @@ Compilata come versione: %1.</translation> <message> <location filename="../../../OptionDialog.ui" line="471"/> <source>Copy engine by order of preference:</source> - <translation>Motore di copia in ordine di preferenza:</translation> + <translation>Motori di copia in ordine di preferenza:</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="542"/> <source>Client connected</source> - <translation>Client connessi</translation> + <translation>Client connesso</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="598"/> @@ -1391,12 +1404,12 @@ Compilata come versione: %1.</translation> <message> <location filename="../../../OptionDialog.ui" line="785"/> <source>Write the transfers</source> - <translation>Scrivere i trasferimenti</translation> + <translation>Scrivi i trasferimenti</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="845"/> <source>Write the folder operations</source> - <translation>Scrivere le operazioni di cartella</translation> + <translation>Scrivi le operazioni cartella</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="792"/> @@ -1408,7 +1421,7 @@ Compilata come versione: %1.</translation> <message> <location filename="../../../OptionDialog.ui" line="815"/> <source>Write the errors</source> - <translation>Scrivere gli errori</translation> + <translation>Scrivi gli errori</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="822"/> @@ -1420,90 +1433,90 @@ Compilata come versione: %1.</translation> <message> <location filename="../../../OptionDialog.ui" line="741"/> <source>Write the log file into:</source> - <translation>Scrivere il file di log in:</translation> + <translation>Scrivi il file di registro in:</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="772"/> <source>Write directly to the file when it receive a new entry (can produce 50% of lost of performance)</source> - <translation>Scrivere direttamente nel file quando si riceve una nuova voce (può causare il 50% di perdita di prestazioni)</translation> + <translation>Scrivere direttamente nel file quando riceve una nuova voce (può causare il 50% di perdita di prestazioni)</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="197"/> - <location filename="../../../OptionDialog.cpp" line="211"/> + <location filename="../../../OptionDialog.cpp" line="204"/> + <location filename="../../../OptionDialog.cpp" line="218"/> <source>Load</source> <translation>Carica</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="197"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load the theme?</source> <translation>Caricare il tema?</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="211"/> + <location filename="../../../OptionDialog.cpp" line="218"/> <source>Load the language?</source> - <translation>Caricare questa lingua?</translation> + <translation>Caricare la lingua?</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="298"/> + <location filename="../../../OptionDialog.cpp" line="305"/> <source>Do nothing</source> <translation>Non fare nulla</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="299"/> + <location filename="../../../OptionDialog.cpp" line="306"/> <source>Ask source as folder</source> - <translation>Chiedi cartella come origine</translation> + <translation>Chiedi origine come cartella</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="300"/> + <location filename="../../../OptionDialog.cpp" line="307"/> <source>Ask sources as files</source> - <translation>Chiedi file come origine</translation> + <translation>Chiedi origini come file</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="301"/> + <location filename="../../../OptionDialog.cpp" line="308"/> <source>Never</source> <translation>Mai</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="302"/> + <location filename="../../../OptionDialog.cpp" line="309"/> <source>When source is same</source> <translation>Quando l'origine è identica</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="303"/> + <location filename="../../../OptionDialog.cpp" line="310"/> <source>When destination is same</source> <translation>Quando la destinazione è identica</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="304"/> + <location filename="../../../OptionDialog.cpp" line="311"/> <source>When source and destination are same</source> - <translation>Quando sia lorigine che la destinazione sono identiche</translation> + <translation>Quando origine e destinazione sono identiche</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="305"/> + <location filename="../../../OptionDialog.cpp" line="312"/> <source>When source or destination are same</source> - <translation>Quando l'origine o la destinazione sono identiche</translation> + <translation>Quando origine o destinazione sono identiche</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="306"/> + <location filename="../../../OptionDialog.cpp" line="313"/> <source>Always</source> <translation>Sempre</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="320"/> - <location filename="../../../OptionDialog.cpp" line="321"/> - <location filename="../../../OptionDialog.cpp" line="322"/> + <location filename="../../../OptionDialog.cpp" line="327"/> + <location filename="../../../OptionDialog.cpp" line="328"/> + <location filename="../../../OptionDialog.cpp" line="329"/> <source>The variables are %1</source> <translation>Le variabili sono: %1</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="962"/> + <location filename="../../../OptionDialog.cpp" line="969"/> <source>Save logs as: </source> - <translation>Salva i log come: </translation> + <translation>Salva i registri come: </translation> </message> <message> <location filename="../../../OptionDialog.ui" line="775"/> <source>Synchronized log</source> - <translation>Log sincronizzato</translation> + <translation>Registro sincronizzato</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="855"/> @@ -1547,7 +1560,7 @@ Compilata come versione: %1.</translation> <message> <location filename="../../../PluginInformation.ui" line="14"/> <source>About this plugin</source> - <translation>Informazioni su questo plug-in</translation> + <translation>Riguardo a questo plug-in</translation> </message> <message> <location filename="../../../PluginInformation.ui" line="23"/> @@ -1597,12 +1610,12 @@ Compilata come versione: %1.</translation> <message> <location filename="../../../PluginInformation.cpp" line="45"/> <source>Plugin loader</source> - <translation>Caricatore di plug-in</translation> + <translation>Caricatore di plug-ins</translation> </message> <message> <location filename="../../../PluginInformation.cpp" line="47"/> <source>Session loader</source> - <translation>Caricatore di sessione</translation> + <translation>Caricatore di sessioni</translation> </message> <message> <location filename="../../../PluginInformation.cpp" line="49"/> @@ -1640,17 +1653,17 @@ Compilata come versione: %1.</translation> <message> <location filename="../../../PluginsManager.cpp" line="489"/> <source>Dependencies part is wrong</source> - <translation>Alcune dipendenze non sono idonee</translation> + <translation>Sezione dipendenze sbagliata</translation> </message> <message> <location filename="../../../PluginsManager.cpp" line="510"/> <source>Dependencies %1 are not satisfied, for plugin: %2</source> - <translation>Le dipendenze %1 per il plug-in %2 non sono soddisfatte</translation> + <translation>Le dipendenze "%1" per il plug-in "%2" non sono soddisfatte</translation> </message> <message> <location filename="../../../PluginsManager.cpp" line="673"/> <source>Remove %1</source> - <translation>Eliminare %1</translation> + <translation>Elimina "%1"</translation> </message> <message> <location filename="../../../PluginsManager.cpp" line="684"/> @@ -1691,17 +1704,17 @@ Compilata come versione: %1.</translation> <message> <location filename="../../../PluginsManager.cpp" line="400"/> <source>English text missing in the informations.xml for the tag: %1</source> - <translation>Testo inglese mancante in informations.xml per il tag %1</translation> + <translation>Testo inglese mancante in informations.xml per il tag "%1"</translation> </message> <message> <location filename="../../../PluginsManager.cpp" line="408"/> <source>Tag not found: %1</source> - <translation>Tag non trovato: %1</translation> + <translation>Tag "%1" non trovato</translation> </message> <message> <location filename="../../../PluginsManager.cpp" line="673"/> <source>Are you sure about removing "%1" in version %2?</source> - <translation>Si desidera eliminare "%1" nella versione %2?</translation> + <translation>Sicuri di voler eliminare "%1" nella versione %2?</translation> </message> <message> <location filename="../../../PluginsManager.cpp" line="708"/> @@ -1716,7 +1729,7 @@ Compilata come versione: %1.</translation> <message> <location filename="../../../PluginsManager.cpp" line="711"/> <source>Ultracopier plugin (*.urc)</source> - <translation>Plug-in di Ultracopier (*.urc)</translation> + <translation>Plug-in Ultracopier (*.urc)</translation> </message> <message> <location filename="../../../PluginsManager.cpp" line="728"/> @@ -1730,7 +1743,7 @@ Compilata come versione: %1.</translation> <location filename="../../../PluginsManager.cpp" line="877"/> <location filename="../../../PluginsManager.cpp" line="884"/> <source>Plugin loader</source> - <translation>Caricatore di plug-in</translation> + <translation>Caricatore di plug-ins</translation> </message> <message> <location filename="../../../PluginsManager.cpp" line="728"/> @@ -1742,33 +1755,34 @@ Compilata come versione: %1.</translation> <location filename="../../../PluginsManager.cpp" line="871"/> <location filename="../../../PluginsManager.cpp" line="884"/> <source>Unable to load the plugin content, please check it: %1</source> - <translation>Impossibile caricare il contenuto del plug-in, si prega di controllare: "%1"</translation> + <translation>Impossibile caricare il contenuto del plug-in, si prega di controllarlo: %1</translation> </message> <message> <location filename="../../../PluginsManager.cpp" line="821"/> <source>Unable to create a folder to install the plugin: %1</source> - <translation>Impossibile creare una cartella per installare il plug-in %1</translation> + <translation>Impossibile creare una cartella per installare il plug-in "%1"</translation> </message> <message> <location filename="../../../PluginsManager.cpp" line="834"/> <source>Unable to create a file to install the plugin: %1 Error:%2</source> - <translation type="unfinished"></translation> + <translation>Impossibile creare un file per installare il plug-in "%1" +Errore: %2</translation> </message> <message> <location filename="../../../PluginsManager.cpp" line="853"/> <source>Folder with same name is present, skip the plugin installation: %1</source> - <translation>Presente cartella con identico nome, non sarà installato il plug-in "%1"</translation> + <translation>Cartella con nome identico già presente, salta l'installazione del plug-in "%1"</translation> </message> <message> <location filename="../../../PluginsManager.cpp" line="859"/> <location filename="../../../PluginsManager.cpp" line="865"/> <location filename="../../../PluginsManager.cpp" line="877"/> <source>Unable to load the plugin content, please check it</source> - <translation>Impossibile caricare il contenuto del plug-in, si prega di controllare</translation> + <translation>Impossibile caricare il contenuto del plug-in, si prega di controllarlo</translation> </message> </context> <context> @@ -1777,17 +1791,17 @@ Error:%2</source> <location filename="../../../ProductKey.ui" line="14"/> <location filename="../../../ProductKey.ui" line="24"/> <source>Product key</source> - <translation>Chiave prodotto</translation> + <translation>Chiave del prodotto</translation> </message> <message> - <location filename="../../../ProductKey.cpp" line="56"/> + <location filename="../../../ProductKey.cpp" line="60"/> <source>Error</source> <translation>Errore</translation> </message> <message> - <location filename="../../../ProductKey.cpp" line="56"/> + <location filename="../../../ProductKey.cpp" line="60"/> <source>Your product key was rejected.<br />If you buy key, unmark check your spam and unmark the mail as spam<br />If you have not buy your key, go to <a href="https://shop.first-world.info/">https://shop.first-world.info/</a></source> - <translation>La vostra chiave prodotto è stata rigettata.<br />Se avete comprato la chiave controllare la cartella spam della vostra casella email.<br />Se non avete comprato la chiave, andare su <a href="https://shop.first-world.info/">https://shop.first-world.info/</a></translation> + <translation>La vostra chiave del prodotto è stata rigettata.<br />Se avete comprato la chiave controllare la cartella spam della vostra casella e-mail.<br />Se non avete comprato la chiave, andate su <a href="https://shop.first-world.info/">https://shop.first-world.info/</a></translation> </message> </context> <context> @@ -1796,7 +1810,7 @@ Error:%2</source> <location filename="../../../lib/qt-tar-xz/QXzDecode.cpp" line="38"/> <location filename="../../../lib/qt-tar-xz/QXzDecode.cpp" line="93"/> <source>Memory allocation failed</source> - <translation>Allocazione di memoria fallita</translation> + <translation>Allocazione memoria fallita</translation> </message> <message> <location filename="../../../lib/qt-tar-xz/QXzDecode.cpp" line="64"/> @@ -1807,7 +1821,7 @@ Error:%2</source> <message> <location filename="../../../lib/qt-tar-xz/QXzDecode.cpp" line="97"/> <source>Memory usage limit reached</source> - <translation>Limite di memoria raggiunto</translation> + <translation>Limite utilizzo memoria raggiunto</translation> </message> <message> <location filename="../../../lib/qt-tar-xz/QXzDecode.cpp" line="101"/> @@ -1817,12 +1831,12 @@ Error:%2</source> <message> <location filename="../../../lib/qt-tar-xz/QXzDecode.cpp" line="105"/> <source>Unsupported options in the .xz headers</source> - <translation>Opzioni non supportate nelle intestazioni del file .xz</translation> + <translation>Opzioni non supportate nelle intestazioni di file .xz</translation> </message> <message> <location filename="../../../lib/qt-tar-xz/QXzDecode.cpp" line="110"/> <source>The file is corrupted</source> - <translation>Il file è corrotto</translation> + <translation>File corrotto</translation> </message> <message> <location filename="../../../lib/qt-tar-xz/QXzDecode.cpp" line="114"/> @@ -1832,7 +1846,7 @@ Error:%2</source> <message> <location filename="../../../lib/qt-tar-xz/QXzDecode.cpp" line="124"/> <source>The input data is too short</source> - <translation>I dati inseriti sono troppo corti</translation> + <translation>Dati inseriti troppo corti</translation> </message> </context> <context> @@ -1843,12 +1857,12 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="541"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="595"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -1904,32 +1918,38 @@ Error:%2</source> <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="452"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="331"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="463"/> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="576"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="474"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="587"/> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="598"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="673"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="677"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="691"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -1939,7 +1959,7 @@ Error:%2</source> <message> <location filename="../../../SystrayIcon.cpp" line="169"/> <source>No copy listener found. Do the copy manually by right click one the system tray icon.</source> - <translation>Nessun rilevatore di copia trovato. Fare una copia manualmente cliccando col tasto destro del mouse sull'icona nell'area di notifica</translation> + <translation>Nessun rilevatore di copia trovato. Effettuare copia manualmente cliccando col tasto destro sull'icona nell'area di notifica.</translation> </message> <message> <location filename="../../../SystrayIcon.cpp" line="175"/> @@ -1949,22 +1969,22 @@ Error:%2</source> <message> <location filename="../../../SystrayIcon.cpp" line="194"/> <source>Searching information...</source> - <translation>Cercando informazioni...</translation> + <translation>Ricerca informazioni...</translation> </message> <message> <location filename="../../../SystrayIcon.cpp" line="207"/> <source>Do not replace the explorer copy/move</source> - <translation>Non rimpiazzare il sistema di copia/spostamento di Windows Explorer</translation> + <translation>Non rimpiazzare il sistema di copia/spostamento di Explorer</translation> </message> <message> <location filename="../../../SystrayIcon.cpp" line="212"/> <source>Semi replace the explorer copy/move</source> - <translation>Rimpiazza parzialmente il sistema di copia/spostamento di Windows Explorer</translation> + <translation>Rimpiazzare parzialmente il sistema di copia/spostamento di Explorer</translation> </message> <message> <location filename="../../../SystrayIcon.cpp" line="217"/> <source>Replace the explorer copy/move</source> - <translation>Rimpiazza il sistema di copia/spostamento di Windows Explorer</translation> + <translation>Rimpiazzare il sistema di copia/spostamento di Explorer</translation> </message> <message> <location filename="../../../SystrayIcon.cpp" line="396"/> @@ -1974,37 +1994,37 @@ Error:%2</source> <message> <location filename="../../../SystrayIcon.cpp" line="396"/> <source>The action on the systray icon is unknown!</source> - <translation>Azione su icona dell'area di notifica sconosciuta!</translation> + <translation>Azione sull'icona dell'area di notifica sconosciuta!</translation> </message> <message> <location filename="../../../SystrayIcon.cpp" line="444"/> <source>&About/Debug report</source> - <translation>Rapporto di debug/informazioni</translation> + <translation>Rapporto di debug/&Informazioni</translation> </message> <message> <location filename="../../../SystrayIcon.cpp" line="446"/> <source>&About</source> - <translation>Al riguardo</translation> + <translation>&Al riguardo</translation> </message> <message> <location filename="../../../SystrayIcon.cpp" line="449"/> <source>&Save bug report</source> - <translation>Salva rapporto bug</translation> + <translation>&Salva rapporto bug</translation> </message> <message> <location filename="../../../SystrayIcon.cpp" line="451"/> <source>&Quit</source> - <translation>Uscire</translation> + <translation>&Esci</translation> </message> <message> <location filename="../../../SystrayIcon.cpp" line="452"/> <source>&Options</source> - <translation>Opzioni</translation> + <translation>&Opzioni</translation> </message> <message> <location filename="../../../SystrayIcon.cpp" line="453"/> <source>&Register product key</source> - <translation type="unfinished"></translation> + <translation>&Registra chiave del prodotto</translation> </message> <message> <location filename="../../../SystrayIcon.cpp" line="491"/> @@ -2019,82 +2039,82 @@ Error:%2</source> <message> <location filename="../../../SystrayIcon.cpp" line="518"/> <source>A&dd copy/moving</source> - <translation>Aggiungi copia/spostamento</translation> + <translation>A&ggiungi copia/spostamento</translation> </message> <message> <location filename="../../../SystrayIcon.cpp" line="544"/> <source>Add &copy</source> - <translation>Aggiungi copia</translation> + <translation>Aggiungi &copia</translation> </message> <message> <location filename="../../../SystrayIcon.cpp" line="545"/> <source>Add &transfer</source> - <translation>Aggiungi trasferimento</translation> + <translation>Aggiungi &trasferimento</translation> </message> <message> <location filename="../../../SystrayIcon.cpp" line="546"/> <source>Add &move</source> - <translation>Aggiungi spostamento</translation> + <translation>Aggiungi &spostamento</translation> </message> </context> <context> <name>Themes</name> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="328"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="328"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="427"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="661"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="663"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1091"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1092"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1093"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1095"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1289"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1301"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1313"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1395"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1407"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1388"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1392"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1394"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1494"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1498"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -2102,24 +2122,24 @@ Error:%2</source> <context> <name>ThemesFactory</name> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="284"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="285"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="286"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="482"/> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="497"/> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="512"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="510"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="525"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -2127,29 +2147,29 @@ Error:%2</source> <context> <name>TransferThread</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="179"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="613"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="620"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="648"/> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="663"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="925"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -2157,19 +2177,19 @@ Error:%2</source> <context> <name>TransferThreadAsync</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -2177,24 +2197,24 @@ Error:%2</source> <context> <name>WriteThread</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="135"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="164"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="197"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="167"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="175"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="199"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="178"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="456"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -2204,7 +2224,7 @@ Error:%2</source> <message> <location filename="../../CopyEngine/Ultracopier-Spec/copyEngineOptions.ui" line="44"/> <source>Transfer</source> - <translation type="unfinished">Trasferisci</translation> + <translation type="unfinished">Trasferimento</translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/copyEngineOptions.ui" line="63"/> @@ -2509,8 +2529,8 @@ Error:%2</source> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation type="unfinished">Sovrascrivere se più recente</translation> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="346"/> @@ -2520,8 +2540,12 @@ Error:%2</source> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> + <source>Overwrite if destination older</source> <translation type="unfinished"></translation> </message> <message> @@ -2909,8 +2933,8 @@ Error:%2</source> </message> <message> <location filename="../../Themes/Oxygen/themesOptions.ui" line="213"/> - <source>Informations</source> - <translation type="unfinished"></translation> + <source>Information</source> + <translation type="unfinished">Informazioni</translation> </message> <message> <location filename="../../Themes/Oxygen/themesOptions.ui" line="219"/> @@ -2923,28 +2947,38 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="257"/> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="269"/> + <source>Click to edit the color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="267"/> - <source>Show dual progression</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="378"/> + <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="277"/> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="287"/> - <source>Progression color</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="395"/> + <source>General margin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="306"/> - <source>Click to edit the color</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="402"/> + <source>Show dual progression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="425"/> + <source>General spacing</source> <translation type="unfinished"></translation> </message> </context> diff --git a/plugins/Languages/ja/informations.xml b/plugins/Languages/ja/informations.xml index 81a05ca..e54f81c 100755 --- a/plugins/Languages/ja/informations.xml +++ b/plugins/Languages/ja/informations.xml @@ -12,7 +12,7 @@ <!-- Detailed description --> <description xml:lang="en"><![CDATA[Translation of Ultracopier to japanese. For more details see the web site.]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>2.2.4.7</version> + <version>2.2.6.0</version> <!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. --> <name>jp</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/ja/translation.ts b/plugins/Languages/ja/translation.ts index 0ace0f4..b0a80ab 100755 --- a/plugins/Languages/ja/translation.ts +++ b/plugins/Languages/ja/translation.ts @@ -93,91 +93,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -185,75 +190,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -670,12 +676,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="87"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="90"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -683,22 +689,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="191"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="198"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -706,22 +712,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="140"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="147"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -868,27 +874,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="84"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="164"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="173"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -1096,13 +1102,15 @@ This version is compiled as version: %1.</source> <name>MkPath</name> <message> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="124"/> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="394"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="187"/> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="210"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -1112,22 +1120,27 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="255"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="278"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="309"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> @@ -1206,7 +1219,7 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="75"/> <location filename="../../../OptionDialog.ui" line="366"/> - <location filename="../../../OptionDialog.cpp" line="290"/> + <location filename="../../../OptionDialog.cpp" line="297"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> @@ -1260,21 +1273,21 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="80"/> <location filename="../../../OptionDialog.ui" line="379"/> - <location filename="../../../OptionDialog.cpp" line="291"/> + <location filename="../../../OptionDialog.cpp" line="298"/> <source>Listener</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="85"/> <location filename="../../../OptionDialog.ui" line="384"/> - <location filename="../../../OptionDialog.cpp" line="292"/> + <location filename="../../../OptionDialog.cpp" line="299"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="93"/> <location filename="../../../OptionDialog.ui" line="389"/> - <location filename="../../../OptionDialog.cpp" line="293"/> + <location filename="../../../OptionDialog.cpp" line="300"/> <source>Session loader</source> <translation type="unfinished"></translation> </message> @@ -1426,75 +1439,75 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="197"/> - <location filename="../../../OptionDialog.cpp" line="211"/> + <location filename="../../../OptionDialog.cpp" line="204"/> + <location filename="../../../OptionDialog.cpp" line="218"/> <source>Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="197"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load the theme?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="211"/> + <location filename="../../../OptionDialog.cpp" line="218"/> <source>Load the language?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="298"/> + <location filename="../../../OptionDialog.cpp" line="305"/> <source>Do nothing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="299"/> + <location filename="../../../OptionDialog.cpp" line="306"/> <source>Ask source as folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="300"/> + <location filename="../../../OptionDialog.cpp" line="307"/> <source>Ask sources as files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="301"/> + <location filename="../../../OptionDialog.cpp" line="308"/> <source>Never</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="302"/> + <location filename="../../../OptionDialog.cpp" line="309"/> <source>When source is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="303"/> + <location filename="../../../OptionDialog.cpp" line="310"/> <source>When destination is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="304"/> + <location filename="../../../OptionDialog.cpp" line="311"/> <source>When source and destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="305"/> + <location filename="../../../OptionDialog.cpp" line="312"/> <source>When source or destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="306"/> + <location filename="../../../OptionDialog.cpp" line="313"/> <source>Always</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="320"/> - <location filename="../../../OptionDialog.cpp" line="321"/> - <location filename="../../../OptionDialog.cpp" line="322"/> + <location filename="../../../OptionDialog.cpp" line="327"/> + <location filename="../../../OptionDialog.cpp" line="328"/> + <location filename="../../../OptionDialog.cpp" line="329"/> <source>The variables are %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="962"/> + <location filename="../../../OptionDialog.cpp" line="969"/> <source>Save logs as: </source> <translation type="unfinished"></translation> </message> @@ -1771,12 +1784,12 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../ProductKey.cpp" line="56"/> + <location filename="../../../ProductKey.cpp" line="60"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../ProductKey.cpp" line="56"/> + <location filename="../../../ProductKey.cpp" line="60"/> <source>Your product key was rejected.<br />If you buy key, unmark check your spam and unmark the mail as spam<br />If you have not buy your key, go to <a href="https://shop.first-world.info/">https://shop.first-world.info/</a></source> <translation type="unfinished"></translation> </message> @@ -1834,12 +1847,12 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="541"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="595"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -1895,32 +1908,38 @@ Error:%2</source> <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="452"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="331"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="463"/> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="576"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="474"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="587"/> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="598"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="673"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="677"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="691"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -2031,61 +2050,61 @@ Error:%2</source> <context> <name>Themes</name> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="328"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="328"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="427"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="661"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="663"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1091"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1092"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1093"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1095"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1289"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1301"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1313"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1395"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1407"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1388"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1392"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1394"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1494"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1498"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -2093,24 +2112,24 @@ Error:%2</source> <context> <name>ThemesFactory</name> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="284"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="285"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="286"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="482"/> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="497"/> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="512"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="510"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="525"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -2118,29 +2137,29 @@ Error:%2</source> <context> <name>TransferThread</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="179"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="613"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="620"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="648"/> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="663"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="925"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -2148,19 +2167,19 @@ Error:%2</source> <context> <name>TransferThreadAsync</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -2168,24 +2187,24 @@ Error:%2</source> <context> <name>WriteThread</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="135"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="164"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="197"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="167"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="175"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="199"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="178"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="456"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -2500,7 +2519,7 @@ Error:%2</source> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> + <source>Overwrite if source newer than destination</source> <translation type="unfinished"></translation> </message> <message> @@ -2511,8 +2530,12 @@ Error:%2</source> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> + <source>Overwrite if destination older</source> <translation type="unfinished"></translation> </message> <message> @@ -2900,7 +2923,7 @@ Error:%2</source> </message> <message> <location filename="../../Themes/Oxygen/themesOptions.ui" line="213"/> - <source>Informations</source> + <source>Information</source> <translation type="unfinished"></translation> </message> <message> @@ -2914,28 +2937,38 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="257"/> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="269"/> + <source>Click to edit the color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="267"/> - <source>Show dual progression</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="378"/> + <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="277"/> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="287"/> - <source>Progression color</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="395"/> + <source>General margin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="306"/> - <source>Click to edit the color</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="402"/> + <source>Show dual progression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="425"/> + <source>General spacing</source> <translation type="unfinished"></translation> </message> </context> diff --git a/plugins/Languages/ko/informations.xml b/plugins/Languages/ko/informations.xml index a8ce2da..e7663ed 100644 --- a/plugins/Languages/ko/informations.xml +++ b/plugins/Languages/ko/informations.xml @@ -13,7 +13,7 @@ <description xml:lang="en"><![CDATA[File to define all English language related, Ultracopier is written in English, then not translation file needed]]></description> <description xml:lang="ko"><![CDATA[Ultracopier의 한국어 번역입니다. 더 나은 번역이나 오타, 오역에 대한 제보는 이메일로 연락해주시면 감사하겠습니다.]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>2.2.4.7</version> + <version>2.2.6.0</version> <!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. --> <name>ko</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/ko/translation.qm b/plugins/Languages/ko/translation.qm Binary files differindex 723cbb4..a24afdb 100755 --- a/plugins/Languages/ko/translation.qm +++ b/plugins/Languages/ko/translation.qm diff --git a/plugins/Languages/ko/translation.ts b/plugins/Languages/ko/translation.ts index 0339f1b..4279893 100644 --- a/plugins/Languages/ko/translation.ts +++ b/plugins/Languages/ko/translation.ts @@ -93,91 +93,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished">대상</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished">확인</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished">건너뛰기</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished">이름 바꾸기</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished">덮어쓰기</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished">더 최신이면 덮어쓰기</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -185,75 +190,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished">확인</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished">건너뛰기</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished">이름 바꾸기</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished">덮어쓰기</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished">더 최신이면 덮어쓰기</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -671,12 +677,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="87"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="90"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -684,22 +690,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="191"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="198"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished">오류</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -707,22 +713,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="140"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="147"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished">오류</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -869,27 +875,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="84"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="164"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="173"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished">오류</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -1098,13 +1104,15 @@ This version is compiled as version: %1.</source> <name>MkPath</name> <message> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="124"/> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="394"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="187"/> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="210"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -1114,22 +1122,27 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="255"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="278"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="309"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> @@ -1208,7 +1221,7 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="75"/> <location filename="../../../OptionDialog.ui" line="366"/> - <location filename="../../../OptionDialog.cpp" line="290"/> + <location filename="../../../OptionDialog.cpp" line="297"/> <source>Copy engine</source> <translation>복사 엔진</translation> </message> @@ -1272,21 +1285,21 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="80"/> <location filename="../../../OptionDialog.ui" line="379"/> - <location filename="../../../OptionDialog.cpp" line="291"/> + <location filename="../../../OptionDialog.cpp" line="298"/> <source>Listener</source> <translation>리스너</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="85"/> <location filename="../../../OptionDialog.ui" line="384"/> - <location filename="../../../OptionDialog.cpp" line="292"/> + <location filename="../../../OptionDialog.cpp" line="299"/> <source>Plugin loader</source> <translation>플러그인 로더</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="93"/> <location filename="../../../OptionDialog.ui" line="389"/> - <location filename="../../../OptionDialog.cpp" line="293"/> + <location filename="../../../OptionDialog.cpp" line="300"/> <source>Session loader</source> <translation>섹션 로더</translation> </message> @@ -1428,75 +1441,75 @@ This version is compiled as version: %1.</source> <translation type="unfinished">로그 파일 만들기:</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="197"/> - <location filename="../../../OptionDialog.cpp" line="211"/> + <location filename="../../../OptionDialog.cpp" line="204"/> + <location filename="../../../OptionDialog.cpp" line="218"/> <source>Load</source> <translation type="unfinished">불러오기</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="197"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load the theme?</source> <translation type="unfinished">테마를 불러오시겠습니까?</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="211"/> + <location filename="../../../OptionDialog.cpp" line="218"/> <source>Load the language?</source> <translation type="unfinished">언어를 불러오시겠습니까?</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="298"/> + <location filename="../../../OptionDialog.cpp" line="305"/> <source>Do nothing</source> <translation type="unfinished">동작 없음</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="299"/> + <location filename="../../../OptionDialog.cpp" line="306"/> <source>Ask source as folder</source> <translation type="unfinished">폴더 위치 확인</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="300"/> + <location filename="../../../OptionDialog.cpp" line="307"/> <source>Ask sources as files</source> <translation type="unfinished">파일 위치 확인</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="301"/> + <location filename="../../../OptionDialog.cpp" line="308"/> <source>Never</source> <translation type="unfinished">안 함</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="302"/> + <location filename="../../../OptionDialog.cpp" line="309"/> <source>When source is same</source> <translation type="unfinished">원본이 같을 때</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="303"/> + <location filename="../../../OptionDialog.cpp" line="310"/> <source>When destination is same</source> <translation type="unfinished">대상이 같을 때</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="304"/> + <location filename="../../../OptionDialog.cpp" line="311"/> <source>When source and destination are same</source> <translation type="unfinished">원본 및 대상이 같을 때</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="305"/> + <location filename="../../../OptionDialog.cpp" line="312"/> <source>When source or destination are same</source> <translation type="unfinished">원본 또는 대상이 같을 때</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="306"/> + <location filename="../../../OptionDialog.cpp" line="313"/> <source>Always</source> <translation type="unfinished">항상</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="320"/> - <location filename="../../../OptionDialog.cpp" line="321"/> - <location filename="../../../OptionDialog.cpp" line="322"/> + <location filename="../../../OptionDialog.cpp" line="327"/> + <location filename="../../../OptionDialog.cpp" line="328"/> + <location filename="../../../OptionDialog.cpp" line="329"/> <source>The variables are %1</source> <translation>변수는 %1입니다.</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="962"/> + <location filename="../../../OptionDialog.cpp" line="969"/> <source>Save logs as: </source> <translation>로그 따로 저장:</translation> </message> @@ -1776,12 +1789,12 @@ Error:%2</source> <translation type="unfinished">제품 키</translation> </message> <message> - <location filename="../../../ProductKey.cpp" line="56"/> + <location filename="../../../ProductKey.cpp" line="60"/> <source>Error</source> <translation type="unfinished">오류</translation> </message> <message> - <location filename="../../../ProductKey.cpp" line="56"/> + <location filename="../../../ProductKey.cpp" line="60"/> <source>Your product key was rejected.<br />If you buy key, unmark check your spam and unmark the mail as spam<br />If you have not buy your key, go to <a href="https://shop.first-world.info/">https://shop.first-world.info/</a></source> <translation>제품 키가 거부되었습니다.<br />키를 구매한 경우, 메일함에서 스팸 폴더를 확인하고 스팸 표시 마크를 해제해 주세요.<br />키를 구입하지 않은 경우, <a href="https://shop.first-world.info/">https://shop.first-world.info/</a>로 이동하세요. </translation> </message> @@ -1839,12 +1852,12 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="541"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="595"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -1900,32 +1913,38 @@ Error:%2</source> <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="452"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="331"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="463"/> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="576"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="474"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="587"/> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="598"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="673"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="677"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="691"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -2036,61 +2055,61 @@ Error:%2</source> <context> <name>Themes</name> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="328"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="328"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="427"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="661"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="663"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1091"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1092"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1093"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1095"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1289"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1301"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1313"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1395"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1407"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1388"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1392"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1394"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1494"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1498"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -2098,24 +2117,24 @@ Error:%2</source> <context> <name>ThemesFactory</name> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="284"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="285"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="286"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="482"/> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="497"/> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="512"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="510"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="525"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -2123,29 +2142,29 @@ Error:%2</source> <context> <name>TransferThread</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="179"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="613"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="620"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="648"/> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="663"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="925"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -2153,19 +2172,19 @@ Error:%2</source> <context> <name>TransferThreadAsync</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -2173,24 +2192,24 @@ Error:%2</source> <context> <name>WriteThread</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="135"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="164"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="197"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="167"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="175"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="199"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="178"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="456"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -2505,8 +2524,8 @@ Error:%2</source> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation type="unfinished">더 최신이면 덮어쓰기</translation> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="346"/> @@ -2516,8 +2535,12 @@ Error:%2</source> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> + <source>Overwrite if destination older</source> <translation type="unfinished"></translation> </message> <message> @@ -2905,8 +2928,8 @@ Error:%2</source> </message> <message> <location filename="../../Themes/Oxygen/themesOptions.ui" line="213"/> - <source>Informations</source> - <translation type="unfinished"></translation> + <source>Information</source> + <translation type="unfinished">정보</translation> </message> <message> <location filename="../../Themes/Oxygen/themesOptions.ui" line="219"/> @@ -2919,28 +2942,38 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="257"/> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="269"/> + <source>Click to edit the color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="267"/> - <source>Show dual progression</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="378"/> + <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="277"/> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="287"/> - <source>Progression color</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="395"/> + <source>General margin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="306"/> - <source>Click to edit the color</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="402"/> + <source>Show dual progression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="425"/> + <source>General spacing</source> <translation type="unfinished"></translation> </message> </context> diff --git a/plugins/Languages/nl/informations.xml b/plugins/Languages/nl/informations.xml index 8eb1d3b..be8260f 100755 --- a/plugins/Languages/nl/informations.xml +++ b/plugins/Languages/nl/informations.xml @@ -12,7 +12,7 @@ <!-- Detailed description --> <description xml:lang="en"><![CDATA[Translation of Ultracopier to dutch. For more details see the web site.]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>2.2.4.7</version> + <version>2.2.6.0</version> <!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. --> <name>nl</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/nl/translation.ts b/plugins/Languages/nl/translation.ts index 2066182..b1cbcc0 100755 --- a/plugins/Languages/nl/translation.ts +++ b/plugins/Languages/nl/translation.ts @@ -93,91 +93,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -185,75 +190,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -670,12 +676,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="87"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="90"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -683,22 +689,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="191"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="198"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -706,22 +712,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="140"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="147"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -868,27 +874,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="84"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="164"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="173"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -1096,13 +1102,15 @@ This version is compiled as version: %1.</source> <name>MkPath</name> <message> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="124"/> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="394"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="187"/> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="210"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -1112,22 +1120,27 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="255"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="278"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="309"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> @@ -1206,7 +1219,7 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="75"/> <location filename="../../../OptionDialog.ui" line="366"/> - <location filename="../../../OptionDialog.cpp" line="290"/> + <location filename="../../../OptionDialog.cpp" line="297"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> @@ -1254,21 +1267,21 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="80"/> <location filename="../../../OptionDialog.ui" line="379"/> - <location filename="../../../OptionDialog.cpp" line="291"/> + <location filename="../../../OptionDialog.cpp" line="298"/> <source>Listener</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="85"/> <location filename="../../../OptionDialog.ui" line="384"/> - <location filename="../../../OptionDialog.cpp" line="292"/> + <location filename="../../../OptionDialog.cpp" line="299"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="93"/> <location filename="../../../OptionDialog.ui" line="389"/> - <location filename="../../../OptionDialog.cpp" line="293"/> + <location filename="../../../OptionDialog.cpp" line="300"/> <source>Session loader</source> <translation type="unfinished"></translation> </message> @@ -1410,75 +1423,75 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="197"/> - <location filename="../../../OptionDialog.cpp" line="211"/> + <location filename="../../../OptionDialog.cpp" line="204"/> + <location filename="../../../OptionDialog.cpp" line="218"/> <source>Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="197"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load the theme?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="211"/> + <location filename="../../../OptionDialog.cpp" line="218"/> <source>Load the language?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="298"/> + <location filename="../../../OptionDialog.cpp" line="305"/> <source>Do nothing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="299"/> + <location filename="../../../OptionDialog.cpp" line="306"/> <source>Ask source as folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="300"/> + <location filename="../../../OptionDialog.cpp" line="307"/> <source>Ask sources as files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="301"/> + <location filename="../../../OptionDialog.cpp" line="308"/> <source>Never</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="302"/> + <location filename="../../../OptionDialog.cpp" line="309"/> <source>When source is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="303"/> + <location filename="../../../OptionDialog.cpp" line="310"/> <source>When destination is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="304"/> + <location filename="../../../OptionDialog.cpp" line="311"/> <source>When source and destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="305"/> + <location filename="../../../OptionDialog.cpp" line="312"/> <source>When source or destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="306"/> + <location filename="../../../OptionDialog.cpp" line="313"/> <source>Always</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="320"/> - <location filename="../../../OptionDialog.cpp" line="321"/> - <location filename="../../../OptionDialog.cpp" line="322"/> + <location filename="../../../OptionDialog.cpp" line="327"/> + <location filename="../../../OptionDialog.cpp" line="328"/> + <location filename="../../../OptionDialog.cpp" line="329"/> <source>The variables are %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="962"/> + <location filename="../../../OptionDialog.cpp" line="969"/> <source>Save logs as: </source> <translation type="unfinished"></translation> </message> @@ -1771,12 +1784,12 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../ProductKey.cpp" line="56"/> + <location filename="../../../ProductKey.cpp" line="60"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../ProductKey.cpp" line="56"/> + <location filename="../../../ProductKey.cpp" line="60"/> <source>Your product key was rejected.<br />If you buy key, unmark check your spam and unmark the mail as spam<br />If you have not buy your key, go to <a href="https://shop.first-world.info/">https://shop.first-world.info/</a></source> <translation type="unfinished"></translation> </message> @@ -1834,12 +1847,12 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="541"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="595"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -1895,32 +1908,38 @@ Error:%2</source> <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="452"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="331"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="463"/> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="576"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="474"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="587"/> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="598"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="673"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="677"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="691"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -2031,61 +2050,61 @@ Error:%2</source> <context> <name>Themes</name> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="328"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="328"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="427"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="661"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="663"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1091"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1092"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1093"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1095"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1289"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1301"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1313"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1395"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1407"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1388"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1392"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1394"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1494"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1498"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -2093,24 +2112,24 @@ Error:%2</source> <context> <name>ThemesFactory</name> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="284"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="285"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="286"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="482"/> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="497"/> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="512"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="510"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="525"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -2118,29 +2137,29 @@ Error:%2</source> <context> <name>TransferThread</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="179"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="613"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="620"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="648"/> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="663"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="925"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -2148,19 +2167,19 @@ Error:%2</source> <context> <name>TransferThreadAsync</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -2168,24 +2187,24 @@ Error:%2</source> <context> <name>WriteThread</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="135"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="164"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="197"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="167"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="175"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="199"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="178"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="456"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -2500,7 +2519,7 @@ Error:%2</source> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> + <source>Overwrite if source newer than destination</source> <translation type="unfinished"></translation> </message> <message> @@ -2511,8 +2530,12 @@ Error:%2</source> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> + <source>Overwrite if destination older</source> <translation type="unfinished"></translation> </message> <message> @@ -2900,7 +2923,7 @@ Error:%2</source> </message> <message> <location filename="../../Themes/Oxygen/themesOptions.ui" line="213"/> - <source>Informations</source> + <source>Information</source> <translation type="unfinished"></translation> </message> <message> @@ -2914,28 +2937,38 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="257"/> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="269"/> + <source>Click to edit the color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="267"/> - <source>Show dual progression</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="378"/> + <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="277"/> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="287"/> - <source>Progression color</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="395"/> + <source>General margin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="306"/> - <source>Click to edit the color</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="402"/> + <source>Show dual progression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="425"/> + <source>General spacing</source> <translation type="unfinished"></translation> </message> </context> diff --git a/plugins/Languages/no/informations.xml b/plugins/Languages/no/informations.xml index 451fa8a..6427bd3 100755 --- a/plugins/Languages/no/informations.xml +++ b/plugins/Languages/no/informations.xml @@ -12,7 +12,7 @@ <!-- Detailed description --> <description xml:lang="en"><![CDATA[Translation of Ultracopier to norwegian. For more details see the web site.]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>2.2.4.7</version> + <version>2.2.6.0</version> <!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. --> <name>no</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/no/translation.ts b/plugins/Languages/no/translation.ts index 2066182..b1cbcc0 100755 --- a/plugins/Languages/no/translation.ts +++ b/plugins/Languages/no/translation.ts @@ -93,91 +93,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -185,75 +190,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -670,12 +676,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="87"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="90"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -683,22 +689,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="191"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="198"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -706,22 +712,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="140"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="147"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -868,27 +874,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="84"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="164"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="173"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -1096,13 +1102,15 @@ This version is compiled as version: %1.</source> <name>MkPath</name> <message> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="124"/> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="394"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="187"/> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="210"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -1112,22 +1120,27 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="255"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="278"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="309"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> @@ -1206,7 +1219,7 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="75"/> <location filename="../../../OptionDialog.ui" line="366"/> - <location filename="../../../OptionDialog.cpp" line="290"/> + <location filename="../../../OptionDialog.cpp" line="297"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> @@ -1254,21 +1267,21 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="80"/> <location filename="../../../OptionDialog.ui" line="379"/> - <location filename="../../../OptionDialog.cpp" line="291"/> + <location filename="../../../OptionDialog.cpp" line="298"/> <source>Listener</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="85"/> <location filename="../../../OptionDialog.ui" line="384"/> - <location filename="../../../OptionDialog.cpp" line="292"/> + <location filename="../../../OptionDialog.cpp" line="299"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="93"/> <location filename="../../../OptionDialog.ui" line="389"/> - <location filename="../../../OptionDialog.cpp" line="293"/> + <location filename="../../../OptionDialog.cpp" line="300"/> <source>Session loader</source> <translation type="unfinished"></translation> </message> @@ -1410,75 +1423,75 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="197"/> - <location filename="../../../OptionDialog.cpp" line="211"/> + <location filename="../../../OptionDialog.cpp" line="204"/> + <location filename="../../../OptionDialog.cpp" line="218"/> <source>Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="197"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load the theme?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="211"/> + <location filename="../../../OptionDialog.cpp" line="218"/> <source>Load the language?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="298"/> + <location filename="../../../OptionDialog.cpp" line="305"/> <source>Do nothing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="299"/> + <location filename="../../../OptionDialog.cpp" line="306"/> <source>Ask source as folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="300"/> + <location filename="../../../OptionDialog.cpp" line="307"/> <source>Ask sources as files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="301"/> + <location filename="../../../OptionDialog.cpp" line="308"/> <source>Never</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="302"/> + <location filename="../../../OptionDialog.cpp" line="309"/> <source>When source is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="303"/> + <location filename="../../../OptionDialog.cpp" line="310"/> <source>When destination is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="304"/> + <location filename="../../../OptionDialog.cpp" line="311"/> <source>When source and destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="305"/> + <location filename="../../../OptionDialog.cpp" line="312"/> <source>When source or destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="306"/> + <location filename="../../../OptionDialog.cpp" line="313"/> <source>Always</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="320"/> - <location filename="../../../OptionDialog.cpp" line="321"/> - <location filename="../../../OptionDialog.cpp" line="322"/> + <location filename="../../../OptionDialog.cpp" line="327"/> + <location filename="../../../OptionDialog.cpp" line="328"/> + <location filename="../../../OptionDialog.cpp" line="329"/> <source>The variables are %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="962"/> + <location filename="../../../OptionDialog.cpp" line="969"/> <source>Save logs as: </source> <translation type="unfinished"></translation> </message> @@ -1771,12 +1784,12 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../ProductKey.cpp" line="56"/> + <location filename="../../../ProductKey.cpp" line="60"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../ProductKey.cpp" line="56"/> + <location filename="../../../ProductKey.cpp" line="60"/> <source>Your product key was rejected.<br />If you buy key, unmark check your spam and unmark the mail as spam<br />If you have not buy your key, go to <a href="https://shop.first-world.info/">https://shop.first-world.info/</a></source> <translation type="unfinished"></translation> </message> @@ -1834,12 +1847,12 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="541"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="595"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -1895,32 +1908,38 @@ Error:%2</source> <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="452"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="331"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="463"/> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="576"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="474"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="587"/> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="598"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="673"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="677"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="691"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -2031,61 +2050,61 @@ Error:%2</source> <context> <name>Themes</name> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="328"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="328"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="427"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="661"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="663"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1091"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1092"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1093"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1095"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1289"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1301"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1313"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1395"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1407"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1388"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1392"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1394"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1494"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1498"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -2093,24 +2112,24 @@ Error:%2</source> <context> <name>ThemesFactory</name> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="284"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="285"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="286"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="482"/> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="497"/> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="512"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="510"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="525"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -2118,29 +2137,29 @@ Error:%2</source> <context> <name>TransferThread</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="179"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="613"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="620"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="648"/> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="663"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="925"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -2148,19 +2167,19 @@ Error:%2</source> <context> <name>TransferThreadAsync</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -2168,24 +2187,24 @@ Error:%2</source> <context> <name>WriteThread</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="135"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="164"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="197"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="167"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="175"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="199"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="178"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="456"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -2500,7 +2519,7 @@ Error:%2</source> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> + <source>Overwrite if source newer than destination</source> <translation type="unfinished"></translation> </message> <message> @@ -2511,8 +2530,12 @@ Error:%2</source> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> + <source>Overwrite if destination older</source> <translation type="unfinished"></translation> </message> <message> @@ -2900,7 +2923,7 @@ Error:%2</source> </message> <message> <location filename="../../Themes/Oxygen/themesOptions.ui" line="213"/> - <source>Informations</source> + <source>Information</source> <translation type="unfinished"></translation> </message> <message> @@ -2914,28 +2937,38 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="257"/> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="269"/> + <source>Click to edit the color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="267"/> - <source>Show dual progression</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="378"/> + <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="277"/> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="287"/> - <source>Progression color</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="395"/> + <source>General margin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="306"/> - <source>Click to edit the color</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="402"/> + <source>Show dual progression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="425"/> + <source>General spacing</source> <translation type="unfinished"></translation> </message> </context> diff --git a/plugins/Languages/pl/informations.xml b/plugins/Languages/pl/informations.xml index b6f0f61..03a8747 100755 --- a/plugins/Languages/pl/informations.xml +++ b/plugins/Languages/pl/informations.xml @@ -12,7 +12,7 @@ <!-- Detailed description --> <description xml:lang="en"><![CDATA[Translation of Ultracopier to polish. For more details see the web site.]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>2.2.4.7</version> + <version>2.2.6.0</version> <!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. --> <name>pl</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/pl/translation.ts b/plugins/Languages/pl/translation.ts index 2066182..b1cbcc0 100755 --- a/plugins/Languages/pl/translation.ts +++ b/plugins/Languages/pl/translation.ts @@ -93,91 +93,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -185,75 +190,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -670,12 +676,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="87"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="90"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -683,22 +689,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="191"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="198"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -706,22 +712,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="140"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="147"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -868,27 +874,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="84"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="164"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="173"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -1096,13 +1102,15 @@ This version is compiled as version: %1.</source> <name>MkPath</name> <message> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="124"/> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="394"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="187"/> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="210"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -1112,22 +1120,27 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="255"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="278"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="309"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> @@ -1206,7 +1219,7 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="75"/> <location filename="../../../OptionDialog.ui" line="366"/> - <location filename="../../../OptionDialog.cpp" line="290"/> + <location filename="../../../OptionDialog.cpp" line="297"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> @@ -1254,21 +1267,21 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="80"/> <location filename="../../../OptionDialog.ui" line="379"/> - <location filename="../../../OptionDialog.cpp" line="291"/> + <location filename="../../../OptionDialog.cpp" line="298"/> <source>Listener</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="85"/> <location filename="../../../OptionDialog.ui" line="384"/> - <location filename="../../../OptionDialog.cpp" line="292"/> + <location filename="../../../OptionDialog.cpp" line="299"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="93"/> <location filename="../../../OptionDialog.ui" line="389"/> - <location filename="../../../OptionDialog.cpp" line="293"/> + <location filename="../../../OptionDialog.cpp" line="300"/> <source>Session loader</source> <translation type="unfinished"></translation> </message> @@ -1410,75 +1423,75 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="197"/> - <location filename="../../../OptionDialog.cpp" line="211"/> + <location filename="../../../OptionDialog.cpp" line="204"/> + <location filename="../../../OptionDialog.cpp" line="218"/> <source>Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="197"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load the theme?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="211"/> + <location filename="../../../OptionDialog.cpp" line="218"/> <source>Load the language?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="298"/> + <location filename="../../../OptionDialog.cpp" line="305"/> <source>Do nothing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="299"/> + <location filename="../../../OptionDialog.cpp" line="306"/> <source>Ask source as folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="300"/> + <location filename="../../../OptionDialog.cpp" line="307"/> <source>Ask sources as files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="301"/> + <location filename="../../../OptionDialog.cpp" line="308"/> <source>Never</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="302"/> + <location filename="../../../OptionDialog.cpp" line="309"/> <source>When source is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="303"/> + <location filename="../../../OptionDialog.cpp" line="310"/> <source>When destination is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="304"/> + <location filename="../../../OptionDialog.cpp" line="311"/> <source>When source and destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="305"/> + <location filename="../../../OptionDialog.cpp" line="312"/> <source>When source or destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="306"/> + <location filename="../../../OptionDialog.cpp" line="313"/> <source>Always</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="320"/> - <location filename="../../../OptionDialog.cpp" line="321"/> - <location filename="../../../OptionDialog.cpp" line="322"/> + <location filename="../../../OptionDialog.cpp" line="327"/> + <location filename="../../../OptionDialog.cpp" line="328"/> + <location filename="../../../OptionDialog.cpp" line="329"/> <source>The variables are %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="962"/> + <location filename="../../../OptionDialog.cpp" line="969"/> <source>Save logs as: </source> <translation type="unfinished"></translation> </message> @@ -1771,12 +1784,12 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../ProductKey.cpp" line="56"/> + <location filename="../../../ProductKey.cpp" line="60"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../ProductKey.cpp" line="56"/> + <location filename="../../../ProductKey.cpp" line="60"/> <source>Your product key was rejected.<br />If you buy key, unmark check your spam and unmark the mail as spam<br />If you have not buy your key, go to <a href="https://shop.first-world.info/">https://shop.first-world.info/</a></source> <translation type="unfinished"></translation> </message> @@ -1834,12 +1847,12 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="541"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="595"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -1895,32 +1908,38 @@ Error:%2</source> <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="452"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="331"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="463"/> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="576"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="474"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="587"/> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="598"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="673"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="677"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="691"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -2031,61 +2050,61 @@ Error:%2</source> <context> <name>Themes</name> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="328"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="328"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="427"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="661"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="663"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1091"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1092"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1093"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1095"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1289"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1301"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1313"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1395"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1407"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1388"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1392"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1394"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1494"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1498"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -2093,24 +2112,24 @@ Error:%2</source> <context> <name>ThemesFactory</name> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="284"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="285"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="286"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="482"/> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="497"/> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="512"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="510"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="525"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -2118,29 +2137,29 @@ Error:%2</source> <context> <name>TransferThread</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="179"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="613"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="620"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="648"/> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="663"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="925"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -2148,19 +2167,19 @@ Error:%2</source> <context> <name>TransferThreadAsync</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -2168,24 +2187,24 @@ Error:%2</source> <context> <name>WriteThread</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="135"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="164"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="197"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="167"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="175"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="199"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="178"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="456"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -2500,7 +2519,7 @@ Error:%2</source> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> + <source>Overwrite if source newer than destination</source> <translation type="unfinished"></translation> </message> <message> @@ -2511,8 +2530,12 @@ Error:%2</source> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> + <source>Overwrite if destination older</source> <translation type="unfinished"></translation> </message> <message> @@ -2900,7 +2923,7 @@ Error:%2</source> </message> <message> <location filename="../../Themes/Oxygen/themesOptions.ui" line="213"/> - <source>Informations</source> + <source>Information</source> <translation type="unfinished"></translation> </message> <message> @@ -2914,28 +2937,38 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="257"/> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="269"/> + <source>Click to edit the color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="267"/> - <source>Show dual progression</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="378"/> + <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="277"/> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="287"/> - <source>Progression color</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="395"/> + <source>General margin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="306"/> - <source>Click to edit the color</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="402"/> + <source>Show dual progression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="425"/> + <source>General spacing</source> <translation type="unfinished"></translation> </message> </context> diff --git a/plugins/Languages/pt/informations.xml b/plugins/Languages/pt/informations.xml index 36147a7..3456e43 100755 --- a/plugins/Languages/pt/informations.xml +++ b/plugins/Languages/pt/informations.xml @@ -12,7 +12,7 @@ <!-- Detailed description --> <description xml:lang="en"><![CDATA[Translation of Ultracopier to portuguese. For more details see the web site.]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>2.2.4.7</version> + <version>2.2.6.0</version> <!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. --> <name>pt</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/pt/translation.ts b/plugins/Languages/pt/translation.ts index 2066182..b1cbcc0 100755 --- a/plugins/Languages/pt/translation.ts +++ b/plugins/Languages/pt/translation.ts @@ -93,91 +93,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -185,75 +190,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -670,12 +676,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="87"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="90"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -683,22 +689,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="191"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="198"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -706,22 +712,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="140"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="147"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -868,27 +874,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="84"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="164"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="173"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -1096,13 +1102,15 @@ This version is compiled as version: %1.</source> <name>MkPath</name> <message> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="124"/> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="394"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="187"/> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="210"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -1112,22 +1120,27 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="255"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="278"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="309"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> @@ -1206,7 +1219,7 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="75"/> <location filename="../../../OptionDialog.ui" line="366"/> - <location filename="../../../OptionDialog.cpp" line="290"/> + <location filename="../../../OptionDialog.cpp" line="297"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> @@ -1254,21 +1267,21 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="80"/> <location filename="../../../OptionDialog.ui" line="379"/> - <location filename="../../../OptionDialog.cpp" line="291"/> + <location filename="../../../OptionDialog.cpp" line="298"/> <source>Listener</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="85"/> <location filename="../../../OptionDialog.ui" line="384"/> - <location filename="../../../OptionDialog.cpp" line="292"/> + <location filename="../../../OptionDialog.cpp" line="299"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="93"/> <location filename="../../../OptionDialog.ui" line="389"/> - <location filename="../../../OptionDialog.cpp" line="293"/> + <location filename="../../../OptionDialog.cpp" line="300"/> <source>Session loader</source> <translation type="unfinished"></translation> </message> @@ -1410,75 +1423,75 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="197"/> - <location filename="../../../OptionDialog.cpp" line="211"/> + <location filename="../../../OptionDialog.cpp" line="204"/> + <location filename="../../../OptionDialog.cpp" line="218"/> <source>Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="197"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load the theme?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="211"/> + <location filename="../../../OptionDialog.cpp" line="218"/> <source>Load the language?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="298"/> + <location filename="../../../OptionDialog.cpp" line="305"/> <source>Do nothing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="299"/> + <location filename="../../../OptionDialog.cpp" line="306"/> <source>Ask source as folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="300"/> + <location filename="../../../OptionDialog.cpp" line="307"/> <source>Ask sources as files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="301"/> + <location filename="../../../OptionDialog.cpp" line="308"/> <source>Never</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="302"/> + <location filename="../../../OptionDialog.cpp" line="309"/> <source>When source is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="303"/> + <location filename="../../../OptionDialog.cpp" line="310"/> <source>When destination is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="304"/> + <location filename="../../../OptionDialog.cpp" line="311"/> <source>When source and destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="305"/> + <location filename="../../../OptionDialog.cpp" line="312"/> <source>When source or destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="306"/> + <location filename="../../../OptionDialog.cpp" line="313"/> <source>Always</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="320"/> - <location filename="../../../OptionDialog.cpp" line="321"/> - <location filename="../../../OptionDialog.cpp" line="322"/> + <location filename="../../../OptionDialog.cpp" line="327"/> + <location filename="../../../OptionDialog.cpp" line="328"/> + <location filename="../../../OptionDialog.cpp" line="329"/> <source>The variables are %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="962"/> + <location filename="../../../OptionDialog.cpp" line="969"/> <source>Save logs as: </source> <translation type="unfinished"></translation> </message> @@ -1771,12 +1784,12 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../ProductKey.cpp" line="56"/> + <location filename="../../../ProductKey.cpp" line="60"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../ProductKey.cpp" line="56"/> + <location filename="../../../ProductKey.cpp" line="60"/> <source>Your product key was rejected.<br />If you buy key, unmark check your spam and unmark the mail as spam<br />If you have not buy your key, go to <a href="https://shop.first-world.info/">https://shop.first-world.info/</a></source> <translation type="unfinished"></translation> </message> @@ -1834,12 +1847,12 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="541"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="595"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -1895,32 +1908,38 @@ Error:%2</source> <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="452"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="331"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="463"/> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="576"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="474"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="587"/> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="598"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="673"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="677"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="691"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -2031,61 +2050,61 @@ Error:%2</source> <context> <name>Themes</name> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="328"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="328"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="427"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="661"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="663"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1091"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1092"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1093"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1095"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1289"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1301"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1313"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1395"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1407"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1388"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1392"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1394"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1494"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1498"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -2093,24 +2112,24 @@ Error:%2</source> <context> <name>ThemesFactory</name> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="284"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="285"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="286"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="482"/> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="497"/> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="512"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="510"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="525"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -2118,29 +2137,29 @@ Error:%2</source> <context> <name>TransferThread</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="179"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="613"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="620"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="648"/> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="663"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="925"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -2148,19 +2167,19 @@ Error:%2</source> <context> <name>TransferThreadAsync</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -2168,24 +2187,24 @@ Error:%2</source> <context> <name>WriteThread</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="135"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="164"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="197"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="167"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="175"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="199"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="178"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="456"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -2500,7 +2519,7 @@ Error:%2</source> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> + <source>Overwrite if source newer than destination</source> <translation type="unfinished"></translation> </message> <message> @@ -2511,8 +2530,12 @@ Error:%2</source> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> + <source>Overwrite if destination older</source> <translation type="unfinished"></translation> </message> <message> @@ -2900,7 +2923,7 @@ Error:%2</source> </message> <message> <location filename="../../Themes/Oxygen/themesOptions.ui" line="213"/> - <source>Informations</source> + <source>Information</source> <translation type="unfinished"></translation> </message> <message> @@ -2914,28 +2937,38 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="257"/> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="269"/> + <source>Click to edit the color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="267"/> - <source>Show dual progression</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="378"/> + <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="277"/> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="287"/> - <source>Progression color</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="395"/> + <source>General margin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="306"/> - <source>Click to edit the color</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="402"/> + <source>Show dual progression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="425"/> + <source>General spacing</source> <translation type="unfinished"></translation> </message> </context> diff --git a/plugins/Languages/ru/informations.xml b/plugins/Languages/ru/informations.xml index 9b3fc4d..c943116 100755 --- a/plugins/Languages/ru/informations.xml +++ b/plugins/Languages/ru/informations.xml @@ -12,7 +12,7 @@ <!-- Detailed description --> <description xml:lang="en"><![CDATA[Translation of Ultracopier to russian. For more details see the web site.]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>2.2.4.7</version> + <version>2.2.6.0</version> <!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. --> <name>ru</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/ru/translation.qm b/plugins/Languages/ru/translation.qm Binary files differindex 36d9bd6..47dd8e2 100755 --- a/plugins/Languages/ru/translation.qm +++ b/plugins/Languages/ru/translation.qm diff --git a/plugins/Languages/ru/translation.ts b/plugins/Languages/ru/translation.ts index 0996543..d422ab6 100755 --- a/plugins/Languages/ru/translation.ts +++ b/plugins/Languages/ru/translation.ts @@ -93,91 +93,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished">назначение</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished">просить</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished">пропускать</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished">переименовать</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished">переписывать</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished">Заменить, если новее</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -185,75 +190,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished">просить</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished">пропускать</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished">переименовать</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished">переписывать</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished">Заменить, если новее</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -670,12 +676,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="87"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="90"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -683,22 +689,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="191"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="198"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished">ошибка</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -706,22 +712,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="140"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="147"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished">ошибка</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -868,27 +874,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="84"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="164"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="173"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished">ошибка</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -1096,13 +1102,15 @@ This version is compiled as version: %1.</source> <name>MkPath</name> <message> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="124"/> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="394"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="187"/> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="210"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -1112,22 +1120,27 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="255"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="278"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="309"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> @@ -1206,7 +1219,7 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="75"/> <location filename="../../../OptionDialog.ui" line="366"/> - <location filename="../../../OptionDialog.cpp" line="290"/> + <location filename="../../../OptionDialog.cpp" line="297"/> <source>Copy engine</source> <translation>Копировать двигатель</translation> </message> @@ -1254,21 +1267,21 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="80"/> <location filename="../../../OptionDialog.ui" line="379"/> - <location filename="../../../OptionDialog.cpp" line="291"/> + <location filename="../../../OptionDialog.cpp" line="298"/> <source>Listener</source> <translation>слушатель</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="85"/> <location filename="../../../OptionDialog.ui" line="384"/> - <location filename="../../../OptionDialog.cpp" line="292"/> + <location filename="../../../OptionDialog.cpp" line="299"/> <source>Plugin loader</source> <translation>плагин погрузчика</translation> </message> <message> <location filename="../../../OptionDialog.ui" line="93"/> <location filename="../../../OptionDialog.ui" line="389"/> - <location filename="../../../OptionDialog.cpp" line="293"/> + <location filename="../../../OptionDialog.cpp" line="300"/> <source>Session loader</source> <translation>сессия погрузчика</translation> </message> @@ -1410,75 +1423,75 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="197"/> - <location filename="../../../OptionDialog.cpp" line="211"/> + <location filename="../../../OptionDialog.cpp" line="204"/> + <location filename="../../../OptionDialog.cpp" line="218"/> <source>Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="197"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load the theme?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="211"/> + <location filename="../../../OptionDialog.cpp" line="218"/> <source>Load the language?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="298"/> + <location filename="../../../OptionDialog.cpp" line="305"/> <source>Do nothing</source> <translation>ничего не делать</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="299"/> + <location filename="../../../OptionDialog.cpp" line="306"/> <source>Ask source as folder</source> <translation>Спросите источника папку</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="300"/> + <location filename="../../../OptionDialog.cpp" line="307"/> <source>Ask sources as files</source> <translation>Спросите источников в виде файлов</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="301"/> + <location filename="../../../OptionDialog.cpp" line="308"/> <source>Never</source> <translation>никогда</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="302"/> + <location filename="../../../OptionDialog.cpp" line="309"/> <source>When source is same</source> <translation>Когда же источник</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="303"/> + <location filename="../../../OptionDialog.cpp" line="310"/> <source>When destination is same</source> <translation>Когда же назначения</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="304"/> + <location filename="../../../OptionDialog.cpp" line="311"/> <source>When source and destination are same</source> <translation>Когда источника и назначения те же</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="305"/> + <location filename="../../../OptionDialog.cpp" line="312"/> <source>When source or destination are same</source> <translation>Когда источника или назначения те же</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="306"/> + <location filename="../../../OptionDialog.cpp" line="313"/> <source>Always</source> <translation>всегда</translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="320"/> - <location filename="../../../OptionDialog.cpp" line="321"/> - <location filename="../../../OptionDialog.cpp" line="322"/> + <location filename="../../../OptionDialog.cpp" line="327"/> + <location filename="../../../OptionDialog.cpp" line="328"/> + <location filename="../../../OptionDialog.cpp" line="329"/> <source>The variables are %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="962"/> + <location filename="../../../OptionDialog.cpp" line="969"/> <source>Save logs as: </source> <translation>Сохранить журналы, как: </translation> </message> @@ -1773,12 +1786,12 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../ProductKey.cpp" line="56"/> + <location filename="../../../ProductKey.cpp" line="60"/> <source>Error</source> <translation type="unfinished">ошибка</translation> </message> <message> - <location filename="../../../ProductKey.cpp" line="56"/> + <location filename="../../../ProductKey.cpp" line="60"/> <source>Your product key was rejected.<br />If you buy key, unmark check your spam and unmark the mail as spam<br />If you have not buy your key, go to <a href="https://shop.first-world.info/">https://shop.first-world.info/</a></source> <translation type="unfinished"></translation> </message> @@ -1836,12 +1849,12 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="541"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="595"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -1897,32 +1910,38 @@ Error:%2</source> <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="452"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="331"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="463"/> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="576"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="474"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="587"/> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="598"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="673"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="677"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="691"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -2033,61 +2052,61 @@ Error:%2</source> <context> <name>Themes</name> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="328"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="328"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="427"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="661"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="663"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1091"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1092"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1093"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1095"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1289"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1301"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1313"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1395"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1407"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1388"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1392"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1394"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1494"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1498"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -2095,24 +2114,24 @@ Error:%2</source> <context> <name>ThemesFactory</name> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="284"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="285"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="286"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="482"/> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="497"/> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="512"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="510"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="525"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -2120,29 +2139,29 @@ Error:%2</source> <context> <name>TransferThread</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="179"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="613"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="620"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="648"/> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="663"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="925"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -2150,19 +2169,19 @@ Error:%2</source> <context> <name>TransferThreadAsync</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -2170,24 +2189,24 @@ Error:%2</source> <context> <name>WriteThread</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="135"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="164"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="197"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="167"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="175"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="199"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="178"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="456"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -2502,8 +2521,8 @@ Error:%2</source> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> - <translation type="unfinished">Заменить, если новее</translation> + <source>Overwrite if source newer than destination</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="346"/> @@ -2513,8 +2532,12 @@ Error:%2</source> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> + <source>Overwrite if destination older</source> <translation type="unfinished"></translation> </message> <message> @@ -2902,8 +2925,8 @@ Error:%2</source> </message> <message> <location filename="../../Themes/Oxygen/themesOptions.ui" line="213"/> - <source>Informations</source> - <translation type="unfinished"></translation> + <source>Information</source> + <translation type="unfinished">информация</translation> </message> <message> <location filename="../../Themes/Oxygen/themesOptions.ui" line="219"/> @@ -2916,28 +2939,38 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="257"/> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="269"/> + <source>Click to edit the color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="267"/> - <source>Show dual progression</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="378"/> + <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="277"/> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="287"/> - <source>Progression color</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="395"/> + <source>General margin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="306"/> - <source>Click to edit the color</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="402"/> + <source>Show dual progression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="425"/> + <source>General spacing</source> <translation type="unfinished"></translation> </message> </context> diff --git a/plugins/Languages/th/informations.xml b/plugins/Languages/th/informations.xml index 36ea0d5..de524b7 100755 --- a/plugins/Languages/th/informations.xml +++ b/plugins/Languages/th/informations.xml @@ -12,7 +12,7 @@ <!-- Detailed description --> <description xml:lang="en"><![CDATA[Translation of Ultracopier to thai. For more details see the web site.]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>2.2.4.7</version> + <version>2.2.6.0</version> <!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. --> <name>th</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/th/translation.ts b/plugins/Languages/th/translation.ts index 2066182..b1cbcc0 100755 --- a/plugins/Languages/th/translation.ts +++ b/plugins/Languages/th/translation.ts @@ -93,91 +93,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -185,75 +190,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -670,12 +676,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="87"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="90"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -683,22 +689,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="191"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="198"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -706,22 +712,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="140"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="147"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -868,27 +874,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="84"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="164"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="173"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -1096,13 +1102,15 @@ This version is compiled as version: %1.</source> <name>MkPath</name> <message> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="124"/> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="394"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="187"/> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="210"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -1112,22 +1120,27 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="255"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="278"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="309"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> @@ -1206,7 +1219,7 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="75"/> <location filename="../../../OptionDialog.ui" line="366"/> - <location filename="../../../OptionDialog.cpp" line="290"/> + <location filename="../../../OptionDialog.cpp" line="297"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> @@ -1254,21 +1267,21 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="80"/> <location filename="../../../OptionDialog.ui" line="379"/> - <location filename="../../../OptionDialog.cpp" line="291"/> + <location filename="../../../OptionDialog.cpp" line="298"/> <source>Listener</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="85"/> <location filename="../../../OptionDialog.ui" line="384"/> - <location filename="../../../OptionDialog.cpp" line="292"/> + <location filename="../../../OptionDialog.cpp" line="299"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="93"/> <location filename="../../../OptionDialog.ui" line="389"/> - <location filename="../../../OptionDialog.cpp" line="293"/> + <location filename="../../../OptionDialog.cpp" line="300"/> <source>Session loader</source> <translation type="unfinished"></translation> </message> @@ -1410,75 +1423,75 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="197"/> - <location filename="../../../OptionDialog.cpp" line="211"/> + <location filename="../../../OptionDialog.cpp" line="204"/> + <location filename="../../../OptionDialog.cpp" line="218"/> <source>Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="197"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load the theme?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="211"/> + <location filename="../../../OptionDialog.cpp" line="218"/> <source>Load the language?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="298"/> + <location filename="../../../OptionDialog.cpp" line="305"/> <source>Do nothing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="299"/> + <location filename="../../../OptionDialog.cpp" line="306"/> <source>Ask source as folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="300"/> + <location filename="../../../OptionDialog.cpp" line="307"/> <source>Ask sources as files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="301"/> + <location filename="../../../OptionDialog.cpp" line="308"/> <source>Never</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="302"/> + <location filename="../../../OptionDialog.cpp" line="309"/> <source>When source is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="303"/> + <location filename="../../../OptionDialog.cpp" line="310"/> <source>When destination is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="304"/> + <location filename="../../../OptionDialog.cpp" line="311"/> <source>When source and destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="305"/> + <location filename="../../../OptionDialog.cpp" line="312"/> <source>When source or destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="306"/> + <location filename="../../../OptionDialog.cpp" line="313"/> <source>Always</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="320"/> - <location filename="../../../OptionDialog.cpp" line="321"/> - <location filename="../../../OptionDialog.cpp" line="322"/> + <location filename="../../../OptionDialog.cpp" line="327"/> + <location filename="../../../OptionDialog.cpp" line="328"/> + <location filename="../../../OptionDialog.cpp" line="329"/> <source>The variables are %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="962"/> + <location filename="../../../OptionDialog.cpp" line="969"/> <source>Save logs as: </source> <translation type="unfinished"></translation> </message> @@ -1771,12 +1784,12 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../ProductKey.cpp" line="56"/> + <location filename="../../../ProductKey.cpp" line="60"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../ProductKey.cpp" line="56"/> + <location filename="../../../ProductKey.cpp" line="60"/> <source>Your product key was rejected.<br />If you buy key, unmark check your spam and unmark the mail as spam<br />If you have not buy your key, go to <a href="https://shop.first-world.info/">https://shop.first-world.info/</a></source> <translation type="unfinished"></translation> </message> @@ -1834,12 +1847,12 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="541"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="595"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -1895,32 +1908,38 @@ Error:%2</source> <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="452"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="331"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="463"/> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="576"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="474"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="587"/> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="598"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="673"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="677"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="691"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -2031,61 +2050,61 @@ Error:%2</source> <context> <name>Themes</name> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="328"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="328"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="427"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="661"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="663"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1091"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1092"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1093"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1095"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1289"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1301"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1313"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1395"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1407"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1388"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1392"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1394"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1494"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1498"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -2093,24 +2112,24 @@ Error:%2</source> <context> <name>ThemesFactory</name> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="284"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="285"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="286"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="482"/> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="497"/> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="512"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="510"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="525"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -2118,29 +2137,29 @@ Error:%2</source> <context> <name>TransferThread</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="179"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="613"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="620"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="648"/> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="663"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="925"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -2148,19 +2167,19 @@ Error:%2</source> <context> <name>TransferThreadAsync</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -2168,24 +2187,24 @@ Error:%2</source> <context> <name>WriteThread</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="135"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="164"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="197"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="167"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="175"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="199"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="178"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="456"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -2500,7 +2519,7 @@ Error:%2</source> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> + <source>Overwrite if source newer than destination</source> <translation type="unfinished"></translation> </message> <message> @@ -2511,8 +2530,12 @@ Error:%2</source> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> + <source>Overwrite if destination older</source> <translation type="unfinished"></translation> </message> <message> @@ -2900,7 +2923,7 @@ Error:%2</source> </message> <message> <location filename="../../Themes/Oxygen/themesOptions.ui" line="213"/> - <source>Informations</source> + <source>Information</source> <translation type="unfinished"></translation> </message> <message> @@ -2914,28 +2937,38 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="257"/> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="269"/> + <source>Click to edit the color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="267"/> - <source>Show dual progression</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="378"/> + <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="277"/> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="287"/> - <source>Progression color</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="395"/> + <source>General margin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="306"/> - <source>Click to edit the color</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="402"/> + <source>Show dual progression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="425"/> + <source>General spacing</source> <translation type="unfinished"></translation> </message> </context> diff --git a/plugins/Languages/tr/informations.xml b/plugins/Languages/tr/informations.xml index 6a0be77..4d33884 100755 --- a/plugins/Languages/tr/informations.xml +++ b/plugins/Languages/tr/informations.xml @@ -12,7 +12,7 @@ <!-- Detailed description --> <description xml:lang="en"><![CDATA[Translation of Ultracopier to turkish. For more details see the web site.]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>2.2.4.7</version> + <version>2.2.6.0</version> <!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. --> <name>tr</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/tr/translation.ts b/plugins/Languages/tr/translation.ts index 2066182..b1cbcc0 100755 --- a/plugins/Languages/tr/translation.ts +++ b/plugins/Languages/tr/translation.ts @@ -93,91 +93,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -185,75 +190,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -670,12 +676,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="87"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="90"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -683,22 +689,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="191"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="198"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -706,22 +712,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="140"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="147"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -868,27 +874,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="84"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="164"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="173"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -1096,13 +1102,15 @@ This version is compiled as version: %1.</source> <name>MkPath</name> <message> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="124"/> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="394"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="187"/> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="210"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -1112,22 +1120,27 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="255"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="278"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="309"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> @@ -1206,7 +1219,7 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="75"/> <location filename="../../../OptionDialog.ui" line="366"/> - <location filename="../../../OptionDialog.cpp" line="290"/> + <location filename="../../../OptionDialog.cpp" line="297"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> @@ -1254,21 +1267,21 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="80"/> <location filename="../../../OptionDialog.ui" line="379"/> - <location filename="../../../OptionDialog.cpp" line="291"/> + <location filename="../../../OptionDialog.cpp" line="298"/> <source>Listener</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="85"/> <location filename="../../../OptionDialog.ui" line="384"/> - <location filename="../../../OptionDialog.cpp" line="292"/> + <location filename="../../../OptionDialog.cpp" line="299"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="93"/> <location filename="../../../OptionDialog.ui" line="389"/> - <location filename="../../../OptionDialog.cpp" line="293"/> + <location filename="../../../OptionDialog.cpp" line="300"/> <source>Session loader</source> <translation type="unfinished"></translation> </message> @@ -1410,75 +1423,75 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="197"/> - <location filename="../../../OptionDialog.cpp" line="211"/> + <location filename="../../../OptionDialog.cpp" line="204"/> + <location filename="../../../OptionDialog.cpp" line="218"/> <source>Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="197"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load the theme?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="211"/> + <location filename="../../../OptionDialog.cpp" line="218"/> <source>Load the language?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="298"/> + <location filename="../../../OptionDialog.cpp" line="305"/> <source>Do nothing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="299"/> + <location filename="../../../OptionDialog.cpp" line="306"/> <source>Ask source as folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="300"/> + <location filename="../../../OptionDialog.cpp" line="307"/> <source>Ask sources as files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="301"/> + <location filename="../../../OptionDialog.cpp" line="308"/> <source>Never</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="302"/> + <location filename="../../../OptionDialog.cpp" line="309"/> <source>When source is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="303"/> + <location filename="../../../OptionDialog.cpp" line="310"/> <source>When destination is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="304"/> + <location filename="../../../OptionDialog.cpp" line="311"/> <source>When source and destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="305"/> + <location filename="../../../OptionDialog.cpp" line="312"/> <source>When source or destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="306"/> + <location filename="../../../OptionDialog.cpp" line="313"/> <source>Always</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="320"/> - <location filename="../../../OptionDialog.cpp" line="321"/> - <location filename="../../../OptionDialog.cpp" line="322"/> + <location filename="../../../OptionDialog.cpp" line="327"/> + <location filename="../../../OptionDialog.cpp" line="328"/> + <location filename="../../../OptionDialog.cpp" line="329"/> <source>The variables are %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="962"/> + <location filename="../../../OptionDialog.cpp" line="969"/> <source>Save logs as: </source> <translation type="unfinished"></translation> </message> @@ -1771,12 +1784,12 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../ProductKey.cpp" line="56"/> + <location filename="../../../ProductKey.cpp" line="60"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../ProductKey.cpp" line="56"/> + <location filename="../../../ProductKey.cpp" line="60"/> <source>Your product key was rejected.<br />If you buy key, unmark check your spam and unmark the mail as spam<br />If you have not buy your key, go to <a href="https://shop.first-world.info/">https://shop.first-world.info/</a></source> <translation type="unfinished"></translation> </message> @@ -1834,12 +1847,12 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="541"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="595"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -1895,32 +1908,38 @@ Error:%2</source> <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="452"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="331"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="463"/> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="576"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="474"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="587"/> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="598"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="673"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="677"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="691"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -2031,61 +2050,61 @@ Error:%2</source> <context> <name>Themes</name> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="328"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="328"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="427"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="661"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="663"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1091"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1092"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1093"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1095"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1289"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1301"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1313"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1395"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1407"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1388"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1392"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1394"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1494"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1498"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -2093,24 +2112,24 @@ Error:%2</source> <context> <name>ThemesFactory</name> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="284"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="285"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="286"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="482"/> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="497"/> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="512"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="510"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="525"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -2118,29 +2137,29 @@ Error:%2</source> <context> <name>TransferThread</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="179"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="613"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="620"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="648"/> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="663"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="925"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -2148,19 +2167,19 @@ Error:%2</source> <context> <name>TransferThreadAsync</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -2168,24 +2187,24 @@ Error:%2</source> <context> <name>WriteThread</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="135"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="164"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="197"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="167"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="175"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="199"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="178"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="456"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -2500,7 +2519,7 @@ Error:%2</source> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> + <source>Overwrite if source newer than destination</source> <translation type="unfinished"></translation> </message> <message> @@ -2511,8 +2530,12 @@ Error:%2</source> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> + <source>Overwrite if destination older</source> <translation type="unfinished"></translation> </message> <message> @@ -2900,7 +2923,7 @@ Error:%2</source> </message> <message> <location filename="../../Themes/Oxygen/themesOptions.ui" line="213"/> - <source>Informations</source> + <source>Information</source> <translation type="unfinished"></translation> </message> <message> @@ -2914,28 +2937,38 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="257"/> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="269"/> + <source>Click to edit the color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="267"/> - <source>Show dual progression</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="378"/> + <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="277"/> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="287"/> - <source>Progression color</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="395"/> + <source>General margin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="306"/> - <source>Click to edit the color</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="402"/> + <source>Show dual progression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="425"/> + <source>General spacing</source> <translation type="unfinished"></translation> </message> </context> diff --git a/plugins/Languages/zh/informations.xml b/plugins/Languages/zh/informations.xml index d5462e7..7b163fb 100755 --- a/plugins/Languages/zh/informations.xml +++ b/plugins/Languages/zh/informations.xml @@ -12,7 +12,7 @@ <!-- Detailed description --> <description xml:lang="en"><![CDATA[Translation of Ultracopier to chinese. For more details see the web site.]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>2.2.4.7</version> + <version>2.2.6.0</version> <!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. --> <name>ch</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/zh_TW/informations.xml b/plugins/Languages/zh_TW/informations.xml index 16f28bb..beaac2c 100755 --- a/plugins/Languages/zh_TW/informations.xml +++ b/plugins/Languages/zh_TW/informations.xml @@ -12,7 +12,7 @@ <!-- Detailed description --> <description xml:lang="en"><![CDATA[Translation of Ultracopier to chinese traditional. For more details see the web site.]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>2.2.4.7</version> + <version>2.2.6.0</version> <!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. --> <name>zh_tw</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/Languages/zh_TW/translation.qm b/plugins/Languages/zh_TW/translation.qm Binary files differindex 0d07322..428093b 100755 --- a/plugins/Languages/zh_TW/translation.qm +++ b/plugins/Languages/zh_TW/translation.qm diff --git a/plugins/Languages/zh_TW/translation.ts b/plugins/Languages/zh_TW/translation.ts index 1f97d2c..1ff1f24 100755 --- a/plugins/Languages/zh_TW/translation.ts +++ b/plugins/Languages/zh_TW/translation.ts @@ -93,91 +93,96 @@ <context> <name>CopyEngine</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="438"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="461"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="465"/> <source>The engine is forced to move, you can't copy with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="473"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="496"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="519"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="542"/> <source>The engine is forced to copy, you can't move with it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/> <source>Destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="520"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="566"/> <source>Use the actual destination "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="685"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="731"/> <source>The mode has been forced previously. This is an internal error, please report it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="976"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="979"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="984"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="988"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="886"/> + <source>Supported only on Windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1035"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1038"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1043"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1047"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="977"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="981"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="985"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="989"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1036"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1040"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1044"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1048"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="980"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1039"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="982"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="994"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1041"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1053"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="986"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1045"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="990"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1049"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="991"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1050"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="992"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1051"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="993"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1052"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1064"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngine.cpp" line="1123"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> @@ -185,75 +190,76 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="303"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="60"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="309"/> <source>Supported only on Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="430"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="433"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="438"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="431"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="435"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="439"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="443"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="449"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="436"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="448"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="442"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="454"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="444"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="450"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="445"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="451"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="446"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="452"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="447"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="453"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="463"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="469"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="502"/> + <location filename="../../CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp" line="508"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -670,12 +676,12 @@ <context> <name>FileErrorDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="87"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="92"/> <source>Error on folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="90"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileErrorDialog.cpp" line="95"/> <source>Folder name</source> <translation type="unfinished"></translation> </message> @@ -683,22 +689,22 @@ <context> <name>FileExistsDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="191"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="201"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="198"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="208"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/> <source>Error</source> <translation type="unfinished">錯誤</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="289"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp" line="299"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -706,22 +712,22 @@ <context> <name>FileIsSameDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="140"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="145"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="147"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="152"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/> <source>Error</source> <translation type="unfinished">錯誤</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="220"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FileIsSameDialog.cpp" line="225"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -868,27 +874,27 @@ <context> <name>FolderExistsDialog</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="84"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="91"/> <source>Folder already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="164"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="172"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="173"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="181"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/> <source>Error</source> <translation type="unfinished">錯誤</translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="240"/> + <location filename="../../CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp" line="248"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -1096,13 +1102,15 @@ This version is compiled as version: %1.</source> <name>MkPath</name> <message> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="124"/> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="394"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="464"/> <source>Unable to remove</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="187"/> <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="210"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="363"/> <source>Unable to create the folder</source> <translation type="unfinished"></translation> </message> @@ -1112,22 +1120,27 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="255"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="304"/> <source>Unable to temporary rename the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="278"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="339"/> + <source>Unable to reverse temporary rename for real move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="348"/> <source>Unable to do the final real move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="309"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="379"/> <source>Unable to move the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="315"/> + <location filename="../../CopyEngine/Ultracopier-Spec/MkPath.cpp" line="385"/> <source>Unable to move the folder: errno: %1</source> <translation type="unfinished"></translation> </message> @@ -1206,7 +1219,7 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="75"/> <location filename="../../../OptionDialog.ui" line="366"/> - <location filename="../../../OptionDialog.cpp" line="290"/> + <location filename="../../../OptionDialog.cpp" line="297"/> <source>Copy engine</source> <translation type="unfinished"></translation> </message> @@ -1260,21 +1273,21 @@ This version is compiled as version: %1.</source> <message> <location filename="../../../OptionDialog.ui" line="80"/> <location filename="../../../OptionDialog.ui" line="379"/> - <location filename="../../../OptionDialog.cpp" line="291"/> + <location filename="../../../OptionDialog.cpp" line="298"/> <source>Listener</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="85"/> <location filename="../../../OptionDialog.ui" line="384"/> - <location filename="../../../OptionDialog.cpp" line="292"/> + <location filename="../../../OptionDialog.cpp" line="299"/> <source>Plugin loader</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../OptionDialog.ui" line="93"/> <location filename="../../../OptionDialog.ui" line="389"/> - <location filename="../../../OptionDialog.cpp" line="293"/> + <location filename="../../../OptionDialog.cpp" line="300"/> <source>Session loader</source> <translation type="unfinished"></translation> </message> @@ -1426,75 +1439,75 @@ This version is compiled as version: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="197"/> - <location filename="../../../OptionDialog.cpp" line="211"/> + <location filename="../../../OptionDialog.cpp" line="204"/> + <location filename="../../../OptionDialog.cpp" line="218"/> <source>Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="197"/> + <location filename="../../../OptionDialog.cpp" line="204"/> <source>Load the theme?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="211"/> + <location filename="../../../OptionDialog.cpp" line="218"/> <source>Load the language?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="298"/> + <location filename="../../../OptionDialog.cpp" line="305"/> <source>Do nothing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="299"/> + <location filename="../../../OptionDialog.cpp" line="306"/> <source>Ask source as folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="300"/> + <location filename="../../../OptionDialog.cpp" line="307"/> <source>Ask sources as files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="301"/> + <location filename="../../../OptionDialog.cpp" line="308"/> <source>Never</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="302"/> + <location filename="../../../OptionDialog.cpp" line="309"/> <source>When source is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="303"/> + <location filename="../../../OptionDialog.cpp" line="310"/> <source>When destination is same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="304"/> + <location filename="../../../OptionDialog.cpp" line="311"/> <source>When source and destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="305"/> + <location filename="../../../OptionDialog.cpp" line="312"/> <source>When source or destination are same</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="306"/> + <location filename="../../../OptionDialog.cpp" line="313"/> <source>Always</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="320"/> - <location filename="../../../OptionDialog.cpp" line="321"/> - <location filename="../../../OptionDialog.cpp" line="322"/> + <location filename="../../../OptionDialog.cpp" line="327"/> + <location filename="../../../OptionDialog.cpp" line="328"/> + <location filename="../../../OptionDialog.cpp" line="329"/> <source>The variables are %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../OptionDialog.cpp" line="962"/> + <location filename="../../../OptionDialog.cpp" line="969"/> <source>Save logs as: </source> <translation type="unfinished"></translation> </message> @@ -1771,12 +1784,12 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../ProductKey.cpp" line="56"/> + <location filename="../../../ProductKey.cpp" line="60"/> <source>Error</source> <translation type="unfinished">錯誤</translation> </message> <message> - <location filename="../../../ProductKey.cpp" line="56"/> + <location filename="../../../ProductKey.cpp" line="60"/> <source>Your product key was rejected.<br />If you buy key, unmark check your spam and unmark the mail as spam<br />If you have not buy your key, go to <a href="https://shop.first-world.info/">https://shop.first-world.info/</a></source> <translation type="unfinished"></translation> </message> @@ -1834,12 +1847,12 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="541"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="543"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="595"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/ReadThread.cpp" line="599"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -1895,32 +1908,38 @@ Error:%2</source> <context> <name>ScanFileOrFolder</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="452"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="454"/> - <source>%1 - copy</source> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="331"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="681"/> + <source>Blacklisted folder</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="463"/> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="465"/> - <source>%1 - copy (%2)</source> + <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="576"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="578"/> - <source>%name% - copy</source> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="474"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="476"/> + <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="587"/> <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="589"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="598"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="600"/> <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="673"/> - <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="677"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="691"/> + <location filename="../../CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp" line="695"/> <source>Problem with folder read</source> <translation type="unfinished"></translation> </message> @@ -2031,61 +2050,61 @@ Error:%2</source> <context> <name>Themes</name> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="328"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="328"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="427"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="661"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="663"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1091"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1092"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1093"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1095"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1289"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1301"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1313"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1395"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1407"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/interface.cpp" line="1388"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1392"/> - <location filename="../../Themes/Oxygen/interface.cpp" line="1394"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1494"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1498"/> + <location filename="../../Themes/Oxygen/interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -2093,24 +2112,24 @@ Error:%2</source> <context> <name>ThemesFactory</name> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="284"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="285"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="286"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="482"/> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="497"/> - <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="512"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="510"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="525"/> + <location filename="../../Themes/Oxygen/ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -2118,29 +2137,29 @@ Error:%2</source> <context> <name>TransferThread</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="179"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="188"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="613"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="628"/> <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="620"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="635"/> <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="648"/> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="663"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/> <source>File not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="889"/> - <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="925"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="904"/> + <location filename="../../CopyEngine/Ultracopier-Spec/TransferThread.cpp" line="940"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -2148,19 +2167,19 @@ Error:%2</source> <context> <name>TransferThreadAsync</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="340"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="342"/> <source>Wrong modification date or unable to get it, you can disable time transfer to do it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="428"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="446"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="436"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="454"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="431"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="448"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="439"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp" line="456"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> @@ -2168,24 +2187,24 @@ Error:%2</source> <context> <name>WriteThread</name> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="135"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="138"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="164"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="197"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="167"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="200"/> <source>Unable to create the destination folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="175"/> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="199"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="178"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="202"/> <source>Unable to create the destination folder, errno: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="456"/> + <location filename="../../CopyEngine/Ultracopier-Spec/async/WriteThread.cpp" line="464"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> @@ -2500,7 +2519,7 @@ Error:%2</source> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="341"/> - <source>Overwrite if newer</source> + <source>Overwrite if source newer than destination</source> <translation type="unfinished"></translation> </message> <message> @@ -2511,8 +2530,12 @@ Error:%2</source> </message> <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="354"/> + <source>Overwrite if source older than destination</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../CopyEngine/Ultracopier-Spec/fileExistsDialog.ui" line="357"/> - <source>Overwrite if older</source> + <source>Overwrite if destination older</source> <translation type="unfinished"></translation> </message> <message> @@ -2900,7 +2923,7 @@ Error:%2</source> </message> <message> <location filename="../../Themes/Oxygen/themesOptions.ui" line="213"/> - <source>Informations</source> + <source>Information</source> <translation type="unfinished"></translation> </message> <message> @@ -2914,28 +2937,38 @@ Error:%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="257"/> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="269"/> + <source>Click to edit the color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="267"/> - <source>Show dual progression</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="378"/> + <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="277"/> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="287"/> - <source>Progression color</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="395"/> + <source>General margin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../Themes/Oxygen/themesOptions.ui" line="306"/> - <source>Click to edit the color</source> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="402"/> + <source>Show dual progression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../Themes/Oxygen/themesOptions.ui" line="425"/> + <source>General spacing</source> <translation type="unfinished"></translation> </message> </context> diff --git a/plugins/Listener/catchcopy-v0002/.qmake.stash b/plugins/Listener/catchcopy-v0002/.qmake.stash new file mode 100644 index 0000000..1ed2e69 --- /dev/null +++ b/plugins/Listener/catchcopy-v0002/.qmake.stash @@ -0,0 +1,23 @@ +QMAKE_CXX.QT_COMPILER_STDCXX = 201703L +QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 11 +QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 2 +QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 0 +QMAKE_CXX.COMPILER_MACROS = \ + QT_COMPILER_STDCXX \ + QMAKE_GCC_MAJOR_VERSION \ + QMAKE_GCC_MINOR_VERSION \ + QMAKE_GCC_PATCH_VERSION +QMAKE_CXX.INCDIRS = \ + /usr/include/c++/11 \ + /usr/include/x86_64-linux-gnu/c++/11 \ + /usr/include/c++/11/backward \ + /usr/lib/gcc/x86_64-linux-gnu/11/include \ + /usr/local/include \ + /usr/include/x86_64-linux-gnu \ + /usr/include +QMAKE_CXX.LIBDIRS = \ + /usr/lib/gcc/x86_64-linux-gnu/11 \ + /usr/lib/x86_64-linux-gnu \ + /usr/lib \ + /lib/x86_64-linux-gnu \ + /lib diff --git a/plugins/Listener/catchcopy-v0002/ExtraSocketCatchcopy.o b/plugins/Listener/catchcopy-v0002/ExtraSocketCatchcopy.o Binary files differnew file mode 100644 index 0000000..5b78cf0 --- /dev/null +++ b/plugins/Listener/catchcopy-v0002/ExtraSocketCatchcopy.o diff --git a/plugins/Listener/catchcopy-v0002/Makefile b/plugins/Listener/catchcopy-v0002/Makefile new file mode 100644 index 0000000..ed28d2c --- /dev/null +++ b/plugins/Listener/catchcopy-v0002/Makefile @@ -0,0 +1,634 @@ +############################################################################# +# Makefile for building: liblistener.so +# Generated by qmake (3.1) (Qt 5.15.2) +# Project: listener.pro +# Template: lib +# Command: /usr/lib/qt5/bin/qmake -o Makefile listener.pro -spec linux-g++ CONFIG+=debug +############################################################################# + +MAKEFILE = Makefile + +EQ = = + +####### Compiler, tools and options + +CC = gcc +CXX = g++ +DEFINES = -DQT_PLUGIN -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB +CFLAGS = -pipe -g -Wall -Wextra -D_REENTRANT -fPIC $(DEFINES) +CXXFLAGS = -pipe -std=c++0x -Wall -Wextra -g -std=gnu++11 -Wall -Wextra -D_REENTRANT -fPIC $(DEFINES) +INCPATH = -I. -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I. -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ +QMAKE = /usr/lib/qt5/bin/qmake +DEL_FILE = rm -f +CHK_DIR_EXISTS= test -d +MKDIR = mkdir -p +COPY = cp -f +COPY_FILE = cp -f +COPY_DIR = cp -f -R +INSTALL_FILE = install -m 644 -p +INSTALL_PROGRAM = install -m 755 -p +INSTALL_DIR = cp -f -R +QINSTALL = /usr/lib/qt5/bin/qmake -install qinstall +QINSTALL_PROGRAM = /usr/lib/qt5/bin/qmake -install qinstall -exe +DEL_FILE = rm -f +SYMLINK = ln -f -s +DEL_DIR = rmdir +MOVE = mv -f +TAR = tar -cf +COMPRESS = gzip -9f +DISTNAME = listener1.0.0 +DISTDIR = /home/user/Desktop/ultracopier/sources/plugins/Listener/catchcopy-v0002/.tmp/listener1.0.0 +LINK = g++ +LFLAGS = -shared +LIBS = $(SUBLIBS) /usr/lib/x86_64-linux-gnu/libQt5Gui.so /usr/lib/x86_64-linux-gnu/libQt5Network.so /usr/lib/x86_64-linux-gnu/libQt5Core.so -lGL -lpthread +AR = ar cqs +RANLIB = +SED = sed +STRIP = strip + +####### Output directory + +OBJECTS_DIR = ./ + +####### Files + +SOURCES = listener.cpp \ + catchcopy-api-0002/ServerCatchcopy.cpp \ + catchcopy-api-0002/ExtraSocketCatchcopy.cpp \ + ../../../cpp11addition.cpp \ + ../../../cpp11additionstringtointcpp.cpp moc_listener.cpp \ + moc_ServerCatchcopy.cpp \ + moc_PluginInterface_Listener.cpp +OBJECTS = listener.o \ + ServerCatchcopy.o \ + ExtraSocketCatchcopy.o \ + cpp11addition.o \ + cpp11additionstringtointcpp.o \ + moc_listener.o \ + moc_ServerCatchcopy.o \ + moc_PluginInterface_Listener.o +DIST = /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/sanitize.conf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_Attica.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_Baloo.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KActivities.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KArchive.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KAuth.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KAuthCore.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KBookmarks.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KCMUtils.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KCodecs.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KCompletion.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KConfigCore.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KConfigGui.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KConfigWidgets.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KCoreAddons.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KCrash.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KDBusAddons.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KEmoticons.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KFileMetaData.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KGlobalAccel.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KGuiAddons.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KI18n.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIconThemes.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIOCore.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIOFileWidgets.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIOGui.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIOWidgets.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KItemModels.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KItemViews.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KJobWidgets.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KNewStuff.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KNewStuffCore.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KNotifications.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KNotifyConfig.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KNTLM.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KParts.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KService.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KTextWidgets.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KUnitConversion.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KWidgetsAddons.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KWindowSystem.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KXmlGui.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_accessibility_support_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_devicediscovery_support_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_edid_support_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_egl_support_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_eglfs_kms_support_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_eglfsdeviceintegration_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_eventdispatcher_support_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_fb_support_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_fontdatabase_support_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_glx_support_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_input_support_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_kms_support_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_linuxaccessibility_support_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformcompositor_support_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_qml.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_qmlmodels.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_qmltest.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_qmlworkerscript.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_quick.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_quickwidgets.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_script.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_scripttools.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_service_support_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_theme_support_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_vulkan_support_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_websockets.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_x11extras.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xkbcommon_support_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_phonon4qt5.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_Solid.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_SonnetCore.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_SonnetUi.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qmake.conf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/toolchain.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources_functions.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qmake_use.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/file_copies.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf \ + listener.pro listener.h \ + catchcopy-api-0002/VariablesCatchcopy.h \ + catchcopy-api-0002/ServerCatchcopy.h \ + catchcopy-api-0002/ExtraSocketCatchcopy.h \ + Environment.h \ + Listenercatchcopy-v0002Variable.h \ + DebugEngineMacro.h \ + StructEnumDefinition.h \ + ../../../interface/PluginInterface_Listener.h \ + ../../../cpp11addition.h listener.cpp \ + catchcopy-api-0002/ServerCatchcopy.cpp \ + catchcopy-api-0002/ExtraSocketCatchcopy.cpp \ + ../../../cpp11addition.cpp \ + ../../../cpp11additionstringtointcpp.cpp +QMAKE_TARGET = listener +DESTDIR = +TARGET = liblistener.so +TARGETD = liblistener.so + + +first: all +####### Build rules + +liblistener.so: $(OBJECTS) $(SUBLIBS) $(OBJCOMP) + -$(DEL_FILE) $(TARGET) + $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS) $(OBJCOMP) + + + +Makefile: listener.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qmake.conf /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/sanitize.conf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_Attica.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_Baloo.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KActivities.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KArchive.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KAuth.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KAuthCore.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KBookmarks.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KCMUtils.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KCodecs.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KCompletion.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KConfigCore.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KConfigGui.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KConfigWidgets.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KCoreAddons.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KCrash.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KDBusAddons.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KEmoticons.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KFileMetaData.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KGlobalAccel.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KGuiAddons.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KI18n.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIconThemes.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIOCore.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIOFileWidgets.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIOGui.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIOWidgets.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KItemModels.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KItemViews.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KJobWidgets.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KNewStuff.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KNewStuffCore.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KNotifications.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KNotifyConfig.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KNTLM.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KParts.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KService.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KTextWidgets.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KUnitConversion.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KWidgetsAddons.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KWindowSystem.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KXmlGui.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_accessibility_support_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_devicediscovery_support_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_edid_support_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_egl_support_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_eglfs_kms_support_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_eglfsdeviceintegration_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_eventdispatcher_support_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_fb_support_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_fontdatabase_support_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_glx_support_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_input_support_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_kms_support_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_linuxaccessibility_support_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformcompositor_support_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_qml.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_qmlmodels.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_qmltest.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_qmlworkerscript.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_quick.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_quickwidgets.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_script.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_scripttools.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_service_support_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_theme_support_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_vulkan_support_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_websockets.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_x11extras.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xkbcommon_support_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_phonon4qt5.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_Solid.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_SonnetCore.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_SonnetUi.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qmake.conf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/toolchain.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources_functions.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qmake_use.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/file_copies.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf \ + listener.pro + $(QMAKE) -o Makefile listener.pro -spec linux-g++ CONFIG+=debug +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/sanitize.conf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_Attica.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_Baloo.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KActivities.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KArchive.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KAuth.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KAuthCore.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KBookmarks.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KCMUtils.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KCodecs.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KCompletion.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KConfigCore.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KConfigGui.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KConfigWidgets.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KCoreAddons.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KCrash.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KDBusAddons.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KEmoticons.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KFileMetaData.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KGlobalAccel.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KGuiAddons.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KI18n.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIconThemes.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIOCore.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIOFileWidgets.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIOGui.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIOWidgets.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KItemModels.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KItemViews.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KJobWidgets.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KNewStuff.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KNewStuffCore.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KNotifications.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KNotifyConfig.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KNTLM.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KParts.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KService.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KTextWidgets.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KUnitConversion.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KWidgetsAddons.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KWindowSystem.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KXmlGui.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_accessibility_support_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_devicediscovery_support_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_edid_support_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_egl_support_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_eglfs_kms_support_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_eglfsdeviceintegration_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_eventdispatcher_support_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_fb_support_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_fontdatabase_support_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_glx_support_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_input_support_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_kms_support_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_linuxaccessibility_support_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformcompositor_support_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_qml.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_qmlmodels.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_qmltest.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_qmlworkerscript.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_quick.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_quickwidgets.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_script.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_scripttools.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_service_support_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_theme_support_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_vulkan_support_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_websockets.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_x11extras.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xkbcommon_support_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_phonon4qt5.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_Solid.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_SonnetCore.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_SonnetUi.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qmake.conf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/toolchain.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources_functions.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qmake_use.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/file_copies.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf: +listener.pro: +qmake: FORCE + @$(QMAKE) -o Makefile listener.pro -spec linux-g++ CONFIG+=debug + +qmake_all: FORCE + + +all: Makefile liblistener.so + +dist: distdir FORCE + (cd `dirname $(DISTDIR)` && $(TAR) $(DISTNAME).tar $(DISTNAME) && $(COMPRESS) $(DISTNAME).tar) && $(MOVE) `dirname $(DISTDIR)`/$(DISTNAME).tar.gz . && $(DEL_FILE) -r $(DISTDIR) + +distdir: FORCE + @test -d $(DISTDIR) || mkdir -p $(DISTDIR) + $(COPY_FILE) --parents $(DIST) $(DISTDIR)/ + $(COPY_FILE) --parents /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/data/dummy.cpp $(DISTDIR)/ + $(COPY_FILE) --parents listener.h catchcopy-api-0002/VariablesCatchcopy.h catchcopy-api-0002/ServerCatchcopy.h catchcopy-api-0002/ExtraSocketCatchcopy.h Environment.h Listenercatchcopy-v0002Variable.h DebugEngineMacro.h StructEnumDefinition.h ../../../interface/PluginInterface_Listener.h ../../../cpp11addition.h $(DISTDIR)/ + $(COPY_FILE) --parents listener.cpp catchcopy-api-0002/ServerCatchcopy.cpp catchcopy-api-0002/ExtraSocketCatchcopy.cpp ../../../cpp11addition.cpp ../../../cpp11additionstringtointcpp.cpp $(DISTDIR)/ + + +clean: compiler_clean + -$(DEL_FILE) $(OBJECTS) + -$(DEL_FILE) *~ core *.core + + +distclean: clean + -$(DEL_FILE) $(TARGET) + -$(DEL_FILE) .qmake.stash + -$(DEL_FILE) Makefile + + +####### Sub-libraries + +mocclean: compiler_moc_header_clean compiler_moc_objc_header_clean compiler_moc_source_clean + +mocables: compiler_moc_header_make_all compiler_moc_objc_header_make_all compiler_moc_source_make_all + +check: first + +benchmark: first + +compiler_rcc_make_all: +compiler_rcc_clean: +compiler_moc_predefs_make_all: moc_predefs.h +compiler_moc_predefs_clean: + -$(DEL_FILE) moc_predefs.h +moc_predefs.h: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/data/dummy.cpp + g++ -pipe -std=c++0x -Wall -Wextra -g -std=gnu++11 -Wall -Wextra -dM -E -o moc_predefs.h /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/data/dummy.cpp + +compiler_moc_header_make_all: moc_listener.cpp moc_ServerCatchcopy.cpp moc_PluginInterface_Listener.cpp +compiler_moc_header_clean: + -$(DEL_FILE) moc_listener.cpp moc_ServerCatchcopy.cpp moc_PluginInterface_Listener.cpp +moc_listener.cpp: listener.h \ + Environment.h \ + Listenercatchcopy-v0002Variable.h \ + StructEnumDefinition.h \ + ../../../StructEnumDefinition.h \ + DebugEngineMacro.h \ + ../../../interface/PluginInterface_Listener.h \ + ../../../interface/OptionInterface.h \ + catchcopy-api-0002/ServerCatchcopy.h \ + moc_predefs.h \ + /usr/lib/qt5/bin/moc + /usr/lib/qt5/bin/moc $(DEFINES) --include /home/user/Desktop/ultracopier/sources/plugins/Listener/catchcopy-v0002/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/user/Desktop/ultracopier/sources/plugins/Listener/catchcopy-v0002 -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I/usr/include/c++/11 -I/usr/include/x86_64-linux-gnu/c++/11 -I/usr/include/c++/11/backward -I/usr/lib/gcc/x86_64-linux-gnu/11/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu -I/usr/include listener.h -o moc_listener.cpp + +moc_ServerCatchcopy.cpp: catchcopy-api-0002/ServerCatchcopy.h \ + moc_predefs.h \ + /usr/lib/qt5/bin/moc + /usr/lib/qt5/bin/moc $(DEFINES) --include /home/user/Desktop/ultracopier/sources/plugins/Listener/catchcopy-v0002/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/user/Desktop/ultracopier/sources/plugins/Listener/catchcopy-v0002 -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I/usr/include/c++/11 -I/usr/include/x86_64-linux-gnu/c++/11 -I/usr/include/c++/11/backward -I/usr/lib/gcc/x86_64-linux-gnu/11/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu -I/usr/include catchcopy-api-0002/ServerCatchcopy.h -o moc_ServerCatchcopy.cpp + +moc_PluginInterface_Listener.cpp: ../../../interface/PluginInterface_Listener.h \ + ../../../interface/OptionInterface.h \ + ../../../StructEnumDefinition.h \ + moc_predefs.h \ + /usr/lib/qt5/bin/moc + /usr/lib/qt5/bin/moc $(DEFINES) --include /home/user/Desktop/ultracopier/sources/plugins/Listener/catchcopy-v0002/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/user/Desktop/ultracopier/sources/plugins/Listener/catchcopy-v0002 -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I/usr/include/c++/11 -I/usr/include/x86_64-linux-gnu/c++/11 -I/usr/include/c++/11/backward -I/usr/lib/gcc/x86_64-linux-gnu/11/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu -I/usr/include ../../../interface/PluginInterface_Listener.h -o moc_PluginInterface_Listener.cpp + +compiler_moc_objc_header_make_all: +compiler_moc_objc_header_clean: +compiler_moc_source_make_all: +compiler_moc_source_clean: +compiler_yacc_decl_make_all: +compiler_yacc_decl_clean: +compiler_yacc_impl_make_all: +compiler_yacc_impl_clean: +compiler_lex_make_all: +compiler_lex_clean: +compiler_clean: compiler_moc_predefs_clean compiler_moc_header_clean + +####### Compile + +listener.o: listener.cpp listener.h \ + Environment.h \ + Listenercatchcopy-v0002Variable.h \ + StructEnumDefinition.h \ + ../../../StructEnumDefinition.h \ + DebugEngineMacro.h \ + ../../../interface/PluginInterface_Listener.h \ + ../../../interface/OptionInterface.h \ + catchcopy-api-0002/ServerCatchcopy.h \ + catchcopy-api-0002/ExtraSocketCatchcopy.h \ + ../../../cpp11addition.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o listener.o listener.cpp + +ServerCatchcopy.o: catchcopy-api-0002/ServerCatchcopy.cpp catchcopy-api-0002/ServerCatchcopy.h \ + catchcopy-api-0002/VariablesCatchcopy.h \ + catchcopy-api-0002/ExtraSocketCatchcopy.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ServerCatchcopy.o catchcopy-api-0002/ServerCatchcopy.cpp + +ExtraSocketCatchcopy.o: catchcopy-api-0002/ExtraSocketCatchcopy.cpp catchcopy-api-0002/ExtraSocketCatchcopy.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ExtraSocketCatchcopy.o catchcopy-api-0002/ExtraSocketCatchcopy.cpp + +cpp11addition.o: ../../../cpp11addition.cpp ../../../cpp11addition.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o cpp11addition.o ../../../cpp11addition.cpp + +cpp11additionstringtointcpp.o: ../../../cpp11additionstringtointcpp.cpp ../../../cpp11addition.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o cpp11additionstringtointcpp.o ../../../cpp11additionstringtointcpp.cpp + +moc_listener.o: moc_listener.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_listener.o moc_listener.cpp + +moc_ServerCatchcopy.o: moc_ServerCatchcopy.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_ServerCatchcopy.o moc_ServerCatchcopy.cpp + +moc_PluginInterface_Listener.o: moc_PluginInterface_Listener.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_PluginInterface_Listener.o moc_PluginInterface_Listener.cpp + +####### Install + +install: FORCE + +uninstall: FORCE + +FORCE: + diff --git a/plugins/Listener/catchcopy-v0002/ServerCatchcopy.o b/plugins/Listener/catchcopy-v0002/ServerCatchcopy.o Binary files differnew file mode 100644 index 0000000..df8b7f4 --- /dev/null +++ b/plugins/Listener/catchcopy-v0002/ServerCatchcopy.o diff --git a/plugins/Listener/catchcopy-v0002/catchcopy-api-0002/ServerCatchcopy.cpp b/plugins/Listener/catchcopy-v0002/catchcopy-api-0002/ServerCatchcopy.cpp index 6fd1172..cb3c8c2 100755 --- a/plugins/Listener/catchcopy-v0002/catchcopy-api-0002/ServerCatchcopy.cpp +++ b/plugins/Listener/catchcopy-v0002/catchcopy-api-0002/ServerCatchcopy.cpp @@ -27,6 +27,7 @@ std::string stringimplode2(const std::vector<std::string>& elems, const std::str ServerCatchcopy::ServerCatchcopy() { + nextOrderId=0; name="Default avanced copier"; idNextClient=0; error_string="Unknown error"; @@ -151,7 +152,11 @@ void ServerCatchcopy::newConnection() newClient.detectTimeOut->setSingleShot(true); newClient.detectTimeOut->setInterval(CATCHCOPY_COMMUNICATION_TIMEOUT); newClient.name="Unknown"; + #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) connect(newClient.socket, static_cast<void(QLocalSocket::*)(QLocalSocket::LocalSocketError)>(&QLocalSocket::error), this, &ServerCatchcopy::connectionError,Qt::QueuedConnection); + #else + connect(newClient.socket, static_cast<void(QLocalSocket::*)(QLocalSocket::LocalSocketError)>(&QLocalSocket::errorOccurred), this, &ServerCatchcopy::connectionError,Qt::QueuedConnection); + #endif connect(newClient.socket, &QIODevice::readyRead, this, &ServerCatchcopy::readyRead,Qt::QueuedConnection); connect(newClient.socket, &QLocalSocket::disconnected, this, &ServerCatchcopy::disconnected,Qt::QueuedConnection); connect(newClient.detectTimeOut,&QTimer::timeout, this, &ServerCatchcopy::checkTimeOut,Qt::QueuedConnection); diff --git a/plugins/Listener/catchcopy-v0002/cpp11addition.o b/plugins/Listener/catchcopy-v0002/cpp11addition.o Binary files differnew file mode 100644 index 0000000..1a5437d --- /dev/null +++ b/plugins/Listener/catchcopy-v0002/cpp11addition.o diff --git a/plugins/Listener/catchcopy-v0002/cpp11additionstringtointcpp.o b/plugins/Listener/catchcopy-v0002/cpp11additionstringtointcpp.o Binary files differnew file mode 100644 index 0000000..3d14b46 --- /dev/null +++ b/plugins/Listener/catchcopy-v0002/cpp11additionstringtointcpp.o diff --git a/plugins/Listener/catchcopy-v0002/informations.xml b/plugins/Listener/catchcopy-v0002/informations.xml index 3d97245..b8943bf 100755 --- 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>2.2.4.7</version> + <version>2.2.6.0</version> <!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. --> <name>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/liblistener.so b/plugins/Listener/catchcopy-v0002/liblistener.so Binary files differnew file mode 100755 index 0000000..00ff4a1 --- /dev/null +++ b/plugins/Listener/catchcopy-v0002/liblistener.so diff --git a/plugins/Listener/catchcopy-v0002/listener.o b/plugins/Listener/catchcopy-v0002/listener.o Binary files differnew file mode 100644 index 0000000..6c03d69 --- /dev/null +++ b/plugins/Listener/catchcopy-v0002/listener.o diff --git a/plugins/Listener/catchcopy-v0002/listener.pro.user.4.9-pre1 b/plugins/Listener/catchcopy-v0002/listener.pro.user.4.9-pre1 new file mode 100755 index 0000000..aa10052 --- /dev/null +++ b/plugins/Listener/catchcopy-v0002/listener.pro.user.4.9-pre1 @@ -0,0 +1,311 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE QtCreatorProject> +<!-- Written by QtCreator 4.8.2, 2020-04-06T18:54:47. --> +<qtcreator> + <data> + <variable>EnvironmentId</variable> + <value type="QByteArray">{74ab603f-f657-4135-92cf-c93af71b2f91}</value> + </data> + <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="QByteArray" key="CurrentPreferences">CppGlobal</value> + </valuemap> + </valuemap> + <value type="int" key="EditorConfiguration.CodeStyle.Count">1</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="int" key="EditorConfiguration.MarginColumn">80</value> + <value type="bool" key="EditorConfiguration.MouseHiding">true</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="bool" key="EditorConfiguration.ShowMargin">false</value> + <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value> + <value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</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</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{23178a1c-09be-4e9f-9aab-ff55e05e7637}</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"> + <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/user/Desktop/ultracopier/sources/plugins/Listener/build-listener-Desktop-Debug</value> + <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="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value> + <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">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="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/> + <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> + <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</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="QString" 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="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/> + <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> + <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</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="QString" 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">Debug</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> + <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> + <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/user/Desktop/ultracopier/sources/plugins/Listener/build-listener-Desktop-Release</value> + <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="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> + <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">true</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="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/> + <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> + <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</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="QString" 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="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/> + <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> + <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</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="QString" 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">Release</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> + <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2"> + <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/user/Desktop/ultracopier/sources/plugins/Listener/build-listener-Desktop-Profile</value> + <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="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value> + <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">true</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">true</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="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/> + <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> + <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</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="QString" 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="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/> + <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> + <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</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="QString" 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">Profile</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Profile</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> + <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">3</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="QString" 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 Configuration</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> + <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> + <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> + <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value> + <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> + <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value> + <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value> + <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value> + <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> + <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> + <value type="int">0</value> + <value type="int">1</value> + <value type="int">2</value> + <value type="int">3</value> + <value type="int">4</value> + <value type="int">5</value> + <value type="int">6</value> + <value type="int">7</value> + <value type="int">8</value> + <value type="int">9</value> + <value type="int">10</value> + <value type="int">11</value> + <value type="int">12</value> + <value type="int">13</value> + <value type="int">14</value> + </valuelist> + <value type="int" key="PE.EnvironmentAspect.Base">2</value> + <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/> + <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Executable"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value> + <value type="QString" key="RunConfiguration.Arguments"></value> + <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> + <value type="bool" key="RunConfiguration.UseCppDebugger">false</value> + <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">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> + <value type="QString" key="RunConfiguration.WorkingDirectory"></value> + <value type="QString" key="RunConfiguration.WorkingDirectory.default"></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.FileVersion</variable> + <value type="int">20</value> + </data> + <data> + <variable>Version</variable> + <value type="int">20</value> + </data> +</qtcreator> diff --git a/plugins/Listener/catchcopy-v0002/moc_PluginInterface_Listener.cpp b/plugins/Listener/catchcopy-v0002/moc_PluginInterface_Listener.cpp new file mode 100644 index 0000000..5c0ab84 --- /dev/null +++ b/plugins/Listener/catchcopy-v0002/moc_PluginInterface_Listener.cpp @@ -0,0 +1,299 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'PluginInterface_Listener.h' +** +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.2) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include <memory> +#include "../../../interface/PluginInterface_Listener.h" +#include <QtCore/qbytearray.h> +#include <QtCore/qmetatype.h> +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'PluginInterface_Listener.h' doesn't include <QObject>." +#elif Q_MOC_OUTPUT_REVISION != 67 +#error "This file was generated using the moc from 5.15.2. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED +struct qt_meta_stringdata_PluginInterface_Listener_t { + QByteArrayData data[28]; + char stringdata0[365]; +}; +#define QT_MOC_LITERAL(idx, ofs, len) \ + Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ + qptrdiff(offsetof(qt_meta_stringdata_PluginInterface_Listener_t, stringdata0) + ofs \ + - idx * sizeof(QByteArrayData)) \ + ) +static const qt_meta_stringdata_PluginInterface_Listener_t qt_meta_stringdata_PluginInterface_Listener = { + { +QT_MOC_LITERAL(0, 0, 24), // "PluginInterface_Listener" +QT_MOC_LITERAL(1, 25, 8), // "newState" +QT_MOC_LITERAL(2, 34, 0), // "" +QT_MOC_LITERAL(3, 35, 27), // "Ultracopier::ListeningState" +QT_MOC_LITERAL(4, 63, 5), // "state" +QT_MOC_LITERAL(5, 69, 25), // "newCopyWithoutDestination" +QT_MOC_LITERAL(6, 95, 8), // "uint32_t" +QT_MOC_LITERAL(7, 104, 7), // "orderId" +QT_MOC_LITERAL(8, 112, 24), // "std::vector<std::string>" +QT_MOC_LITERAL(9, 137, 7), // "sources" +QT_MOC_LITERAL(10, 145, 7), // "newCopy" +QT_MOC_LITERAL(11, 153, 11), // "std::string" +QT_MOC_LITERAL(12, 165, 11), // "destination" +QT_MOC_LITERAL(13, 177, 25), // "newMoveWithoutDestination" +QT_MOC_LITERAL(14, 203, 7), // "newMove" +QT_MOC_LITERAL(15, 211, 5), // "error" +QT_MOC_LITERAL(16, 217, 13), // "newClientList" +QT_MOC_LITERAL(17, 231, 16), // "debugInformation" +QT_MOC_LITERAL(18, 248, 23), // "Ultracopier::DebugLevel" +QT_MOC_LITERAL(19, 272, 5), // "level" +QT_MOC_LITERAL(20, 278, 8), // "fonction" +QT_MOC_LITERAL(21, 287, 4), // "text" +QT_MOC_LITERAL(22, 292, 4), // "file" +QT_MOC_LITERAL(23, 297, 5), // "ligne" +QT_MOC_LITERAL(24, 303, 16), // "transferFinished" +QT_MOC_LITERAL(25, 320, 9), // "withError" +QT_MOC_LITERAL(26, 330, 16), // "transferCanceled" +QT_MOC_LITERAL(27, 347, 17) // "newLanguageLoaded" + + }, + "PluginInterface_Listener\0newState\0\0" + "Ultracopier::ListeningState\0state\0" + "newCopyWithoutDestination\0uint32_t\0" + "orderId\0std::vector<std::string>\0" + "sources\0newCopy\0std::string\0destination\0" + "newMoveWithoutDestination\0newMove\0" + "error\0newClientList\0debugInformation\0" + "Ultracopier::DebugLevel\0level\0fonction\0" + "text\0file\0ligne\0transferFinished\0" + "withError\0transferCanceled\0newLanguageLoaded" +}; +#undef QT_MOC_LITERAL + +static const uint qt_meta_data_PluginInterface_Listener[] = { + + // content: + 8, // revision + 0, // classname + 0, 0, // classinfo + 11, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 8, // signalCount + + // signals: name, argc, parameters, tag, flags + 1, 1, 69, 2, 0x06 /* Public */, + 5, 2, 72, 2, 0x06 /* Public */, + 10, 3, 77, 2, 0x06 /* Public */, + 13, 2, 84, 2, 0x06 /* Public */, + 14, 3, 89, 2, 0x06 /* Public */, + 15, 1, 96, 2, 0x06 /* Public */, + 16, 0, 99, 2, 0x06 /* Public */, + 17, 5, 100, 2, 0x06 /* Public */, + + // slots: name, argc, parameters, tag, flags + 24, 2, 111, 2, 0x0a /* Public */, + 26, 1, 116, 2, 0x0a /* Public */, + 27, 0, 119, 2, 0x0a /* Public */, + + // signals: parameters + QMetaType::Void, 0x80000000 | 3, 4, + QMetaType::Void, 0x80000000 | 6, 0x80000000 | 8, 7, 9, + QMetaType::Void, 0x80000000 | 6, 0x80000000 | 8, 0x80000000 | 11, 7, 9, 12, + QMetaType::Void, 0x80000000 | 6, 0x80000000 | 8, 7, 9, + QMetaType::Void, 0x80000000 | 6, 0x80000000 | 8, 0x80000000 | 11, 7, 9, 12, + QMetaType::Void, 0x80000000 | 11, 15, + QMetaType::Void, + QMetaType::Void, 0x80000000 | 18, 0x80000000 | 11, 0x80000000 | 11, 0x80000000 | 11, QMetaType::Int, 19, 20, 21, 22, 23, + + // slots: parameters + QMetaType::Void, 0x80000000 | 6, QMetaType::Bool, 7, 25, + QMetaType::Void, 0x80000000 | 6, 7, + QMetaType::Void, + + 0 // eod +}; + +void PluginInterface_Listener::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + auto *_t = static_cast<PluginInterface_Listener *>(_o); + Q_UNUSED(_t) + switch (_id) { + case 0: _t->newState((*reinterpret_cast< const Ultracopier::ListeningState(*)>(_a[1]))); break; + case 1: _t->newCopyWithoutDestination((*reinterpret_cast< const uint32_t(*)>(_a[1])),(*reinterpret_cast< const std::vector<std::string>(*)>(_a[2]))); break; + case 2: _t->newCopy((*reinterpret_cast< const uint32_t(*)>(_a[1])),(*reinterpret_cast< const std::vector<std::string>(*)>(_a[2])),(*reinterpret_cast< const std::string(*)>(_a[3]))); break; + case 3: _t->newMoveWithoutDestination((*reinterpret_cast< const uint32_t(*)>(_a[1])),(*reinterpret_cast< const std::vector<std::string>(*)>(_a[2]))); break; + case 4: _t->newMove((*reinterpret_cast< const uint32_t(*)>(_a[1])),(*reinterpret_cast< const std::vector<std::string>(*)>(_a[2])),(*reinterpret_cast< const std::string(*)>(_a[3]))); break; + case 5: _t->error((*reinterpret_cast< const std::string(*)>(_a[1]))); break; + case 6: _t->newClientList(); break; + case 7: _t->debugInformation((*reinterpret_cast< const Ultracopier::DebugLevel(*)>(_a[1])),(*reinterpret_cast< const std::string(*)>(_a[2])),(*reinterpret_cast< const std::string(*)>(_a[3])),(*reinterpret_cast< const std::string(*)>(_a[4])),(*reinterpret_cast< const int(*)>(_a[5]))); break; + case 8: _t->transferFinished((*reinterpret_cast< const uint32_t(*)>(_a[1])),(*reinterpret_cast< const bool(*)>(_a[2]))); break; + case 9: _t->transferCanceled((*reinterpret_cast< const uint32_t(*)>(_a[1]))); break; + case 10: _t->newLanguageLoaded(); break; + default: ; + } + } else if (_c == QMetaObject::IndexOfMethod) { + int *result = reinterpret_cast<int *>(_a[0]); + { + using _t = void (PluginInterface_Listener::*)(const Ultracopier::ListeningState & ) const; + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&PluginInterface_Listener::newState)) { + *result = 0; + return; + } + } + { + using _t = void (PluginInterface_Listener::*)(const uint32_t & , const std::vector<std::string> & ) const; + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&PluginInterface_Listener::newCopyWithoutDestination)) { + *result = 1; + return; + } + } + { + using _t = void (PluginInterface_Listener::*)(const uint32_t & , const std::vector<std::string> & , const std::string & ) const; + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&PluginInterface_Listener::newCopy)) { + *result = 2; + return; + } + } + { + using _t = void (PluginInterface_Listener::*)(const uint32_t & , const std::vector<std::string> & ) const; + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&PluginInterface_Listener::newMoveWithoutDestination)) { + *result = 3; + return; + } + } + { + using _t = void (PluginInterface_Listener::*)(const uint32_t & , const std::vector<std::string> & , const std::string & ) const; + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&PluginInterface_Listener::newMove)) { + *result = 4; + return; + } + } + { + using _t = void (PluginInterface_Listener::*)(const std::string & ) const; + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&PluginInterface_Listener::error)) { + *result = 5; + return; + } + } + { + using _t = void (PluginInterface_Listener::*)() const; + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&PluginInterface_Listener::newClientList)) { + *result = 6; + return; + } + } + { + using _t = void (PluginInterface_Listener::*)(const Ultracopier::DebugLevel & , const std::string & , const std::string & , const std::string & , const int & ) const; + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&PluginInterface_Listener::debugInformation)) { + *result = 7; + return; + } + } + } +} + +QT_INIT_METAOBJECT const QMetaObject PluginInterface_Listener::staticMetaObject = { { + QMetaObject::SuperData::link<QObject::staticMetaObject>(), + qt_meta_stringdata_PluginInterface_Listener.data, + qt_meta_data_PluginInterface_Listener, + qt_static_metacall, + nullptr, + nullptr +} }; + + +const QMetaObject *PluginInterface_Listener::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject; +} + +void *PluginInterface_Listener::qt_metacast(const char *_clname) +{ + if (!_clname) return nullptr; + if (!strcmp(_clname, qt_meta_stringdata_PluginInterface_Listener.stringdata0)) + return static_cast<void*>(this); + return QObject::qt_metacast(_clname); +} + +int PluginInterface_Listener::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 11) + qt_static_metacall(this, _c, _id, _a); + _id -= 11; + } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { + if (_id < 11) + *reinterpret_cast<int*>(_a[0]) = -1; + _id -= 11; + } + return _id; +} + +// SIGNAL 0 +void PluginInterface_Listener::newState(const Ultracopier::ListeningState & _t1)const +{ + void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))) }; + QMetaObject::activate(const_cast< PluginInterface_Listener *>(this), &staticMetaObject, 0, _a); +} + +// SIGNAL 1 +void PluginInterface_Listener::newCopyWithoutDestination(const uint32_t & _t1, const std::vector<std::string> & _t2)const +{ + void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))), const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t2))) }; + QMetaObject::activate(const_cast< PluginInterface_Listener *>(this), &staticMetaObject, 1, _a); +} + +// SIGNAL 2 +void PluginInterface_Listener::newCopy(const uint32_t & _t1, const std::vector<std::string> & _t2, const std::string & _t3)const +{ + void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))), const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t2))), const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t3))) }; + QMetaObject::activate(const_cast< PluginInterface_Listener *>(this), &staticMetaObject, 2, _a); +} + +// SIGNAL 3 +void PluginInterface_Listener::newMoveWithoutDestination(const uint32_t & _t1, const std::vector<std::string> & _t2)const +{ + void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))), const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t2))) }; + QMetaObject::activate(const_cast< PluginInterface_Listener *>(this), &staticMetaObject, 3, _a); +} + +// SIGNAL 4 +void PluginInterface_Listener::newMove(const uint32_t & _t1, const std::vector<std::string> & _t2, const std::string & _t3)const +{ + void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))), const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t2))), const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t3))) }; + QMetaObject::activate(const_cast< PluginInterface_Listener *>(this), &staticMetaObject, 4, _a); +} + +// SIGNAL 5 +void PluginInterface_Listener::error(const std::string & _t1)const +{ + void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))) }; + QMetaObject::activate(const_cast< PluginInterface_Listener *>(this), &staticMetaObject, 5, _a); +} + +// SIGNAL 6 +void PluginInterface_Listener::newClientList()const +{ + QMetaObject::activate(const_cast< PluginInterface_Listener *>(this), &staticMetaObject, 6, nullptr); +} + +// SIGNAL 7 +void PluginInterface_Listener::debugInformation(const Ultracopier::DebugLevel & _t1, const std::string & _t2, const std::string & _t3, const std::string & _t4, const int & _t5)const +{ + void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))), const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t2))), const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t3))), const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t4))), const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t5))) }; + QMetaObject::activate(const_cast< PluginInterface_Listener *>(this), &staticMetaObject, 7, _a); +} +QT_WARNING_POP +QT_END_MOC_NAMESPACE diff --git a/plugins/Listener/catchcopy-v0002/moc_PluginInterface_Listener.o b/plugins/Listener/catchcopy-v0002/moc_PluginInterface_Listener.o Binary files differnew file mode 100644 index 0000000..27ebed1 --- /dev/null +++ b/plugins/Listener/catchcopy-v0002/moc_PluginInterface_Listener.o diff --git a/plugins/Listener/catchcopy-v0002/moc_ServerCatchcopy.cpp b/plugins/Listener/catchcopy-v0002/moc_ServerCatchcopy.cpp new file mode 100644 index 0000000..68883b6 --- /dev/null +++ b/plugins/Listener/catchcopy-v0002/moc_ServerCatchcopy.cpp @@ -0,0 +1,475 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ServerCatchcopy.h' +** +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.2) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include <memory> +#include "catchcopy-api-0002/ServerCatchcopy.h" +#include <QtCore/qbytearray.h> +#include <QtCore/qmetatype.h> +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ServerCatchcopy.h' doesn't include <QObject>." +#elif Q_MOC_OUTPUT_REVISION != 67 +#error "This file was generated using the moc from 5.15.2. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED +struct qt_meta_stringdata_ServerCatchcopy_t { + QByteArrayData data[48]; + char stringdata0[645]; +}; +#define QT_MOC_LITERAL(idx, ofs, len) \ + Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ + qptrdiff(offsetof(qt_meta_stringdata_ServerCatchcopy_t, stringdata0) + ofs \ + - idx * sizeof(QByteArrayData)) \ + ) +static const qt_meta_stringdata_ServerCatchcopy_t qt_meta_stringdata_ServerCatchcopy = { + { +QT_MOC_LITERAL(0, 0, 15), // "ServerCatchcopy" +QT_MOC_LITERAL(1, 16, 15), // "connectedClient" +QT_MOC_LITERAL(2, 32, 0), // "" +QT_MOC_LITERAL(3, 33, 8), // "uint32_t" +QT_MOC_LITERAL(4, 42, 2), // "id" +QT_MOC_LITERAL(5, 45, 18), // "disconnectedClient" +QT_MOC_LITERAL(6, 64, 8), // "newQuery" +QT_MOC_LITERAL(7, 73, 6), // "client" +QT_MOC_LITERAL(8, 80, 7), // "orderId" +QT_MOC_LITERAL(9, 88, 24), // "std::vector<std::string>" +QT_MOC_LITERAL(10, 113, 10), // "returnList" +QT_MOC_LITERAL(11, 124, 5), // "error" +QT_MOC_LITERAL(12, 130, 11), // "std::string" +QT_MOC_LITERAL(13, 142, 18), // "communicationError" +QT_MOC_LITERAL(14, 161, 24), // "askProtocolCompatibility" +QT_MOC_LITERAL(15, 186, 7), // "version" +QT_MOC_LITERAL(16, 194, 20), // "askProtocolExtension" +QT_MOC_LITERAL(17, 215, 9), // "extension" +QT_MOC_LITERAL(18, 225, 10), // "clientName" +QT_MOC_LITERAL(19, 236, 4), // "name" +QT_MOC_LITERAL(20, 241, 13), // "askServerName" +QT_MOC_LITERAL(21, 255, 25), // "newCopyWithoutDestination" +QT_MOC_LITERAL(22, 281, 13), // "globalOrderId" +QT_MOC_LITERAL(23, 295, 7), // "sources" +QT_MOC_LITERAL(24, 303, 7), // "newCopy" +QT_MOC_LITERAL(25, 311, 11), // "destination" +QT_MOC_LITERAL(26, 323, 25), // "newMoveWithoutDestination" +QT_MOC_LITERAL(27, 349, 7), // "newMove" +QT_MOC_LITERAL(28, 357, 13), // "newConnection" +QT_MOC_LITERAL(29, 371, 15), // "connectionError" +QT_MOC_LITERAL(30, 387, 30), // "QLocalSocket::LocalSocketError" +QT_MOC_LITERAL(31, 418, 12), // "disconnected" +QT_MOC_LITERAL(32, 431, 9), // "readyRead" +QT_MOC_LITERAL(33, 441, 12), // "checkTimeOut" +QT_MOC_LITERAL(34, 454, 16), // "disconnectClient" +QT_MOC_LITERAL(35, 471, 5), // "reply" +QT_MOC_LITERAL(36, 477, 10), // "returnCode" +QT_MOC_LITERAL(37, 488, 12), // "returnString" +QT_MOC_LITERAL(38, 501, 17), // "protocolSupported" +QT_MOC_LITERAL(39, 519, 5), // "value" +QT_MOC_LITERAL(40, 525, 25), // "incorrectArgumentListSize" +QT_MOC_LITERAL(41, 551, 17), // "incorrectArgument" +QT_MOC_LITERAL(42, 569, 16), // "clientRegistered" +QT_MOC_LITERAL(43, 586, 10), // "serverName" +QT_MOC_LITERAL(44, 597, 12), // "copyFinished" +QT_MOC_LITERAL(45, 610, 9), // "withError" +QT_MOC_LITERAL(46, 620, 12), // "copyCanceled" +QT_MOC_LITERAL(47, 633, 11) // "unknowOrder" + + }, + "ServerCatchcopy\0connectedClient\0\0" + "uint32_t\0id\0disconnectedClient\0newQuery\0" + "client\0orderId\0std::vector<std::string>\0" + "returnList\0error\0std::string\0" + "communicationError\0askProtocolCompatibility\0" + "version\0askProtocolExtension\0extension\0" + "clientName\0name\0askServerName\0" + "newCopyWithoutDestination\0globalOrderId\0" + "sources\0newCopy\0destination\0" + "newMoveWithoutDestination\0newMove\0" + "newConnection\0connectionError\0" + "QLocalSocket::LocalSocketError\0" + "disconnected\0readyRead\0checkTimeOut\0" + "disconnectClient\0reply\0returnCode\0" + "returnString\0protocolSupported\0value\0" + "incorrectArgumentListSize\0incorrectArgument\0" + "clientRegistered\0serverName\0copyFinished\0" + "withError\0copyCanceled\0unknowOrder" +}; +#undef QT_MOC_LITERAL + +static const uint qt_meta_data_ServerCatchcopy[] = { + + // content: + 8, // revision + 0, // classname + 0, 0, // classinfo + 32, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 14, // signalCount + + // signals: name, argc, parameters, tag, flags + 1, 1, 174, 2, 0x06 /* Public */, + 5, 1, 177, 2, 0x06 /* Public */, + 6, 3, 180, 2, 0x06 /* Public */, + 11, 1, 187, 2, 0x06 /* Public */, + 13, 1, 190, 2, 0x06 /* Public */, + 14, 3, 193, 2, 0x06 /* Public */, + 16, 3, 200, 2, 0x06 /* Public */, + 16, 4, 207, 2, 0x06 /* Public */, + 18, 2, 216, 2, 0x06 /* Public */, + 20, 2, 221, 2, 0x06 /* Public */, + 21, 2, 226, 2, 0x06 /* Public */, + 24, 3, 231, 2, 0x06 /* Public */, + 26, 2, 238, 2, 0x06 /* Public */, + 27, 3, 243, 2, 0x06 /* Public */, + + // slots: name, argc, parameters, tag, flags + 28, 0, 250, 2, 0x08 /* Private */, + 29, 1, 251, 2, 0x08 /* Private */, + 31, 0, 254, 2, 0x08 /* Private */, + 32, 0, 255, 2, 0x08 /* Private */, + 33, 0, 256, 2, 0x08 /* Private */, + 34, 1, 257, 2, 0x0a /* Public */, + 35, 4, 260, 2, 0x0a /* Public */, + 35, 4, 269, 2, 0x0a /* Public */, + 38, 3, 278, 2, 0x0a /* Public */, + 40, 2, 285, 2, 0x0a /* Public */, + 41, 2, 290, 2, 0x0a /* Public */, + 42, 2, 295, 2, 0x0a /* Public */, + 43, 3, 300, 2, 0x0a /* Public */, + 44, 3, 307, 2, 0x0a /* Public */, + 46, 2, 314, 2, 0x0a /* Public */, + 44, 2, 319, 2, 0x0a /* Public */, + 46, 1, 324, 2, 0x0a /* Public */, + 47, 2, 327, 2, 0x0a /* Public */, + + // signals: parameters + QMetaType::Void, 0x80000000 | 3, 4, + QMetaType::Void, 0x80000000 | 3, 4, + QMetaType::Void, 0x80000000 | 3, 0x80000000 | 3, 0x80000000 | 9, 7, 8, 10, + QMetaType::Void, 0x80000000 | 12, 11, + QMetaType::Void, 0x80000000 | 12, 11, + QMetaType::Void, 0x80000000 | 3, 0x80000000 | 3, 0x80000000 | 12, 7, 8, 15, + QMetaType::Void, 0x80000000 | 3, 0x80000000 | 3, 0x80000000 | 12, 7, 8, 17, + QMetaType::Void, 0x80000000 | 3, 0x80000000 | 3, 0x80000000 | 12, 0x80000000 | 12, 7, 8, 17, 15, + QMetaType::Void, 0x80000000 | 3, 0x80000000 | 12, 7, 19, + QMetaType::Void, 0x80000000 | 3, 0x80000000 | 3, 7, 8, + QMetaType::Void, 0x80000000 | 3, 0x80000000 | 9, 22, 23, + QMetaType::Void, 0x80000000 | 3, 0x80000000 | 9, 0x80000000 | 12, 22, 23, 25, + QMetaType::Void, 0x80000000 | 3, 0x80000000 | 9, 22, 23, + QMetaType::Void, 0x80000000 | 3, 0x80000000 | 9, 0x80000000 | 12, 22, 23, 25, + + // slots: parameters + QMetaType::Void, + QMetaType::Void, 0x80000000 | 30, 11, + QMetaType::Void, + QMetaType::Void, + QMetaType::Void, + QMetaType::Void, 0x80000000 | 3, 4, + QMetaType::Void, 0x80000000 | 3, 0x80000000 | 3, 0x80000000 | 3, 0x80000000 | 9, 7, 8, 36, 10, + QMetaType::Void, 0x80000000 | 3, 0x80000000 | 3, 0x80000000 | 3, 0x80000000 | 12, 7, 8, 36, 37, + QMetaType::Void, 0x80000000 | 3, 0x80000000 | 3, QMetaType::Bool, 7, 8, 39, + QMetaType::Void, 0x80000000 | 3, 0x80000000 | 3, 7, 8, + QMetaType::Void, 0x80000000 | 3, 0x80000000 | 3, 7, 8, + QMetaType::Void, 0x80000000 | 3, 0x80000000 | 3, 7, 8, + QMetaType::Void, 0x80000000 | 3, 0x80000000 | 3, 0x80000000 | 12, 7, 8, 19, + QMetaType::Void, 0x80000000 | 3, 0x80000000 | 3, QMetaType::Bool, 7, 8, 45, + QMetaType::Void, 0x80000000 | 3, 0x80000000 | 3, 7, 8, + QMetaType::Void, 0x80000000 | 3, QMetaType::Bool, 22, 45, + QMetaType::Void, 0x80000000 | 3, 22, + QMetaType::Void, 0x80000000 | 3, 0x80000000 | 3, 7, 8, + + 0 // eod +}; + +void ServerCatchcopy::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + auto *_t = static_cast<ServerCatchcopy *>(_o); + Q_UNUSED(_t) + switch (_id) { + case 0: _t->connectedClient((*reinterpret_cast< const uint32_t(*)>(_a[1]))); break; + case 1: _t->disconnectedClient((*reinterpret_cast< const uint32_t(*)>(_a[1]))); break; + case 2: _t->newQuery((*reinterpret_cast< const uint32_t(*)>(_a[1])),(*reinterpret_cast< const uint32_t(*)>(_a[2])),(*reinterpret_cast< const std::vector<std::string>(*)>(_a[3]))); break; + case 3: _t->error((*reinterpret_cast< const std::string(*)>(_a[1]))); break; + case 4: _t->communicationError((*reinterpret_cast< const std::string(*)>(_a[1]))); break; + case 5: _t->askProtocolCompatibility((*reinterpret_cast< const uint32_t(*)>(_a[1])),(*reinterpret_cast< const uint32_t(*)>(_a[2])),(*reinterpret_cast< const std::string(*)>(_a[3]))); break; + case 6: _t->askProtocolExtension((*reinterpret_cast< const uint32_t(*)>(_a[1])),(*reinterpret_cast< const uint32_t(*)>(_a[2])),(*reinterpret_cast< const std::string(*)>(_a[3]))); break; + case 7: _t->askProtocolExtension((*reinterpret_cast< const uint32_t(*)>(_a[1])),(*reinterpret_cast< const uint32_t(*)>(_a[2])),(*reinterpret_cast< const std::string(*)>(_a[3])),(*reinterpret_cast< const std::string(*)>(_a[4]))); break; + case 8: _t->clientName((*reinterpret_cast< const uint32_t(*)>(_a[1])),(*reinterpret_cast< const std::string(*)>(_a[2]))); break; + case 9: _t->askServerName((*reinterpret_cast< const uint32_t(*)>(_a[1])),(*reinterpret_cast< const uint32_t(*)>(_a[2]))); break; + case 10: _t->newCopyWithoutDestination((*reinterpret_cast< const uint32_t(*)>(_a[1])),(*reinterpret_cast< const std::vector<std::string>(*)>(_a[2]))); break; + case 11: _t->newCopy((*reinterpret_cast< const uint32_t(*)>(_a[1])),(*reinterpret_cast< const std::vector<std::string>(*)>(_a[2])),(*reinterpret_cast< const std::string(*)>(_a[3]))); break; + case 12: _t->newMoveWithoutDestination((*reinterpret_cast< const uint32_t(*)>(_a[1])),(*reinterpret_cast< const std::vector<std::string>(*)>(_a[2]))); break; + case 13: _t->newMove((*reinterpret_cast< const uint32_t(*)>(_a[1])),(*reinterpret_cast< const std::vector<std::string>(*)>(_a[2])),(*reinterpret_cast< const std::string(*)>(_a[3]))); break; + case 14: _t->newConnection(); break; + case 15: _t->connectionError((*reinterpret_cast< const QLocalSocket::LocalSocketError(*)>(_a[1]))); break; + case 16: _t->disconnected(); break; + case 17: _t->readyRead(); break; + case 18: _t->checkTimeOut(); break; + case 19: _t->disconnectClient((*reinterpret_cast< const uint32_t(*)>(_a[1]))); break; + case 20: _t->reply((*reinterpret_cast< const uint32_t(*)>(_a[1])),(*reinterpret_cast< const uint32_t(*)>(_a[2])),(*reinterpret_cast< const uint32_t(*)>(_a[3])),(*reinterpret_cast< const std::vector<std::string>(*)>(_a[4]))); break; + case 21: _t->reply((*reinterpret_cast< const uint32_t(*)>(_a[1])),(*reinterpret_cast< const uint32_t(*)>(_a[2])),(*reinterpret_cast< const uint32_t(*)>(_a[3])),(*reinterpret_cast< const std::string(*)>(_a[4]))); break; + case 22: _t->protocolSupported((*reinterpret_cast< const uint32_t(*)>(_a[1])),(*reinterpret_cast< const uint32_t(*)>(_a[2])),(*reinterpret_cast< const bool(*)>(_a[3]))); break; + case 23: _t->incorrectArgumentListSize((*reinterpret_cast< const uint32_t(*)>(_a[1])),(*reinterpret_cast< const uint32_t(*)>(_a[2]))); break; + case 24: _t->incorrectArgument((*reinterpret_cast< const uint32_t(*)>(_a[1])),(*reinterpret_cast< const uint32_t(*)>(_a[2]))); break; + case 25: _t->clientRegistered((*reinterpret_cast< const uint32_t(*)>(_a[1])),(*reinterpret_cast< const uint32_t(*)>(_a[2]))); break; + case 26: _t->serverName((*reinterpret_cast< const uint32_t(*)>(_a[1])),(*reinterpret_cast< const uint32_t(*)>(_a[2])),(*reinterpret_cast< const std::string(*)>(_a[3]))); break; + case 27: _t->copyFinished((*reinterpret_cast< const uint32_t(*)>(_a[1])),(*reinterpret_cast< const uint32_t(*)>(_a[2])),(*reinterpret_cast< const bool(*)>(_a[3]))); break; + case 28: _t->copyCanceled((*reinterpret_cast< const uint32_t(*)>(_a[1])),(*reinterpret_cast< const uint32_t(*)>(_a[2]))); break; + case 29: _t->copyFinished((*reinterpret_cast< const uint32_t(*)>(_a[1])),(*reinterpret_cast< const bool(*)>(_a[2]))); break; + case 30: _t->copyCanceled((*reinterpret_cast< const uint32_t(*)>(_a[1]))); break; + case 31: _t->unknowOrder((*reinterpret_cast< const uint32_t(*)>(_a[1])),(*reinterpret_cast< const uint32_t(*)>(_a[2]))); break; + default: ; + } + } else if (_c == QMetaObject::IndexOfMethod) { + int *result = reinterpret_cast<int *>(_a[0]); + { + using _t = void (ServerCatchcopy::*)(const uint32_t & ); + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&ServerCatchcopy::connectedClient)) { + *result = 0; + return; + } + } + { + using _t = void (ServerCatchcopy::*)(const uint32_t & ); + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&ServerCatchcopy::disconnectedClient)) { + *result = 1; + return; + } + } + { + using _t = void (ServerCatchcopy::*)(const uint32_t & , const uint32_t & , const std::vector<std::string> & ); + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&ServerCatchcopy::newQuery)) { + *result = 2; + return; + } + } + { + using _t = void (ServerCatchcopy::*)(const std::string & ); + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&ServerCatchcopy::error)) { + *result = 3; + return; + } + } + { + using _t = void (ServerCatchcopy::*)(const std::string & ); + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&ServerCatchcopy::communicationError)) { + *result = 4; + return; + } + } + { + using _t = void (ServerCatchcopy::*)(const uint32_t & , const uint32_t & , const std::string & ); + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&ServerCatchcopy::askProtocolCompatibility)) { + *result = 5; + return; + } + } + { + using _t = void (ServerCatchcopy::*)(const uint32_t & , const uint32_t & , const std::string & ); + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&ServerCatchcopy::askProtocolExtension)) { + *result = 6; + return; + } + } + { + using _t = void (ServerCatchcopy::*)(const uint32_t & , const uint32_t & , const std::string & , const std::string & ); + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&ServerCatchcopy::askProtocolExtension)) { + *result = 7; + return; + } + } + { + using _t = void (ServerCatchcopy::*)(const uint32_t & , const std::string & ); + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&ServerCatchcopy::clientName)) { + *result = 8; + return; + } + } + { + using _t = void (ServerCatchcopy::*)(const uint32_t & , const uint32_t & ); + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&ServerCatchcopy::askServerName)) { + *result = 9; + return; + } + } + { + using _t = void (ServerCatchcopy::*)(const uint32_t & , const std::vector<std::string> & ); + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&ServerCatchcopy::newCopyWithoutDestination)) { + *result = 10; + return; + } + } + { + using _t = void (ServerCatchcopy::*)(const uint32_t & , const std::vector<std::string> & , const std::string & ); + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&ServerCatchcopy::newCopy)) { + *result = 11; + return; + } + } + { + using _t = void (ServerCatchcopy::*)(const uint32_t & , const std::vector<std::string> & ); + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&ServerCatchcopy::newMoveWithoutDestination)) { + *result = 12; + return; + } + } + { + using _t = void (ServerCatchcopy::*)(const uint32_t & , const std::vector<std::string> & , const std::string & ); + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&ServerCatchcopy::newMove)) { + *result = 13; + return; + } + } + } +} + +QT_INIT_METAOBJECT const QMetaObject ServerCatchcopy::staticMetaObject = { { + QMetaObject::SuperData::link<QObject::staticMetaObject>(), + qt_meta_stringdata_ServerCatchcopy.data, + qt_meta_data_ServerCatchcopy, + qt_static_metacall, + nullptr, + nullptr +} }; + + +const QMetaObject *ServerCatchcopy::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject; +} + +void *ServerCatchcopy::qt_metacast(const char *_clname) +{ + if (!_clname) return nullptr; + if (!strcmp(_clname, qt_meta_stringdata_ServerCatchcopy.stringdata0)) + return static_cast<void*>(this); + return QObject::qt_metacast(_clname); +} + +int ServerCatchcopy::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 32) + qt_static_metacall(this, _c, _id, _a); + _id -= 32; + } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { + if (_id < 32) + *reinterpret_cast<int*>(_a[0]) = -1; + _id -= 32; + } + return _id; +} + +// SIGNAL 0 +void ServerCatchcopy::connectedClient(const uint32_t & _t1) +{ + void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))) }; + QMetaObject::activate(this, &staticMetaObject, 0, _a); +} + +// SIGNAL 1 +void ServerCatchcopy::disconnectedClient(const uint32_t & _t1) +{ + void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))) }; + QMetaObject::activate(this, &staticMetaObject, 1, _a); +} + +// SIGNAL 2 +void ServerCatchcopy::newQuery(const uint32_t & _t1, const uint32_t & _t2, const std::vector<std::string> & _t3) +{ + void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))), const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t2))), const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t3))) }; + QMetaObject::activate(this, &staticMetaObject, 2, _a); +} + +// SIGNAL 3 +void ServerCatchcopy::error(const std::string & _t1) +{ + void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))) }; + QMetaObject::activate(this, &staticMetaObject, 3, _a); +} + +// SIGNAL 4 +void ServerCatchcopy::communicationError(const std::string & _t1) +{ + void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))) }; + QMetaObject::activate(this, &staticMetaObject, 4, _a); +} + +// SIGNAL 5 +void ServerCatchcopy::askProtocolCompatibility(const uint32_t & _t1, const uint32_t & _t2, const std::string & _t3) +{ + void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))), const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t2))), const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t3))) }; + QMetaObject::activate(this, &staticMetaObject, 5, _a); +} + +// SIGNAL 6 +void ServerCatchcopy::askProtocolExtension(const uint32_t & _t1, const uint32_t & _t2, const std::string & _t3) +{ + void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))), const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t2))), const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t3))) }; + QMetaObject::activate(this, &staticMetaObject, 6, _a); +} + +// SIGNAL 7 +void ServerCatchcopy::askProtocolExtension(const uint32_t & _t1, const uint32_t & _t2, const std::string & _t3, const std::string & _t4) +{ + void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))), const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t2))), const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t3))), const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t4))) }; + QMetaObject::activate(this, &staticMetaObject, 7, _a); +} + +// SIGNAL 8 +void ServerCatchcopy::clientName(const uint32_t & _t1, const std::string & _t2) +{ + void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))), const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t2))) }; + QMetaObject::activate(this, &staticMetaObject, 8, _a); +} + +// SIGNAL 9 +void ServerCatchcopy::askServerName(const uint32_t & _t1, const uint32_t & _t2) +{ + void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))), const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t2))) }; + QMetaObject::activate(this, &staticMetaObject, 9, _a); +} + +// SIGNAL 10 +void ServerCatchcopy::newCopyWithoutDestination(const uint32_t & _t1, const std::vector<std::string> & _t2) +{ + void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))), const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t2))) }; + QMetaObject::activate(this, &staticMetaObject, 10, _a); +} + +// SIGNAL 11 +void ServerCatchcopy::newCopy(const uint32_t & _t1, const std::vector<std::string> & _t2, const std::string & _t3) +{ + void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))), const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t2))), const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t3))) }; + QMetaObject::activate(this, &staticMetaObject, 11, _a); +} + +// SIGNAL 12 +void ServerCatchcopy::newMoveWithoutDestination(const uint32_t & _t1, const std::vector<std::string> & _t2) +{ + void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))), const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t2))) }; + QMetaObject::activate(this, &staticMetaObject, 12, _a); +} + +// SIGNAL 13 +void ServerCatchcopy::newMove(const uint32_t & _t1, const std::vector<std::string> & _t2, const std::string & _t3) +{ + void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))), const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t2))), const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t3))) }; + QMetaObject::activate(this, &staticMetaObject, 13, _a); +} +QT_WARNING_POP +QT_END_MOC_NAMESPACE diff --git a/plugins/Listener/catchcopy-v0002/moc_ServerCatchcopy.o b/plugins/Listener/catchcopy-v0002/moc_ServerCatchcopy.o Binary files differnew file mode 100644 index 0000000..9f55a3c --- /dev/null +++ b/plugins/Listener/catchcopy-v0002/moc_ServerCatchcopy.o diff --git a/plugins/Listener/catchcopy-v0002/moc_listener.cpp b/plugins/Listener/catchcopy-v0002/moc_listener.cpp new file mode 100644 index 0000000..7a60d64 --- /dev/null +++ b/plugins/Listener/catchcopy-v0002/moc_listener.cpp @@ -0,0 +1,197 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'listener.h' +** +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.2) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include <memory> +#include "listener.h" +#include <QtCore/qbytearray.h> +#include <QtCore/qmetatype.h> +#include <QtCore/qplugin.h> +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'listener.h' doesn't include <QObject>." +#elif Q_MOC_OUTPUT_REVISION != 67 +#error "This file was generated using the moc from 5.15.2. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED +struct qt_meta_stringdata_Listener_t { + QByteArrayData data[22]; + char stringdata0[273]; +}; +#define QT_MOC_LITERAL(idx, ofs, len) \ + Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ + qptrdiff(offsetof(qt_meta_stringdata_Listener_t, stringdata0) + ofs \ + - idx * sizeof(QByteArrayData)) \ + ) +static const qt_meta_stringdata_Listener_t qt_meta_stringdata_Listener = { + { +QT_MOC_LITERAL(0, 0, 8), // "Listener" +QT_MOC_LITERAL(1, 9, 16), // "transferFinished" +QT_MOC_LITERAL(2, 26, 0), // "" +QT_MOC_LITERAL(3, 27, 8), // "uint32_t" +QT_MOC_LITERAL(4, 36, 7), // "orderId" +QT_MOC_LITERAL(5, 44, 9), // "withError" +QT_MOC_LITERAL(6, 54, 16), // "transferCanceled" +QT_MOC_LITERAL(7, 71, 17), // "newLanguageLoaded" +QT_MOC_LITERAL(8, 89, 13), // "errorInternal" +QT_MOC_LITERAL(9, 103, 11), // "std::string" +QT_MOC_LITERAL(10, 115, 6), // "string" +QT_MOC_LITERAL(11, 122, 26), // "communicationErrorInternal" +QT_MOC_LITERAL(12, 149, 10), // "clientName" +QT_MOC_LITERAL(13, 160, 6), // "client" +QT_MOC_LITERAL(14, 167, 4), // "name" +QT_MOC_LITERAL(15, 172, 22), // "copyWithoutDestination" +QT_MOC_LITERAL(16, 195, 24), // "std::vector<std::string>" +QT_MOC_LITERAL(17, 220, 7), // "sources" +QT_MOC_LITERAL(18, 228, 4), // "copy" +QT_MOC_LITERAL(19, 233, 11), // "destination" +QT_MOC_LITERAL(20, 245, 22), // "moveWithoutDestination" +QT_MOC_LITERAL(21, 268, 4) // "move" + + }, + "Listener\0transferFinished\0\0uint32_t\0" + "orderId\0withError\0transferCanceled\0" + "newLanguageLoaded\0errorInternal\0" + "std::string\0string\0communicationErrorInternal\0" + "clientName\0client\0name\0copyWithoutDestination\0" + "std::vector<std::string>\0sources\0copy\0" + "destination\0moveWithoutDestination\0" + "move" +}; +#undef QT_MOC_LITERAL + +static const uint qt_meta_data_Listener[] = { + + // content: + 8, // revision + 0, // classname + 0, 0, // classinfo + 10, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: name, argc, parameters, tag, flags + 1, 2, 64, 2, 0x0a /* Public */, + 6, 1, 69, 2, 0x0a /* Public */, + 7, 0, 72, 2, 0x0a /* Public */, + 8, 1, 73, 2, 0x08 /* Private */, + 11, 1, 76, 2, 0x08 /* Private */, + 12, 2, 79, 2, 0x08 /* Private */, + 15, 2, 84, 2, 0x08 /* Private */, + 18, 3, 89, 2, 0x08 /* Private */, + 20, 2, 96, 2, 0x08 /* Private */, + 21, 3, 101, 2, 0x08 /* Private */, + + // slots: parameters + QMetaType::Void, 0x80000000 | 3, QMetaType::Bool, 4, 5, + QMetaType::Void, 0x80000000 | 3, 4, + QMetaType::Void, + QMetaType::Void, 0x80000000 | 9, 10, + QMetaType::Void, 0x80000000 | 9, 10, + QMetaType::Void, 0x80000000 | 3, 0x80000000 | 9, 13, 14, + QMetaType::Void, 0x80000000 | 3, 0x80000000 | 16, 4, 17, + QMetaType::Void, 0x80000000 | 3, 0x80000000 | 16, 0x80000000 | 9, 4, 17, 19, + QMetaType::Void, 0x80000000 | 3, 0x80000000 | 16, 4, 17, + QMetaType::Void, 0x80000000 | 3, 0x80000000 | 16, 0x80000000 | 9, 4, 17, 19, + + 0 // eod +}; + +void Listener::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + auto *_t = static_cast<Listener *>(_o); + Q_UNUSED(_t) + switch (_id) { + case 0: _t->transferFinished((*reinterpret_cast< const uint32_t(*)>(_a[1])),(*reinterpret_cast< const bool(*)>(_a[2]))); break; + case 1: _t->transferCanceled((*reinterpret_cast< const uint32_t(*)>(_a[1]))); break; + case 2: _t->newLanguageLoaded(); break; + case 3: _t->errorInternal((*reinterpret_cast< const std::string(*)>(_a[1]))); break; + case 4: _t->communicationErrorInternal((*reinterpret_cast< const std::string(*)>(_a[1]))); break; + case 5: _t->clientName((*reinterpret_cast< uint32_t(*)>(_a[1])),(*reinterpret_cast< std::string(*)>(_a[2]))); break; + case 6: _t->copyWithoutDestination((*reinterpret_cast< const uint32_t(*)>(_a[1])),(*reinterpret_cast< const std::vector<std::string>(*)>(_a[2]))); break; + case 7: _t->copy((*reinterpret_cast< const uint32_t(*)>(_a[1])),(*reinterpret_cast< const std::vector<std::string>(*)>(_a[2])),(*reinterpret_cast< const std::string(*)>(_a[3]))); break; + case 8: _t->moveWithoutDestination((*reinterpret_cast< const uint32_t(*)>(_a[1])),(*reinterpret_cast< const std::vector<std::string>(*)>(_a[2]))); break; + case 9: _t->move((*reinterpret_cast< const uint32_t(*)>(_a[1])),(*reinterpret_cast< const std::vector<std::string>(*)>(_a[2])),(*reinterpret_cast< const std::string(*)>(_a[3]))); break; + default: ; + } + } +} + +QT_INIT_METAOBJECT const QMetaObject Listener::staticMetaObject = { { + QMetaObject::SuperData::link<PluginInterface_Listener::staticMetaObject>(), + qt_meta_stringdata_Listener.data, + qt_meta_data_Listener, + qt_static_metacall, + nullptr, + nullptr +} }; + + +const QMetaObject *Listener::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject; +} + +void *Listener::qt_metacast(const char *_clname) +{ + if (!_clname) return nullptr; + if (!strcmp(_clname, qt_meta_stringdata_Listener.stringdata0)) + return static_cast<void*>(this); + if (!strcmp(_clname, "first-world.info.ultracopier.PluginInterface.Listener/2.0.0.0")) + return static_cast< PluginInterface_Listener*>(this); + return PluginInterface_Listener::qt_metacast(_clname); +} + +int Listener::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = PluginInterface_Listener::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 10) + qt_static_metacall(this, _c, _id, _a); + _id -= 10; + } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { + if (_id < 10) + *reinterpret_cast<int*>(_a[0]) = -1; + _id -= 10; + } + return _id; +} + +QT_PLUGIN_METADATA_SECTION +static constexpr unsigned char qt_pluginMetaData[] = { + 'Q', 'T', 'M', 'E', 'T', 'A', 'D', 'A', 'T', 'A', ' ', '!', + // metadata version, Qt version, architectural requirements + 0, QT_VERSION_MAJOR, QT_VERSION_MINOR, qPluginArchRequirements(), + 0xbf, + // "IID" + 0x02, 0x78, 0x3d, 'f', 'i', 'r', 's', 't', + '-', 'w', 'o', 'r', 'l', 'd', '.', 'i', + 'n', 'f', 'o', '.', 'u', 'l', 't', 'r', + 'a', 'c', 'o', 'p', 'i', 'e', 'r', '.', + 'P', 'l', 'u', 'g', 'i', 'n', 'I', 'n', + 't', 'e', 'r', 'f', 'a', 'c', 'e', '.', + 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', + '/', '1', '.', '0', '.', '0', '.', '0', + // "className" + 0x03, 0x68, 'L', 'i', 's', 't', 'e', 'n', + 'e', 'r', + 0xff, +}; +QT_MOC_EXPORT_PLUGIN(Listener, Listener) + +QT_WARNING_POP +QT_END_MOC_NAMESPACE diff --git a/plugins/Listener/catchcopy-v0002/moc_listener.o b/plugins/Listener/catchcopy-v0002/moc_listener.o Binary files differnew file mode 100644 index 0000000..232df8b --- /dev/null +++ b/plugins/Listener/catchcopy-v0002/moc_listener.o diff --git a/plugins/Listener/catchcopy-v0002/moc_predefs.h b/plugins/Listener/catchcopy-v0002/moc_predefs.h new file mode 100644 index 0000000..383ffa9 --- /dev/null +++ b/plugins/Listener/catchcopy-v0002/moc_predefs.h @@ -0,0 +1,398 @@ +#define __DBL_MIN_EXP__ (-1021) +#define __cpp_attributes 200809L +#define __UINT_LEAST16_MAX__ 0xffff +#define __ATOMIC_ACQUIRE 2 +#define __FLT128_MAX_10_EXP__ 4932 +#define __FLT_MIN__ 1.17549435082228750796873653722224568e-38F +#define __GCC_IEC_559_COMPLEX 2 +#define __UINT_LEAST8_TYPE__ unsigned char +#define __SIZEOF_FLOAT80__ 16 +#define __INTMAX_C(c) c ## L +#define __CHAR_BIT__ 8 +#define __UINT8_MAX__ 0xff +#define __SCHAR_WIDTH__ 8 +#define __WINT_MAX__ 0xffffffffU +#define __FLT32_MIN_EXP__ (-125) +#define __cpp_static_assert 200410L +#define __ORDER_LITTLE_ENDIAN__ 1234 +#define __SIZE_MAX__ 0xffffffffffffffffUL +#define __WCHAR_MAX__ 0x7fffffff +#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1 +#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1 +#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1 +#define __DBL_DENORM_MIN__ double(4.94065645841246544176568792868221372e-324L) +#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1 +#define __GCC_ATOMIC_CHAR_LOCK_FREE 2 +#define __GCC_IEC_559 2 +#define __FLT32X_DECIMAL_DIG__ 17 +#define __FLT_EVAL_METHOD__ 0 +#define __cpp_binary_literals 201304L +#define __FLT64_DECIMAL_DIG__ 17 +#define __GCC_ATOMIC_CHAR32_T_LOCK_FREE 2 +#define __cpp_variadic_templates 200704L +#define __UINT_FAST64_MAX__ 0xffffffffffffffffUL +#define __SIG_ATOMIC_TYPE__ int +#define __DBL_MIN_10_EXP__ (-307) +#define __FINITE_MATH_ONLY__ 0 +#define __FLT32X_MAX_EXP__ 1024 +#define __FLT32_HAS_DENORM__ 1 +#define __UINT_FAST8_MAX__ 0xff +#define __cpp_rvalue_reference 200610L +#define __FLT32_MAX_10_EXP__ 38 +#define __DEC64_MAX_EXP__ 385 +#define __INT8_C(c) c +#define __INT_LEAST8_WIDTH__ 8 +#define __UINT_LEAST64_MAX__ 0xffffffffffffffffUL +#define __INT_LEAST8_MAX__ 0x7f +#define __SHRT_MAX__ 0x7fff +#define __LDBL_MAX__ 1.18973149535723176502126385303097021e+4932L +#define __FLT64X_MAX_10_EXP__ 4932 +#define __LDBL_IS_IEC_60559__ 2 +#define __FLT64X_HAS_QUIET_NAN__ 1 +#define __UINT_LEAST8_MAX__ 0xff +#define __GCC_ATOMIC_BOOL_LOCK_FREE 2 +#define __FLT128_DENORM_MIN__ 6.47517511943802511092443895822764655e-4966F128 +#define __UINTMAX_TYPE__ long unsigned int +#define __linux 1 +#define __DEC32_EPSILON__ 1E-6DF +#define __FLT_EVAL_METHOD_TS_18661_3__ 0 +#define __unix 1 +#define __UINT32_MAX__ 0xffffffffU +#define __GXX_EXPERIMENTAL_CXX0X__ 1 +#define __FLT128_MIN_EXP__ (-16381) +#define __WINT_MIN__ 0U +#define __FLT128_MIN_10_EXP__ (-4931) +#define __FLT32X_IS_IEC_60559__ 2 +#define __INT_LEAST16_WIDTH__ 16 +#define __SCHAR_MAX__ 0x7f +#define __FLT128_MANT_DIG__ 113 +#define __WCHAR_MIN__ (-__WCHAR_MAX__ - 1) +#define __INT64_C(c) c ## L +#define __GCC_ATOMIC_POINTER_LOCK_FREE 2 +#define __FLT32X_MANT_DIG__ 53 +#define __GCC_ATOMIC_CHAR16_T_LOCK_FREE 2 +#define __USER_LABEL_PREFIX__ +#define __FLT64X_EPSILON__ 1.08420217248550443400745280086994171e-19F64x +#define __STDC_HOSTED__ 1 +#define __DEC64_MIN_EXP__ (-382) +#define __DBL_DIG__ 15 +#define __FLT32_DIG__ 6 +#define __FLT_EPSILON__ 1.19209289550781250000000000000000000e-7F +#define __GXX_WEAK__ 1 +#define __SHRT_WIDTH__ 16 +#define __FLT32_IS_IEC_60559__ 2 +#define __LDBL_MIN__ 3.36210314311209350626267781732175260e-4932L +#define __DBL_IS_IEC_60559__ 2 +#define __DEC32_MAX__ 9.999999E96DF +#define __cpp_threadsafe_static_init 200806L +#define __FLT64X_DENORM_MIN__ 3.64519953188247460252840593361941982e-4951F64x +#define __FLT32X_HAS_INFINITY__ 1 +#define __INT32_MAX__ 0x7fffffff +#define __unix__ 1 +#define __INT_WIDTH__ 32 +#define __SIZEOF_LONG__ 8 +#define __STDC_IEC_559__ 1 +#define __STDC_ISO_10646__ 201706L +#define __UINT16_C(c) c +#define __DECIMAL_DIG__ 21 +#define __STDC_IEC_559_COMPLEX__ 1 +#define __FLT64_EPSILON__ 2.22044604925031308084726333618164062e-16F64 +#define __gnu_linux__ 1 +#define __INT16_MAX__ 0x7fff +#define __FLT64_MIN_EXP__ (-1021) +#define __FLT64X_MIN_10_EXP__ (-4931) +#define __LDBL_HAS_QUIET_NAN__ 1 +#define __FLT64_MANT_DIG__ 53 +#define __FLT64X_MANT_DIG__ 64 +#define __GNUC__ 11 +#define __GXX_RTTI 1 +#define __pie__ 2 +#define __MMX__ 1 +#define __FLT_HAS_DENORM__ 1 +#define __SIZEOF_LONG_DOUBLE__ 16 +#define __BIGGEST_ALIGNMENT__ 16 +#define __STDC_UTF_16__ 1 +#define __FLT64_MAX_10_EXP__ 308 +#define __cpp_delegating_constructors 200604L +#define __FLT32_HAS_INFINITY__ 1 +#define __DBL_MAX__ double(1.79769313486231570814527423731704357e+308L) +#define __cpp_raw_strings 200710L +#define __INT_FAST32_MAX__ 0x7fffffffffffffffL +#define __DBL_HAS_INFINITY__ 1 +#define __SIZEOF_FLOAT__ 4 +#define __HAVE_SPECULATION_SAFE_VALUE 1 +#define __DEC32_MIN_EXP__ (-94) +#define __INTPTR_WIDTH__ 64 +#define __FLT64X_HAS_INFINITY__ 1 +#define __UINT_LEAST32_MAX__ 0xffffffffU +#define __FLT32X_HAS_DENORM__ 1 +#define __INT_FAST16_TYPE__ long int +#define __MMX_WITH_SSE__ 1 +#define __LDBL_HAS_DENORM__ 1 +#define __cplusplus 201103L +#define __cpp_ref_qualifiers 200710L +#define __DEC32_MIN__ 1E-95DF +#define __DEPRECATED 1 +#define __cpp_rvalue_references 200610L +#define __DBL_MAX_EXP__ 1024 +#define __WCHAR_WIDTH__ 32 +#define __FLT32_MAX__ 3.40282346638528859811704183484516925e+38F32 +#define __DEC128_EPSILON__ 1E-33DL +#define __SSE2_MATH__ 1 +#define __ATOMIC_HLE_RELEASE 131072 +#define __PTRDIFF_MAX__ 0x7fffffffffffffffL +#define __amd64 1 +#define __ATOMIC_HLE_ACQUIRE 65536 +#define __GNUG__ 11 +#define __LONG_LONG_MAX__ 0x7fffffffffffffffLL +#define __SIZEOF_SIZE_T__ 8 +#define __cpp_nsdmi 200809L +#define __FLT64X_MIN_EXP__ (-16381) +#define __SIZEOF_WINT_T__ 4 +#define __LONG_LONG_WIDTH__ 64 +#define __cpp_initializer_lists 200806L +#define __FLT32_MAX_EXP__ 128 +#define __cpp_hex_float 201603L +#define __GXX_ABI_VERSION 1016 +#define __FLT128_HAS_INFINITY__ 1 +#define __FLT_MIN_EXP__ (-125) +#define __GCC_HAVE_DWARF2_CFI_ASM 1 +#define __x86_64 1 +#define __cpp_lambdas 200907L +#define __INT_FAST64_TYPE__ long int +#define __FLT64_DENORM_MIN__ 4.94065645841246544176568792868221372e-324F64 +#define __DBL_MIN__ double(2.22507385850720138309023271733240406e-308L) +#define __FLT128_EPSILON__ 1.92592994438723585305597794258492732e-34F128 +#define __FLT64X_NORM_MAX__ 1.18973149535723176502126385303097021e+4932F64x +#define __SIZEOF_POINTER__ 8 +#define __LP64__ 1 +#define __DBL_HAS_QUIET_NAN__ 1 +#define __FLT32X_EPSILON__ 2.22044604925031308084726333618164062e-16F32x +#define __DECIMAL_BID_FORMAT__ 1 +#define __FLT64_MIN_10_EXP__ (-307) +#define __FLT64X_DECIMAL_DIG__ 21 +#define __DEC128_MIN__ 1E-6143DL +#define __REGISTER_PREFIX__ +#define __UINT16_MAX__ 0xffff +#define __LDBL_HAS_INFINITY__ 1 +#define __FLT32_MIN__ 1.17549435082228750796873653722224568e-38F32 +#define __UINT8_TYPE__ unsigned char +#define __FLT_DIG__ 6 +#define __NO_INLINE__ 1 +#define __DEC_EVAL_METHOD__ 2 +#define __DEC128_MAX__ 9.999999999999999999999999999999999E6144DL +#define __FLT_MANT_DIG__ 24 +#define __LDBL_DECIMAL_DIG__ 21 +#define __VERSION__ "11.2.0" +#define __UINT64_C(c) c ## UL +#define __cpp_unicode_characters 200704L +#define _STDC_PREDEF_H 1 +#define __INT_LEAST32_MAX__ 0x7fffffff +#define __GCC_ATOMIC_INT_LOCK_FREE 2 +#define __FLT128_MAX_EXP__ 16384 +#define __FLT32_MANT_DIG__ 24 +#define __FLOAT_WORD_ORDER__ __ORDER_LITTLE_ENDIAN__ +#define __FLT128_HAS_DENORM__ 1 +#define __FLT32_DECIMAL_DIG__ 9 +#define __FLT128_DIG__ 33 +#define __INT32_C(c) c +#define __DEC64_EPSILON__ 1E-15DD +#define __ORDER_PDP_ENDIAN__ 3412 +#define __DEC128_MIN_EXP__ (-6142) +#define __INT_FAST32_TYPE__ long int +#define __UINT_LEAST16_TYPE__ short unsigned int +#define unix 1 +#define __DBL_HAS_DENORM__ 1 +#define __cpp_rtti 199711L +#define __SIZE_TYPE__ long unsigned int +#define __UINT64_MAX__ 0xffffffffffffffffUL +#define __FLT_IS_IEC_60559__ 2 +#define __GNUC_WIDE_EXECUTION_CHARSET_NAME "UTF-32LE" +#define __FLT64X_DIG__ 18 +#define __INT8_TYPE__ signed char +#define __ELF__ 1 +#define __GCC_ASM_FLAG_OUTPUTS__ 1 +#define __UINT32_TYPE__ unsigned int +#define __FLT_RADIX__ 2 +#define __INT_LEAST16_TYPE__ short int +#define __LDBL_EPSILON__ 1.08420217248550443400745280086994171e-19L +#define __UINTMAX_C(c) c ## UL +#define __GLIBCXX_BITSIZE_INT_N_0 128 +#define __k8 1 +#define __FLT32X_MIN__ 2.22507385850720138309023271733240406e-308F32x +#define __SIG_ATOMIC_MAX__ 0x7fffffff +#define __GCC_ATOMIC_WCHAR_T_LOCK_FREE 2 +#define __SIZEOF_PTRDIFF_T__ 8 +#define __LDBL_DIG__ 18 +#define __FLT64_IS_IEC_60559__ 2 +#define __x86_64__ 1 +#define __FLT32X_MIN_EXP__ (-1021) +#define __DEC32_SUBNORMAL_MIN__ 0.000001E-95DF +#define __INT_FAST16_MAX__ 0x7fffffffffffffffL +#define __FLT64_DIG__ 15 +#define __UINT_FAST32_MAX__ 0xffffffffffffffffUL +#define __UINT_LEAST64_TYPE__ long unsigned int +#define __FLT_HAS_QUIET_NAN__ 1 +#define __FLT_MAX_10_EXP__ 38 +#define __LONG_MAX__ 0x7fffffffffffffffL +#define __FLT64X_HAS_DENORM__ 1 +#define __DEC128_SUBNORMAL_MIN__ 0.000000000000000000000000000000001E-6143DL +#define __FLT_HAS_INFINITY__ 1 +#define __GNUC_EXECUTION_CHARSET_NAME "UTF-8" +#define __cpp_unicode_literals 200710L +#define __UINT_FAST16_TYPE__ long unsigned int +#define __DEC64_MAX__ 9.999999999999999E384DD +#define __INT_FAST32_WIDTH__ 64 +#define __CHAR16_TYPE__ short unsigned int +#define __PRAGMA_REDEFINE_EXTNAME 1 +#define __SIZE_WIDTH__ 64 +#define __SEG_FS 1 +#define __INT_LEAST16_MAX__ 0x7fff +#define __DEC64_MANT_DIG__ 16 +#define __INT64_MAX__ 0x7fffffffffffffffL +#define __SEG_GS 1 +#define __FLT32_DENORM_MIN__ 1.40129846432481707092372958328991613e-45F32 +#define __SIG_ATOMIC_WIDTH__ 32 +#define __INT_LEAST64_TYPE__ long int +#define __INT16_TYPE__ short int +#define __INT_LEAST8_TYPE__ signed char +#define __SIZEOF_INT__ 4 +#define __DEC32_MAX_EXP__ 97 +#define __INT_FAST8_MAX__ 0x7f +#define __FLT128_MAX__ 1.18973149535723176508575932662800702e+4932F128 +#define __INTPTR_MAX__ 0x7fffffffffffffffL +#define linux 1 +#define __FLT64_HAS_QUIET_NAN__ 1 +#define __FLT32_MIN_10_EXP__ (-37) +#define __EXCEPTIONS 1 +#define __PTRDIFF_WIDTH__ 64 +#define __LDBL_MANT_DIG__ 64 +#define __cpp_range_based_for 200907L +#define __FLT64_HAS_INFINITY__ 1 +#define __FLT64X_MAX__ 1.18973149535723176502126385303097021e+4932F64x +#define __SIG_ATOMIC_MIN__ (-__SIG_ATOMIC_MAX__ - 1) +#define __code_model_small__ 1 +#define __GCC_ATOMIC_LONG_LOCK_FREE 2 +#define __DEC32_MANT_DIG__ 7 +#define __k8__ 1 +#define __INTPTR_TYPE__ long int +#define __UINT16_TYPE__ short unsigned int +#define __WCHAR_TYPE__ int +#define __pic__ 2 +#define __UINTPTR_MAX__ 0xffffffffffffffffUL +#define __INT_FAST64_WIDTH__ 64 +#define __cpp_decltype 200707L +#define __INT_FAST64_MAX__ 0x7fffffffffffffffL +#define __GCC_ATOMIC_TEST_AND_SET_TRUEVAL 1 +#define __FLT_NORM_MAX__ 3.40282346638528859811704183484516925e+38F +#define __FLT64X_MAX_EXP__ 16384 +#define __UINT_FAST64_TYPE__ long unsigned int +#define __INT_MAX__ 0x7fffffff +#define __linux__ 1 +#define __INT64_TYPE__ long int +#define __FLT_MAX_EXP__ 128 +#define __ORDER_BIG_ENDIAN__ 4321 +#define __DBL_MANT_DIG__ 53 +#define __cpp_inheriting_constructors 201511L +#define __SIZEOF_FLOAT128__ 16 +#define __INT_LEAST64_MAX__ 0x7fffffffffffffffL +#define __DEC64_MIN__ 1E-383DD +#define __WINT_TYPE__ unsigned int +#define __UINT_LEAST32_TYPE__ unsigned int +#define __SIZEOF_SHORT__ 2 +#define __FLT32_NORM_MAX__ 3.40282346638528859811704183484516925e+38F32 +#define __SSE__ 1 +#define __LDBL_MIN_EXP__ (-16381) +#define __FLT64_MAX__ 1.79769313486231570814527423731704357e+308F64 +#define __amd64__ 1 +#define __WINT_WIDTH__ 32 +#define __INT_LEAST64_WIDTH__ 64 +#define __LDBL_MAX_EXP__ 16384 +#define __FLT32X_MAX_10_EXP__ 308 +#define __SIZEOF_INT128__ 16 +#define __FLT64X_IS_IEC_60559__ 2 +#define __LDBL_MAX_10_EXP__ 4932 +#define __ATOMIC_RELAXED 0 +#define __DBL_EPSILON__ double(2.22044604925031308084726333618164062e-16L) +#define __FLT128_MIN__ 3.36210314311209350626267781732175260e-4932F128 +#define _LP64 1 +#define __UINT8_C(c) c +#define __FLT64_MAX_EXP__ 1024 +#define __INT_LEAST32_TYPE__ int +#define __SIZEOF_WCHAR_T__ 4 +#define __GNUC_PATCHLEVEL__ 0 +#define __FLT128_NORM_MAX__ 1.18973149535723176508575932662800702e+4932F128 +#define __FLT64_NORM_MAX__ 1.79769313486231570814527423731704357e+308F64 +#define __FLT128_HAS_QUIET_NAN__ 1 +#define __INTMAX_MAX__ 0x7fffffffffffffffL +#define __INT_FAST8_TYPE__ signed char +#define __FLT64X_MIN__ 3.36210314311209350626267781732175260e-4932F64x +#define __STDCPP_THREADS__ 1 +#define __GNUC_STDC_INLINE__ 1 +#define __FLT64_HAS_DENORM__ 1 +#define __FLT32_EPSILON__ 1.19209289550781250000000000000000000e-7F32 +#define __DBL_DECIMAL_DIG__ 17 +#define __STDC_UTF_32__ 1 +#define __INT_FAST8_WIDTH__ 8 +#define __FXSR__ 1 +#define __FLT32X_MAX__ 1.79769313486231570814527423731704357e+308F32x +#define __DBL_NORM_MAX__ double(1.79769313486231570814527423731704357e+308L) +#define __BYTE_ORDER__ __ORDER_LITTLE_ENDIAN__ +#define __INTMAX_WIDTH__ 64 +#define __cpp_runtime_arrays 198712L +#define __UINT64_TYPE__ long unsigned int +#define __UINT32_C(c) c ## U +#define __cpp_alias_templates 200704L +#define __FLT_DENORM_MIN__ 1.40129846432481707092372958328991613e-45F +#define __FLT128_IS_IEC_60559__ 2 +#define __INT8_MAX__ 0x7f +#define __LONG_WIDTH__ 64 +#define __PIC__ 2 +#define __UINT_FAST32_TYPE__ long unsigned int +#define __FLT32X_NORM_MAX__ 1.79769313486231570814527423731704357e+308F32x +#define __CHAR32_TYPE__ unsigned int +#define __FLT_MAX__ 3.40282346638528859811704183484516925e+38F +#define __cpp_constexpr 200704L +#define __SSE2__ 1 +#define __INT32_TYPE__ int +#define __SIZEOF_DOUBLE__ 8 +#define __cpp_exceptions 199711L +#define __FLT_MIN_10_EXP__ (-37) +#define __FLT64_MIN__ 2.22507385850720138309023271733240406e-308F64 +#define __INT_LEAST32_WIDTH__ 32 +#define __INTMAX_TYPE__ long int +#define __DEC128_MAX_EXP__ 6145 +#define __FLT32X_HAS_QUIET_NAN__ 1 +#define __ATOMIC_CONSUME 1 +#define __GNUC_MINOR__ 2 +#define __GLIBCXX_TYPE_INT_N_0 __int128 +#define __INT_FAST16_WIDTH__ 64 +#define __UINTMAX_MAX__ 0xffffffffffffffffUL +#define __PIE__ 2 +#define __FLT32X_DENORM_MIN__ 4.94065645841246544176568792868221372e-324F32x +#define __DBL_MAX_10_EXP__ 308 +#define __LDBL_DENORM_MIN__ 3.64519953188247460252840593361941982e-4951L +#define __INT16_C(c) c +#define __STDC__ 1 +#define __FLT32X_DIG__ 15 +#define __PTRDIFF_TYPE__ long int +#define __ATOMIC_SEQ_CST 5 +#define __FLT32X_MIN_10_EXP__ (-307) +#define __UINTPTR_TYPE__ long unsigned int +#define __DEC64_SUBNORMAL_MIN__ 0.000000000000001E-383DD +#define __DEC128_MANT_DIG__ 34 +#define __LDBL_MIN_10_EXP__ (-4931) +#define __SSE_MATH__ 1 +#define __SIZEOF_LONG_LONG__ 8 +#define __cpp_user_defined_literals 200809L +#define __FLT128_DECIMAL_DIG__ 36 +#define __GCC_ATOMIC_LLONG_LOCK_FREE 2 +#define __FLT32_HAS_QUIET_NAN__ 1 +#define __FLT_DECIMAL_DIG__ 9 +#define __UINT_FAST16_MAX__ 0xffffffffffffffffUL +#define __LDBL_NORM_MAX__ 1.18973149535723176502126385303097021e+4932L +#define __GCC_ATOMIC_SHORT_LOCK_FREE 2 +#define __UINT_FAST8_TYPE__ unsigned char +#define _GNU_SOURCE 1 +#define __ATOMIC_ACQ_REL 4 +#define __ATOMIC_RELEASE 3 diff --git a/plugins/PluginLoader/catchcopy-v0002/Languages/ar/translation.qm b/plugins/PluginLoader/catchcopy-v0002/Languages/ar/translation.qm Binary files differindex 62327be..9f49930 100755 --- a/plugins/PluginLoader/catchcopy-v0002/Languages/ar/translation.qm +++ b/plugins/PluginLoader/catchcopy-v0002/Languages/ar/translation.qm diff --git a/plugins/PluginLoader/catchcopy-v0002/Languages/de/translation.qm b/plugins/PluginLoader/catchcopy-v0002/Languages/de/translation.qm Binary files differindex d8b0880..cf50c12 100755 --- a/plugins/PluginLoader/catchcopy-v0002/Languages/de/translation.qm +++ b/plugins/PluginLoader/catchcopy-v0002/Languages/de/translation.qm diff --git a/plugins/PluginLoader/catchcopy-v0002/Languages/en/translation.qm b/plugins/PluginLoader/catchcopy-v0002/Languages/en/translation.qm Binary files differindex d925dd6..922339a 100755 --- a/plugins/PluginLoader/catchcopy-v0002/Languages/en/translation.qm +++ b/plugins/PluginLoader/catchcopy-v0002/Languages/en/translation.qm diff --git a/plugins/PluginLoader/catchcopy-v0002/Languages/es/translation.qm b/plugins/PluginLoader/catchcopy-v0002/Languages/es/translation.qm Binary files differindex 543b9c0..4c26a4e 100755 --- a/plugins/PluginLoader/catchcopy-v0002/Languages/es/translation.qm +++ b/plugins/PluginLoader/catchcopy-v0002/Languages/es/translation.qm diff --git a/plugins/PluginLoader/catchcopy-v0002/Languages/fr/translation.qm b/plugins/PluginLoader/catchcopy-v0002/Languages/fr/translation.qm Binary files differindex 5f0a7f4..c846512 100755 --- a/plugins/PluginLoader/catchcopy-v0002/Languages/fr/translation.qm +++ b/plugins/PluginLoader/catchcopy-v0002/Languages/fr/translation.qm diff --git a/plugins/PluginLoader/catchcopy-v0002/Languages/hu/translation.qm b/plugins/PluginLoader/catchcopy-v0002/Languages/hu/translation.qm Binary files differindex d05e9c3..94e5a1a 100755 --- a/plugins/PluginLoader/catchcopy-v0002/Languages/hu/translation.qm +++ b/plugins/PluginLoader/catchcopy-v0002/Languages/hu/translation.qm diff --git a/plugins/PluginLoader/catchcopy-v0002/Languages/it/translation.qm b/plugins/PluginLoader/catchcopy-v0002/Languages/it/translation.qm Binary files differindex 3974c3a..7cb3f3d 100755 --- a/plugins/PluginLoader/catchcopy-v0002/Languages/it/translation.qm +++ b/plugins/PluginLoader/catchcopy-v0002/Languages/it/translation.qm diff --git a/plugins/PluginLoader/catchcopy-v0002/Languages/it/translation.ts b/plugins/PluginLoader/catchcopy-v0002/Languages/it/translation.ts index 256518d..7356729 100644 --- a/plugins/PluginLoader/catchcopy-v0002/Languages/it/translation.ts +++ b/plugins/PluginLoader/catchcopy-v0002/Languages/it/translation.ts @@ -6,17 +6,17 @@ <message> <location filename="../../OptionsWidget.ui" line="17"/> <source>In normal case, only the dll 64Bits is important with 64Bits OS, and 32Bits dll with 32Bits OS. When it's important, the UAC can be opened to load the dll.</source> - <translation>Solitamente, le librerie dll 64bit sono indispensabili solo per sistemi operativi a x64, e le librerie 32bit per sistemi operativi a x86. Quando è necessario, l' UAC (il controllo dell'account utente) può essere aperto per caricare le dll</translation> + <translation>Solitamente, le librerie dll 64bit sono indispensabili solo per sistemi operativi x64, e le librerie 32bit per sistemi operativi x86. Quando necessario, UAC (il controllo dell'account utente) può essere aperto per caricare le dll.</translation> </message> <message> <location filename="../../OptionsWidget.ui" line="20"/> <source>All the dlls are importants</source> - <translation>Tutte le librerie dll sono necessarie</translation> + <translation>Tutte le librerie dll sono importanti</translation> </message> <message> <location filename="../../OptionsWidget.ui" line="34"/> <source>Register for all users</source> - <translation>Registrare per tutti gli utenti</translation> + <translation>Registra per tutti gli utenti</translation> </message> </context> </TS> diff --git a/plugins/PluginLoader/catchcopy-v0002/Languages/ko/translation.qm b/plugins/PluginLoader/catchcopy-v0002/Languages/ko/translation.qm Binary files differindex 3738845..aeaedce 100755 --- a/plugins/PluginLoader/catchcopy-v0002/Languages/ko/translation.qm +++ b/plugins/PluginLoader/catchcopy-v0002/Languages/ko/translation.qm diff --git a/plugins/PluginLoader/catchcopy-v0002/Languages/ru/translation.qm b/plugins/PluginLoader/catchcopy-v0002/Languages/ru/translation.qm Binary files differindex 00c9703..d4dcd8c 100755 --- a/plugins/PluginLoader/catchcopy-v0002/Languages/ru/translation.qm +++ b/plugins/PluginLoader/catchcopy-v0002/Languages/ru/translation.qm diff --git a/plugins/PluginLoader/catchcopy-v0002/informations.xml b/plugins/PluginLoader/catchcopy-v0002/informations.xml index 79b7630..dea4b19 100755 --- 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>2.2.4.7</version> + <version>2.2.6.0</version> <!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. --> <name>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.pro b/plugins/PluginLoader/catchcopy-v0002/pluginLoader.pro index f7541f4..eb6af20 100755 --- a/plugins/PluginLoader/catchcopy-v0002/pluginLoader.pro +++ b/plugins/PluginLoader/catchcopy-v0002/pluginLoader.pro @@ -43,7 +43,8 @@ TRANSLATIONS += \ $$PWD/Languages/tr/translation.ts \
$$PWD/Languages/zh/translation.ts
-win32:LIBS += -lole32 -lshell32
+#comment here why need -lole32 -lshell32
+#win32:LIBS += -lole32 -lshell32
FORMS += \
$$PWD/OptionsWidget.ui
diff --git a/plugins/SessionLoader/Windows/informations.xml b/plugins/SessionLoader/Windows/informations.xml index 1f1a324..57ec59c 100755 --- 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>2.2.4.7</version> + <version>2.2.6.0</version> <!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. --> <name>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/Themes/Oxygen/Languages/ar/translation.qm b/plugins/Themes/Oxygen/Languages/ar/translation.qm Binary files differindex 2ac6267..c225865 100755 --- a/plugins/Themes/Oxygen/Languages/ar/translation.qm +++ b/plugins/Themes/Oxygen/Languages/ar/translation.qm diff --git a/plugins/Themes/Oxygen/Languages/ar/translation.ts b/plugins/Themes/Oxygen/Languages/ar/translation.ts index 24a1bd9..4c10ecb 100644 --- a/plugins/Themes/Oxygen/Languages/ar/translation.ts +++ b/plugins/Themes/Oxygen/Languages/ar/translation.ts @@ -4,61 +4,61 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation>شراء النسخة النهائية لتمويل التنمية</translation> </message> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="427"/> + <location filename="../../interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation>الملف %1/%2 ، الحجم: %3/%4</translation> </message> <message> - <location filename="../../interface.cpp" line="661"/> + <location filename="../../interface.cpp" line="674"/> <source>Copy list</source> <translation>قائمة النسخ</translation> </message> <message> - <location filename="../../interface.cpp" line="663"/> + <location filename="../../interface.cpp" line="676"/> <source>Move list</source> <translation>قائمة النقل</translation> </message> <message> - <location filename="../../interface.cpp" line="1091"/> + <location filename="../../interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation>عدم الإغلاق في حاله العثور على أخطاء</translation> </message> <message> - <location filename="../../interface.cpp" line="1092"/> + <location filename="../../interface.cpp" line="1118"/> <source>Never close</source> <translation>لا تغلق أبدا</translation> </message> <message> - <location filename="../../interface.cpp" line="1093"/> + <location filename="../../interface.cpp" line="1119"/> <source>Always close</source> <translation>إغلاق دائم</translation> </message> <message> - <location filename="../../interface.cpp" line="1095"/> + <location filename="../../interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation>اسم الملف ، 0KB</translation> </message> <message> - <location filename="../../interface.cpp" line="1289"/> - <location filename="../../interface.cpp" line="1301"/> - <location filename="../../interface.cpp" line="1313"/> + <location filename="../../interface.cpp" line="1395"/> + <location filename="../../interface.cpp" line="1407"/> + <location filename="../../interface.cpp" line="1419"/> <source>Select a color</source> <translation>تحديد لون</translation> </message> <message> - <location filename="../../interface.cpp" line="1388"/> - <location filename="../../interface.cpp" line="1392"/> - <location filename="../../interface.cpp" line="1394"/> + <location filename="../../interface.cpp" line="1494"/> + <location filename="../../interface.cpp" line="1498"/> + <location filename="../../interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation>%1 %2% من %3</translation> </message> @@ -66,24 +66,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="284"/> + <location filename="../../ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation>عدم الإغلاق في حاله العثور على أخطاء</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="285"/> + <location filename="../../ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation>لا تغلق أبدا</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="286"/> + <location filename="../../ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation>إغلاق دائم</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="482"/> - <location filename="../../ThemesFactory.cpp" line="497"/> - <location filename="../../ThemesFactory.cpp" line="512"/> + <location filename="../../ThemesFactory.cpp" line="510"/> + <location filename="../../ThemesFactory.cpp" line="525"/> + <location filename="../../ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation>تحديد لون</translation> </message> @@ -250,7 +250,7 @@ <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="267"/> + <location filename="../../themesOptions.ui" line="402"/> <source>Show dual progression</source> <translation>إظهار التقدم المزدوج</translation> </message> @@ -301,32 +301,42 @@ <translation>حفظ الموضع</translation> </message> <message> - <location filename="../../themesOptions.ui" line="213"/> - <source>Informations</source> - <translation>المعلومات</translation> - </message> - <message> <location filename="../../themesOptions.ui" line="251"/> <source>Display</source> <translation>عرض</translation> </message> <message> - <location filename="../../themesOptions.ui" line="257"/> + <location filename="../../themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation>السرعة مع شريط التقدم</translation> </message> <message> - <location filename="../../themesOptions.ui" line="287"/> + <location filename="../../themesOptions.ui" line="378"/> <source>Progression color</source> <translation>تدرج اللون</translation> </message> <message> - <location filename="../../themesOptions.ui" line="306"/> + <location filename="../../themesOptions.ui" line="395"/> + <source>General margin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="425"/> + <source>General spacing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="269"/> <source>Click to edit the color</source> <translation>انقر لتحرير اللون</translation> </message> <message> - <location filename="../../themesOptions.ui" line="277"/> + <location filename="../../themesOptions.ui" line="213"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation>إظهار التقدم في العنوان</translation> </message> diff --git a/plugins/Themes/Oxygen/Languages/de/translation.qm b/plugins/Themes/Oxygen/Languages/de/translation.qm Binary files differindex 6bbb305..e53bc42 100755 --- a/plugins/Themes/Oxygen/Languages/de/translation.qm +++ b/plugins/Themes/Oxygen/Languages/de/translation.qm diff --git a/plugins/Themes/Oxygen/Languages/de/translation.ts b/plugins/Themes/Oxygen/Languages/de/translation.ts index 68c3f7c..2ab23ab 100644 --- a/plugins/Themes/Oxygen/Languages/de/translation.ts +++ b/plugins/Themes/Oxygen/Languages/de/translation.ts @@ -4,61 +4,61 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <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="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="427"/> + <location filename="../../interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation>Datei %1/%2, Größe:%3/%4</translation> </message> <message> - <location filename="../../interface.cpp" line="661"/> + <location filename="../../interface.cpp" line="674"/> <source>Copy list</source> <translation>Zu kopierende Dateien</translation> </message> <message> - <location filename="../../interface.cpp" line="663"/> + <location filename="../../interface.cpp" line="676"/> <source>Move list</source> <translation>Zu verschiebende Dateien</translation> </message> <message> - <location filename="../../interface.cpp" line="1091"/> + <location filename="../../interface.cpp" line="1117"/> <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="1092"/> + <location filename="../../interface.cpp" line="1118"/> <source>Never close</source> <translation>Niemals schließen</translation> </message> <message> - <location filename="../../interface.cpp" line="1093"/> + <location filename="../../interface.cpp" line="1119"/> <source>Always close</source> <translation>Immer schließen</translation> </message> <message> - <location filename="../../interface.cpp" line="1095"/> + <location filename="../../interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation>Dateiname, 0KB</translation> </message> <message> - <location filename="../../interface.cpp" line="1289"/> - <location filename="../../interface.cpp" line="1301"/> - <location filename="../../interface.cpp" line="1313"/> + <location filename="../../interface.cpp" line="1395"/> + <location filename="../../interface.cpp" line="1407"/> + <location filename="../../interface.cpp" line="1419"/> <source>Select a color</source> <translation>Farbe auswählen</translation> </message> <message> - <location filename="../../interface.cpp" line="1388"/> - <location filename="../../interface.cpp" line="1392"/> - <location filename="../../interface.cpp" line="1394"/> + <location filename="../../interface.cpp" line="1494"/> + <location filename="../../interface.cpp" line="1498"/> + <location filename="../../interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation>%1 %2% von %3</translation> </message> @@ -66,24 +66,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="284"/> + <location filename="../../ThemesFactory.cpp" line="294"/> <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="285"/> + <location filename="../../ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation>Niemals schließen</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="286"/> + <location filename="../../ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation>Immer schließen</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="482"/> - <location filename="../../ThemesFactory.cpp" line="497"/> - <location filename="../../ThemesFactory.cpp" line="512"/> + <location filename="../../ThemesFactory.cpp" line="510"/> + <location filename="../../ThemesFactory.cpp" line="525"/> + <location filename="../../ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation>Wählen Sie eine Farbe</translation> </message> @@ -250,7 +250,7 @@ <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="267"/> + <location filename="../../themesOptions.ui" line="402"/> <source>Show dual progression</source> <translation></translation> </message> @@ -291,7 +291,12 @@ <translation>Minimiert starten</translation> </message> <message> - <location filename="../../themesOptions.ui" line="306"/> + <location filename="../../themesOptions.ui" line="213"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="269"/> <source>Click to edit the color</source> <translation>Zum Bearbeiten der Farbe klicken</translation> </message> @@ -306,31 +311,36 @@ <translation>Speichere Fensterposition</translation> </message> <message> - <location filename="../../themesOptions.ui" line="213"/> - <source>Informations</source> - <translation>Informationen</translation> - </message> - <message> <location filename="../../themesOptions.ui" line="251"/> <source>Display</source> <translation>Anzeige</translation> </message> <message> - <location filename="../../themesOptions.ui" line="257"/> + <location filename="../../themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation>Geschwindigkeit als Fortschrittsbalken anzeigen</translation> </message> <message> - <location filename="../../themesOptions.ui" line="287"/> + <location filename="../../themesOptions.ui" line="378"/> <source>Progression color</source> <translation>Farbe des Fortschrittsbalken</translation> </message> <message> - <location filename="../../themesOptions.ui" line="277"/> + <location filename="../../themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation>Fortschritt im Fenstertitel zeigen</translation> </message> <message> + <location filename="../../themesOptions.ui" line="395"/> + <source>General margin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="425"/> + <source>General spacing</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../themesOptions.ui" line="183"/> <source>Always on top</source> <translation>Fenster immer im Vordergrund halten</translation> diff --git a/plugins/Themes/Oxygen/Languages/el/translation.ts b/plugins/Themes/Oxygen/Languages/el/translation.ts index e7d9002..79e2ba9 100755 --- a/plugins/Themes/Oxygen/Languages/el/translation.ts +++ b/plugins/Themes/Oxygen/Languages/el/translation.ts @@ -4,61 +4,61 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="427"/> + <location filename="../../interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="661"/> + <location filename="../../interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="663"/> + <location filename="../../interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1091"/> + <location filename="../../interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1092"/> + <location filename="../../interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1093"/> + <location filename="../../interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1095"/> + <location filename="../../interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1289"/> - <location filename="../../interface.cpp" line="1301"/> - <location filename="../../interface.cpp" line="1313"/> + <location filename="../../interface.cpp" line="1395"/> + <location filename="../../interface.cpp" line="1407"/> + <location filename="../../interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1388"/> - <location filename="../../interface.cpp" line="1392"/> - <location filename="../../interface.cpp" line="1394"/> + <location filename="../../interface.cpp" line="1494"/> + <location filename="../../interface.cpp" line="1498"/> + <location filename="../../interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -66,24 +66,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="284"/> + <location filename="../../ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="285"/> + <location filename="../../ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="286"/> + <location filename="../../ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="482"/> - <location filename="../../ThemesFactory.cpp" line="497"/> - <location filename="../../ThemesFactory.cpp" line="512"/> + <location filename="../../ThemesFactory.cpp" line="510"/> + <location filename="../../ThemesFactory.cpp" line="525"/> + <location filename="../../ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -250,7 +250,7 @@ <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="267"/> + <location filename="../../themesOptions.ui" line="402"/> <source>Show dual progression</source> <translation type="unfinished"></translation> </message> @@ -301,32 +301,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="213"/> - <source>Informations</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../themesOptions.ui" line="251"/> <source>Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="257"/> + <location filename="../../themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="287"/> + <location filename="../../themesOptions.ui" line="378"/> <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="306"/> + <location filename="../../themesOptions.ui" line="395"/> + <source>General margin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="425"/> + <source>General spacing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="269"/> <source>Click to edit the color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="277"/> + <location filename="../../themesOptions.ui" line="213"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/Themes/Oxygen/Languages/en/translation.qm b/plugins/Themes/Oxygen/Languages/en/translation.qm Binary files differindex d925dd6..922339a 100755 --- a/plugins/Themes/Oxygen/Languages/en/translation.qm +++ b/plugins/Themes/Oxygen/Languages/en/translation.qm diff --git a/plugins/Themes/Oxygen/Languages/en/translation.ts b/plugins/Themes/Oxygen/Languages/en/translation.ts index 4bb21ad..ff5d6da 100755 --- a/plugins/Themes/Oxygen/Languages/en/translation.ts +++ b/plugins/Themes/Oxygen/Languages/en/translation.ts @@ -4,61 +4,61 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="427"/> + <location filename="../../interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="661"/> + <location filename="../../interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="663"/> + <location filename="../../interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1091"/> + <location filename="../../interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1092"/> + <location filename="../../interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1093"/> + <location filename="../../interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1095"/> + <location filename="../../interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1289"/> - <location filename="../../interface.cpp" line="1301"/> - <location filename="../../interface.cpp" line="1313"/> + <location filename="../../interface.cpp" line="1395"/> + <location filename="../../interface.cpp" line="1407"/> + <location filename="../../interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1388"/> - <location filename="../../interface.cpp" line="1392"/> - <location filename="../../interface.cpp" line="1394"/> + <location filename="../../interface.cpp" line="1494"/> + <location filename="../../interface.cpp" line="1498"/> + <location filename="../../interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -66,24 +66,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="284"/> + <location filename="../../ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="285"/> + <location filename="../../ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="286"/> + <location filename="../../ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="482"/> - <location filename="../../ThemesFactory.cpp" line="497"/> - <location filename="../../ThemesFactory.cpp" line="512"/> + <location filename="../../ThemesFactory.cpp" line="510"/> + <location filename="../../ThemesFactory.cpp" line="525"/> + <location filename="../../ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -250,7 +250,7 @@ <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="267"/> + <location filename="../../themesOptions.ui" line="402"/> <source>Show dual progression</source> <translation type="unfinished"></translation> </message> @@ -301,32 +301,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="213"/> - <source>Informations</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../themesOptions.ui" line="251"/> <source>Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="257"/> + <location filename="../../themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="287"/> + <location filename="../../themesOptions.ui" line="378"/> <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="306"/> + <location filename="../../themesOptions.ui" line="395"/> + <source>General margin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="425"/> + <source>General spacing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="269"/> <source>Click to edit the color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="277"/> + <location filename="../../themesOptions.ui" line="213"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/Themes/Oxygen/Languages/es/translation.qm b/plugins/Themes/Oxygen/Languages/es/translation.qm Binary files differindex 5d258b3..d48e432 100755 --- a/plugins/Themes/Oxygen/Languages/es/translation.qm +++ b/plugins/Themes/Oxygen/Languages/es/translation.qm diff --git a/plugins/Themes/Oxygen/Languages/es/translation.ts b/plugins/Themes/Oxygen/Languages/es/translation.ts index 00d805d..03e2307 100755 --- a/plugins/Themes/Oxygen/Languages/es/translation.ts +++ b/plugins/Themes/Oxygen/Languages/es/translation.ts @@ -4,86 +4,86 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <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="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Register your key</source> - <translation type="unfinished"></translation> + <translation>Registra tu clave</translation> </message> <message> - <location filename="../../interface.cpp" line="427"/> + <location filename="../../interface.cpp" line="440"/> <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="661"/> + <location filename="../../interface.cpp" line="674"/> <source>Copy list</source> <translation>Lista de copia</translation> </message> <message> - <location filename="../../interface.cpp" line="663"/> + <location filename="../../interface.cpp" line="676"/> <source>Move list</source> <translation>Lista de movimiento</translation> </message> <message> - <location filename="../../interface.cpp" line="1091"/> + <location filename="../../interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation>No cierre si se encuentran errores</translation> </message> <message> - <location filename="../../interface.cpp" line="1092"/> + <location filename="../../interface.cpp" line="1118"/> <source>Never close</source> <translation>Nunca cierre</translation> </message> <message> - <location filename="../../interface.cpp" line="1093"/> + <location filename="../../interface.cpp" line="1119"/> <source>Always close</source> <translation>Siempre cerrar</translation> </message> <message> - <location filename="../../interface.cpp" line="1095"/> + <location filename="../../interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation>Nombre de archivo, 0KB</translation> </message> <message> - <location filename="../../interface.cpp" line="1289"/> - <location filename="../../interface.cpp" line="1301"/> - <location filename="../../interface.cpp" line="1313"/> + <location filename="../../interface.cpp" line="1395"/> + <location filename="../../interface.cpp" line="1407"/> + <location filename="../../interface.cpp" line="1419"/> <source>Select a color</source> <translation>Seleccione un color</translation> </message> <message> - <location filename="../../interface.cpp" line="1388"/> - <location filename="../../interface.cpp" line="1392"/> - <location filename="../../interface.cpp" line="1394"/> + <location filename="../../interface.cpp" line="1494"/> + <location filename="../../interface.cpp" line="1498"/> + <location filename="../../interface.cpp" line="1500"/> <source>%1 %2% of %3</source> - <translation type="unfinished"></translation> + <translation>%1 %2% de %3</translation> </message> </context> <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="284"/> + <location filename="../../ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation>No cierre si se encuentran errores</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="285"/> + <location filename="../../ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation>Nunca cierre</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="286"/> + <location filename="../../ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation>Siempre cerrar</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="482"/> - <location filename="../../ThemesFactory.cpp" line="497"/> - <location filename="../../ThemesFactory.cpp" line="512"/> + <location filename="../../ThemesFactory.cpp" line="510"/> + <location filename="../../ThemesFactory.cpp" line="525"/> + <location filename="../../ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation>Seleccione un color</translation> </message> @@ -250,7 +250,7 @@ <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="267"/> + <location filename="../../themesOptions.ui" line="402"/> <source>Show dual progression</source> <translation>Mostrar progresión dual</translation> </message> @@ -288,10 +288,15 @@ <message> <location filename="../../themesOptions.ui" line="53"/> <source>Start minimized</source> - <translation type="unfinished"></translation> + <translation>Iniciar minimizado</translation> </message> <message> - <location filename="../../themesOptions.ui" line="306"/> + <location filename="../../themesOptions.ui" line="213"/> + <source>Information</source> + <translation>Informacións</translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="269"/> <source>Click to edit the color</source> <translation>Haga clic para editar el color</translation> </message> @@ -303,12 +308,7 @@ <message> <location filename="../../themesOptions.ui" line="190"/> <source>Save position</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../themesOptions.ui" line="213"/> - <source>Informations</source> - <translation>Informations</translation> + <translation>Guardar posicion</translation> </message> <message> <location filename="../../themesOptions.ui" line="251"/> @@ -316,21 +316,31 @@ <translation>Visualización</translation> </message> <message> - <location filename="../../themesOptions.ui" line="257"/> + <location filename="../../themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation>Velocidad con barra de progreso</translation> </message> <message> - <location filename="../../themesOptions.ui" line="287"/> + <location filename="../../themesOptions.ui" line="378"/> <source>Progression color</source> <translation>Progresión de color</translation> </message> <message> - <location filename="../../themesOptions.ui" line="277"/> + <location filename="../../themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation>Mostrar progresión en el título</translation> </message> <message> + <location filename="../../themesOptions.ui" line="395"/> + <source>General margin</source> + <translation>Margen general</translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="425"/> + <source>General spacing</source> + <translation>Espaciado general</translation> + </message> + <message> <location filename="../../themesOptions.ui" line="183"/> <source>Always on top</source> <translation>Siempre visible</translation> diff --git a/plugins/Themes/Oxygen/Languages/fr/translation.qm b/plugins/Themes/Oxygen/Languages/fr/translation.qm Binary files differindex 3db8765..1b4fb0b 100755 --- a/plugins/Themes/Oxygen/Languages/fr/translation.qm +++ b/plugins/Themes/Oxygen/Languages/fr/translation.qm diff --git a/plugins/Themes/Oxygen/Languages/fr/translation.ts b/plugins/Themes/Oxygen/Languages/fr/translation.ts index 3eb2e67..5af9a4d 100755 --- a/plugins/Themes/Oxygen/Languages/fr/translation.ts +++ b/plugins/Themes/Oxygen/Languages/fr/translation.ts @@ -4,14 +4,14 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="+328"/> + <location filename="../../interface.cpp" line="+341"/> <source>Buy the Ultimate version to fund development</source> <translation>Achetez la version Ultimate pour financer le développement</translation> </message> <message> <location line="+0"/> <source>Register your key</source> - <translation type="unfinished"></translation> + <translation>Enregistrez votre clé</translation> </message> <message> <location line="+99"/> @@ -29,7 +29,7 @@ <translation>Liste de déplacements</translation> </message> <message> - <location line="+428"/> + <location line="+441"/> <source>Don't close if errors are found</source> <translation>Garder ouvert s'il y a des erreurs</translation> </message> @@ -49,7 +49,7 @@ <translation>Nom de fichier, 0Ko</translation> </message> <message> - <location line="+194"/> + <location line="+274"/> <location line="+12"/> <location line="+12"/> <source>Select a color</source> @@ -66,7 +66,7 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="+284"/> + <location filename="../../ThemesFactory.cpp" line="+294"/> <source>Don't close if errors are found</source> <translation>Garder ouvert s'il y a des erreurs</translation> </message> @@ -81,7 +81,7 @@ <translation>Toujours fermer</translation> </message> <message> - <location line="+196"/> + <location line="+214"/> <location line="+15"/> <location line="+15"/> <source>Select a color</source> @@ -250,12 +250,12 @@ <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="+267"/> + <location filename="../../themesOptions.ui" line="+402"/> <source>Show dual progression</source> <translation>Afficher une double progression</translation> </message> <message> - <location line="-48"/> + <location line="-183"/> <source>Show speed as main information</source> <translation>Afficher la vitesse comme information principale</translation> </message> @@ -291,12 +291,17 @@ <translation>Démarrer minimisé</translation> </message> <message> - <location line="+253"/> + <location line="+160"/> + <source>Information</source> + <translation>Informations</translation> + </message> + <message> + <location line="+56"/> <source>Click to edit the color</source> <translation>Cliquer pour éditer la couleur</translation> </message> <message> - <location line="-159"/> + <location line="-122"/> <source> KB/s</source> <translation> Ko/s</translation> </message> @@ -306,32 +311,37 @@ <translation>Sauvegarder la position</translation> </message> <message> - <location line="+23"/> - <source>Informations</source> - <translation>Informations</translation> - </message> - <message> - <location line="+38"/> + <location line="+61"/> <source>Display</source> <translation>Affichage</translation> </message> <message> - <location line="+6"/> + <location line="+117"/> <source>Speed with progress bar</source> <translation>Vitesse avec barre de progression</translation> </message> <message> - <location line="+30"/> + <location line="+10"/> <source>Progression color</source> <translation>Couleur de progression</translation> </message> <message> - <location line="-10"/> + <location line="+10"/> <source>Show progression in the title</source> <translation>Afficher la progression dans le titre</translation> </message> <message> - <location line="-94"/> + <location line="+7"/> + <source>General margin</source> + <translation>Marge générale</translation> + </message> + <message> + <location line="+30"/> + <source>General spacing</source> + <translation>Espacement général</translation> + </message> + <message> + <location line="-242"/> <source>Always on top</source> <translation>Toujours au 1er plan</translation> </message> diff --git a/plugins/Themes/Oxygen/Languages/hi/translation.ts b/plugins/Themes/Oxygen/Languages/hi/translation.ts index e7d9002..79e2ba9 100755 --- a/plugins/Themes/Oxygen/Languages/hi/translation.ts +++ b/plugins/Themes/Oxygen/Languages/hi/translation.ts @@ -4,61 +4,61 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="427"/> + <location filename="../../interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="661"/> + <location filename="../../interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="663"/> + <location filename="../../interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1091"/> + <location filename="../../interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1092"/> + <location filename="../../interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1093"/> + <location filename="../../interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1095"/> + <location filename="../../interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1289"/> - <location filename="../../interface.cpp" line="1301"/> - <location filename="../../interface.cpp" line="1313"/> + <location filename="../../interface.cpp" line="1395"/> + <location filename="../../interface.cpp" line="1407"/> + <location filename="../../interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1388"/> - <location filename="../../interface.cpp" line="1392"/> - <location filename="../../interface.cpp" line="1394"/> + <location filename="../../interface.cpp" line="1494"/> + <location filename="../../interface.cpp" line="1498"/> + <location filename="../../interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -66,24 +66,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="284"/> + <location filename="../../ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="285"/> + <location filename="../../ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="286"/> + <location filename="../../ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="482"/> - <location filename="../../ThemesFactory.cpp" line="497"/> - <location filename="../../ThemesFactory.cpp" line="512"/> + <location filename="../../ThemesFactory.cpp" line="510"/> + <location filename="../../ThemesFactory.cpp" line="525"/> + <location filename="../../ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -250,7 +250,7 @@ <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="267"/> + <location filename="../../themesOptions.ui" line="402"/> <source>Show dual progression</source> <translation type="unfinished"></translation> </message> @@ -301,32 +301,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="213"/> - <source>Informations</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../themesOptions.ui" line="251"/> <source>Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="257"/> + <location filename="../../themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="287"/> + <location filename="../../themesOptions.ui" line="378"/> <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="306"/> + <location filename="../../themesOptions.ui" line="395"/> + <source>General margin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="425"/> + <source>General spacing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="269"/> <source>Click to edit the color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="277"/> + <location filename="../../themesOptions.ui" line="213"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/Themes/Oxygen/Languages/hu/translation.qm b/plugins/Themes/Oxygen/Languages/hu/translation.qm Binary files differindex 55200d4..e02fee6 100755 --- a/plugins/Themes/Oxygen/Languages/hu/translation.qm +++ b/plugins/Themes/Oxygen/Languages/hu/translation.qm diff --git a/plugins/Themes/Oxygen/Languages/hu/translation.ts b/plugins/Themes/Oxygen/Languages/hu/translation.ts index ec2d5d1..419d18f 100755 --- a/plugins/Themes/Oxygen/Languages/hu/translation.ts +++ b/plugins/Themes/Oxygen/Languages/hu/translation.ts @@ -4,61 +4,61 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <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="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="427"/> + <location filename="../../interface.cpp" line="440"/> <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="661"/> + <location filename="../../interface.cpp" line="674"/> <source>Copy list</source> <translation>Lista másolása</translation> </message> <message> - <location filename="../../interface.cpp" line="663"/> + <location filename="../../interface.cpp" line="676"/> <source>Move list</source> <translation>Lista mozgatása</translation> </message> <message> - <location filename="../../interface.cpp" line="1091"/> + <location filename="../../interface.cpp" line="1117"/> <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="1092"/> + <location filename="../../interface.cpp" line="1118"/> <source>Never close</source> <translation>Sose zárja be</translation> </message> <message> - <location filename="../../interface.cpp" line="1093"/> + <location filename="../../interface.cpp" line="1119"/> <source>Always close</source> <translation>Mindig zárja be</translation> </message> <message> - <location filename="../../interface.cpp" line="1095"/> + <location filename="../../interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation>Fájlnév, 0KB</translation> </message> <message> - <location filename="../../interface.cpp" line="1289"/> - <location filename="../../interface.cpp" line="1301"/> - <location filename="../../interface.cpp" line="1313"/> + <location filename="../../interface.cpp" line="1395"/> + <location filename="../../interface.cpp" line="1407"/> + <location filename="../../interface.cpp" line="1419"/> <source>Select a color</source> <translation>Válassz egy színt</translation> </message> <message> - <location filename="../../interface.cpp" line="1388"/> - <location filename="../../interface.cpp" line="1392"/> - <location filename="../../interface.cpp" line="1394"/> + <location filename="../../interface.cpp" line="1494"/> + <location filename="../../interface.cpp" line="1498"/> + <location filename="../../interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -66,24 +66,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="284"/> + <location filename="../../ThemesFactory.cpp" line="294"/> <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="285"/> + <location filename="../../ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation>Sose zárja be</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="286"/> + <location filename="../../ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation>Mindig zárja be</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="482"/> - <location filename="../../ThemesFactory.cpp" line="497"/> - <location filename="../../ThemesFactory.cpp" line="512"/> + <location filename="../../ThemesFactory.cpp" line="510"/> + <location filename="../../ThemesFactory.cpp" line="525"/> + <location filename="../../ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation>Válassz egy színt</translation> </message> @@ -250,7 +250,7 @@ <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="267"/> + <location filename="../../themesOptions.ui" line="402"/> <source>Show dual progression</source> <translation>Páros folyamat mutatása</translation> </message> @@ -291,7 +291,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="306"/> + <location filename="../../themesOptions.ui" line="213"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="269"/> <source>Click to edit the color</source> <translation>Kattints a szín szerkesztéséhez</translation> </message> @@ -306,31 +311,36 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="213"/> - <source>Informations</source> - <translation>Információk</translation> - </message> - <message> <location filename="../../themesOptions.ui" line="251"/> <source>Display</source> <translation>Megjelenítés</translation> </message> <message> - <location filename="../../themesOptions.ui" line="257"/> + <location filename="../../themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation>Sebesség folyamatsávval</translation> </message> <message> - <location filename="../../themesOptions.ui" line="287"/> + <location filename="../../themesOptions.ui" line="378"/> <source>Progression color</source> <translation>Folyamat színe</translation> </message> <message> - <location filename="../../themesOptions.ui" line="277"/> + <location filename="../../themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation>Folyamat mutatása a címsorban</translation> </message> <message> + <location filename="../../themesOptions.ui" line="395"/> + <source>General margin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="425"/> + <source>General spacing</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../themesOptions.ui" line="183"/> <source>Always on top</source> <translation>Mindig legfelül</translation> diff --git a/plugins/Themes/Oxygen/Languages/id/translation.ts b/plugins/Themes/Oxygen/Languages/id/translation.ts index e7d9002..79e2ba9 100755 --- a/plugins/Themes/Oxygen/Languages/id/translation.ts +++ b/plugins/Themes/Oxygen/Languages/id/translation.ts @@ -4,61 +4,61 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="427"/> + <location filename="../../interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="661"/> + <location filename="../../interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="663"/> + <location filename="../../interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1091"/> + <location filename="../../interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1092"/> + <location filename="../../interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1093"/> + <location filename="../../interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1095"/> + <location filename="../../interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1289"/> - <location filename="../../interface.cpp" line="1301"/> - <location filename="../../interface.cpp" line="1313"/> + <location filename="../../interface.cpp" line="1395"/> + <location filename="../../interface.cpp" line="1407"/> + <location filename="../../interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1388"/> - <location filename="../../interface.cpp" line="1392"/> - <location filename="../../interface.cpp" line="1394"/> + <location filename="../../interface.cpp" line="1494"/> + <location filename="../../interface.cpp" line="1498"/> + <location filename="../../interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -66,24 +66,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="284"/> + <location filename="../../ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="285"/> + <location filename="../../ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="286"/> + <location filename="../../ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="482"/> - <location filename="../../ThemesFactory.cpp" line="497"/> - <location filename="../../ThemesFactory.cpp" line="512"/> + <location filename="../../ThemesFactory.cpp" line="510"/> + <location filename="../../ThemesFactory.cpp" line="525"/> + <location filename="../../ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -250,7 +250,7 @@ <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="267"/> + <location filename="../../themesOptions.ui" line="402"/> <source>Show dual progression</source> <translation type="unfinished"></translation> </message> @@ -301,32 +301,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="213"/> - <source>Informations</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../themesOptions.ui" line="251"/> <source>Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="257"/> + <location filename="../../themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="287"/> + <location filename="../../themesOptions.ui" line="378"/> <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="306"/> + <location filename="../../themesOptions.ui" line="395"/> + <source>General margin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="425"/> + <source>General spacing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="269"/> <source>Click to edit the color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="277"/> + <location filename="../../themesOptions.ui" line="213"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/Themes/Oxygen/Languages/it/translation.qm b/plugins/Themes/Oxygen/Languages/it/translation.qm Binary files differindex 003803d..8eff0a1 100755 --- a/plugins/Themes/Oxygen/Languages/it/translation.qm +++ b/plugins/Themes/Oxygen/Languages/it/translation.qm diff --git a/plugins/Themes/Oxygen/Languages/it/translation.ts b/plugins/Themes/Oxygen/Languages/it/translation.ts index f9216f9..10c71f0 100644 --- a/plugins/Themes/Oxygen/Languages/it/translation.ts +++ b/plugins/Themes/Oxygen/Languages/it/translation.ts @@ -4,61 +4,61 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> - <translation>Acquista versione ultimate per finanziare lo sviluppo</translation> + <translation>Acquista versione Ultimate per finanziare lo sviluppo</translation> </message> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Register your key</source> - <translation type="unfinished"></translation> + <translation>Registrate la vostra chiave</translation> </message> <message> - <location filename="../../interface.cpp" line="427"/> + <location filename="../../interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation>File %1/%2, dimensione: %3/%4</translation> </message> <message> - <location filename="../../interface.cpp" line="661"/> + <location filename="../../interface.cpp" line="674"/> <source>Copy list</source> <translation>Lista di copia</translation> </message> <message> - <location filename="../../interface.cpp" line="663"/> + <location filename="../../interface.cpp" line="676"/> <source>Move list</source> <translation>Lista di spostamento</translation> </message> <message> - <location filename="../../interface.cpp" line="1091"/> + <location filename="../../interface.cpp" line="1117"/> <source>Don't close if errors are found</source> - <translation>Non chiudere se vengono trovati errori</translation> + <translation>Non chiudere se vengono rilevati errori</translation> </message> <message> - <location filename="../../interface.cpp" line="1092"/> + <location filename="../../interface.cpp" line="1118"/> <source>Never close</source> <translation>Non chiudere mai</translation> </message> <message> - <location filename="../../interface.cpp" line="1093"/> + <location filename="../../interface.cpp" line="1119"/> <source>Always close</source> - <translation>Chiudere sempre</translation> + <translation>Chiudi sempre</translation> </message> <message> - <location filename="../../interface.cpp" line="1095"/> + <location filename="../../interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation>Nome file, 0KB</translation> </message> <message> - <location filename="../../interface.cpp" line="1289"/> - <location filename="../../interface.cpp" line="1301"/> - <location filename="../../interface.cpp" line="1313"/> + <location filename="../../interface.cpp" line="1395"/> + <location filename="../../interface.cpp" line="1407"/> + <location filename="../../interface.cpp" line="1419"/> <source>Select a color</source> - <translation>Selezionare colore</translation> + <translation>Seleziona colore</translation> </message> <message> - <location filename="../../interface.cpp" line="1388"/> - <location filename="../../interface.cpp" line="1392"/> - <location filename="../../interface.cpp" line="1394"/> + <location filename="../../interface.cpp" line="1494"/> + <location filename="../../interface.cpp" line="1498"/> + <location filename="../../interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation>%1 %2% di %3</translation> </message> @@ -66,26 +66,26 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="284"/> + <location filename="../../ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation>Non chiudere se vengono rilevati errori</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="285"/> + <location filename="../../ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation>Non chiudere mai</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="286"/> + <location filename="../../ThemesFactory.cpp" line="296"/> <source>Always close</source> - <translation>Chiudere sempre</translation> + <translation>Chiudi sempre</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="482"/> - <location filename="../../ThemesFactory.cpp" line="497"/> - <location filename="../../ThemesFactory.cpp" line="512"/> + <location filename="../../ThemesFactory.cpp" line="510"/> + <location filename="../../ThemesFactory.cpp" line="525"/> + <location filename="../../ThemesFactory.cpp" line="540"/> <source>Select a color</source> - <translation>Selezionare colore</translation> + <translation>Seleziona colore</translation> </message> </context> <context> @@ -103,22 +103,22 @@ <message> <location filename="../../interface.ui" line="235"/> <source>&More</source> - <translation>Avanzate</translation> + <translation>&Altro</translation> </message> <message> <location filename="../../interface.ui" line="255"/> <source>&Pause</source> - <translation>Pausa</translation> + <translation>&Pausa</translation> </message> <message> <location filename="../../interface.ui" line="269"/> <source>&Skip</source> - <translation>Salta</translation> + <translation>&Salta</translation> </message> <message> <location filename="../../interface.ui" line="280"/> <source>&Cancel</source> - <translation>Annulla</translation> + <translation>&Annulla</translation> </message> <message> <location filename="../../interface.ui" line="127"/> @@ -138,22 +138,22 @@ <message> <location filename="../../interface.ui" line="361"/> <source>Move the selected items to the top</source> - <translation>Metti elementi selezionati in cima</translation> + <translation>Sposta elementi selezionati in cima</translation> </message> <message> <location filename="../../interface.ui" line="387"/> <source>Move up the selected items</source> - <translation>Sposta elementi selezionati in sù</translation> + <translation>Sposta in su gli elementi selezionati</translation> </message> <message> <location filename="../../interface.ui" line="413"/> <source>Move down the selected items</source> - <translation>Sposta elementi selezionati in giù</translation> + <translation>Sposta in giù gli elementi selezionati</translation> </message> <message> <location filename="../../interface.ui" line="439"/> <source>Move the selected items to the bottom</source> - <translation>Metti elementi selezionati in coda</translation> + <translation>Sposta elementi selezionati in fondo</translation> </message> <message> <location filename="../../interface.ui" line="465"/> @@ -163,7 +163,7 @@ <message> <location filename="../../interface.ui" line="494"/> <source>Delete the selected items</source> - <translation>Elimina elementi selezionati</translation> + <translation>Elimina gli elementi selezionati</translation> </message> <message> <location filename="../../interface.ui" line="520"/> @@ -199,7 +199,7 @@ <message> <location filename="../../interface.ui" line="692"/> <source>Export the errors into transfer list</source> - <translation>Esporta errori in lista di trasferimento</translation> + <translation>Esporta nella lista di trasferimento gli errori</translation> </message> <message> <location filename="../../interface.ui" line="731"/> @@ -229,30 +229,30 @@ <message> <location filename="../../interface.ui" line="814"/> <source>Move file(s)</source> - <translation>Spostare file</translation> + <translation>Sposta (i) file</translation> </message> <message> <location filename="../../interface.ui" line="823"/> <source>Move folder</source> - <translation>Spostare cartella/e</translation> + <translation>Sposta cartella</translation> </message> <message> <location filename="../../interface.ui" line="832"/> <source>Copy file(s)</source> - <translation>Copiare file</translation> + <translation>Copia (i) file</translation> </message> <message> <location filename="../../interface.ui" line="841"/> <source>Copy folder</source> - <translation>Copiare cartella/e</translation> + <translation>Copia cartella</translation> </message> </context> <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="267"/> + <location filename="../../themesOptions.ui" line="402"/> <source>Show dual progression</source> - <translation>Mostrare progressione duale</translation> + <translation>Visualizza progressione duale</translation> </message> <message> <location filename="../../themesOptions.ui" line="219"/> @@ -262,12 +262,12 @@ <message> <location filename="../../themesOptions.ui" line="44"/> <source>Use</source> - <translation>Funzionalità</translation> + <translation>Utilizza</translation> </message> <message> <location filename="../../themesOptions.ui" line="173"/> <source>Start with the "more button" pushed</source> - <translation>Avvio con bottone "Avanzate" premuto</translation> + <translation>Avvia con pulsante "Altro" attivo</translation> </message> <message> <location filename="../../themesOptions.ui" line="67"/> @@ -291,7 +291,12 @@ <translation>Avvia ridotto a icona</translation> </message> <message> - <location filename="../../themesOptions.ui" line="306"/> + <location filename="../../themesOptions.ui" line="213"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="269"/> <source>Click to edit the color</source> <translation>Cliccare per modificare colore</translation> </message> @@ -306,29 +311,34 @@ <translation>Salva posizione</translation> </message> <message> - <location filename="../../themesOptions.ui" line="213"/> - <source>Informations</source> - <translation>Informazioni</translation> - </message> - <message> <location filename="../../themesOptions.ui" line="251"/> <source>Display</source> <translation>Visualizzazione</translation> </message> <message> - <location filename="../../themesOptions.ui" line="257"/> + <location filename="../../themesOptions.ui" line="368"/> <source>Speed with progress bar</source> - <translation>Velocità in barra progresso</translation> + <translation>Velocità nella barra di progresso</translation> </message> <message> - <location filename="../../themesOptions.ui" line="287"/> + <location filename="../../themesOptions.ui" line="378"/> <source>Progression color</source> <translation>Colore progressione</translation> </message> <message> - <location filename="../../themesOptions.ui" line="277"/> + <location filename="../../themesOptions.ui" line="388"/> <source>Show progression in the title</source> - <translation>Mostra percentuale di progresso nel titolo</translation> + <translation>Visualizza progresso nel titolo</translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="395"/> + <source>General margin</source> + <translation>Margine generale</translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="425"/> + <source>General spacing</source> + <translation>Spaziatura generale</translation> </message> <message> <location filename="../../themesOptions.ui" line="183"/> diff --git a/plugins/Themes/Oxygen/Languages/ja/translation.ts b/plugins/Themes/Oxygen/Languages/ja/translation.ts index 88a695a..4973600 100755 --- a/plugins/Themes/Oxygen/Languages/ja/translation.ts +++ b/plugins/Themes/Oxygen/Languages/ja/translation.ts @@ -4,61 +4,61 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="427"/> + <location filename="../../interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="661"/> + <location filename="../../interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="663"/> + <location filename="../../interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1091"/> + <location filename="../../interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1092"/> + <location filename="../../interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1093"/> + <location filename="../../interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1095"/> + <location filename="../../interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1289"/> - <location filename="../../interface.cpp" line="1301"/> - <location filename="../../interface.cpp" line="1313"/> + <location filename="../../interface.cpp" line="1395"/> + <location filename="../../interface.cpp" line="1407"/> + <location filename="../../interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1388"/> - <location filename="../../interface.cpp" line="1392"/> - <location filename="../../interface.cpp" line="1394"/> + <location filename="../../interface.cpp" line="1494"/> + <location filename="../../interface.cpp" line="1498"/> + <location filename="../../interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -66,24 +66,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="284"/> + <location filename="../../ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="285"/> + <location filename="../../ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="286"/> + <location filename="../../ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="482"/> - <location filename="../../ThemesFactory.cpp" line="497"/> - <location filename="../../ThemesFactory.cpp" line="512"/> + <location filename="../../ThemesFactory.cpp" line="510"/> + <location filename="../../ThemesFactory.cpp" line="525"/> + <location filename="../../ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -250,7 +250,7 @@ <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="267"/> + <location filename="../../themesOptions.ui" line="402"/> <source>Show dual progression</source> <translation type="unfinished"></translation> </message> @@ -301,32 +301,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="213"/> - <source>Informations</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../themesOptions.ui" line="251"/> <source>Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="257"/> + <location filename="../../themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="287"/> + <location filename="../../themesOptions.ui" line="378"/> <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="306"/> + <location filename="../../themesOptions.ui" line="395"/> + <source>General margin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="425"/> + <source>General spacing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="269"/> <source>Click to edit the color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="277"/> + <location filename="../../themesOptions.ui" line="213"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/Themes/Oxygen/Languages/ko/translation.qm b/plugins/Themes/Oxygen/Languages/ko/translation.qm Binary files differindex 3738845..aeaedce 100755 --- a/plugins/Themes/Oxygen/Languages/ko/translation.qm +++ b/plugins/Themes/Oxygen/Languages/ko/translation.qm diff --git a/plugins/Themes/Oxygen/Languages/ko/translation.ts b/plugins/Themes/Oxygen/Languages/ko/translation.ts index 4838264..3b5c3b3 100644 --- a/plugins/Themes/Oxygen/Languages/ko/translation.ts +++ b/plugins/Themes/Oxygen/Languages/ko/translation.ts @@ -4,7 +4,7 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="+328"/> + <location filename="../../interface.cpp" line="+341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished">개발 지원을 위해 Ultimate 버전 구입</translation> </message> @@ -29,7 +29,7 @@ <translation type="unfinished">이동 목록</translation> </message> <message> - <location line="+428"/> + <location line="+441"/> <source>Don't close if errors are found</source> <translation type="unfinished">오류가 발견될 경우 닫지 않음</translation> </message> @@ -49,7 +49,7 @@ <translation type="unfinished">파일 이름, 0KB</translation> </message> <message> - <location line="+194"/> + <location line="+274"/> <location line="+12"/> <location line="+12"/> <source>Select a color</source> @@ -66,7 +66,7 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="+284"/> + <location filename="../../ThemesFactory.cpp" line="+294"/> <source>Don't close if errors are found</source> <translation type="unfinished">오류가 발견된 경우 닫지 않음</translation> </message> @@ -81,7 +81,7 @@ <translation type="unfinished">항상 닫기</translation> </message> <message> - <location line="+196"/> + <location line="+214"/> <location line="+15"/> <location line="+15"/> <source>Select a color</source> @@ -250,12 +250,12 @@ <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="+267"/> + <location filename="../../themesOptions.ui" line="+402"/> <source>Show dual progression</source> <translation type="unfinished">이중 진행 표시</translation> </message> <message> - <location line="-48"/> + <location line="-183"/> <source>Show speed as main information</source> <translation type="unfinished">주요 정보로 속도 표시</translation> </message> @@ -291,12 +291,17 @@ <translation type="unfinished">최소화된 시작</translation> </message> <message> - <location line="+253"/> + <location line="+160"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+56"/> <source>Click to edit the color</source> <translation type="unfinished">색상 편집 클릭</translation> </message> <message> - <location line="-159"/> + <location line="-122"/> <source> KB/s</source> <translation type="unfinished"> KB/초</translation> </message> @@ -306,32 +311,37 @@ <translation type="unfinished">위치 저장</translation> </message> <message> - <location line="+23"/> - <source>Informations</source> - <translation type="unfinished">정보</translation> - </message> - <message> - <location line="+38"/> + <location line="+61"/> <source>Display</source> <translation type="unfinished">표시</translation> </message> <message> - <location line="+6"/> + <location line="+117"/> <source>Speed with progress bar</source> <translation type="unfinished">진행 표시줄이 있는 속도</translation> </message> <message> - <location line="+30"/> + <location line="+10"/> <source>Progression color</source> <translation type="unfinished">진행 색상</translation> </message> <message> - <location line="-10"/> + <location line="+10"/> <source>Show progression in the title</source> <translation type="unfinished">제목에 진행률 표시</translation> </message> <message> - <location line="-94"/> + <location line="+7"/> + <source>General margin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+30"/> + <source>General spacing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-242"/> <source>Always on top</source> <translation type="unfinished">항상 위에 놓기</translation> </message> diff --git a/plugins/Themes/Oxygen/Languages/nl/translation.ts b/plugins/Themes/Oxygen/Languages/nl/translation.ts index e7d9002..79e2ba9 100755 --- a/plugins/Themes/Oxygen/Languages/nl/translation.ts +++ b/plugins/Themes/Oxygen/Languages/nl/translation.ts @@ -4,61 +4,61 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="427"/> + <location filename="../../interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="661"/> + <location filename="../../interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="663"/> + <location filename="../../interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1091"/> + <location filename="../../interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1092"/> + <location filename="../../interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1093"/> + <location filename="../../interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1095"/> + <location filename="../../interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1289"/> - <location filename="../../interface.cpp" line="1301"/> - <location filename="../../interface.cpp" line="1313"/> + <location filename="../../interface.cpp" line="1395"/> + <location filename="../../interface.cpp" line="1407"/> + <location filename="../../interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1388"/> - <location filename="../../interface.cpp" line="1392"/> - <location filename="../../interface.cpp" line="1394"/> + <location filename="../../interface.cpp" line="1494"/> + <location filename="../../interface.cpp" line="1498"/> + <location filename="../../interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -66,24 +66,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="284"/> + <location filename="../../ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="285"/> + <location filename="../../ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="286"/> + <location filename="../../ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="482"/> - <location filename="../../ThemesFactory.cpp" line="497"/> - <location filename="../../ThemesFactory.cpp" line="512"/> + <location filename="../../ThemesFactory.cpp" line="510"/> + <location filename="../../ThemesFactory.cpp" line="525"/> + <location filename="../../ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -250,7 +250,7 @@ <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="267"/> + <location filename="../../themesOptions.ui" line="402"/> <source>Show dual progression</source> <translation type="unfinished"></translation> </message> @@ -301,32 +301,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="213"/> - <source>Informations</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../themesOptions.ui" line="251"/> <source>Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="257"/> + <location filename="../../themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="287"/> + <location filename="../../themesOptions.ui" line="378"/> <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="306"/> + <location filename="../../themesOptions.ui" line="395"/> + <source>General margin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="425"/> + <source>General spacing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="269"/> <source>Click to edit the color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="277"/> + <location filename="../../themesOptions.ui" line="213"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="388"/> <source>Show progression in the title</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 e7d9002..79e2ba9 100755 --- a/plugins/Themes/Oxygen/Languages/no/translation.ts +++ b/plugins/Themes/Oxygen/Languages/no/translation.ts @@ -4,61 +4,61 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="427"/> + <location filename="../../interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="661"/> + <location filename="../../interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="663"/> + <location filename="../../interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1091"/> + <location filename="../../interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1092"/> + <location filename="../../interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1093"/> + <location filename="../../interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1095"/> + <location filename="../../interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1289"/> - <location filename="../../interface.cpp" line="1301"/> - <location filename="../../interface.cpp" line="1313"/> + <location filename="../../interface.cpp" line="1395"/> + <location filename="../../interface.cpp" line="1407"/> + <location filename="../../interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1388"/> - <location filename="../../interface.cpp" line="1392"/> - <location filename="../../interface.cpp" line="1394"/> + <location filename="../../interface.cpp" line="1494"/> + <location filename="../../interface.cpp" line="1498"/> + <location filename="../../interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -66,24 +66,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="284"/> + <location filename="../../ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="285"/> + <location filename="../../ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="286"/> + <location filename="../../ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="482"/> - <location filename="../../ThemesFactory.cpp" line="497"/> - <location filename="../../ThemesFactory.cpp" line="512"/> + <location filename="../../ThemesFactory.cpp" line="510"/> + <location filename="../../ThemesFactory.cpp" line="525"/> + <location filename="../../ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -250,7 +250,7 @@ <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="267"/> + <location filename="../../themesOptions.ui" line="402"/> <source>Show dual progression</source> <translation type="unfinished"></translation> </message> @@ -301,32 +301,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="213"/> - <source>Informations</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../themesOptions.ui" line="251"/> <source>Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="257"/> + <location filename="../../themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="287"/> + <location filename="../../themesOptions.ui" line="378"/> <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="306"/> + <location filename="../../themesOptions.ui" line="395"/> + <source>General margin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="425"/> + <source>General spacing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="269"/> <source>Click to edit the color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="277"/> + <location filename="../../themesOptions.ui" line="213"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="388"/> <source>Show progression in the title</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 e7d9002..79e2ba9 100755 --- a/plugins/Themes/Oxygen/Languages/pl/translation.ts +++ b/plugins/Themes/Oxygen/Languages/pl/translation.ts @@ -4,61 +4,61 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="427"/> + <location filename="../../interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="661"/> + <location filename="../../interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="663"/> + <location filename="../../interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1091"/> + <location filename="../../interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1092"/> + <location filename="../../interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1093"/> + <location filename="../../interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1095"/> + <location filename="../../interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1289"/> - <location filename="../../interface.cpp" line="1301"/> - <location filename="../../interface.cpp" line="1313"/> + <location filename="../../interface.cpp" line="1395"/> + <location filename="../../interface.cpp" line="1407"/> + <location filename="../../interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1388"/> - <location filename="../../interface.cpp" line="1392"/> - <location filename="../../interface.cpp" line="1394"/> + <location filename="../../interface.cpp" line="1494"/> + <location filename="../../interface.cpp" line="1498"/> + <location filename="../../interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -66,24 +66,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="284"/> + <location filename="../../ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="285"/> + <location filename="../../ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="286"/> + <location filename="../../ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="482"/> - <location filename="../../ThemesFactory.cpp" line="497"/> - <location filename="../../ThemesFactory.cpp" line="512"/> + <location filename="../../ThemesFactory.cpp" line="510"/> + <location filename="../../ThemesFactory.cpp" line="525"/> + <location filename="../../ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -250,7 +250,7 @@ <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="267"/> + <location filename="../../themesOptions.ui" line="402"/> <source>Show dual progression</source> <translation type="unfinished"></translation> </message> @@ -301,32 +301,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="213"/> - <source>Informations</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../themesOptions.ui" line="251"/> <source>Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="257"/> + <location filename="../../themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="287"/> + <location filename="../../themesOptions.ui" line="378"/> <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="306"/> + <location filename="../../themesOptions.ui" line="395"/> + <source>General margin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="425"/> + <source>General spacing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="269"/> <source>Click to edit the color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="277"/> + <location filename="../../themesOptions.ui" line="213"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="388"/> <source>Show progression in the title</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 e7d9002..79e2ba9 100755 --- a/plugins/Themes/Oxygen/Languages/pt/translation.ts +++ b/plugins/Themes/Oxygen/Languages/pt/translation.ts @@ -4,61 +4,61 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="427"/> + <location filename="../../interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="661"/> + <location filename="../../interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="663"/> + <location filename="../../interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1091"/> + <location filename="../../interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1092"/> + <location filename="../../interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1093"/> + <location filename="../../interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1095"/> + <location filename="../../interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1289"/> - <location filename="../../interface.cpp" line="1301"/> - <location filename="../../interface.cpp" line="1313"/> + <location filename="../../interface.cpp" line="1395"/> + <location filename="../../interface.cpp" line="1407"/> + <location filename="../../interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1388"/> - <location filename="../../interface.cpp" line="1392"/> - <location filename="../../interface.cpp" line="1394"/> + <location filename="../../interface.cpp" line="1494"/> + <location filename="../../interface.cpp" line="1498"/> + <location filename="../../interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -66,24 +66,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="284"/> + <location filename="../../ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="285"/> + <location filename="../../ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="286"/> + <location filename="../../ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="482"/> - <location filename="../../ThemesFactory.cpp" line="497"/> - <location filename="../../ThemesFactory.cpp" line="512"/> + <location filename="../../ThemesFactory.cpp" line="510"/> + <location filename="../../ThemesFactory.cpp" line="525"/> + <location filename="../../ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -250,7 +250,7 @@ <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="267"/> + <location filename="../../themesOptions.ui" line="402"/> <source>Show dual progression</source> <translation type="unfinished"></translation> </message> @@ -301,32 +301,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="213"/> - <source>Informations</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../themesOptions.ui" line="251"/> <source>Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="257"/> + <location filename="../../themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="287"/> + <location filename="../../themesOptions.ui" line="378"/> <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="306"/> + <location filename="../../themesOptions.ui" line="395"/> + <source>General margin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="425"/> + <source>General spacing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="269"/> <source>Click to edit the color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="277"/> + <location filename="../../themesOptions.ui" line="213"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/Themes/Oxygen/Languages/ru/translation.qm b/plugins/Themes/Oxygen/Languages/ru/translation.qm Binary files differindex ff20604..e2563ef 100755 --- a/plugins/Themes/Oxygen/Languages/ru/translation.qm +++ b/plugins/Themes/Oxygen/Languages/ru/translation.qm diff --git a/plugins/Themes/Oxygen/Languages/ru/translation.ts b/plugins/Themes/Oxygen/Languages/ru/translation.ts index 1ee6073..66a6a4c 100755 --- a/plugins/Themes/Oxygen/Languages/ru/translation.ts +++ b/plugins/Themes/Oxygen/Languages/ru/translation.ts @@ -4,61 +4,61 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="427"/> + <location filename="../../interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation>Файл %1/%2, размер: %3/%4</translation> </message> <message> - <location filename="../../interface.cpp" line="661"/> + <location filename="../../interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished">Копировать список</translation> </message> <message> - <location filename="../../interface.cpp" line="663"/> + <location filename="../../interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1091"/> + <location filename="../../interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished">Не закрывать, если найдены ошибки</translation> </message> <message> - <location filename="../../interface.cpp" line="1092"/> + <location filename="../../interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished">Никогда не закрывать</translation> </message> <message> - <location filename="../../interface.cpp" line="1093"/> + <location filename="../../interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished">Всегда закрывайте</translation> </message> <message> - <location filename="../../interface.cpp" line="1095"/> + <location filename="../../interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation>Имя файла, 0KB</translation> </message> <message> - <location filename="../../interface.cpp" line="1289"/> - <location filename="../../interface.cpp" line="1301"/> - <location filename="../../interface.cpp" line="1313"/> + <location filename="../../interface.cpp" line="1395"/> + <location filename="../../interface.cpp" line="1407"/> + <location filename="../../interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1388"/> - <location filename="../../interface.cpp" line="1392"/> - <location filename="../../interface.cpp" line="1394"/> + <location filename="../../interface.cpp" line="1494"/> + <location filename="../../interface.cpp" line="1498"/> + <location filename="../../interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -66,24 +66,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="284"/> + <location filename="../../ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished">Не закрывать, если найдены ошибки</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="285"/> + <location filename="../../ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished">Никогда не закрывать</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="286"/> + <location filename="../../ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished">Всегда закрывайте</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="482"/> - <location filename="../../ThemesFactory.cpp" line="497"/> - <location filename="../../ThemesFactory.cpp" line="512"/> + <location filename="../../ThemesFactory.cpp" line="510"/> + <location filename="../../ThemesFactory.cpp" line="525"/> + <location filename="../../ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -250,7 +250,7 @@ <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="267"/> + <location filename="../../themesOptions.ui" line="402"/> <source>Show dual progression</source> <translation type="unfinished"></translation> </message> @@ -291,7 +291,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="306"/> + <location filename="../../themesOptions.ui" line="213"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="269"/> <source>Click to edit the color</source> <translation type="unfinished"></translation> </message> @@ -306,31 +311,36 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="213"/> - <source>Informations</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../themesOptions.ui" line="251"/> <source>Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="257"/> + <location filename="../../themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="287"/> + <location filename="../../themesOptions.ui" line="378"/> <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="277"/> + <location filename="../../themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../../themesOptions.ui" line="395"/> + <source>General margin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="425"/> + <source>General spacing</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../themesOptions.ui" line="183"/> <source>Always on top</source> <translation type="unfinished"></translation> diff --git a/plugins/Themes/Oxygen/Languages/th/translation.ts b/plugins/Themes/Oxygen/Languages/th/translation.ts index e7d9002..79e2ba9 100755 --- a/plugins/Themes/Oxygen/Languages/th/translation.ts +++ b/plugins/Themes/Oxygen/Languages/th/translation.ts @@ -4,61 +4,61 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="427"/> + <location filename="../../interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="661"/> + <location filename="../../interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="663"/> + <location filename="../../interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1091"/> + <location filename="../../interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1092"/> + <location filename="../../interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1093"/> + <location filename="../../interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1095"/> + <location filename="../../interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1289"/> - <location filename="../../interface.cpp" line="1301"/> - <location filename="../../interface.cpp" line="1313"/> + <location filename="../../interface.cpp" line="1395"/> + <location filename="../../interface.cpp" line="1407"/> + <location filename="../../interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1388"/> - <location filename="../../interface.cpp" line="1392"/> - <location filename="../../interface.cpp" line="1394"/> + <location filename="../../interface.cpp" line="1494"/> + <location filename="../../interface.cpp" line="1498"/> + <location filename="../../interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -66,24 +66,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="284"/> + <location filename="../../ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="285"/> + <location filename="../../ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="286"/> + <location filename="../../ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="482"/> - <location filename="../../ThemesFactory.cpp" line="497"/> - <location filename="../../ThemesFactory.cpp" line="512"/> + <location filename="../../ThemesFactory.cpp" line="510"/> + <location filename="../../ThemesFactory.cpp" line="525"/> + <location filename="../../ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -250,7 +250,7 @@ <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="267"/> + <location filename="../../themesOptions.ui" line="402"/> <source>Show dual progression</source> <translation type="unfinished"></translation> </message> @@ -301,32 +301,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="213"/> - <source>Informations</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../themesOptions.ui" line="251"/> <source>Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="257"/> + <location filename="../../themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="287"/> + <location filename="../../themesOptions.ui" line="378"/> <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="306"/> + <location filename="../../themesOptions.ui" line="395"/> + <source>General margin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="425"/> + <source>General spacing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="269"/> <source>Click to edit the color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="277"/> + <location filename="../../themesOptions.ui" line="213"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="388"/> <source>Show progression in the title</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 e7d9002..79e2ba9 100755 --- a/plugins/Themes/Oxygen/Languages/tr/translation.ts +++ b/plugins/Themes/Oxygen/Languages/tr/translation.ts @@ -4,61 +4,61 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="427"/> + <location filename="../../interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="661"/> + <location filename="../../interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="663"/> + <location filename="../../interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1091"/> + <location filename="../../interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1092"/> + <location filename="../../interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1093"/> + <location filename="../../interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1095"/> + <location filename="../../interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1289"/> - <location filename="../../interface.cpp" line="1301"/> - <location filename="../../interface.cpp" line="1313"/> + <location filename="../../interface.cpp" line="1395"/> + <location filename="../../interface.cpp" line="1407"/> + <location filename="../../interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1388"/> - <location filename="../../interface.cpp" line="1392"/> - <location filename="../../interface.cpp" line="1394"/> + <location filename="../../interface.cpp" line="1494"/> + <location filename="../../interface.cpp" line="1498"/> + <location filename="../../interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -66,24 +66,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="284"/> + <location filename="../../ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="285"/> + <location filename="../../ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="286"/> + <location filename="../../ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="482"/> - <location filename="../../ThemesFactory.cpp" line="497"/> - <location filename="../../ThemesFactory.cpp" line="512"/> + <location filename="../../ThemesFactory.cpp" line="510"/> + <location filename="../../ThemesFactory.cpp" line="525"/> + <location filename="../../ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -250,7 +250,7 @@ <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="267"/> + <location filename="../../themesOptions.ui" line="402"/> <source>Show dual progression</source> <translation type="unfinished"></translation> </message> @@ -301,32 +301,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="213"/> - <source>Informations</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../themesOptions.ui" line="251"/> <source>Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="257"/> + <location filename="../../themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="287"/> + <location filename="../../themesOptions.ui" line="378"/> <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="306"/> + <location filename="../../themesOptions.ui" line="395"/> + <source>General margin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="425"/> + <source>General spacing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="269"/> <source>Click to edit the color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="277"/> + <location filename="../../themesOptions.ui" line="213"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="388"/> <source>Show progression in the title</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 88a695a..4973600 100755 --- a/plugins/Themes/Oxygen/Languages/zh/translation.ts +++ b/plugins/Themes/Oxygen/Languages/zh/translation.ts @@ -4,61 +4,61 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="427"/> + <location filename="../../interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="661"/> + <location filename="../../interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="663"/> + <location filename="../../interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1091"/> + <location filename="../../interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1092"/> + <location filename="../../interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1093"/> + <location filename="../../interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1095"/> + <location filename="../../interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1289"/> - <location filename="../../interface.cpp" line="1301"/> - <location filename="../../interface.cpp" line="1313"/> + <location filename="../../interface.cpp" line="1395"/> + <location filename="../../interface.cpp" line="1407"/> + <location filename="../../interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1388"/> - <location filename="../../interface.cpp" line="1392"/> - <location filename="../../interface.cpp" line="1394"/> + <location filename="../../interface.cpp" line="1494"/> + <location filename="../../interface.cpp" line="1498"/> + <location filename="../../interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -66,24 +66,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="284"/> + <location filename="../../ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="285"/> + <location filename="../../ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="286"/> + <location filename="../../ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="482"/> - <location filename="../../ThemesFactory.cpp" line="497"/> - <location filename="../../ThemesFactory.cpp" line="512"/> + <location filename="../../ThemesFactory.cpp" line="510"/> + <location filename="../../ThemesFactory.cpp" line="525"/> + <location filename="../../ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -250,7 +250,7 @@ <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="267"/> + <location filename="../../themesOptions.ui" line="402"/> <source>Show dual progression</source> <translation type="unfinished"></translation> </message> @@ -301,32 +301,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="213"/> - <source>Informations</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../themesOptions.ui" line="251"/> <source>Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="257"/> + <location filename="../../themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="287"/> + <location filename="../../themesOptions.ui" line="378"/> <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="306"/> + <location filename="../../themesOptions.ui" line="395"/> + <source>General margin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="425"/> + <source>General spacing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="269"/> <source>Click to edit the color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="277"/> + <location filename="../../themesOptions.ui" line="213"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/Themes/Oxygen/ThemesFactory.cpp b/plugins/Themes/Oxygen/ThemesFactory.cpp index 8d3c090..f944deb 100755 --- a/plugins/Themes/Oxygen/ThemesFactory.cpp +++ b/plugins/Themes/Oxygen/ThemesFactory.cpp @@ -41,7 +41,9 @@ PluginInterface_Themes * ThemesFactory::getInstance() ui->checkBoxStartWithMoreButtonPushed->isChecked(), ui->minimizeToSystray->isChecked(), ui->startMinimized->isChecked(), - ui->savePosition->isChecked() + ui->savePosition->isChecked(), + ui->generalMargin->value(), + ui->generalSpacing->value() ); #ifdef ULTRACOPIER_PLUGIN_DEBUG if(!connect(newInterface,&Themes::debugInformation,this,&PluginInterface_ThemesFactory::debugInformation)) @@ -106,6 +108,8 @@ void ThemesFactory::setResources(OptionInterface * optionsEngine,const std::stri KeysList.push_back(std::pair<std::string, std::string>("savePosition","false")); KeysList.push_back(std::pair<std::string, std::string>("savePositionX","0")); KeysList.push_back(std::pair<std::string, std::string>("savePositionY","0")); + KeysList.push_back(std::pair<std::string, std::string>("generalMargin","0")); + KeysList.push_back(std::pair<std::string, std::string>("generalSpacing","0")); optionsEngine->addOptionGroup(KeysList); connect(optionsEngine,&OptionInterface::resetOptions,this,&ThemesFactory::resetOptions); updateSpeed(); @@ -135,6 +139,8 @@ QWidget * ThemesFactory::options() ui->minimizeToSystray->setChecked(stringtobool(optionsEngine->getOptionValue("minimizeToSystray"))); ui->startMinimized->setChecked(stringtobool(optionsEngine->getOptionValue("startMinimized"))); ui->savePosition->setChecked(stringtobool(optionsEngine->getOptionValue("savePosition"))); + ui->generalMargin->setValue(stringtoint8(optionsEngine->getOptionValue("generalMargin"))); + ui->generalSpacing->setValue(stringtoint8(optionsEngine->getOptionValue("generalSpacing"))); progressColorWrite=QVariant(QString::fromStdString(optionsEngine->getOptionValue("progressColorWrite"))).value<QColor>(); progressColorRead=QVariant(QString::fromStdString(optionsEngine->getOptionValue("progressColorRead"))).value<QColor>(); @@ -186,6 +192,10 @@ QWidget * ThemesFactory::options() abort(); if(!connect(ui->savePosition,&QCheckBox::stateChanged,this,&ThemesFactory::savePositionHaveChanged)) abort(); + if(!connect(ui->generalSpacing,static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &ThemesFactory::uigeneralSpacing)) + abort(); + if(!connect(ui->generalMargin,static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &ThemesFactory::uigeneralMargin)) + abort(); } else ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented"); @@ -382,6 +392,24 @@ void ThemesFactory::uiUpdateSpeed() ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented"); } +void ThemesFactory::uigeneralSpacing() +{ + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"emit uigeneralSpacing: "+std::to_string(currentSpeed)); + if(optionsEngine!=NULL) + optionsEngine->setOptionValue("generalSpacing",std::to_string(ui->generalSpacing->value())); + else + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented"); +} + +void ThemesFactory::uigeneralMargin() +{ + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"emit uigeneralMargin: "+std::to_string(currentSpeed)); + if(optionsEngine!=NULL) + optionsEngine->setOptionValue("generalMargin",std::to_string(ui->generalMargin->value())); + else + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented"); +} + void ThemesFactory::updateSpeed() { if(optionsEngine==NULL) diff --git a/plugins/Themes/Oxygen/ThemesFactory.h b/plugins/Themes/Oxygen/ThemesFactory.h index e29d430..fed4313 100755 --- a/plugins/Themes/Oxygen/ThemesFactory.h +++ b/plugins/Themes/Oxygen/ThemesFactory.h @@ -71,6 +71,8 @@ private slots: void startMinimized(bool checked); void savePositionBeforeClose(QObject *obj); void savePositionHaveChanged(bool checked); + void uigeneralMargin(); + void uigeneralSpacing(); public slots: void resetOptions(); void newLanguageLoaded(); diff --git a/plugins/Themes/Oxygen/TransferModel.cpp b/plugins/Themes/Oxygen/TransferModel.cpp index 607658c..d06c8b3 100755 --- a/plugins/Themes/Oxygen/TransferModel.cpp +++ b/plugins/Themes/Oxygen/TransferModel.cpp @@ -502,15 +502,15 @@ TransferModel::currentTransfertItem TransferModel::getCurrentTransfertItem() con returnItem.progressBar_write=0; } break; - //should never pass here + //should never pass here -> why? case Ultracopier::PostOperation: - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("wrong action type for file %1: actionType: %2").arg(itemTransfer.generalData.id).arg(itemTransfer.actionType).toStdString()); + //ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("wrong action type for file %1: actionType: PostOperation").arg(itemTransfer.generalData.id).arg(itemTransfer.actionType).toStdString()); returnItem.progressBar_read=65535; returnItem.progressBar_write=65535; break; - //should never pass here + //should never pass here -> why? case Ultracopier::PreOperation: - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("wrong action type for file %1: actionType: %2").arg(itemTransfer.generalData.id).arg(itemTransfer.actionType).toStdString()); + //ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("wrong action type for file %1: actionType: PreOperation").arg(itemTransfer.generalData.id).arg(itemTransfer.actionType).toStdString()); returnItem.progressBar_read=0; returnItem.progressBar_write=0; break; diff --git a/plugins/Themes/Oxygen/informations.xml b/plugins/Themes/Oxygen/informations.xml index c944d32..68cc747 100755 --- 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>2.2.4.7</version> + <version>2.2.6.0</version> <!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. --> <name>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 fa3b013..416443e 100755 --- a/plugins/Themes/Oxygen/interface.cpp +++ b/plugins/Themes/Oxygen/interface.cpp @@ -19,6 +19,9 @@ #endif #include <windows.h> #endif +#ifdef ULTRACOPIER_PLUGIN_DEBUG +#include <sys/stat.h> +#endif #include "interface.h" #include "ui_interface.h" @@ -56,7 +59,9 @@ Themes::Themes(const bool &alwaysOnTop, const bool &moreButtonPushed, const bool &minimizeToSystray, const bool &startMinimized, - const bool &savePosition) : + const bool &savePosition, + const qint8 &generalMargin, + const qint8 &generalSpacing) : duration(0), durationStarted(false), ui(new Ui::interfaceCopy()), @@ -105,6 +110,8 @@ Themes::Themes(const bool &alwaysOnTop, uiOptions->showDualProgression->setChecked(showDualProgression); uiOptions->startMinimized->setEnabled(false); uiOptions->alwaysOnTop->setChecked(alwaysOnTop); + uiOptions->generalMargin->setValue(generalMargin); + uiOptions->generalSpacing->setValue(generalSpacing); uiOptions->minimizeToSystray->setChecked(minimizeToSystray); //uiOptions->setupUi(ui->tabWidget->widget(ui->tabWidget->count()-1)); uiOptions->labelStartWithMoreButtonPushed->setVisible(false); @@ -133,6 +140,9 @@ Themes::Themes(const bool &alwaysOnTop, uiOptions->checkBoxShowSpeed->setChecked(checkBoxShowSpeed); menu=new QMenu(this); ui->add->setMenu(menu); + ui->interfaceLayout->setSpacing(uiOptions->generalSpacing->value()); + const quint8 &margin=uiOptions->generalMargin->value(); + ui->interfaceLayout->setContentsMargins(margin, margin, margin, margin); //connect the options checkBoxShowSpeed_toggled(uiOptions->checkBoxShowSpeed->isChecked()); @@ -145,11 +155,14 @@ Themes::Themes(const bool &alwaysOnTop, connect(uiOptions->progressColorRemaining,&QAbstractButton::clicked,this,&Themes::progressColorRemaining_clicked); connect(uiOptions->alwaysOnTop,&QAbstractButton::clicked,this,&Themes::alwaysOnTop_clickedSlot); - isInPause(false); - connect(uiOptions->limitSpeed, static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &Themes::uiUpdateSpeed); connect(uiOptions->checkBox_limitSpeed,&QAbstractButton::toggled, this, &Themes::uiUpdateSpeed); + isInPause(false); + + connect(uiOptions->generalMargin, static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &Themes::uigeneralMargin); + connect(uiOptions->generalSpacing, static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &Themes::uigeneralSpacing); + connect(ui->actionAddFile,&QAction::triggered,this,&Themes::forcedModeAddFile); connect(ui->actionAddFileToCopy,&QAction::triggered,this,&Themes::forcedModeAddFileToCopy); connect(ui->actionAddFileToMove,&QAction::triggered,this,&Themes::forcedModeAddFileToMove); @@ -537,7 +550,7 @@ void Themes::detectedSpeed(const uint64_t &speed)//in byte per seconds tempSpeed=999999999; if(tempSpeed>(quint64)ui->progressBarCurrentSpeed->maximum()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"set max speed to: "+std::to_string(tempSpeed)); + //ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"set max speed to: "+std::to_string(tempSpeed)); ui->progressBarCurrentSpeed->setMaximum(tempSpeed); } ui->progressBarCurrentSpeed->setValue(tempSpeed); @@ -917,6 +930,19 @@ void Themes::uiUpdateSpeed() emit newSpeedLimitation(currentSpeed); } +void Themes::uigeneralSpacing() +{ + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"emit uigeneralSpacing"+std::to_string(uiOptions->generalSpacing->value())); + ui->interfaceLayout->setSpacing(uiOptions->generalSpacing->value()); +} + +void Themes::uigeneralMargin() +{ + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"emit uigeneralMargin"+std::to_string(uiOptions->generalMargin->value())); + const quint8 &margin=uiOptions->generalMargin->value(); + ui->interfaceLayout->setContentsMargins(margin, margin, margin, margin); +} + void Themes::updateSpeed() { ui->label_Slider_speed->setVisible(uiOptions->checkBoxShowSpeed->isChecked()); @@ -1210,6 +1236,26 @@ void Themes::on_moreButton_toggled(bool checked) this->adjustSize(); } +#ifdef ULTRACOPIER_PLUGIN_DEBUG +bool stringStartWithInter(std::string const &fullString, std::string const &starting) +{ + if (fullString.length() >= starting.length()) { + return (fullString.substr(0,starting.length())==starting); + } else { + return false; + } +} + +#ifdef WIDESTRING +#define INTERNALTYPEPATH std::wstring +#define INTERNALTYPECHAR wchar_t +#else +#define INTERNALTYPEPATH std::string +#define INTERNALTYPECHAR char +#endif + +#endif + /* drag event processing need setAcceptDrops(true); into the constructor @@ -1224,6 +1270,13 @@ void Themes::dropEvent(QDropEvent *event) const QMimeData* mimeData = event->mimeData(); if(mimeData->hasUrls()) { + if(event->dropAction()!=Qt::CopyAction) + { + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"event->dropAction()!=Qt::CopyAction ignore"); + //drag'n'drop with shift pressed send the file to trash + event->ignore(); + return; + } ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"hasUrls"); std::vector<std::string> urls; unsigned int index=0; @@ -1235,6 +1288,51 @@ void Themes::dropEvent(QDropEvent *event) urls.push_back(urlString); index++; } + + #ifdef ULTRACOPIER_PLUGIN_DEBUG + { + + unsigned int index=0; + while(index<urls.size()) + { + std::string source=urls.at(index); + //can be: file://192.168.0.99/share/file.txt + //can be: file:///C:/file.txt + //can be: file:///home/user/fileatrootunderunix + #ifndef Q_OS_WIN + if(stringStartWithInter(source,"file:///")) + source.replace(0,7,""); + #else + if(stringStartWithInter(source,"file:///")) + source.replace(0,8,""); + else if(stringStartWithInter(source,"file://")) + source.replace(0,5,""); + else if(stringStartWithInter(source,"file:/")) + source.replace(0,6,""); + #endif + if(index<99) + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,urls.at(index)+" -> "+source); + index++; + + #ifndef __WIN32__ + struct stat sb; + if (::stat(source.c_str(), &sb) == -1) + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"source is_file: 0"); + else + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"source is_file: 1"); + #else + DWORD dwAttrib = GetFileAttributesA(source.c_str()); + if(dwAttrib != INVALID_FILE_ATTRIBUTES && + (dwAttrib & FILE_ATTRIBUTE_NORMAL || dwAttrib & FILE_ATTRIBUTE_ARCHIVE) + ) + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"source is_file: 1"); + else + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"source is_file: 0"); + #endif + } + } + #endif + emit urlDropped(urls); event->acceptProposedAction(); } @@ -1248,7 +1346,10 @@ void Themes::dragEnterEvent(QDragEnterEvent* event) if(mimeData->hasUrls()) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"hasUrls"); - event->acceptProposedAction(); + if(event->dropAction()==Qt::CopyAction) + event->acceptProposedAction(); + else + event->ignore();//drag'n'drop with shift pressed send the file to trash } } @@ -1257,7 +1358,12 @@ void Themes::dragMoveEvent(QDragMoveEvent* event) // if some actions should not be usable, like move, this code must be adopted const QMimeData* mimeData = event->mimeData(); if(mimeData->hasUrls()) - event->acceptProposedAction(); + { + if(event->dropAction()==Qt::CopyAction) + event->acceptProposedAction(); + else + event->ignore();//drag'n'drop with shift pressed send the file to trash + } } void Themes::dragLeaveEvent(QDragLeaveEvent* event) diff --git a/plugins/Themes/Oxygen/interface.h b/plugins/Themes/Oxygen/interface.h index b534b68..e263ad1 100755 --- a/plugins/Themes/Oxygen/interface.h +++ b/plugins/Themes/Oxygen/interface.h @@ -53,7 +53,7 @@ public: const bool &moreButtonPushed, const bool &minimizeToSystray, const bool &startMinimized, - const bool &savePosition); + const bool &savePosition, const qint8 &generalMargin, const qint8 &generalSpacing); ~Themes(); //send information about the copy /// \brief to set the action in progress @@ -129,6 +129,8 @@ private slots: void forcedModeAddFileToMove(); void forcedModeAddFolderToMove(); void uiUpdateSpeed(); + void uigeneralSpacing(); + void uigeneralMargin(); void on_pushButtonCloseSearch_clicked(); //close the search box void closeTheSearchBox(); diff --git a/plugins/Themes/Oxygen/interface.ui b/plugins/Themes/Oxygen/interface.ui index f3761bd..0e087a6 100755 --- a/plugins/Themes/Oxygen/interface.ui +++ b/plugins/Themes/Oxygen/interface.ui @@ -17,7 +17,7 @@ <iconset resource="interfaceResources.qrc"> <normaloff>:/Themes/Oxygen/resources/main.png</normaloff>:/Themes/Oxygen/resources/main.png</iconset> </property> - <layout class="QVBoxLayout"> + <layout class="QVBoxLayout" name="interfaceLayout"> <property name="spacing"> <number>2</number> </property> diff --git a/plugins/Themes/Oxygen/themesOptions.ui b/plugins/Themes/Oxygen/themesOptions.ui index 366ca68..e8db25b 100755 --- a/plugins/Themes/Oxygen/themesOptions.ui +++ b/plugins/Themes/Oxygen/themesOptions.ui @@ -29,15 +29,15 @@ <item> <widget class="QToolBox" name="toolBox"> <property name="currentIndex"> - <number>0</number> + <number>2</number> </property> <widget class="QWidget" name="page"> <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>509</width> - <height>292</height> + <width>551</width> + <height>279</height> </rect> </property> <attribute name="label"> @@ -205,12 +205,12 @@ <rect> <x>0</x> <y>0</y> - <width>509</width> - <height>292</height> + <width>519</width> + <height>293</height> </rect> </property> <attribute name="label"> - <string>Informations</string> + <string>Information</string> </attribute> <layout class="QGridLayout" name="gridLayout_2"> <item row="0" column="0"> @@ -243,51 +243,14 @@ <rect> <x>0</x> <y>0</y> - <width>509</width> - <height>292</height> + <width>519</width> + <height>293</height> </rect> </property> <attribute name="label"> <string>Display</string> </attribute> <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="QLabel" name="labelSpeedWithProgressBar"> - <property name="text"> - <string>Speed with progress bar</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QCheckBox" name="speedWithProgressBar"/> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="labelDualProgression"> - <property name="text"> - <string>Show dual progression</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QCheckBox" name="showDualProgression"/> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="label_3"> - <property name="text"> - <string>Show progression in the title</string> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="QCheckBox" name="showProgressionInTheTitle"/> - </item> - <item row="3" column="0"> - <widget class="QLabel" name="labelProgressionColor"> - <property name="text"> - <string>Progression color</string> - </property> - </widget> - </item> <item row="3" column="1"> <widget class="QFrame" name="frameProgressionColor"> <property name="minimumSize"> @@ -399,7 +362,48 @@ </layout> </widget> </item> + <item row="0" column="0"> + <widget class="QLabel" name="labelSpeedWithProgressBar"> + <property name="text"> + <string>Speed with progress bar</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QCheckBox" name="showProgressionInTheTitle"/> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="labelProgressionColor"> + <property name="text"> + <string>Progression color</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QCheckBox" name="showDualProgression"/> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Show progression in the title</string> + </property> + </widget> + </item> <item row="4" column="0"> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>General margin</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="labelDualProgression"> + <property name="text"> + <string>Show dual progression</string> + </property> + </widget> + </item> + <item row="6" column="0"> <spacer name="verticalSpacer"> <property name="orientation"> <enum>Qt::Vertical</enum> @@ -412,6 +416,22 @@ </property> </spacer> </item> + <item row="0" column="1"> + <widget class="QCheckBox" name="speedWithProgressBar"/> + </item> + <item row="5" column="0"> + <widget class="QLabel" name="label_5"> + <property name="text"> + <string>General spacing</string> + </property> + </widget> + </item> + <item row="4" column="1"> + <widget class="QSpinBox" name="generalMargin"/> + </item> + <item row="5" column="1"> + <widget class="QSpinBox" name="generalSpacing"/> + </item> </layout> </widget> </widget> diff --git a/plugins/Themes/Oxygen2/Languages/ar/translation.qm b/plugins/Themes/Oxygen2/Languages/ar/translation.qm Binary files differindex 563a429..34cce78 100755 --- a/plugins/Themes/Oxygen2/Languages/ar/translation.qm +++ b/plugins/Themes/Oxygen2/Languages/ar/translation.qm diff --git a/plugins/Themes/Oxygen2/Languages/ar/translation.ts b/plugins/Themes/Oxygen2/Languages/ar/translation.ts index 6ce52fb..9c9e33d 100644 --- a/plugins/Themes/Oxygen2/Languages/ar/translation.ts +++ b/plugins/Themes/Oxygen2/Languages/ar/translation.ts @@ -8,19 +8,35 @@ <source>%1 files</source> <translation>ملفات %1</translation> </message> - <message> + <message numerus="yes"> <location filename="../../radialMap/map.cpp" line="204"/> - <source>%1 file, with an average size of %2</source> - <translation>%1 ملف ، بمتوسط حجم %2</translation> + <source>%n file(s), with an average size of %1</source> + <comment>file</comment> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> </message> </context> <context> <name>RadialMap::Widget</name> - <message> + <message numerus="yes"> <location filename="../../radialMap/widgetEvents.cpp" line="194"/> <location filename="../../radialMap/widgetEvents.cpp" line="196"/> - <source> into %1 files</source> - <translation>إلى ملفات %1</translation> + <source> into %n file(s)</source> + <comment>file</comment> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> </message> </context> <context> @@ -73,16 +89,16 @@ <translation>اسم الملف ، 0KB</translation> </message> <message> - <location filename="../../interface.cpp" line="1534"/> - <location filename="../../interface.cpp" line="1546"/> - <location filename="../../interface.cpp" line="1558"/> + <location filename="../../interface.cpp" line="1549"/> + <location filename="../../interface.cpp" line="1561"/> + <location filename="../../interface.cpp" line="1573"/> <source>Select a color</source> <translation>تحديد لون</translation> </message> <message> - <location filename="../../interface.cpp" line="1646"/> - <location filename="../../interface.cpp" line="1657"/> - <location filename="../../interface.cpp" line="1666"/> + <location filename="../../interface.cpp" line="1661"/> + <location filename="../../interface.cpp" line="1672"/> + <location filename="../../interface.cpp" line="1681"/> <source>%1 %2% of %3 into %4 files</source> <translation>%1 %2% من %3 إلى ملفات %4</translation> </message> @@ -351,8 +367,8 @@ </message> <message> <location filename="../../themesOptions.ui" line="239"/> - <source>Informations</source> - <translation>المعلومات</translation> + <source>Information</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../../themesOptions.ui" line="277"/> diff --git a/plugins/Themes/Oxygen2/Languages/de/translation.qm b/plugins/Themes/Oxygen2/Languages/de/translation.qm Binary files differindex ef742de..ae4879f 100755 --- a/plugins/Themes/Oxygen2/Languages/de/translation.qm +++ b/plugins/Themes/Oxygen2/Languages/de/translation.qm diff --git a/plugins/Themes/Oxygen2/Languages/de/translation.ts b/plugins/Themes/Oxygen2/Languages/de/translation.ts index dd465c4..9d459d9 100644 --- a/plugins/Themes/Oxygen2/Languages/de/translation.ts +++ b/plugins/Themes/Oxygen2/Languages/de/translation.ts @@ -8,19 +8,27 @@ <source>%1 files</source> <translation>%1 Dateien</translation> </message> - <message> + <message numerus="yes"> <location filename="../../radialMap/map.cpp" line="204"/> - <source>%1 file, with an average size of %2</source> - <translation>%1 Datei, mit einer ungefähren Größe von %2</translation> + <source>%n file(s), with an average size of %1</source> + <comment>file</comment> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> </message> </context> <context> <name>RadialMap::Widget</name> - <message> + <message numerus="yes"> <location filename="../../radialMap/widgetEvents.cpp" line="194"/> <location filename="../../radialMap/widgetEvents.cpp" line="196"/> - <source> into %1 files</source> - <translation> in%1 Dateien</translation> + <source> into %n file(s)</source> + <comment>file</comment> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> </message> </context> <context> @@ -73,16 +81,16 @@ <translation>Dateiname, 0KB</translation> </message> <message> - <location filename="../../interface.cpp" line="1534"/> - <location filename="../../interface.cpp" line="1546"/> - <location filename="../../interface.cpp" line="1558"/> + <location filename="../../interface.cpp" line="1549"/> + <location filename="../../interface.cpp" line="1561"/> + <location filename="../../interface.cpp" line="1573"/> <source>Select a color</source> <translation>Farbe auswählen</translation> </message> <message> - <location filename="../../interface.cpp" line="1646"/> - <location filename="../../interface.cpp" line="1657"/> - <location filename="../../interface.cpp" line="1666"/> + <location filename="../../interface.cpp" line="1661"/> + <location filename="../../interface.cpp" line="1672"/> + <location filename="../../interface.cpp" line="1681"/> <source>%1 %2% of %3 into %4 files</source> <translation>%1 %2 von %3 in %4 Dateien</translation> </message> @@ -325,6 +333,11 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../../themesOptions.ui" line="239"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../themesOptions.ui" line="332"/> <source>Click to edit the color</source> <translation>Zum Bearbeiten der Farbe klicken</translation> @@ -355,11 +368,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="239"/> - <source>Informations</source> - <translation>Informationen</translation> - </message> - <message> <location filename="../../themesOptions.ui" line="277"/> <source>Display</source> <translation>Anzeige</translation> diff --git a/plugins/Themes/Oxygen2/Languages/el/translation.ts b/plugins/Themes/Oxygen2/Languages/el/translation.ts index 437f2f0..96a3deb 100755 --- a/plugins/Themes/Oxygen2/Languages/el/translation.ts +++ b/plugins/Themes/Oxygen2/Languages/el/translation.ts @@ -8,19 +8,25 @@ <source>%1 files</source> <translation type="unfinished"></translation> </message> - <message> + <message numerus="yes"> <location filename="../../radialMap/map.cpp" line="204"/> - <source>%1 file, with an average size of %2</source> - <translation type="unfinished"></translation> + <source>%n file(s), with an average size of %1</source> + <comment>file</comment> + <translation type="unfinished"> + <numerusform></numerusform> + </translation> </message> </context> <context> <name>RadialMap::Widget</name> - <message> + <message numerus="yes"> <location filename="../../radialMap/widgetEvents.cpp" line="194"/> <location filename="../../radialMap/widgetEvents.cpp" line="196"/> - <source> into %1 files</source> - <translation type="unfinished"></translation> + <source> into %n file(s)</source> + <comment>file</comment> + <translation type="unfinished"> + <numerusform></numerusform> + </translation> </message> </context> <context> @@ -73,16 +79,16 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1534"/> - <location filename="../../interface.cpp" line="1546"/> - <location filename="../../interface.cpp" line="1558"/> + <location filename="../../interface.cpp" line="1549"/> + <location filename="../../interface.cpp" line="1561"/> + <location filename="../../interface.cpp" line="1573"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1646"/> - <location filename="../../interface.cpp" line="1657"/> - <location filename="../../interface.cpp" line="1666"/> + <location filename="../../interface.cpp" line="1661"/> + <location filename="../../interface.cpp" line="1672"/> + <location filename="../../interface.cpp" line="1681"/> <source>%1 %2% of %3 into %4 files</source> <translation type="unfinished"></translation> </message> @@ -351,7 +357,7 @@ </message> <message> <location filename="../../themesOptions.ui" line="239"/> - <source>Informations</source> + <source>Information</source> <translation type="unfinished"></translation> </message> <message> diff --git a/plugins/Themes/Oxygen2/Languages/en/translation.qm b/plugins/Themes/Oxygen2/Languages/en/translation.qm Binary files differindex d925dd6..922339a 100755 --- a/plugins/Themes/Oxygen2/Languages/en/translation.qm +++ b/plugins/Themes/Oxygen2/Languages/en/translation.qm diff --git a/plugins/Themes/Oxygen2/Languages/en/translation.ts b/plugins/Themes/Oxygen2/Languages/en/translation.ts index 6d6af2c..34a1955 100755 --- a/plugins/Themes/Oxygen2/Languages/en/translation.ts +++ b/plugins/Themes/Oxygen2/Languages/en/translation.ts @@ -8,19 +8,27 @@ <source>%1 files</source> <translation type="unfinished"></translation> </message> - <message> + <message numerus="yes"> <location filename="../../radialMap/map.cpp" line="204"/> - <source>%1 file, with an average size of %2</source> - <translation type="unfinished"></translation> + <source>%n file(s), with an average size of %1</source> + <comment>file</comment> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> </message> </context> <context> <name>RadialMap::Widget</name> - <message> + <message numerus="yes"> <location filename="../../radialMap/widgetEvents.cpp" line="194"/> <location filename="../../radialMap/widgetEvents.cpp" line="196"/> - <source> into %1 files</source> - <translation type="unfinished"></translation> + <source> into %n file(s)</source> + <comment>file</comment> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> </message> </context> <context> @@ -73,16 +81,16 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1534"/> - <location filename="../../interface.cpp" line="1546"/> - <location filename="../../interface.cpp" line="1558"/> + <location filename="../../interface.cpp" line="1549"/> + <location filename="../../interface.cpp" line="1561"/> + <location filename="../../interface.cpp" line="1573"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1646"/> - <location filename="../../interface.cpp" line="1657"/> - <location filename="../../interface.cpp" line="1666"/> + <location filename="../../interface.cpp" line="1661"/> + <location filename="../../interface.cpp" line="1672"/> + <location filename="../../interface.cpp" line="1681"/> <source>%1 %2% of %3 into %4 files</source> <translation type="unfinished"></translation> </message> @@ -351,7 +359,7 @@ </message> <message> <location filename="../../themesOptions.ui" line="239"/> - <source>Informations</source> + <source>Information</source> <translation type="unfinished"></translation> </message> <message> diff --git a/plugins/Themes/Oxygen2/Languages/es/translation.qm b/plugins/Themes/Oxygen2/Languages/es/translation.qm Binary files differindex e18e87a..7341325 100755 --- a/plugins/Themes/Oxygen2/Languages/es/translation.qm +++ b/plugins/Themes/Oxygen2/Languages/es/translation.qm diff --git a/plugins/Themes/Oxygen2/Languages/es/translation.ts b/plugins/Themes/Oxygen2/Languages/es/translation.ts index d6cf375..fcf1382 100755 --- a/plugins/Themes/Oxygen2/Languages/es/translation.ts +++ b/plugins/Themes/Oxygen2/Languages/es/translation.ts @@ -6,21 +6,29 @@ <message> <location filename="../../radialMap/map.cpp" line="108"/> <source>%1 files</source> - <translation type="unfinished"></translation> + <translation>%1 archivos</translation> </message> - <message> + <message numerus="yes"> <location filename="../../radialMap/map.cpp" line="204"/> - <source>%1 file, with an average size of %2</source> - <translation type="unfinished"></translation> + <source>%n file(s), with an average size of %1</source> + <comment>file</comment> + <translation> + <numerusform>%n archivo, con un tamaño promedio de %1</numerusform> + <numerusform>%n archivos, con un tamaño promedio de %1</numerusform> + </translation> </message> </context> <context> <name>RadialMap::Widget</name> - <message> + <message numerus="yes"> <location filename="../../radialMap/widgetEvents.cpp" line="194"/> <location filename="../../radialMap/widgetEvents.cpp" line="196"/> - <source> into %1 files</source> - <translation type="unfinished"></translation> + <source> into %n file(s)</source> + <comment>file</comment> + <translation> + <numerusform> en %n archivo</numerusform> + <numerusform> en %n archivos</numerusform> + </translation> </message> </context> <context> @@ -35,12 +43,12 @@ <location filename="../../interface.cpp" line="293"/> <location filename="../../interface.cpp" line="314"/> <source>Register your key</source> - <translation type="unfinished"></translation> + <translation>Registra tu clave</translation> </message> <message> <location filename="../../interface.cpp" line="525"/> <source>File %1/%2, size: %3/%4</source> - <translation>El archivo %1/%2, el tamaño: %3/%4</translation> + <translation>Archivo %1/%2, el tamaño: %3/%4</translation> </message> <message> <location filename="../../interface.cpp" line="832"/> @@ -73,18 +81,18 @@ <translation>Nombre de archivo, 0KB</translation> </message> <message> - <location filename="../../interface.cpp" line="1534"/> - <location filename="../../interface.cpp" line="1546"/> - <location filename="../../interface.cpp" line="1558"/> + <location filename="../../interface.cpp" line="1549"/> + <location filename="../../interface.cpp" line="1561"/> + <location filename="../../interface.cpp" line="1573"/> <source>Select a color</source> <translation>Seleccione un color</translation> </message> <message> - <location filename="../../interface.cpp" line="1646"/> - <location filename="../../interface.cpp" line="1657"/> - <location filename="../../interface.cpp" line="1666"/> + <location filename="../../interface.cpp" line="1661"/> + <location filename="../../interface.cpp" line="1672"/> + <location filename="../../interface.cpp" line="1681"/> <source>%1 %2% of %3 into %4 files</source> - <translation type="unfinished"></translation> + <translation>%1 %2% de %3 en %4 archivos</translation> </message> </context> <context> @@ -147,12 +155,12 @@ <message> <location filename="../../interface.ui" line="232"/> <source>0</source> - <translation type="unfinished"></translation> + <translation>0</translation> </message> <message> <location filename="../../interface.ui" line="252"/> <source>100MB+</source> - <translation type="unfinished"></translation> + <translation>100MB+</translation> </message> <message> <location filename="../../interface.ui" line="527"/> @@ -317,12 +325,17 @@ <message> <location filename="../../themesOptions.ui" line="117"/> <source>Start minimized</source> - <translation type="unfinished"></translation> + <translation>Iniciar minimizado</translation> </message> <message> <location filename="../../themesOptions.ui" line="144"/> <source>Position at start</source> - <translation type="unfinished"></translation> + <translation>Posición al inicio</translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="239"/> + <source>Information</source> + <translation>Informacións</translation> </message> <message> <location filename="../../themesOptions.ui" line="332"/> @@ -337,27 +350,22 @@ <message> <location filename="../../themesOptions.ui" line="204"/> <source>Dark UI</source> - <translation type="unfinished"></translation> + <translation>Interfaz de usuario oscura</translation> </message> <message> <location filename="../../themesOptions.ui" line="212"/> <source>Default</source> - <translation type="unfinished"></translation> + <translation>Defecto</translation> </message> <message> <location filename="../../themesOptions.ui" line="217"/> <source>Save as previous</source> - <translation type="unfinished"></translation> + <translation>Guardar como anterior</translation> </message> <message> <location filename="../../themesOptions.ui" line="222"/> <source>At Center</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../themesOptions.ui" line="239"/> - <source>Informations</source> - <translation>Informations</translation> + <translation>En el centro</translation> </message> <message> <location filename="../../themesOptions.ui" line="277"/> diff --git a/plugins/Themes/Oxygen2/Languages/fr/translation.qm b/plugins/Themes/Oxygen2/Languages/fr/translation.qm Binary files differindex c6039f5..2b82280 100755 --- a/plugins/Themes/Oxygen2/Languages/fr/translation.qm +++ b/plugins/Themes/Oxygen2/Languages/fr/translation.qm diff --git a/plugins/Themes/Oxygen2/Languages/fr/translation.ts b/plugins/Themes/Oxygen2/Languages/fr/translation.ts index de538ab..43f44ad 100755 --- a/plugins/Themes/Oxygen2/Languages/fr/translation.ts +++ b/plugins/Themes/Oxygen2/Languages/fr/translation.ts @@ -8,19 +8,27 @@ <source>%1 files</source> <translation>%1 fichiers</translation> </message> - <message> + <message numerus="yes"> <location line="+96"/> - <source>%1 file, with an average size of %2</source> - <translation>%1 fichiers, avec une taille moyenne de %2</translation> + <source>%n file(s), with an average size of %1</source> + <comment>file</comment> + <translation> + <numerusform>%n fichier, avec une taille moyenne de %1</numerusform> + <numerusform>%n fichiers, avec une taille moyenne de %1</numerusform> + </translation> </message> </context> <context> <name>RadialMap::Widget</name> - <message> + <message numerus="yes"> <location filename="../../radialMap/widgetEvents.cpp" line="+194"/> <location line="+2"/> - <source> into %1 files</source> - <translation> dans %1 fichiers</translation> + <source> into %n file(s)</source> + <comment>file</comment> + <translation> + <numerusform> dans %n fichier</numerusform> + <numerusform> dans %n fichiers</numerusform> + </translation> </message> </context> <context> @@ -35,7 +43,7 @@ <location line="-21"/> <location line="+21"/> <source>Register your key</source> - <translation type="unfinished"></translation> + <translation>Enregistrez votre clé</translation> </message> <message> <location line="+211"/> @@ -73,7 +81,7 @@ <translation>Nom de fichier, 0Ko</translation> </message> <message> - <location line="+195"/> + <location line="+210"/> <location line="+12"/> <location line="+12"/> <source>Select a color</source> @@ -322,10 +330,15 @@ <message> <location line="+27"/> <source>Position at start</source> - <translation type="unfinished"></translation> + <translation>Position au départ</translation> + </message> + <message> + <location line="+95"/> + <source>Information</source> + <translation>Informations</translation> </message> <message> - <location line="+188"/> + <location line="+93"/> <source>Click to edit the color</source> <translation>Cliquer pour éditer la couleur</translation> </message> @@ -342,25 +355,20 @@ <message> <location line="+8"/> <source>Default</source> - <translation type="unfinished"></translation> + <translation>Défaut</translation> </message> <message> <location line="+5"/> <source>Save as previous</source> - <translation type="unfinished"></translation> + <translation>Enregistrer comme précédent</translation> </message> <message> <location line="+5"/> <source>At Center</source> - <translation type="unfinished"></translation> + <translation>Au centre</translation> </message> <message> - <location line="+17"/> - <source>Informations</source> - <translation>Informations</translation> - </message> - <message> - <location line="+38"/> + <location line="+55"/> <source>Display</source> <translation>Affichage</translation> </message> diff --git a/plugins/Themes/Oxygen2/Languages/hi/translation.ts b/plugins/Themes/Oxygen2/Languages/hi/translation.ts index 437f2f0..96a3deb 100755 --- a/plugins/Themes/Oxygen2/Languages/hi/translation.ts +++ b/plugins/Themes/Oxygen2/Languages/hi/translation.ts @@ -8,19 +8,25 @@ <source>%1 files</source> <translation type="unfinished"></translation> </message> - <message> + <message numerus="yes"> <location filename="../../radialMap/map.cpp" line="204"/> - <source>%1 file, with an average size of %2</source> - <translation type="unfinished"></translation> + <source>%n file(s), with an average size of %1</source> + <comment>file</comment> + <translation type="unfinished"> + <numerusform></numerusform> + </translation> </message> </context> <context> <name>RadialMap::Widget</name> - <message> + <message numerus="yes"> <location filename="../../radialMap/widgetEvents.cpp" line="194"/> <location filename="../../radialMap/widgetEvents.cpp" line="196"/> - <source> into %1 files</source> - <translation type="unfinished"></translation> + <source> into %n file(s)</source> + <comment>file</comment> + <translation type="unfinished"> + <numerusform></numerusform> + </translation> </message> </context> <context> @@ -73,16 +79,16 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1534"/> - <location filename="../../interface.cpp" line="1546"/> - <location filename="../../interface.cpp" line="1558"/> + <location filename="../../interface.cpp" line="1549"/> + <location filename="../../interface.cpp" line="1561"/> + <location filename="../../interface.cpp" line="1573"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1646"/> - <location filename="../../interface.cpp" line="1657"/> - <location filename="../../interface.cpp" line="1666"/> + <location filename="../../interface.cpp" line="1661"/> + <location filename="../../interface.cpp" line="1672"/> + <location filename="../../interface.cpp" line="1681"/> <source>%1 %2% of %3 into %4 files</source> <translation type="unfinished"></translation> </message> @@ -351,7 +357,7 @@ </message> <message> <location filename="../../themesOptions.ui" line="239"/> - <source>Informations</source> + <source>Information</source> <translation type="unfinished"></translation> </message> <message> diff --git a/plugins/Themes/Oxygen2/Languages/hu/translation.qm b/plugins/Themes/Oxygen2/Languages/hu/translation.qm Binary files differindex 6567c41..6cb93ef 100755 --- a/plugins/Themes/Oxygen2/Languages/hu/translation.qm +++ b/plugins/Themes/Oxygen2/Languages/hu/translation.qm diff --git a/plugins/Themes/Oxygen2/Languages/hu/translation.ts b/plugins/Themes/Oxygen2/Languages/hu/translation.ts index 398241e..913bc1c 100755 --- a/plugins/Themes/Oxygen2/Languages/hu/translation.ts +++ b/plugins/Themes/Oxygen2/Languages/hu/translation.ts @@ -8,19 +8,25 @@ <source>%1 files</source> <translation type="unfinished"></translation> </message> - <message> + <message numerus="yes"> <location filename="../../radialMap/map.cpp" line="204"/> - <source>%1 file, with an average size of %2</source> - <translation type="unfinished"></translation> + <source>%n file(s), with an average size of %1</source> + <comment>file</comment> + <translation type="unfinished"> + <numerusform></numerusform> + </translation> </message> </context> <context> <name>RadialMap::Widget</name> - <message> + <message numerus="yes"> <location filename="../../radialMap/widgetEvents.cpp" line="194"/> <location filename="../../radialMap/widgetEvents.cpp" line="196"/> - <source> into %1 files</source> - <translation type="unfinished"></translation> + <source> into %n file(s)</source> + <comment>file</comment> + <translation type="unfinished"> + <numerusform></numerusform> + </translation> </message> </context> <context> @@ -73,16 +79,16 @@ <translation>Fájlnév, 0KB</translation> </message> <message> - <location filename="../../interface.cpp" line="1534"/> - <location filename="../../interface.cpp" line="1546"/> - <location filename="../../interface.cpp" line="1558"/> + <location filename="../../interface.cpp" line="1549"/> + <location filename="../../interface.cpp" line="1561"/> + <location filename="../../interface.cpp" line="1573"/> <source>Select a color</source> <translation>Válassz egy színt</translation> </message> <message> - <location filename="../../interface.cpp" line="1646"/> - <location filename="../../interface.cpp" line="1657"/> - <location filename="../../interface.cpp" line="1666"/> + <location filename="../../interface.cpp" line="1661"/> + <location filename="../../interface.cpp" line="1672"/> + <location filename="../../interface.cpp" line="1681"/> <source>%1 %2% of %3 into %4 files</source> <translation type="unfinished"></translation> </message> @@ -325,6 +331,11 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../../themesOptions.ui" line="239"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../themesOptions.ui" line="332"/> <source>Click to edit the color</source> <translation>Kattints a szín szerkesztéséhez</translation> @@ -355,11 +366,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="239"/> - <source>Informations</source> - <translation>Információk</translation> - </message> - <message> <location filename="../../themesOptions.ui" line="277"/> <source>Display</source> <translation>Megjelenítés</translation> diff --git a/plugins/Themes/Oxygen2/Languages/id/translation.ts b/plugins/Themes/Oxygen2/Languages/id/translation.ts index 437f2f0..96a3deb 100755 --- a/plugins/Themes/Oxygen2/Languages/id/translation.ts +++ b/plugins/Themes/Oxygen2/Languages/id/translation.ts @@ -8,19 +8,25 @@ <source>%1 files</source> <translation type="unfinished"></translation> </message> - <message> + <message numerus="yes"> <location filename="../../radialMap/map.cpp" line="204"/> - <source>%1 file, with an average size of %2</source> - <translation type="unfinished"></translation> + <source>%n file(s), with an average size of %1</source> + <comment>file</comment> + <translation type="unfinished"> + <numerusform></numerusform> + </translation> </message> </context> <context> <name>RadialMap::Widget</name> - <message> + <message numerus="yes"> <location filename="../../radialMap/widgetEvents.cpp" line="194"/> <location filename="../../radialMap/widgetEvents.cpp" line="196"/> - <source> into %1 files</source> - <translation type="unfinished"></translation> + <source> into %n file(s)</source> + <comment>file</comment> + <translation type="unfinished"> + <numerusform></numerusform> + </translation> </message> </context> <context> @@ -73,16 +79,16 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1534"/> - <location filename="../../interface.cpp" line="1546"/> - <location filename="../../interface.cpp" line="1558"/> + <location filename="../../interface.cpp" line="1549"/> + <location filename="../../interface.cpp" line="1561"/> + <location filename="../../interface.cpp" line="1573"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1646"/> - <location filename="../../interface.cpp" line="1657"/> - <location filename="../../interface.cpp" line="1666"/> + <location filename="../../interface.cpp" line="1661"/> + <location filename="../../interface.cpp" line="1672"/> + <location filename="../../interface.cpp" line="1681"/> <source>%1 %2% of %3 into %4 files</source> <translation type="unfinished"></translation> </message> @@ -351,7 +357,7 @@ </message> <message> <location filename="../../themesOptions.ui" line="239"/> - <source>Informations</source> + <source>Information</source> <translation type="unfinished"></translation> </message> <message> diff --git a/plugins/Themes/Oxygen2/Languages/it/translation.qm b/plugins/Themes/Oxygen2/Languages/it/translation.qm Binary files differindex 5afbca5..87a7344 100755 --- a/plugins/Themes/Oxygen2/Languages/it/translation.qm +++ b/plugins/Themes/Oxygen2/Languages/it/translation.qm diff --git a/plugins/Themes/Oxygen2/Languages/it/translation.ts b/plugins/Themes/Oxygen2/Languages/it/translation.ts index b0f3b6e..6c63b02 100644 --- a/plugins/Themes/Oxygen2/Languages/it/translation.ts +++ b/plugins/Themes/Oxygen2/Languages/it/translation.ts @@ -8,19 +8,27 @@ <source>%1 files</source> <translation>%1 file</translation> </message> - <message> + <message numerus="yes"> <location filename="../../radialMap/map.cpp" line="204"/> - <source>%1 file, with an average size of %2</source> - <translation>%1 file, con una dimensione media di %2</translation> + <source>%n file(s), with an average size of %1</source> + <comment>file</comment> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> </message> </context> <context> <name>RadialMap::Widget</name> - <message> + <message numerus="yes"> <location filename="../../radialMap/widgetEvents.cpp" line="194"/> <location filename="../../radialMap/widgetEvents.cpp" line="196"/> - <source> into %1 files</source> - <translation> in %1 file</translation> + <source> into %n file(s)</source> + <comment>file</comment> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> </message> </context> <context> @@ -35,7 +43,7 @@ <location filename="../../interface.cpp" line="293"/> <location filename="../../interface.cpp" line="314"/> <source>Register your key</source> - <translation type="unfinished"></translation> + <translation>Registrate la vostra chiave</translation> </message> <message> <location filename="../../interface.cpp" line="525"/> @@ -73,16 +81,16 @@ <translation>Nome del file, 0KB</translation> </message> <message> - <location filename="../../interface.cpp" line="1534"/> - <location filename="../../interface.cpp" line="1546"/> - <location filename="../../interface.cpp" line="1558"/> + <location filename="../../interface.cpp" line="1549"/> + <location filename="../../interface.cpp" line="1561"/> + <location filename="../../interface.cpp" line="1573"/> <source>Select a color</source> - <translation>Scegliere un colore</translation> + <translation>Seleziona colore</translation> </message> <message> - <location filename="../../interface.cpp" line="1646"/> - <location filename="../../interface.cpp" line="1657"/> - <location filename="../../interface.cpp" line="1666"/> + <location filename="../../interface.cpp" line="1661"/> + <location filename="../../interface.cpp" line="1672"/> + <location filename="../../interface.cpp" line="1681"/> <source>%1 %2% of %3 into %4 files</source> <translation>%1 %2% di %3 in %4 file</translation> </message> @@ -109,7 +117,7 @@ <location filename="../../ThemesFactory.cpp" line="533"/> <location filename="../../ThemesFactory.cpp" line="548"/> <source>Select a color</source> - <translation>Scegliere un colore</translation> + <translation>Seleziona colore</translation> </message> </context> <context> @@ -122,27 +130,27 @@ <message> <location filename="../../interface.ui" line="301"/> <source>&More</source> - <translation>Avanzate</translation> + <translation>&Altro</translation> </message> <message> <location filename="../../interface.ui" line="321"/> <source>&Pause</source> - <translation>Pausa</translation> + <translation>&Pausa</translation> </message> <message> <location filename="../../interface.ui" line="482"/> <source>&Skip</source> - <translation>Salta</translation> + <translation>&Salta</translation> </message> <message> <location filename="../../interface.ui" line="493"/> <source>&Cancel</source> - <translation>Annulla</translation> + <translation>&Annulla</translation> </message> <message> <location filename="../../interface.ui" line="389"/> <source>Close on transfer completion</source> - <translation>Arresta il sistema a trasferimento comletato</translation> + <translation>Chiudi a trasferimento comletato</translation> </message> <message> <location filename="../../interface.ui" line="232"/> @@ -157,7 +165,7 @@ <message> <location filename="../../interface.ui" line="527"/> <source>Limit copy speed to:</source> - <translation>Limitare la velocità di copia a:</translation> + <translation>Limita velocità di copia a:</translation> </message> <message> <location filename="../../interface.ui" line="570"/> @@ -233,12 +241,12 @@ <message> <location filename="../../interface.ui" line="963"/> <source>Source</source> - <translation>Cartella di origine</translation> + <translation>Origine</translation> </message> <message> <location filename="../../interface.ui" line="968"/> <source>Destination</source> - <translation>Cartella di destinazione</translation> + <translation>Destinazione</translation> </message> <message> <location filename="../../interface.ui" line="982"/> @@ -258,7 +266,7 @@ <message> <location filename="../../interface.ui" line="1046"/> <source>Move file(s)</source> - <translation>Sposta file</translation> + <translation>Sposta (i) file</translation> </message> <message> <location filename="../../interface.ui" line="1055"/> @@ -268,12 +276,12 @@ <message> <location filename="../../interface.ui" line="1064"/> <source>Copy file(s)</source> - <translation>Copia file</translation> + <translation>Copia (i) file</translation> </message> <message> <location filename="../../interface.ui" line="1073"/> <source>Copy folder</source> - <translation>Copia la cartella</translation> + <translation>Copia cartella</translation> </message> </context> <context> @@ -281,27 +289,27 @@ <message> <location filename="../../themesOptions.ui" line="293"/> <source>Show dual progression</source> - <translation>Mostrare la doppia progressione</translation> + <translation>Mostrare doppia progressione</translation> </message> <message> <location filename="../../themesOptions.ui" line="245"/> <source>Show speed as main information</source> - <translation>Mostrare la velocità come principale informazione</translation> + <translation>Mostrare velocità come informazione principale</translation> </message> <message> <location filename="../../themesOptions.ui" line="44"/> <source>Use</source> - <translation>Utilità</translation> + <translation>Utilizza</translation> </message> <message> <location filename="../../themesOptions.ui" line="110"/> <source>Start with the "more button" pushed</source> - <translation>Iniziare col pulsante "Altro" attivo</translation> + <translation>Avvia con pulsante "Altro" attivo</translation> </message> <message> <location filename="../../themesOptions.ui" line="57"/> <source>Minimize on close to systray</source> - <translation>Alla chiusura riduci nella'area di notifica</translation> + <translation>Alla chiusura riduci in area di notifica</translation> </message> <message> <location filename="../../themesOptions.ui" line="80"/> @@ -312,7 +320,7 @@ <location filename="../../themesOptions.ui" line="70"/> <location filename="../../themesOptions.ui" line="87"/> <source>Limit copy speed to</source> - <translation>Limitare velocità di copia a:</translation> + <translation>Limita velocità di copia a</translation> </message> <message> <location filename="../../themesOptions.ui" line="117"/> @@ -322,7 +330,12 @@ <message> <location filename="../../themesOptions.ui" line="144"/> <source>Position at start</source> - <translation>Posizione di partenza</translation> + <translation>Posizione all'avvio</translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="239"/> + <source>Information</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../../themesOptions.ui" line="332"/> @@ -347,7 +360,7 @@ <message> <location filename="../../themesOptions.ui" line="217"/> <source>Save as previous</source> - <translation>Mantenere come precedente</translation> + <translation>Salva come il precedente</translation> </message> <message> <location filename="../../themesOptions.ui" line="222"/> @@ -355,11 +368,6 @@ <translation>Centrale</translation> </message> <message> - <location filename="../../themesOptions.ui" line="239"/> - <source>Informations</source> - <translation>Informazioni</translation> - </message> - <message> <location filename="../../themesOptions.ui" line="277"/> <source>Display</source> <translation>Visualizza</translation> @@ -377,7 +385,7 @@ <message> <location filename="../../themesOptions.ui" line="303"/> <source>Show progression in the title</source> - <translation>Mostrare la percentuale di progresso sul titolo</translation> + <translation>Mostra progressione titolo</translation> </message> <message> <location filename="../../themesOptions.ui" line="137"/> diff --git a/plugins/Themes/Oxygen2/Languages/ja/translation.ts b/plugins/Themes/Oxygen2/Languages/ja/translation.ts index 5965f2e..485b400 100755 --- a/plugins/Themes/Oxygen2/Languages/ja/translation.ts +++ b/plugins/Themes/Oxygen2/Languages/ja/translation.ts @@ -8,19 +8,25 @@ <source>%1 files</source> <translation type="unfinished"></translation> </message> - <message> + <message numerus="yes"> <location filename="../../radialMap/map.cpp" line="204"/> - <source>%1 file, with an average size of %2</source> - <translation type="unfinished"></translation> + <source>%n file(s), with an average size of %1</source> + <comment>file</comment> + <translation type="unfinished"> + <numerusform></numerusform> + </translation> </message> </context> <context> <name>RadialMap::Widget</name> - <message> + <message numerus="yes"> <location filename="../../radialMap/widgetEvents.cpp" line="194"/> <location filename="../../radialMap/widgetEvents.cpp" line="196"/> - <source> into %1 files</source> - <translation type="unfinished"></translation> + <source> into %n file(s)</source> + <comment>file</comment> + <translation type="unfinished"> + <numerusform></numerusform> + </translation> </message> </context> <context> @@ -73,16 +79,16 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1534"/> - <location filename="../../interface.cpp" line="1546"/> - <location filename="../../interface.cpp" line="1558"/> + <location filename="../../interface.cpp" line="1549"/> + <location filename="../../interface.cpp" line="1561"/> + <location filename="../../interface.cpp" line="1573"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1646"/> - <location filename="../../interface.cpp" line="1657"/> - <location filename="../../interface.cpp" line="1666"/> + <location filename="../../interface.cpp" line="1661"/> + <location filename="../../interface.cpp" line="1672"/> + <location filename="../../interface.cpp" line="1681"/> <source>%1 %2% of %3 into %4 files</source> <translation type="unfinished"></translation> </message> @@ -351,7 +357,7 @@ </message> <message> <location filename="../../themesOptions.ui" line="239"/> - <source>Informations</source> + <source>Information</source> <translation type="unfinished"></translation> </message> <message> diff --git a/plugins/Themes/Oxygen2/Languages/ko/translation.qm b/plugins/Themes/Oxygen2/Languages/ko/translation.qm Binary files differindex 3738845..aeaedce 100755 --- a/plugins/Themes/Oxygen2/Languages/ko/translation.qm +++ b/plugins/Themes/Oxygen2/Languages/ko/translation.qm diff --git a/plugins/Themes/Oxygen2/Languages/ko/translation.ts b/plugins/Themes/Oxygen2/Languages/ko/translation.ts index 1a06732..7bd326e 100644 --- a/plugins/Themes/Oxygen2/Languages/ko/translation.ts +++ b/plugins/Themes/Oxygen2/Languages/ko/translation.ts @@ -8,19 +8,25 @@ <source>%1 files</source> <translation type="unfinished">%1 파일</translation> </message> - <message> + <message numerus="yes"> <location line="+96"/> - <source>%1 file, with an average size of %2</source> - <translation type="unfinished">%1 파일, %2의 파일, 평균 크기</translation> + <source>%n file(s), with an average size of %1</source> + <comment>file</comment> + <translation type="unfinished"> + <numerusform></numerusform> + </translation> </message> </context> <context> <name>RadialMap::Widget</name> - <message> + <message numerus="yes"> <location filename="../../radialMap/widgetEvents.cpp" line="+194"/> <location line="+2"/> - <source> into %1 files</source> - <translation type="unfinished"> %1 파일</translation> + <source> into %n file(s)</source> + <comment>file</comment> + <translation type="unfinished"> + <numerusform></numerusform> + </translation> </message> </context> <context> @@ -73,7 +79,7 @@ <translation type="unfinished">파일 이름, 0KB</translation> </message> <message> - <location line="+195"/> + <location line="+210"/> <location line="+12"/> <location line="+12"/> <source>Select a color</source> @@ -326,7 +332,12 @@ <translation type="unfinished">시작 시 위치</translation> </message> <message> - <location line="+188"/> + <location line="+95"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+93"/> <source>Click to edit the color</source> <translation type="unfinished">색상 편집 클릭</translation> </message> @@ -356,12 +367,7 @@ <translation type="unfinished">가운데</translation> </message> <message> - <location line="+17"/> - <source>Informations</source> - <translation type="unfinished">정보</translation> - </message> - <message> - <location line="+38"/> + <location line="+55"/> <source>Display</source> <translation type="unfinished">표시</translation> </message> diff --git a/plugins/Themes/Oxygen2/Languages/nl/translation.ts b/plugins/Themes/Oxygen2/Languages/nl/translation.ts index 437f2f0..96a3deb 100755 --- a/plugins/Themes/Oxygen2/Languages/nl/translation.ts +++ b/plugins/Themes/Oxygen2/Languages/nl/translation.ts @@ -8,19 +8,25 @@ <source>%1 files</source> <translation type="unfinished"></translation> </message> - <message> + <message numerus="yes"> <location filename="../../radialMap/map.cpp" line="204"/> - <source>%1 file, with an average size of %2</source> - <translation type="unfinished"></translation> + <source>%n file(s), with an average size of %1</source> + <comment>file</comment> + <translation type="unfinished"> + <numerusform></numerusform> + </translation> </message> </context> <context> <name>RadialMap::Widget</name> - <message> + <message numerus="yes"> <location filename="../../radialMap/widgetEvents.cpp" line="194"/> <location filename="../../radialMap/widgetEvents.cpp" line="196"/> - <source> into %1 files</source> - <translation type="unfinished"></translation> + <source> into %n file(s)</source> + <comment>file</comment> + <translation type="unfinished"> + <numerusform></numerusform> + </translation> </message> </context> <context> @@ -73,16 +79,16 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1534"/> - <location filename="../../interface.cpp" line="1546"/> - <location filename="../../interface.cpp" line="1558"/> + <location filename="../../interface.cpp" line="1549"/> + <location filename="../../interface.cpp" line="1561"/> + <location filename="../../interface.cpp" line="1573"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1646"/> - <location filename="../../interface.cpp" line="1657"/> - <location filename="../../interface.cpp" line="1666"/> + <location filename="../../interface.cpp" line="1661"/> + <location filename="../../interface.cpp" line="1672"/> + <location filename="../../interface.cpp" line="1681"/> <source>%1 %2% of %3 into %4 files</source> <translation type="unfinished"></translation> </message> @@ -351,7 +357,7 @@ </message> <message> <location filename="../../themesOptions.ui" line="239"/> - <source>Informations</source> + <source>Information</source> <translation type="unfinished"></translation> </message> <message> diff --git a/plugins/Themes/Oxygen2/Languages/no/translation.ts b/plugins/Themes/Oxygen2/Languages/no/translation.ts index 437f2f0..96a3deb 100755 --- a/plugins/Themes/Oxygen2/Languages/no/translation.ts +++ b/plugins/Themes/Oxygen2/Languages/no/translation.ts @@ -8,19 +8,25 @@ <source>%1 files</source> <translation type="unfinished"></translation> </message> - <message> + <message numerus="yes"> <location filename="../../radialMap/map.cpp" line="204"/> - <source>%1 file, with an average size of %2</source> - <translation type="unfinished"></translation> + <source>%n file(s), with an average size of %1</source> + <comment>file</comment> + <translation type="unfinished"> + <numerusform></numerusform> + </translation> </message> </context> <context> <name>RadialMap::Widget</name> - <message> + <message numerus="yes"> <location filename="../../radialMap/widgetEvents.cpp" line="194"/> <location filename="../../radialMap/widgetEvents.cpp" line="196"/> - <source> into %1 files</source> - <translation type="unfinished"></translation> + <source> into %n file(s)</source> + <comment>file</comment> + <translation type="unfinished"> + <numerusform></numerusform> + </translation> </message> </context> <context> @@ -73,16 +79,16 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1534"/> - <location filename="../../interface.cpp" line="1546"/> - <location filename="../../interface.cpp" line="1558"/> + <location filename="../../interface.cpp" line="1549"/> + <location filename="../../interface.cpp" line="1561"/> + <location filename="../../interface.cpp" line="1573"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1646"/> - <location filename="../../interface.cpp" line="1657"/> - <location filename="../../interface.cpp" line="1666"/> + <location filename="../../interface.cpp" line="1661"/> + <location filename="../../interface.cpp" line="1672"/> + <location filename="../../interface.cpp" line="1681"/> <source>%1 %2% of %3 into %4 files</source> <translation type="unfinished"></translation> </message> @@ -351,7 +357,7 @@ </message> <message> <location filename="../../themesOptions.ui" line="239"/> - <source>Informations</source> + <source>Information</source> <translation type="unfinished"></translation> </message> <message> diff --git a/plugins/Themes/Oxygen2/Languages/pl/translation.ts b/plugins/Themes/Oxygen2/Languages/pl/translation.ts index 437f2f0..96a3deb 100755 --- a/plugins/Themes/Oxygen2/Languages/pl/translation.ts +++ b/plugins/Themes/Oxygen2/Languages/pl/translation.ts @@ -8,19 +8,25 @@ <source>%1 files</source> <translation type="unfinished"></translation> </message> - <message> + <message numerus="yes"> <location filename="../../radialMap/map.cpp" line="204"/> - <source>%1 file, with an average size of %2</source> - <translation type="unfinished"></translation> + <source>%n file(s), with an average size of %1</source> + <comment>file</comment> + <translation type="unfinished"> + <numerusform></numerusform> + </translation> </message> </context> <context> <name>RadialMap::Widget</name> - <message> + <message numerus="yes"> <location filename="../../radialMap/widgetEvents.cpp" line="194"/> <location filename="../../radialMap/widgetEvents.cpp" line="196"/> - <source> into %1 files</source> - <translation type="unfinished"></translation> + <source> into %n file(s)</source> + <comment>file</comment> + <translation type="unfinished"> + <numerusform></numerusform> + </translation> </message> </context> <context> @@ -73,16 +79,16 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1534"/> - <location filename="../../interface.cpp" line="1546"/> - <location filename="../../interface.cpp" line="1558"/> + <location filename="../../interface.cpp" line="1549"/> + <location filename="../../interface.cpp" line="1561"/> + <location filename="../../interface.cpp" line="1573"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1646"/> - <location filename="../../interface.cpp" line="1657"/> - <location filename="../../interface.cpp" line="1666"/> + <location filename="../../interface.cpp" line="1661"/> + <location filename="../../interface.cpp" line="1672"/> + <location filename="../../interface.cpp" line="1681"/> <source>%1 %2% of %3 into %4 files</source> <translation type="unfinished"></translation> </message> @@ -351,7 +357,7 @@ </message> <message> <location filename="../../themesOptions.ui" line="239"/> - <source>Informations</source> + <source>Information</source> <translation type="unfinished"></translation> </message> <message> diff --git a/plugins/Themes/Oxygen2/Languages/pt/translation.ts b/plugins/Themes/Oxygen2/Languages/pt/translation.ts index 437f2f0..96a3deb 100755 --- a/plugins/Themes/Oxygen2/Languages/pt/translation.ts +++ b/plugins/Themes/Oxygen2/Languages/pt/translation.ts @@ -8,19 +8,25 @@ <source>%1 files</source> <translation type="unfinished"></translation> </message> - <message> + <message numerus="yes"> <location filename="../../radialMap/map.cpp" line="204"/> - <source>%1 file, with an average size of %2</source> - <translation type="unfinished"></translation> + <source>%n file(s), with an average size of %1</source> + <comment>file</comment> + <translation type="unfinished"> + <numerusform></numerusform> + </translation> </message> </context> <context> <name>RadialMap::Widget</name> - <message> + <message numerus="yes"> <location filename="../../radialMap/widgetEvents.cpp" line="194"/> <location filename="../../radialMap/widgetEvents.cpp" line="196"/> - <source> into %1 files</source> - <translation type="unfinished"></translation> + <source> into %n file(s)</source> + <comment>file</comment> + <translation type="unfinished"> + <numerusform></numerusform> + </translation> </message> </context> <context> @@ -73,16 +79,16 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1534"/> - <location filename="../../interface.cpp" line="1546"/> - <location filename="../../interface.cpp" line="1558"/> + <location filename="../../interface.cpp" line="1549"/> + <location filename="../../interface.cpp" line="1561"/> + <location filename="../../interface.cpp" line="1573"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1646"/> - <location filename="../../interface.cpp" line="1657"/> - <location filename="../../interface.cpp" line="1666"/> + <location filename="../../interface.cpp" line="1661"/> + <location filename="../../interface.cpp" line="1672"/> + <location filename="../../interface.cpp" line="1681"/> <source>%1 %2% of %3 into %4 files</source> <translation type="unfinished"></translation> </message> @@ -351,7 +357,7 @@ </message> <message> <location filename="../../themesOptions.ui" line="239"/> - <source>Informations</source> + <source>Information</source> <translation type="unfinished"></translation> </message> <message> diff --git a/plugins/Themes/Oxygen2/Languages/ru/translation.qm b/plugins/Themes/Oxygen2/Languages/ru/translation.qm Binary files differindex 59964bb..51865b5 100755 --- a/plugins/Themes/Oxygen2/Languages/ru/translation.qm +++ b/plugins/Themes/Oxygen2/Languages/ru/translation.qm diff --git a/plugins/Themes/Oxygen2/Languages/ru/translation.ts b/plugins/Themes/Oxygen2/Languages/ru/translation.ts index 5169984..7b1975d 100755 --- a/plugins/Themes/Oxygen2/Languages/ru/translation.ts +++ b/plugins/Themes/Oxygen2/Languages/ru/translation.ts @@ -8,19 +8,29 @@ <source>%1 files</source> <translation type="unfinished"></translation> </message> - <message> + <message numerus="yes"> <location filename="../../radialMap/map.cpp" line="204"/> - <source>%1 file, with an average size of %2</source> - <translation type="unfinished"></translation> + <source>%n file(s), with an average size of %1</source> + <comment>file</comment> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> </message> </context> <context> <name>RadialMap::Widget</name> - <message> + <message numerus="yes"> <location filename="../../radialMap/widgetEvents.cpp" line="194"/> <location filename="../../radialMap/widgetEvents.cpp" line="196"/> - <source> into %1 files</source> - <translation type="unfinished"></translation> + <source> into %n file(s)</source> + <comment>file</comment> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> </message> </context> <context> @@ -73,16 +83,16 @@ <translation>Имя файла, 0KB</translation> </message> <message> - <location filename="../../interface.cpp" line="1534"/> - <location filename="../../interface.cpp" line="1546"/> - <location filename="../../interface.cpp" line="1558"/> + <location filename="../../interface.cpp" line="1549"/> + <location filename="../../interface.cpp" line="1561"/> + <location filename="../../interface.cpp" line="1573"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1646"/> - <location filename="../../interface.cpp" line="1657"/> - <location filename="../../interface.cpp" line="1666"/> + <location filename="../../interface.cpp" line="1661"/> + <location filename="../../interface.cpp" line="1672"/> + <location filename="../../interface.cpp" line="1681"/> <source>%1 %2% of %3 into %4 files</source> <translation type="unfinished"></translation> </message> @@ -325,6 +335,11 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../../themesOptions.ui" line="239"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../themesOptions.ui" line="332"/> <source>Click to edit the color</source> <translation type="unfinished"></translation> @@ -355,11 +370,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="239"/> - <source>Informations</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../themesOptions.ui" line="277"/> <source>Display</source> <translation type="unfinished"></translation> diff --git a/plugins/Themes/Oxygen2/Languages/th/translation.ts b/plugins/Themes/Oxygen2/Languages/th/translation.ts index 437f2f0..96a3deb 100755 --- a/plugins/Themes/Oxygen2/Languages/th/translation.ts +++ b/plugins/Themes/Oxygen2/Languages/th/translation.ts @@ -8,19 +8,25 @@ <source>%1 files</source> <translation type="unfinished"></translation> </message> - <message> + <message numerus="yes"> <location filename="../../radialMap/map.cpp" line="204"/> - <source>%1 file, with an average size of %2</source> - <translation type="unfinished"></translation> + <source>%n file(s), with an average size of %1</source> + <comment>file</comment> + <translation type="unfinished"> + <numerusform></numerusform> + </translation> </message> </context> <context> <name>RadialMap::Widget</name> - <message> + <message numerus="yes"> <location filename="../../radialMap/widgetEvents.cpp" line="194"/> <location filename="../../radialMap/widgetEvents.cpp" line="196"/> - <source> into %1 files</source> - <translation type="unfinished"></translation> + <source> into %n file(s)</source> + <comment>file</comment> + <translation type="unfinished"> + <numerusform></numerusform> + </translation> </message> </context> <context> @@ -73,16 +79,16 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1534"/> - <location filename="../../interface.cpp" line="1546"/> - <location filename="../../interface.cpp" line="1558"/> + <location filename="../../interface.cpp" line="1549"/> + <location filename="../../interface.cpp" line="1561"/> + <location filename="../../interface.cpp" line="1573"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1646"/> - <location filename="../../interface.cpp" line="1657"/> - <location filename="../../interface.cpp" line="1666"/> + <location filename="../../interface.cpp" line="1661"/> + <location filename="../../interface.cpp" line="1672"/> + <location filename="../../interface.cpp" line="1681"/> <source>%1 %2% of %3 into %4 files</source> <translation type="unfinished"></translation> </message> @@ -351,7 +357,7 @@ </message> <message> <location filename="../../themesOptions.ui" line="239"/> - <source>Informations</source> + <source>Information</source> <translation type="unfinished"></translation> </message> <message> diff --git a/plugins/Themes/Oxygen2/Languages/tr/translation.ts b/plugins/Themes/Oxygen2/Languages/tr/translation.ts index 437f2f0..96a3deb 100755 --- a/plugins/Themes/Oxygen2/Languages/tr/translation.ts +++ b/plugins/Themes/Oxygen2/Languages/tr/translation.ts @@ -8,19 +8,25 @@ <source>%1 files</source> <translation type="unfinished"></translation> </message> - <message> + <message numerus="yes"> <location filename="../../radialMap/map.cpp" line="204"/> - <source>%1 file, with an average size of %2</source> - <translation type="unfinished"></translation> + <source>%n file(s), with an average size of %1</source> + <comment>file</comment> + <translation type="unfinished"> + <numerusform></numerusform> + </translation> </message> </context> <context> <name>RadialMap::Widget</name> - <message> + <message numerus="yes"> <location filename="../../radialMap/widgetEvents.cpp" line="194"/> <location filename="../../radialMap/widgetEvents.cpp" line="196"/> - <source> into %1 files</source> - <translation type="unfinished"></translation> + <source> into %n file(s)</source> + <comment>file</comment> + <translation type="unfinished"> + <numerusform></numerusform> + </translation> </message> </context> <context> @@ -73,16 +79,16 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1534"/> - <location filename="../../interface.cpp" line="1546"/> - <location filename="../../interface.cpp" line="1558"/> + <location filename="../../interface.cpp" line="1549"/> + <location filename="../../interface.cpp" line="1561"/> + <location filename="../../interface.cpp" line="1573"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1646"/> - <location filename="../../interface.cpp" line="1657"/> - <location filename="../../interface.cpp" line="1666"/> + <location filename="../../interface.cpp" line="1661"/> + <location filename="../../interface.cpp" line="1672"/> + <location filename="../../interface.cpp" line="1681"/> <source>%1 %2% of %3 into %4 files</source> <translation type="unfinished"></translation> </message> @@ -351,7 +357,7 @@ </message> <message> <location filename="../../themesOptions.ui" line="239"/> - <source>Informations</source> + <source>Information</source> <translation type="unfinished"></translation> </message> <message> diff --git a/plugins/Themes/Oxygen2/Languages/zh/translation.ts b/plugins/Themes/Oxygen2/Languages/zh/translation.ts index 5965f2e..485b400 100755 --- a/plugins/Themes/Oxygen2/Languages/zh/translation.ts +++ b/plugins/Themes/Oxygen2/Languages/zh/translation.ts @@ -8,19 +8,25 @@ <source>%1 files</source> <translation type="unfinished"></translation> </message> - <message> + <message numerus="yes"> <location filename="../../radialMap/map.cpp" line="204"/> - <source>%1 file, with an average size of %2</source> - <translation type="unfinished"></translation> + <source>%n file(s), with an average size of %1</source> + <comment>file</comment> + <translation type="unfinished"> + <numerusform></numerusform> + </translation> </message> </context> <context> <name>RadialMap::Widget</name> - <message> + <message numerus="yes"> <location filename="../../radialMap/widgetEvents.cpp" line="194"/> <location filename="../../radialMap/widgetEvents.cpp" line="196"/> - <source> into %1 files</source> - <translation type="unfinished"></translation> + <source> into %n file(s)</source> + <comment>file</comment> + <translation type="unfinished"> + <numerusform></numerusform> + </translation> </message> </context> <context> @@ -73,16 +79,16 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1534"/> - <location filename="../../interface.cpp" line="1546"/> - <location filename="../../interface.cpp" line="1558"/> + <location filename="../../interface.cpp" line="1549"/> + <location filename="../../interface.cpp" line="1561"/> + <location filename="../../interface.cpp" line="1573"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1646"/> - <location filename="../../interface.cpp" line="1657"/> - <location filename="../../interface.cpp" line="1666"/> + <location filename="../../interface.cpp" line="1661"/> + <location filename="../../interface.cpp" line="1672"/> + <location filename="../../interface.cpp" line="1681"/> <source>%1 %2% of %3 into %4 files</source> <translation type="unfinished"></translation> </message> @@ -351,7 +357,7 @@ </message> <message> <location filename="../../themesOptions.ui" line="239"/> - <source>Informations</source> + <source>Information</source> <translation type="unfinished"></translation> </message> <message> diff --git a/plugins/Themes/Oxygen2/informations.xml b/plugins/Themes/Oxygen2/informations.xml index 7606fe6..2992128 100755 --- a/plugins/Themes/Oxygen2/informations.xml +++ b/plugins/Themes/Oxygen2/informations.xml @@ -17,7 +17,7 @@ <description xml:lang="en"><![CDATA[Oxygen2 style for Ultracopier]]></description> <description xml:lang="fr"><![CDATA[Style oxygen2 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>2.2.4.7</version> + <version>2.2.6.0</version> <!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. --> <name>Oxygen2</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/Oxygen2/interface.cpp b/plugins/Themes/Oxygen2/interface.cpp index b90ee8c..14d4f6b 100755 --- a/plugins/Themes/Oxygen2/interface.cpp +++ b/plugins/Themes/Oxygen2/interface.cpp @@ -1469,6 +1469,13 @@ void Themes::dropEvent(QDropEvent *event) const QMimeData* mimeData = event->mimeData(); if(mimeData->hasUrls()) { + if(event->dropAction()!=Qt::CopyAction) + { + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"event->dropAction()!=Qt::CopyAction ignore"); + //drag'n'drop with shift pressed send the file to trash + event->ignore(); + return; + } ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"hasUrls"); std::vector<std::string> urls; unsigned int index=0; @@ -1493,7 +1500,10 @@ void Themes::dragEnterEvent(QDragEnterEvent* event) if(mimeData->hasUrls()) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"hasUrls"); - event->acceptProposedAction(); + if(event->dropAction()==Qt::CopyAction) + event->acceptProposedAction(); + else + event->ignore();//drag'n'drop with shift pressed send the file to trash } } @@ -1502,7 +1512,12 @@ void Themes::dragMoveEvent(QDragMoveEvent* event) // if some actions should not be usable, like move, this code must be adopted const QMimeData* mimeData = event->mimeData(); if(mimeData->hasUrls()) - event->acceptProposedAction(); + { + if(event->dropAction()==Qt::CopyAction) + event->acceptProposedAction(); + else + event->ignore();//drag'n'drop with shift pressed send the file to trash + } } void Themes::dragLeaveEvent(QDragLeaveEvent* event) diff --git a/plugins/Themes/Oxygen2/radialMap/map.cpp b/plugins/Themes/Oxygen2/radialMap/map.cpp index a7306ac..598ca9b 100755 --- a/plugins/Themes/Oxygen2/radialMap/map.cpp +++ b/plugins/Themes/Oxygen2/radialMap/map.cpp @@ -201,8 +201,7 @@ bool RadialMap::Map::build(const Folder * const dir, const uint depth, uint a_st if (depth == 0 && hiddenSize >= m_limits[depth] && hiddenFileCount > 0) { //append a segment for unrepresented space - a "fake" segment - const QString s = QObject::tr("%1 file, with an average size of %2") - .arg(hiddenFileCount) + const QString s = QObject::tr("%n file(s), with an average size of %1","file",hiddenFileCount) .arg(QString::fromStdString(File::facilityEngine->sizeToString(hiddenSize/hiddenFileCount))); diff --git a/plugins/Themes/Oxygen2/radialMap/widgetEvents.cpp b/plugins/Themes/Oxygen2/radialMap/widgetEvents.cpp index d9c23a0..208437c 100755 --- a/plugins/Themes/Oxygen2/radialMap/widgetEvents.cpp +++ b/plugins/Themes/Oxygen2/radialMap/widgetEvents.cpp @@ -191,9 +191,9 @@ void RadialMap::Widget::mouseMoveEvent(QMouseEvent *e) { const Folder* folder=static_cast<const Folder*>(m_focus->file()); if(path.isEmpty()) - string += m_focus->file()->humanReadableSize()+tr(" into %1 files").arg(folder->children()); + string += m_focus->file()->humanReadableSize()+tr(" into %n file(s)","file",folder->children()); else - string += path+"\n"+m_focus->file()->humanReadableSize()+tr(" into %1 files").arg(folder->children()); + string += path+"\n"+m_focus->file()->humanReadableSize()+tr(" into %n file(s)","file",folder->children()); } else string += path+" "+m_focus->file()->humanReadableSize(); diff --git a/plugins/Themes/Oxygen2/themesOptions.ui b/plugins/Themes/Oxygen2/themesOptions.ui index b2da124..810f075 100755 --- a/plugins/Themes/Oxygen2/themesOptions.ui +++ b/plugins/Themes/Oxygen2/themesOptions.ui @@ -236,7 +236,7 @@ </rect> </property> <attribute name="label"> - <string>Informations</string> + <string>Information</string> </attribute> <layout class="QGridLayout" name="gridLayout_2"> <item row="0" column="0"> diff --git a/plugins/Themes/Supercopier/informations.xml b/plugins/Themes/Supercopier/informations.xml index 870b90f..7080c31 100755 --- a/plugins/Themes/Supercopier/informations.xml +++ b/plugins/Themes/Supercopier/informations.xml @@ -17,7 +17,7 @@ <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>2.2.4.7</version> + <version>2.2.6.0</version> <!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. --> <name>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. --> |